gsd-pi 2.81.0 → 2.82.0

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

@@ -93,7 +93,6 @@ export declare class ToolExecutionComponent extends Container {
     private shouldRenderCompactSuccess;
     getRollupPhase(): ToolExecutionPhase | null;
     private getPhaseLabel;
-    private getCompactSummary;
     private getCompactAction;
     private getTargetMetadata;
     private getCompactTarget;

package/packages/pi-coding-agent/dist/modes/interactive/components/tool-execution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-execution.d.ts","sourceRoot":"","sources":["../../../../src/modes/interactive/components/tool-execution.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tool-execution.d.ts","sourceRoot":"","sources":["../../../../src/modes/interactive/components/tool-execution.ts"],"names":[],"mappings":"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"}

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

@@ -1,4 +1,5 @@
-// GSD-2 Interactive Tool Execution Rendering
+// Project/App: GSD-2
+// File Purpose: Interactive terminal tool execution renderer for commands, tool calls, diffs, images, and summaries.
 import { Box, Container, getCapabilities, Image, imageFallback, Spacer, style, Text, truncateToWidth, visibleWidth, } from "@gsd/pi-tui";
 import stripAnsi from "strip-ansi";
 import { computeEditDiff } from "../../../core/tools/edit-diff.js";
@@ -10,6 +11,7 @@ import { getLanguageFromPath, highlightCode, theme } from "../theme/theme.js";
 import { shortenPath } from "../utils/shorten-path.js";
 import { renderDiff } from "./diff.js";
 import { keyHint } from "./keybinding-hints.js";
+import { renderCommandCard, renderToolLineCard, renderTranscriptCard } from "./transcript-design.js";
 import { truncateToVisualLines } from "./visual-truncate.js";
 // Preview line limit for bash when not expanded
 const BASH_PREVIEW_LINES = 5;
@@ -68,54 +70,6 @@ function prettifyToolName(name, label) {
         .map((word) => (word.length === 0 ? word : word[0].toUpperCase() + word.slice(1)))
         .join(" ");
 }
-function trimOuterBlankLines(lines) {
-    let start = 0;
-    let end = lines.length;
-    while (start < end && lines[start].trim().length === 0)
-        start++;
-    while (end > start && lines[end - 1].trim().length === 0)
-        end--;
-    return lines.slice(start, end);
-}
-function renderToolFrame(contentLines, width, opts) {
-    const outerWidth = Math.max(20, width);
-    const contentWidth = Math.max(1, outerWidth - 2); // "│ " + content
-    const borderColor = opts.tone === "error" ? "toolError" : opts.tone === "pending" ? "toolRunning" : "toolSuccess";
-    const topColor = borderColor;
-    const labelColor = opts.tone === "error" ? "toolError" : opts.tone === "pending" ? "toolRunning" : "toolSuccess";
-    const statusColor = opts.tone === "error" ? "toolError" : opts.tone === "pending" ? "toolRunning" : "toolSuccess";
-    const leftStyled = theme.fg(labelColor, theme.bold(opts.label));
-    const rightStyled = theme.fg(statusColor, opts.status);
-    const titleWidth = Math.max(1, outerWidth - 4);
-    const gap = Math.max(1, titleWidth - visibleWidth(leftStyled) - visibleWidth(rightStyled));
-    const headerRow = `${leftStyled}${" ".repeat(gap)}${rightStyled}`;
-    const headerPad = Math.max(0, titleWidth - visibleWidth(headerRow));
-    const sourceLines = trimOuterBlankLines(contentLines);
-    const bodyLines = (sourceLines.length > 0 ? sourceLines : [""]).map((line) => {
-        const clipped = truncateToWidth(line, contentWidth, "");
-        return clipped;
-    });
-    return style()
-        .border("rounded")
-        .borderColor((line) => theme.fg(line.startsWith("─") ? topColor : borderColor, line))
-        .title(headerRow + " ".repeat(headerPad))
-        .render(bodyLines, outerWidth);
-}
-function renderCollapsedToolRow(label, status, width, tone) {
-    const outerWidth = Math.max(20, width);
-    const contentWidth = Math.max(1, outerWidth - 2);
-    const statusColor = tone === "success" ? "toolSuccess" : "toolMuted";
-    const labelStyled = theme.fg(statusColor, label);
-    const statusStyled = theme.fg(statusColor, status);
-    const labelWidth = Math.max(1, contentWidth - visibleWidth(statusStyled) - 1);
-    const clippedLabel = truncateToWidth(labelStyled, labelWidth, "");
-    const gap = Math.max(1, contentWidth - visibleWidth(clippedLabel) - visibleWidth(statusStyled));
-    const line = `${clippedLabel}${" ".repeat(gap)}${statusStyled}`;
-    return style()
-        .border("minimal")
-        .borderColor((text) => theme.fg(statusColor, text))
-        .render([line], outerWidth);
-}
 const COMPACT_ARG_VALUE_LIMIT = 60;
 const GENERIC_OUTPUT_PREVIEW_LINES = 10;
 const GENERIC_ARGS_JSON_PREVIEW_LINES = 10;
@@ -153,6 +107,42 @@ function formatToolTarget(target) {
     }
     return appendLineOrRange(displayPath, target);
 }
+function directDetailsTarget(details, action) {
+    if (!details || typeof details !== "object")
+        return undefined;
+    const record = details;
+    const rawPath = record.resolvedPath ?? record.inputPath ?? record.file_path ?? record.path;
+    if (typeof rawPath !== "string" || rawPath.trim().length === 0)
+        return undefined;
+    const target = {
+        kind: "file",
+        action,
+        resolvedPath: typeof record.resolvedPath === "string" ? record.resolvedPath : rawPath,
+        inputPath: typeof record.inputPath === "string" ? record.inputPath : rawPath,
+    };
+    if (typeof record.line === "number") {
+        target.line = record.line;
+    }
+    const range = record.range;
+    if (range && typeof range === "object") {
+        const rangeRecord = range;
+        target.range = {
+            start: typeof rangeRecord.start === "number" ? rangeRecord.start : undefined,
+            end: typeof rangeRecord.end === "number" ? rangeRecord.end : undefined,
+        };
+    }
+    return target;
+}
+function firstStringArg(args, keys) {
+    for (const key of keys) {
+        const value = str(args[key]);
+        if (value === null)
+            continue;
+        if (value)
+            return value;
+    }
+    return "";
+}
 function formatArgsPathTarget(path, args) {
     if (!path)
         return undefined;
@@ -552,19 +542,42 @@ export class ToolExecutionComponent extends Container {
         const contentWidth = Math.max(1, frameWidth - 4);
         const frameTone = this.result?.isError ? "error" : this.isPartial || !this.result ? "pending" : "success";
         const elapsed = formatElapsed((this.endedAt ?? Date.now()) - this.startedAt);
-        const frameStatus = `${this.isPartial || !this.result ? "running" : this.result.isError ? "failed" : "success"} · ${elapsed}`;
+        const statusWord = this.isPartial || !this.result ? "running" : this.result.isError ? "failed" : "success";
+        const frameStatus = `${statusWord} · ${elapsed}`;
         const parsed = parseMcpToolName(this.toolName);
         const frameLabel = parsed
             ? `${parsed.server}·${parsed.tool}`
             : prettifyToolName(this.toolName, this.toolDefinition?.label) || "unknown";
-        if (this.shouldRenderCompactSuccess()) {
-            return ["", ...renderCollapsedToolRow(this.getCompactSummary(frameLabel), frameStatus, frameWidth, "success")];
+        const recommendedTone = frameTone === "pending" ? "running" : frameTone === "error" ? "error" : "success";
+        if (this.normalizedToolName === "bash" && !this.expanded && !this.result?.isError) {
+            const command = str(this.args?.command);
+            return [
+                "",
+                ...renderCommandCard(command && command.length > 0 ? formatCommandPreview(command) : frameLabel, frameWidth, {
+                    status: frameStatus,
+                    tone: recommendedTone,
+                }),
+            ];
+        }
+        const hasImages = this.result?.content?.some((block) => block.type === "image") ?? false;
+        if (!this.expanded && !this.result?.isError && !hasImages) {
+            const compactTarget = this.getCompactTarget();
+            return [
+                "",
+                ...renderToolLineCard(frameLabel, compactTarget, frameWidth, {
+                    status: frameStatus,
+                    tone: recommendedTone,
+                    hidden: !this.isPartial && !!this.result,
+                }),
+            ];
         }
         const lines = super.render(contentWidth);
-        const framed = renderToolFrame(lines, frameWidth, {
-            label: frameLabel,
-            status: frameStatus,
-            tone: frameTone,
+        const framed = renderTranscriptCard(lines, frameWidth, {
+            title: frameLabel,
+            right: frameStatus,
+            tone: recommendedTone,
+            footerLeft: this.expanded ? "output expanded" : undefined,
+            footerRight: this.expanded ? "ctrl+o collapse" : undefined,
         });
         return framed.length > 0 ? ["", ...framed] : framed;
     }
@@ -608,14 +621,6 @@ export class ToolExecutionComponent extends Container {
             return "Finalization";
         return "Other tool actions";
     }
-    getCompactSummary(frameLabel) {
-        if (this.normalizedToolName === "bash") {
-            const command = str(this.args?.command);
-            return command ? `bash ${formatCommandPreview(command)}` : frameLabel;
-        }
-        const target = this.getCompactTarget();
-        return target ? `${this.getCompactAction()} ${target}` : frameLabel;
-    }
     getCompactAction() {
         const target = this.getTargetMetadata();
         if (target?.action)
@@ -624,14 +629,16 @@ export class ToolExecutionComponent extends Container {
     }
     getTargetMetadata() {
         const target = this.result?.details?.target;
-        return target && typeof target === "object" ? target : undefined;
+        if (target && typeof target === "object")
+            return target;
+        return directDetailsTarget(this.result?.details, this.normalizedToolName);
     }
     getCompactTarget() {
         const metadata = this.getTargetMetadata();
         const metadataTarget = metadata ? formatToolTarget(metadata) : undefined;
         if (metadataTarget)
             return metadataTarget;
-        const path = str(this.args?.file_path ?? this.args?.path);
+        const path = firstStringArg(this.args ?? {}, ["file_path", "path", "notebook_path"]);
         if (path === null)
             return undefined;
         if (this.normalizedToolName === "read" || this.normalizedToolName === "hashline_read") {
@@ -641,16 +648,20 @@ export class ToolExecutionComponent extends Container {
             return path ? shortenPath(path) : undefined;
         }
         if (this.normalizedToolName === "ls") {
-            return shortenPath(path || ".");
+            return path ? shortenPath(path) : undefined;
         }
         if (this.normalizedToolName === "find") {
             const pattern = str(this.args?.pattern);
-            return pattern ? `${pattern} in ${shortenPath(path || ".")}` : shortenPath(path || ".");
+            if (pattern)
+                return path ? `${pattern} in ${shortenPath(path)}` : pattern;
+            return path ? shortenPath(path) : undefined;
         }
         if (this.normalizedToolName === "grep") {
             const pattern = str(this.args?.pattern);
             const glob = str(this.args?.glob);
-            const label = pattern ? `${pattern} in ${shortenPath(path || ".")}` : shortenPath(path || ".");
+            const label = pattern ? (path ? `${pattern} in ${shortenPath(path)}` : pattern) : path ? shortenPath(path) : undefined;
+            if (!label)
+                return glob || undefined;
             return glob ? `${label} (${glob})` : label;
         }
         return undefined;
@@ -1194,23 +1205,15 @@ export class ToolExecutionComponent extends Container {
         }
         else {
             // Generic tool / MCP tool without a registered renderer.
-            // MCP tool names from Claude Code arrive as `mcp__<server>__<tool>`;
-            // render the server prefix in muted style so the tool name reads
-            // cleanly. GSD-registered MCP tools have already had their prefix
-            // stripped upstream in partial-builder.ts and won't reach this branch.
-            const parsed = parseMcpToolName(this.toolName);
-            const displayName = parsed
-                ? parsed.tool
-                : prettifyToolName(this.toolName, this.toolDefinition?.label);
-            const serverPrefix = parsed ? theme.fg("muted", `${parsed.server}\u00b7`) : "";
-            text = serverPrefix + theme.fg("toolTitle", theme.bold(displayName));
+            // The frame header already contains the tool identity, so the body
+            // should show only arguments and output.
             const argsText = formatCompactArgs(this.args, this.expanded);
             if (argsText) {
                 if (argsText.includes("\n")) {
-                    text += `\n\n${theme.fg("toolOutput", argsText)}`;
+                    text = theme.fg("toolOutput", argsText);
                 }
                 else {
-                    text += " " + theme.fg("toolOutput", argsText);
+                    text = theme.fg("toolOutput", argsText);
                 }
             }
             if (this.result) {
@@ -1220,7 +1223,8 @@ export class ToolExecutionComponent extends Container {
                     const maxLines = this.expanded ? lines.length : GENERIC_OUTPUT_PREVIEW_LINES;
                     const displayLines = lines.slice(0, maxLines);
                     const remaining = lines.length - maxLines;
-                    text += `\n\n${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
+                    const outputText = displayLines.map((line) => theme.fg("toolOutput", line)).join("\n");
+                    text += `${text ? "\n\n" : ""}${outputText}`;
                     if (remaining > 0) {
                         text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("expandTools", "to expand")})`;
                     }