lsd-pi 1.3.6 → 1.3.7

package/packages/pi-coding-agent/dist/modes/interactive/components/tool-execution.js

@@ -1,6 +1,6 @@
 import { Box, Container, getCapabilities, Image, imageFallback, Spacer, Text, truncateToWidth, } from "@gsd/pi-tui";
 import stripAnsi from "strip-ansi";
-import { computeEditDiff } from "../../../core/tools/edit-diff.js";
+import { computeEditDiff, computeWriteDiff, } from "../../../core/tools/edit-diff.js";
 import { allTools } from "../../../core/tools/index.js";
 import { shouldCollapse } from "../../../core/tool-priority.js";
 import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize } from "../../../core/tools/truncate.js";
@@ -10,7 +10,7 @@ import { renderTerminalText } from "../../../utils/terminal-serializer.js";
 import { getLanguageFromPath, highlightCode, theme } from "../theme/theme.js";
 import { editorLink } from "../utils/editor-link.js";
 import { shortenPath } from "../utils/shorten-path.js";
-import { renderDiff } from "./diff.js";
+import { renderDiff, renderDiffLines } from "./diff.js";
 import { truncateToVisualLines } from "./visual-truncate.js";
 // Preview line limit for bash when not expanded
 const BASH_PREVIEW_LINES = 5;
@@ -117,6 +117,40 @@ export class ToolExecutionComponent extends Container {
         const hasCustomRenderers = this.toolDefinition?.renderCall || this.toolDefinition?.renderResult;
         return isBuiltInName && !hasCustomRenderers;
     }
+    setPrimaryContent(useBox) {
+        const hasBox = this.children.includes(this.contentBox);
+        const hasText = this.children.includes(this.contentText);
+        if (useBox) {
+            if (hasText)
+                this.removeChild(this.contentText);
+            if (!hasBox)
+                this.addChild(this.contentBox);
+        }
+        else {
+            if (hasBox)
+                this.removeChild(this.contentBox);
+            if (!hasText)
+                this.addChild(this.contentText);
+        }
+    }
+    getDiffTextToRender() {
+        if (this.toolName === "write") {
+            if (!this.isPartial && this.writeDiffPreview && !("error" in this.writeDiffPreview) && this.writeDiffPreview.diff) {
+                return this.writeDiffPreview.diff;
+            }
+            return undefined;
+        }
+        if (this.toolName !== "edit" || this.result?.isError) {
+            return undefined;
+        }
+        if (this.result?.details?.diff) {
+            return this.result.details.diff;
+        }
+        if (this.editDiffPreview && !("error" in this.editDiffPreview) && this.editDiffPreview.diff) {
+            return this.editDiffPreview.diff;
+        }
+        return undefined;
+    }
     updateArgs(args) {
         this.args = args;
         if (this.toolName === "write" && this.isPartial) {
@@ -212,9 +246,33 @@ export class ToolExecutionComponent extends Container {
             if (rawPath !== null && fileContent !== null) {
                 this.rebuildWriteHighlightCacheFull(rawPath, fileContent);
             }
+            this.maybeComputeWriteDiff();
         }
         this.maybeComputeEditDiff();
     }
+    /**
+     * Compute write diff preview when we have complete args.
+     * This runs async and updates display when done.
+     */
+    maybeComputeWriteDiff() {
+        if (this.toolName !== "write")
+            return;
+        const path = this.args?.path ?? this.args?.file_path;
+        const content = this.args?.content;
+        if (!path || content === undefined)
+            return;
+        const argsKey = JSON.stringify({ path, content });
+        if (this.writeDiffArgsKey === argsKey)
+            return;
+        this.writeDiffArgsKey = argsKey;
+        computeWriteDiff(path, content, this.cwd).then((result) => {
+            if (this.writeDiffArgsKey === argsKey) {
+                this.writeDiffPreview = result;
+                this.updateDisplay();
+                this.ui.requestRender();
+            }
+        });
+    }
     /**
      * Compute edit diff preview when we have complete args.
      * This runs async and updates display when done.
@@ -304,8 +362,8 @@ export class ToolExecutionComponent extends Container {
     getElapsed() {
         return Date.now() - this.startTime;
     }
-    shouldHideWhenCollapsed() {
-        return !this.isPartial && shouldCollapse(this.toolName, this.result?.isError ?? false);
+    shouldHideWhenCollapsed(collapseToolCalls = true) {
+        return collapseToolCalls && !this.isPartial && shouldCollapse(this.toolName, this.result?.isError ?? false);
     }
     setRenderMode(mode) {
         if (this.renderMode !== mode) {
@@ -370,15 +428,23 @@ export class ToolExecutionComponent extends Container {
             }
         }
         const useBuiltInRenderer = this.shouldUseBuiltInRenderer();
+        const diffTextToRender = this.getDiffTextToRender();
         let customRendererHasContent = false;
         // Use built-in rendering for built-in tools (or overrides without custom renderers)
         if (useBuiltInRenderer) {
+            const useDiffBox = !!diffTextToRender && !this.shouldHideCollapsedPreview();
+            this.setPrimaryContent(this.toolName === "bash" || useDiffBox);
             if (this.toolName === "bash") {
                 // Bash uses Box with visual line truncation - no background
                 this.contentBox.setBgFn((text) => text);
                 this.contentBox.clear();
                 this.renderBashContent(statusIndicator);
             }
+            else if (useDiffBox && diffTextToRender) {
+                this.contentBox.setBgFn((text) => text);
+                this.contentBox.clear();
+                this.renderBuiltInDiffContent(statusIndicator, diffTextToRender);
+            }
             else {
                 // Other built-in tools: use Text directly with caching - no background
                 this.contentText.setCustomBgFn((text) => text);
@@ -507,6 +573,20 @@ export class ToolExecutionComponent extends Container {
         const computedHidden = !useBuiltInRenderer && this.toolDefinition ? !customRendererHasContent && this.imageComponents.length === 0 : false;
         this.hideComponent = this.manuallyHidden || computedHidden;
     }
+    /**
+     * Render built-in edit/write diff blocks with width-aware full-line backgrounds.
+     */
+    renderBuiltInDiffContent(statusIndicator, diffText) {
+        const header = this.formatToolExecution(statusIndicator).split("\n\n", 1)[0] ?? "";
+        this.contentBox.addChild(new Text(header, 0, 0));
+        this.contentBox.addChild({
+            render: (width) => {
+                const contentWidth = Math.max(1, width - 2);
+                return ["", ...renderDiffLines(diffText, contentWidth).map((line) => ` ${line} `)];
+            },
+            invalidate: () => { },
+        });
+    }
     /**
      * Render bash content using visual line truncation (like bash-execution.ts)
      */
@@ -726,14 +806,40 @@ export class ToolExecutionComponent extends Container {
             const rawPath = str(this.args?.file_path ?? this.args?.path);
             const fileContent = str(this.args?.content);
             const path = rawPath !== null ? shortenPath(rawPath) : null;
+            const firstChangedLine = this.writeDiffPreview && "firstChangedLine" in this.writeDiffPreview
+                ? this.writeDiffPreview.firstChangedLine
+                : undefined;
             let writePathDisplay = path === null ? invalidArg : path ? theme.fg("accent", path) : theme.fg("toolOutput", "...");
             if (rawPath && path) {
-                writePathDisplay = editorLink(rawPath, writePathDisplay, { cwd: this.cwd, scheme: this.editorScheme });
+                writePathDisplay = editorLink(rawPath, writePathDisplay, {
+                    cwd: this.cwd,
+                    line: firstChangedLine ?? undefined,
+                    scheme: this.editorScheme,
+                });
+            }
+            if (firstChangedLine) {
+                writePathDisplay += theme.fg("warning", `:${firstChangedLine}`);
             }
             text = `${statusIndicator} ${theme.fg("toolTitle", theme.bold("write"))} ${writePathDisplay}`;
             if (fileContent === null) {
                 text += `\n\n${theme.fg("error", "[invalid content arg - expected string]")}`;
             }
+            else if (this.result?.isError) {
+                const errorText = this.getTextOutput();
+                if (errorText) {
+                    text += `\n\n${theme.fg("error", errorText)}`;
+                }
+            }
+            else if (!this.isPartial && this.writeDiffPreview) {
+                if ("error" in this.writeDiffPreview) {
+                    text += `\n\n${theme.fg("error", this.writeDiffPreview.error)}`;
+                }
+                else if (this.writeDiffPreview.diff) {
+                    text += hideCollapsedPreview
+                        ? this.collapsedHintWithPrefix()
+                        : `\n\n${renderDiff(this.writeDiffPreview.diff, { filePath: rawPath ?? undefined })}`;
+                }
+            }
             else if (fileContent) {
                 const lang = rawPath ? getLanguageFromPath(rawPath) : undefined;
                 let lines;
@@ -775,13 +881,6 @@ export class ToolExecutionComponent extends Container {
                     }
                 }
             }
-            // Show error if tool execution failed
-            if (this.result?.isError) {
-                const errorText = this.getTextOutput();
-                if (errorText) {
-                    text += `\n\n${theme.fg("error", errorText)}`;
-                }
-            }
         }
         else if (this.toolName === "edit") {
             const rawPath = str(this.args?.file_path ?? this.args?.path);