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

Fix edit tool diff not showing in TUI

Browse source 
The async diff preview computation could race with tool execution,
causing editDiffPreview to contain an error (file already modified)
while the actual tool result had the correct diff in details.diff.

Fix: prioritize result.details.diff over editDiffPreview when the
tool has executed successfully. The preview is only used before
tool execution completes.
This commit is contained in:
Mario Zechner 2026-01-03 04:23:59 +01:00
parent 746ec9eb01
commit 0f81b09625
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -479,8 +479,13 @@ export class ToolExecutionComponent extends Container {
if (errorText) {
text += `\n\n${theme.fg("error", errorText)}`;
}
} else if (this.result?.details?.diff) {
// Tool executed successfully - use the diff from result
// This takes priority over editDiffPreview which may have a stale error
// due to race condition (async preview computed after file was modified)
text += `\n\n${renderDiff(this.result.details.diff, { filePath: rawPath })}`;
} else if (this.editDiffPreview) {
// Use cached diff preview (works both before and after execution)
// Use cached diff preview (before tool executes)
if ("error" in this.editDiffPreview) {
text += `\n\n${theme.fg("error", this.editDiffPreview.error)}`;
} else if (this.editDiffPreview.diff) {