getcompanion-ai/co-mono
1
0
Fork 0
mirror of https://github.com/getcompanion-ai/co-mono.git synced 2026-04-16 05:03:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add intra-line diff highlighting for edit tool

Browse source 
- Extract diff rendering to dedicated diff.ts component
- Show word-level changes with inverse highlighting when a single line is modified
- Use diffWords for cleaner token grouping (includes adjacent whitespace)
- Only apply intra-line diff when exactly 1 removed and 1 added line (true modification)
- Multi-line changes show all removed then all added without incorrect pairing
- Add theme.inverse() method for inverse text styling
This commit is contained in:
Mario Zechner 2025-12-18 16:49:44 +01:00
parent 1a944f50f9
commit 5117187362
3 changed files with 155 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
packages/coding-agent/src/modes/interactive/components/tool-execution.ts
View file

@ -13,6 +13,7 @@ import stripAnsi from "strip-ansi";
import type { CustomAgentTool } from "../../../core/custom-tools/types.js";
import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize } from "../../../core/tools/truncate.js";
import { getLanguageFromPath, highlightCode, theme } from "../theme/theme.js";
import { renderDiff } from "./diff.js";
/**
* Convert absolute path to tilde notation if it's in home directory
@ -358,7 +359,8 @@ export class ToolExecutionComponent extends Container {
}
}
} else if (this.toolName === "edit") {
const path = shortenPath(this.args?.file_path || this.args?.path || "");
const rawPath = this.args?.file_path || this.args?.path || "";
const path = shortenPath(rawPath);
text =
theme.fg("toolTitle", theme.bold("edit")) +
" " +
@ -371,17 +373,7 @@ export class ToolExecutionComponent extends Container {
text += "\n\n" + theme.fg("error", errorText);
}
} else if (this.result.details?.diff) {
const diffLines = this.result.details.diff.split("\n");
const coloredLines = diffLines.map((line: string) => {
if (line.startsWith("+")) {
return theme.fg("toolDiffAdded", line);
} else if (line.startsWith("-")) {
return theme.fg("toolDiffRemoved", line);
} else {
return theme.fg("toolDiffContext", line);
}
});
text += "\n\n" + coloredLines.join("\n");
text += "\n\n" + renderDiff(this.result.details.diff, { filePath: rawPath });
}
}
} else if (this.toolName === "ls") {