lsd-pi 1.1.4 → 1.1.6

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

@@ -5,23 +5,16 @@ import { allTools } from "../../../core/tools/index.js";
 import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize } from "../../../core/tools/truncate.js";
 import { convertToPng } from "../../../utils/image-convert.js";
 import { sanitizeBinaryOutput } from "../../../utils/shell.js";
+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 { keyHint } from "./keybinding-hints.js";
 import { truncateToVisualLines } from "./visual-truncate.js";
 // Preview line limit for bash when not expanded
 const BASH_PREVIEW_LINES = 5;
-// Flash interval for RTK badge animation (ms)
-const RTK_FLASH_INTERVAL_MS = 400;
 // Flash interval for tool status spinner (ms)
 const SPINNER_INTERVAL_MS = 150;
-/** Returns true when RTK is active in this process. */
-function isRtkEnabled() {
-    const v = (process.env["GSD_RTK_DISABLED"] ?? "").trim().toLowerCase();
-    return v !== "1" && v !== "true" && v !== "yes";
-}
 // Spinner animation frames
 const SPINNER_FRAMES = ["◯", "◔", "◑", "◕", "●"];
 let spinnerFrame = 0;
@@ -63,9 +56,6 @@ export class ToolExecutionComponent extends Container {
         this.convertedImages = new Map();
         // When true, this component intentionally renders no lines
         this.hideComponent = false;
-        // RTK badge flash state
-        this.rtkFlashOn = true;
-        this.rtkFlashTimer = null;
         // Tool status spinner state
         this.spinnerTimer = null;
         this.spinnerFrame = 0;
@@ -78,8 +68,8 @@ export class ToolExecutionComponent extends Container {
         this.ui = ui;
         this.cwd = cwd;
         // Always create both - contentBox for custom tools/bash, contentText for other built-ins
-        this.contentBox = new Box(1, 1, (text) => theme.bg("toolPendingBg", text));
-        this.contentText = new Text("", 1, 1, (text) => theme.bg("toolPendingBg", text));
+        this.contentBox = new Box(1, 0, (text) => theme.bg("toolPendingBg", text));
+        this.contentText = new Text("", 1, 0, (text) => theme.bg("toolPendingBg", text));
         // Use contentBox for bash (visual truncation) or custom tools with custom renderers
         // Use contentText for built-in tools (including overrides without custom renderers)
         if (toolName === "bash" || (toolDefinition && !this.shouldUseBuiltInRenderer())) {
@@ -230,12 +220,6 @@ export class ToolExecutionComponent extends Container {
     updateResult(result, isPartial = false) {
         this.result = result;
         this.isPartial = isPartial;
-        // Stop RTK flash when result arrives — settle to dim
-        if (!isPartial && this.rtkFlashTimer) {
-            clearInterval(this.rtkFlashTimer);
-            this.rtkFlashTimer = null;
-            this.rtkFlashOn = false;
-        }
         if (this.toolName === "write" && !isPartial) {
             const rawPath = str(this.args?.file_path ?? this.args?.path);
             const fileContent = str(this.args?.content);
@@ -298,10 +282,6 @@ export class ToolExecutionComponent extends Container {
         this.updateDisplay();
     }
     dispose() {
-        if (this.rtkFlashTimer) {
-            clearInterval(this.rtkFlashTimer);
-            this.rtkFlashTimer = null;
-        }
         if (this.spinnerTimer) {
             clearInterval(this.spinnerTimer);
             this.spinnerTimer = null;
@@ -315,7 +295,7 @@ export class ToolExecutionComponent extends Container {
         if (this.hideComponent) {
             return [];
         }
-        return super.render(width);
+        return [...super.render(width), ""];
     }
     updateDisplay() {
         // Status indicator with circle
@@ -373,7 +353,7 @@ export class ToolExecutionComponent extends Container {
             // Render call component
             if (this.toolDefinition.renderCall) {
                 try {
-                    const callComponent = this.toolDefinition.renderCall(this.args, theme);
+                    const callComponent = this.toolDefinition.renderCall(this.args, theme, { statusIndicator });
                     if (callComponent !== undefined) {
                         this.contentBox.addChild(callComponent);
                         customRendererHasContent = true;
@@ -396,8 +376,9 @@ export class ToolExecutionComponent extends Container {
                     if (this.shouldHideCollapsedPreview()) {
                         const output = this.getTextOutput();
                         const hasDetails = output.trim().length > 0 || this.imageComponents.length > 0 || this.result.details !== undefined;
-                        if (hasDetails) {
-                            this.contentBox.addChild(new Text(`\n${this.collapsedExpandHint()}`, 0, 0));
+                        const collapsedHint = this.collapsedHintWithPrefix("\n");
+                        if (hasDetails && collapsedHint) {
+                            this.contentBox.addChild(new Text(collapsedHint, 0, 0));
                             customRendererHasContent = true;
                         }
                     }
@@ -423,7 +404,10 @@ export class ToolExecutionComponent extends Container {
                 const output = this.getTextOutput();
                 if (output) {
                     if (this.shouldHideCollapsedPreview()) {
-                        this.contentBox.addChild(new Text(`\n${this.collapsedExpandHint()}`, 0, 0));
+                        const collapsedHint = this.collapsedHintWithPrefix("\n");
+                        if (collapsedHint) {
+                            this.contentBox.addChild(new Text(collapsedHint, 0, 0));
+                        }
                     }
                     else {
                         this.contentBox.addChild(new Text(theme.fg("toolOutput", output), 0, 0));
@@ -483,57 +467,50 @@ export class ToolExecutionComponent extends Container {
     renderBashContent(statusIndicator) {
         const command = str(this.args?.command);
         const timeout = this.args?.timeout;
-        const rtkActive = isRtkEnabled();
-        // Start RTK flash timer on first partial render
-        if (rtkActive && this.isPartial && !this.result && !this.rtkFlashTimer) {
-            this.rtkFlashTimer = setInterval(() => {
-                this.rtkFlashOn = !this.rtkFlashOn;
-                this.updateDisplay();
-                this.ui.requestRender();
-            }, RTK_FLASH_INTERVAL_MS);
-        }
-        // Header with status indicator
+        const body = new Container();
+        this.contentBox.addChild(body);
         const timeoutSuffix = timeout ? theme.fg("muted", ` (timeout ${timeout}s)`) : "";
-        const commandDisplay = command === null ? theme.fg("error", "[invalid arg]") : command ? command : theme.fg("toolOutput", "...");
+        const commandDisplay = command === null
+            ? theme.fg("error", "[invalid arg]")
+            : command
+                ? theme.fg("toolOutput", command)
+                : theme.fg("toolOutput", "...");
         const sandboxBadge = this.result?.details?.sandboxed ? `  ${theme.fg("success", "[sandboxed]")}` : "";
-        const rtkBadge = rtkActive
-            ? "  " + (this.rtkFlashOn ? theme.fg("accent", "$ RTK") : theme.fg("dim", "$ RTK"))
-            : "";
-        this.contentBox.addChild(new Text(`${statusIndicator} ${theme.fg("toolTitle", theme.bold(`$ ${commandDisplay}`))}${timeoutSuffix}${sandboxBadge}${rtkBadge}`, 0, 0));
+        const toolLabel = theme.fg("toolTitle", theme.bold("bash"));
+        const shellPrompt = theme.fg("muted", "$ ");
+        body.addChild(new Text(`${statusIndicator} ${toolLabel} ${shellPrompt}${commandDisplay}${timeoutSuffix}${sandboxBadge}`, 0, 0));
         if (this.result) {
             const output = this.getTextOutput().trim();
             if (output) {
-                // Style each line for the output
                 const styledOutput = output
                     .split("\n")
                     .map((line) => theme.fg("toolOutput", line))
                     .join("\n");
                 if (this.expanded) {
-                    // Show all lines when expanded
-                    this.contentBox.addChild(new Text(`\n${styledOutput}`, 0, 0));
+                    body.addChild(new Text(`\n${styledOutput}`, 0, 0));
                 }
                 else if (this.renderMode === "minimal") {
-                    this.contentBox.addChild(new Text(`\n${this.collapsedExpandHint()}`, 0, 0));
+                    const collapsedHint = this.collapsedHintWithPrefix("\n");
+                    if (collapsedHint) {
+                        body.addChild(new Text(collapsedHint, 1, 0));
+                    }
                 }
                 else {
-                    // Use visual line truncation when collapsed with width-aware caching
                     let cachedWidth;
                     let cachedLines;
                     let cachedSkipped;
-                    this.contentBox.addChild({
+                    body.addChild({
                         render: (width) => {
                             if (cachedLines === undefined || cachedWidth !== width) {
-                                const result = truncateToVisualLines(styledOutput, BASH_PREVIEW_LINES, width);
-                                cachedLines = result.visualLines;
+                                const result = truncateToVisualLines(styledOutput, BASH_PREVIEW_LINES, Math.max(1, width - 1));
+                                cachedLines = result.visualLines.map((line) => ` ${line}`);
                                 cachedSkipped = result.skippedCount;
                                 cachedWidth = width;
                             }
                             if (cachedSkipped && cachedSkipped > 0) {
-                                const hint = theme.fg("muted", `... (${cachedSkipped} earlier lines,`) +
-                                    ` ${keyHint("expandTools", "to expand")})`;
-                                return ["", truncateToWidth(hint, width, "..."), ...cachedLines];
+                                const hint = theme.fg("muted", `... (${cachedSkipped} earlier lines)`);
+                                return ["", truncateToWidth(` ${hint}`, width, "..."), ...cachedLines];
                             }
-                            // Add blank line for spacing (matches expanded case)
                             return ["", ...cachedLines];
                         },
                         invalidate: () => {
@@ -544,7 +521,6 @@ export class ToolExecutionComponent extends Container {
                     });
                 }
             }
-            // Truncation warnings
             const truncation = this.result.details?.truncation;
             const fullOutputPath = this.result.details?.fullOutputPath;
             if (truncation?.truncated || fullOutputPath) {
@@ -560,7 +536,7 @@ export class ToolExecutionComponent extends Container {
                         warnings.push(`Truncated: ${truncation.outputLines} lines shown (${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit)`);
                     }
                 }
-                this.contentBox.addChild(new Text(`\n${theme.fg("warning", `[${warnings.join(". ")}]`)}`, 0, 0));
+                body.addChild(new Text(`\n${theme.fg("warning", `[${warnings.join(". ")}]`)}`, 0, 0));
             }
         }
     }
@@ -572,9 +548,16 @@ export class ToolExecutionComponent extends Container {
         let output = textBlocks
             .map((c) => {
             // Use sanitizeBinaryOutput to handle binary data that crashes string-width
-            return sanitizeBinaryOutput(stripAnsi(c.text || "")).replace(/\r/g, "");
+            return sanitizeBinaryOutput(c.text || "");
         })
             .join("\n");
+        if (this.toolName === "bash") {
+            output = renderTerminalText(output);
+        }
+        else {
+            output = output.replace(/\r/g, "");
+            output = stripAnsi(output);
+        }
         const caps = getCapabilities();
         if (imageBlocks.length > 0 && (!caps.images || !this.showImages)) {
             const imageIndicators = imageBlocks
@@ -594,8 +577,12 @@ export class ToolExecutionComponent extends Container {
         }
         return !this.expanded && this.renderMode === "minimal" && !this.result?.isError;
     }
-    collapsedExpandHint(label = keyHint("expandTools", "to expand")) {
-        return theme.fg("muted", `(${label})`);
+    collapsedExpandHint(_label) {
+        return ""; // hint is shown in editor bottom border instead
+    }
+    collapsedHintWithPrefix(prefix = "\n\n") {
+        const hint = this.collapsedExpandHint();
+        return hint ? `${prefix}${hint}` : "";
     }
     collapsedFirstLine(output) {
         const first = output.split("\n").map((line) => line.trim()).find(Boolean);
@@ -631,7 +618,7 @@ export class ToolExecutionComponent extends Container {
                 const lines = lang ? highlightCode(replaceTabs(output), lang) : output.split("\n");
                 if (hideCollapsedPreview) {
                     if (output.trim()) {
-                        text += `\n\n${this.collapsedExpandHint()}`;
+                        text += this.collapsedHintWithPrefix();
                     }
                 }
                 else {
@@ -644,7 +631,7 @@ export class ToolExecutionComponent extends Container {
                                 .map((line) => (lang ? replaceTabs(line) : theme.fg("toolOutput", replaceTabs(line))))
                                 .join("\n");
                     if (remaining > 0) {
-                        text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("expandTools", "to expand")})`;
+                        text += theme.fg("muted", `\n... (${remaining} more lines)`);
                     }
                 }
                 const truncation = this.result.details?.truncation;
@@ -705,7 +692,7 @@ export class ToolExecutionComponent extends Container {
                     this.writeHighlightCache = undefined;
                 }
                 if (hideCollapsedPreview) {
-                    text += `\n\n${this.collapsedExpandHint()}`;
+                    text += this.collapsedHintWithPrefix();
                 }
                 else {
                     const totalLines = lines.length;
@@ -716,9 +703,7 @@ export class ToolExecutionComponent extends Container {
                         "\n\n" +
                             displayLines.map((line) => (lang ? line : theme.fg("toolOutput", replaceTabs(line)))).join("\n");
                     if (remaining > 0) {
-                        text +=
-                            theme.fg("muted", `\n... (${remaining} more lines, ${totalLines} total,`) +
-                                ` ${keyHint("expandTools", "to expand")})`;
+                        text += theme.fg("muted", `\n... (${remaining} more lines, ${totalLines} total)`);
                     }
                 }
             }
@@ -763,7 +748,7 @@ export class ToolExecutionComponent extends Container {
                 // This takes priority over editDiffPreview which may have a stale error
                 // due to race condition (async preview computed after file was modified)
                 text += hideCollapsedPreview
-                    ? `\n\n${this.collapsedExpandHint()}`
+                    ? this.collapsedHintWithPrefix()
                     : `\n\n${renderDiff(this.result.details.diff, { filePath: rawPath ?? undefined })}`;
             }
             else if (this.editDiffPreview) {
@@ -773,7 +758,7 @@ export class ToolExecutionComponent extends Container {
                 }
                 else if (this.editDiffPreview.diff) {
                     text += hideCollapsedPreview
-                        ? `\n\n${this.collapsedExpandHint()}`
+                        ? this.collapsedHintWithPrefix()
                         : `\n\n${renderDiff(this.editDiffPreview.diff, { filePath: rawPath ?? undefined })}`;
                 }
             }
@@ -794,7 +779,7 @@ export class ToolExecutionComponent extends Container {
                 const output = this.getTextOutput().trim();
                 if (output) {
                     if (hideCollapsedPreview) {
-                        text += `\n\n${this.collapsedExpandHint()}`;
+                        text += this.collapsedHintWithPrefix();
                     }
                     else {
                         const lines = output.split("\n");
@@ -803,7 +788,7 @@ export class ToolExecutionComponent extends Container {
                         const remaining = lines.length - maxLines;
                         text += `\n\n${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
                         if (remaining > 0) {
-                            text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("expandTools", "to expand")})`;
+                            text += theme.fg("muted", `\n... (${remaining} more lines)`);
                         }
                     }
                 }
@@ -846,7 +831,7 @@ export class ToolExecutionComponent extends Container {
                 const output = this.getTextOutput().trim();
                 if (output) {
                     if (hideCollapsedPreview) {
-                        text += `\n\n${this.collapsedExpandHint()}`;
+                        text += this.collapsedHintWithPrefix();
                     }
                     else {
                         const lines = output.split("\n");
@@ -855,7 +840,7 @@ export class ToolExecutionComponent extends Container {
                         const remaining = lines.length - maxLines;
                         text += `\n\n${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
                         if (remaining > 0) {
-                            text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("expandTools", "to expand")})`;
+                            text += theme.fg("muted", `\n... (${remaining} more lines)`);
                         }
                     }
                 }
@@ -902,7 +887,7 @@ export class ToolExecutionComponent extends Container {
                 const output = this.getTextOutput().trim();
                 if (output) {
                     if (hideCollapsedPreview) {
-                        text += `\n\n${this.collapsedExpandHint()}`;
+                        text += this.collapsedHintWithPrefix();
                     }
                     else {
                         const lines = output.split("\n");
@@ -911,7 +896,7 @@ export class ToolExecutionComponent extends Container {
                         const remaining = lines.length - maxLines;
                         text += `\n\n${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
                         if (remaining > 0) {
-                            text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("expandTools", "to expand")})`;
+                            text += theme.fg("muted", `\n... (${remaining} more lines)`);
                         }
                     }
                 }
@@ -943,7 +928,7 @@ export class ToolExecutionComponent extends Container {
                 const output = this.getTextOutput().trim();
                 if (output) {
                     if (hideCollapsedPreview) {
-                        text += `\n\n${this.collapsedExpandHint()}`;
+                        text += this.collapsedHintWithPrefix();
                     }
                     else {
                         const lines = output.split("\n");
@@ -952,17 +937,61 @@ export class ToolExecutionComponent extends Container {
                         const remaining = lines.length - maxLines;
                         text += `\n\n${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
                         if (remaining > 0) {
-                            text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("expandTools", "to expand")})`;
+                            text += theme.fg("muted", `\n... (${remaining} more lines)`);
                         }
                     }
                 }
             }
         }
+        else if (this.toolName === "lsp") {
+            const action = this.args?.action;
+            const file = this.args?.file;
+            const line = this.args?.line;
+            const symbol = this.args?.symbol;
+            const query = this.args?.query;
+            const newName = this.args?.new_name;
+            text = `${statusIndicator} ${theme.fg("toolTitle", theme.bold("lsp"))}`;
+            if (action)
+                text += ` ${theme.fg("accent", action)}`;
+            if (file) {
+                const shortFile = shortenPath(file);
+                let styledFile = theme.fg("muted", shortFile);
+                if (file && shortFile) {
+                    styledFile = editorLink(file, styledFile, { cwd: this.cwd, line, scheme: this.editorScheme });
+                }
+                text += ` ${styledFile}`;
+                if (line !== undefined)
+                    text += theme.fg("warning", `:${line}`);
+            }
+            if (symbol)
+                text += ` ${theme.fg("toolOutput", symbol)}`;
+            if (query)
+                text += ` ${theme.fg("muted", `"${query}"`)}`;
+            if (newName)
+                text += ` → ${theme.fg("accent", newName)}`;
+            if (this.result) {
+                const output = this.getTextOutput().trim();
+                if (output) {
+                    if (hideCollapsedPreview) {
+                        text += this.collapsedHintWithPrefix();
+                    }
+                    else {
+                        const lines = output.split("\n");
+                        const maxLines = this.expanded ? lines.length : 10;
+                        const displayLines = lines.slice(0, maxLines);
+                        const remaining = lines.length - maxLines;
+                        text += `\n\n${displayLines.map((l) => theme.fg("toolOutput", l)).join("\n")}`;
+                        if (remaining > 0)
+                            text += theme.fg("muted", `\n... (${remaining} more lines)`);
+                    }
+                }
+            }
+        }
         else {
             // Generic tool (shouldn't reach here for custom tools)
             text = `${statusIndicator} ${theme.fg("toolTitle", theme.bold(this.toolName))}`;
             const content = JSON.stringify(this.args, null, 2);
-            text += hideCollapsedPreview ? `\n\n${this.collapsedExpandHint()}` : `\n\n${content}`;
+            text += hideCollapsedPreview ? this.collapsedHintWithPrefix() : `\n\n${content}`;
             const output = this.getTextOutput();
             if (output && !hideCollapsedPreview) {
                 text += `\n${output}`;