@esso0428/pi-subagents 0.15.14 → 0.15.16

package/src/ui/ccstyle/tool-result.ts

@@ -51,21 +51,16 @@ export function outputLineCount(result: any): number {
 }
 
 export function countLines(text: string): number {
-  return text.trim() ? text.trim().split("\n").filter((line) => line.trim().length > 0).length : 0;
+  return text.trim() ? text.trim().split("\n").filter((line) => line.trim()).length : 0;
 }
 
 /** Format arguments as stable, readable `key: value` rows for the Input rail. */
 export function formatToolInputArgs(args: unknown, maxChars = 8_000): string {
   if (args === undefined || args === null) return "";
-  if (typeof args !== "object") {
-    const text = sanitizeToolResultText(String(args));
-    return text.length > maxChars ? `${text.slice(0, maxChars)}…` : text;
+  if (typeof args !== "object" || Array.isArray(args)) {
+    const rendered = typeof args === "string" ? sanitizeToolResultText(args) : safeJson(args);
+    return rendered.length > maxChars ? `${rendered.slice(0, maxChars)}…` : rendered;
   }
-  if (Array.isArray(args)) {
-    const text = safeJson(args);
-    return text.length > maxChars ? `${text.slice(0, maxChars)}…` : text;
-  }
-
   const preferred = [
     "path", "file_path", "command", "query", "pattern", "url", "name",
     "message", "content", "old_string", "new_string",
@@ -81,32 +76,24 @@ export function formatToolInputArgs(args: unknown, maxChars = 8_000): string {
       return li - ri;
     });
   const lines: string[] = [];
-  for (const [rawKey, value] of entries) {
-    const key = sanitizeToolResultText(rawKey);
+  for (const [key, value] of entries) {
+    const safeKey = sanitizeToolResultText(key);
     if (typeof value === "string") {
       const safeValue = sanitizeToolResultText(value);
       if (safeValue.includes("\n")) {
-        lines.push(`${key}:`);
-        for (const line of safeValue.split("\n")) lines.push(`  ${line}`);
-      } else {
-        lines.push(`${key}: ${safeValue}`);
-      }
-      continue;
-    }
-    if (typeof value === "number" || typeof value === "boolean" || value === null) {
-      lines.push(`${key}: ${String(value)}`);
-      continue;
-    }
-    const json = safeJson(value);
-    if (json.includes("\n")) {
-      lines.push(`${key}:`);
-      for (const line of json.split("\n")) lines.push(`  ${line}`);
+        lines.push(`${safeKey}:`);
+        lines.push(...safeValue.split("\n").map((line) => `  ${line}`));
+      } else lines.push(`${safeKey}: ${safeValue}`);
     } else {
-      lines.push(`${key}: ${json}`);
+      const rendered = safeJson(value);
+      if (rendered.includes("\n")) {
+        lines.push(`${safeKey}:`);
+        lines.push(...rendered.split("\n").map((line) => `  ${line}`));
+      } else lines.push(`${safeKey}: ${rendered}`);
     }
   }
-  const text = lines.join("\n");
-  return text.length > maxChars ? `${text.slice(0, maxChars)}…` : text;
+  const rendered = lines.join("\n");
+  return rendered.length > maxChars ? `${rendered.slice(0, maxChars)}…` : rendered;
 }
 
 function hasExpandableDetail(text: string, args: unknown): boolean {
@@ -115,18 +102,8 @@ function hasExpandableDetail(text: string, args: unknown): boolean {
 
 export type ToolIoSection = "input" | "output";
 
-/**
- * Viewer-local Input/Output card. The rail and show-more rows intentionally
- * mirror ccstyle, but state is kept on this component so history remains
- * deterministic and no global terminal mouse handler is needed.
- */
-class ExpandedToolIoView implements Component {
-  private readonly isError: boolean;
-  private input: string;
-  private output: string;
-  private maxOutputLines: number;
-  private maxInputLines: number;
-  private theme: any;
+/** Viewer-local adaptation of pi-cc's structured Input/Output tool card. */
+export class ExpandedToolIoView implements Component {
   private cachedWidth: number | undefined;
   private cachedLines: string[] | undefined;
   private lineSections: Array<ToolIoSection | null> = [];
@@ -134,28 +111,16 @@ class ExpandedToolIoView implements Component {
   private showMoreRows: Partial<Record<ToolIoSection, number>> = {};
 
   constructor(
-    input: string,
-    output: string,
-    isError: boolean,
-    maxOutputLines = DEFAULT_TOOL_DISPLAY_CONFIG.expandedPreviewMaxLines,
-    maxInputLines = DEFAULT_TOOL_DISPLAY_CONFIG.expandedPreviewMaxLines,
-    theme?: any,
-  ) {
-    this.input = input;
-    this.output = output;
-    this.isError = isError;
-    this.maxOutputLines = Math.max(1, maxOutputLines);
-    this.maxInputLines = Math.max(1, maxInputLines);
-    this.theme = theme;
-  }
+    private input: string,
+    private output: string,
+    private readonly isError: boolean,
+    private readonly maxOutputLines = DEFAULT_TOOL_DISPLAY_CONFIG.expandedPreviewMaxLines,
+    private readonly maxInputLines = DEFAULT_TOOL_DISPLAY_CONFIG.expandedPreviewMaxLines,
+    private readonly theme?: any,
+  ) {}
 
-  getInputBody(): string {
-    return this.input;
-  }
-
-  getOutputBody(): string {
-    return this.output.trim() ? this.output : "Done";
-  }
+  getInputBody(): string { return this.input; }
+  getOutputBody(): string { return this.output.trim() ? this.output : "Done"; }
 
   setHoveredSection(section: ToolIoSection | null): void {
     if (this.hoveredSection === section) return;
@@ -163,47 +128,30 @@ class ExpandedToolIoView implements Component {
     this.invalidate();
   }
 
-  sectionAtLine(line: number): ToolIoSection | null {
-    return this.lineSections[line] ?? null;
-  }
-
-  showMoreLine(section: ToolIoSection): number | undefined {
-    return this.showMoreRows[section];
-  }
+  sectionAtLine(line: number): ToolIoSection | null { return this.lineSections[line] ?? null; }
+  showMoreLine(section: ToolIoSection): number | undefined { return this.showMoreRows[section]; }
 
   render(width: number): string[] {
     const safeWidth = toolViewportWidth(width);
     if (this.cachedLines && this.cachedWidth === safeWidth) return this.cachedLines;
-
-    const bodyColor = this.isError ? "error" : "toolOutput";
+    const theme = this.theme;
+    const color = (name: string, value: string): string => typeof theme?.fg === "function" ? theme.fg(name, value) : value;
+    const bold = (value: string): string => typeof theme?.bold === "function" ? theme.bold(value) : value;
     const rail = " │ ";
     const contentWidth = Math.max(1, safeWidth - visibleWidth(rail));
+    const bodyColor = this.isError ? "error" : "toolOutput";
     const rows: string[] = [];
     this.lineSections = [];
     this.showMoreRows = {};
-
     const push = (line: string, section: ToolIoSection | null) => {
       rows.push(truncateToWidth(line, safeWidth, ""));
       this.lineSections.push(section);
     };
-    // The theme is optional so the component remains safe in small/test hosts.
-    const theme = this.theme;
-    const color = (name: string, value: string): string => typeof theme?.fg === "function" ? theme.fg(name, value) : value;
-    const bold = (value: string): string => typeof theme?.bold === "function" ? theme.bold(value) : value;
-    const pushHeader = (corner: "├" | "└", title: string) => push(
-      color("dim", ` ${corner} `) + color("accent", bold(title)),
-      null,
-    );
-    const pushRail = (value: string, section: ToolIoSection, continued: boolean) => push(
-      color("dim", continued ? rail : "   ") + value,
-      section,
-    );
-    const pushBlank = () => push(color("dim", " │"), null);
-    const styleInput = (line: string): string => {
-      const match = line.match(/^([A-Za-z_][\w.-]*)(:\s*)(.*)$/);
-      return match
-        ? color("dim", `${match[1]}${match[2]}`) + color("muted", match[3] ?? "")
-        : color("muted", line);
+    const pushHeader = (corner: "├" | "└", title: string) => {
+      push(color("dim", ` ${corner} `) + color("accent", bold(title)), null);
+    };
+    const pushRail = (line: string, section: ToolIoSection, continued: boolean) => {
+      push(color("dim", continued ? rail : "   ") + line, section);
     };
     const pushBody = (body: string, section: ToolIoSection, limit: number, continued: boolean, input: boolean) => {
       const raw = body.replace(/\t/g, "   ").replace(/\n+$/, "");
@@ -213,20 +161,25 @@ class ExpandedToolIoView implements Component {
       }
       const sources = raw.split("\n");
       const wrapped: string[] = [];
+      const styleInput = (line: string): string => {
+        const match = line.match(/^([A-Za-z_][\w.-]*)(:\s*)(.*)$/);
+        return match
+          ? color("dim", `${match[1]}${match[2]}`) + color("muted", match[3] ?? "")
+          : color("muted", line);
+      };
       for (const source of sources) {
         const styled = input ? styleInput(source) : color(bodyColor, source);
-        const parts = wrapTextWithAnsi(styled, contentWidth);
-        wrapped.push(...(parts.length ? parts : [styled]));
+        const lines = wrapTextWithAnsi(styled, contentWidth);
+        wrapped.push(...(lines.length ? lines : [styled]));
       }
       const truncated = sources.length > limit || wrapped.length > limit;
       const visible = truncated ? wrapped.slice(0, limit) : wrapped;
       for (const line of visible) pushRail(line, section, continued);
-      if (truncated) {
-        const hidden = Math.max(1, wrapped.length - visible.length);
+      if (truncated && wrapped.length > visible.length) {
+        const hidden = wrapped.length - visible.length;
         const hintColor = this.hoveredSection === section ? "text" : "dim";
         pushRail(
-          color("dim", `… +${hidden} more lines`) +
-            color("dim", " •") + color(hintColor, ` ${showMoreHintText()}`),
+          color("dim", `… +${hidden} more lines`) + color("dim", " •") + color(hintColor, ` ${showMoreHintText()}`),
           section,
           continued,
         );
@@ -235,15 +188,13 @@ class ExpandedToolIoView implements Component {
     };
 
     const hasInput = this.input.trim().length > 0;
-    const output = this.getOutputBody();
     if (hasInput) {
       pushHeader("├", "Input");
-      pushBody(this.input, "input", this.maxInputLines, true, true);
-      pushBlank();
+      pushBody(this.input, "input", Math.max(1, this.maxInputLines), true, true);
+      push(color("dim", " │"), null);
     }
     pushHeader("└", "Output");
-    pushBody(output, "output", this.maxOutputLines, false, false);
-
+    pushBody(this.getOutputBody(), "output", Math.max(1, this.maxOutputLines), false, false);
     this.cachedWidth = safeWidth;
     this.cachedLines = rows;
     return rows;
@@ -253,7 +204,6 @@ class ExpandedToolIoView implements Component {
     this.cachedWidth = undefined;
     this.cachedLines = undefined;
   }
-
 }
 
 function unavailableComponent(reason: string, theme: any): Component {
@@ -265,34 +215,24 @@ function unavailableComponent(reason: string, theme: any): Component {
   };
 }
 
-function resultText(result: any): string {
-  return rawTextFromResult(result);
-}
+function resultText(result: any): string { return rawTextFromResult(result); }
 
 function persistedFromDetails(details: any): PersistedDiff | undefined {
   if (!details || typeof details !== "object") return undefined;
   const persisted: PersistedDiff = {};
   if (typeof details.diff === "string") persisted.diff = details.diff;
   if (typeof details.patch === "string") persisted.patch = details.patch;
-  if (typeof details.diffUnavailableReason === "string") {
-    persisted.diffUnavailableReason = details.diffUnavailableReason;
-  }
+  if (typeof details.diffUnavailableReason === "string") persisted.diffUnavailableReason = details.diffUnavailableReason;
   return Object.keys(persisted).length ? persisted : undefined;
 }
 
 function viewerConfig(context: any): ViewerDiffConfig {
   const candidate = context?.diffConfig;
-  if (!candidate || typeof candidate !== "object") return DEFAULT_TOOL_DISPLAY_CONFIG;
-  return {
-    ...DEFAULT_TOOL_DISPLAY_CONFIG,
-    ...candidate,
-  };
+  return candidate && typeof candidate === "object"
+    ? { ...DEFAULT_TOOL_DISPLAY_CONFIG, ...candidate }
+    : DEFAULT_TOOL_DISPLAY_CONFIG;
 }
 
-/**
- * Rich edit/write rendering for the conversation viewer. Durable details are
- * passed through before any live/ephemeral context so history is deterministic.
- */
 export function renderRichToolResult(
   toolName: string,
   result: any,
@@ -303,61 +243,35 @@ export function renderRichToolResult(
   if (options?.isPartial || options?.isError || context?.isError) return undefined;
   const expanded = options?.expanded === true || context?.expanded === true;
   const args = context?.args ?? options?.args;
-  const filePath = args?.file_path ?? args?.path;
   const details = result?.details;
   const persistedDiff = context?.persistedDiff ?? persistedFromDetails(details);
   const fileExistedBeforeWrite = typeof context?.fileExistedBeforeWrite === "boolean"
     ? context.fileExistedBeforeWrite
-    : typeof details?.fileExistedBeforeWrite === "boolean"
-      ? details.fileExistedBeforeWrite
-      : undefined;
+    : typeof details?.fileExistedBeforeWrite === "boolean" ? details.fileExistedBeforeWrite : undefined;
 
   if (toolName === "edit") {
-    return renderEditDiffResult(
-      details,
-      { expanded, filePath, persistedDiff, isHovered: options?.isHovered, invalidate: context?.invalidate },
-      viewerConfig(context),
-      theme,
-      resultText(result),
-    );
+    return renderEditDiffResult(details, {
+      expanded, filePath: args?.file_path ?? args?.path, persistedDiff,
+      isHovered: options?.isHovered, invalidate: context?.invalidate,
+    }, viewerConfig(context), theme, resultText(result));
   }
   if (toolName !== "write") return undefined;
   if (persistedDiff?.diffUnavailableReason && !persistedDiff.diff && !persistedDiff.patch) {
     return unavailableComponent(persistedDiff.diffUnavailableReason, theme);
   }
-
   const content = typeof args?.content === "string" ? args.content : undefined;
-  if (!content && !persistedDiff?.diff && !persistedDiff?.patch) {
+  if (typeof content !== "string" && !persistedDiff?.diff && !persistedDiff?.patch) {
     return unavailableComponent("execution metadata is unavailable", theme);
   }
-  return renderWriteDiffResult(
-    content,
-    {
-      expanded,
-      filePath,
-      persistedDiff,
-      previousContent: context?.previousContent,
-      fileExistedBeforeWrite,
-      isHovered: options?.isHovered,
-      invalidate: context?.invalidate,
-    },
-    viewerConfig(context),
-    theme,
-    resultText(result),
-  );
-}
-
-function renderCallSummary(toolName: string, args: any, theme: any): string {
-  const title = toolName.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/[_-]+/g, " ");
-  const value = args?.path ?? args?.file_path ?? args?.command ?? args?.query ?? args?.name;
-  const summary = value === undefined ? title : `${title} ${oneLine(value)}`;
-  return theme.fg("toolTitle", summary);
-}
-
-function settledIcon(context: any): string {
-  if (context?.isError) return "✗";
-  if (context?.isPartial || context?.executionStarted) return "●";
-  return "✓";
+  return renderWriteDiffResult(content, {
+    expanded,
+    filePath: args?.file_path ?? args?.path,
+    persistedDiff,
+    previousContent: context?.previousContent,
+    fileExistedBeforeWrite,
+    isHovered: options?.isHovered,
+    invalidate: context?.invalidate,
+  }, viewerConfig(context), theme, resultText(result));
 }
 
 function renderFallbackResult(result: any, options: any, theme: any, context: any): Component {
@@ -365,49 +279,31 @@ function renderFallbackResult(result: any, options: any, theme: any, context: an
   const expanded = options?.expanded === true || context?.expanded === true;
   const maxChars = Number.isFinite(context?.maxChars) ? Math.max(0, Math.floor(context.maxChars)) : 16_384;
   const text = textFromResult(result, expanded, maxChars);
-  if (expanded && (text.trim() || formatToolInputArgs(context?.args, maxChars).trim())) {
+  const input = formatToolInputArgs(context?.args, maxChars);
+  if (expanded && (text.trim() || input.trim())) {
     const maxLines = Number.isFinite(context?.diffConfig?.expandedPreviewMaxLines)
       ? Math.max(1, Math.floor(context.diffConfig.expandedPreviewMaxLines))
       : DEFAULT_TOOL_DISPLAY_CONFIG.expandedPreviewMaxLines;
-    return new ExpandedToolIoView(
-      formatToolInputArgs(context?.args, maxChars),
-      text,
-      Boolean(error),
-      maxLines,
-      maxLines,
-      theme,
-    );
+    return new ExpandedToolIoView(input, text, Boolean(error), maxLines, maxLines, theme);
   }
-  const lines = text ? text.split("\n") : [];
-  const count = lines.length;
+  const count = text ? text.split("\n").length : 0;
   const summary = error ? oneLine(text) || "Failed" : count ? `${count} ${count === 1 ? "line" : "lines"} returned` : "Done";
   const expandable = !expanded && hasExpandableDetail(text, context?.args);
   return {
     render(width: number): string[] {
       const hovered = options?.isHovered?.() ?? context?.isHovered?.() ?? false;
-      const clickLabel = showMoreHintText();
-      const hint = expandable ? ` • ${clickLabel}` : "";
-      const color = error ? "error" : "muted";
+      const hint = expandable ? ` • ${showMoreHintText()}` : "";
       const line = expandable && hovered
-        ? theme.fg(color, `   ↳ ${summary} • `) + theme.fg("text", clickLabel)
-        : theme.fg(color, `   ↳ ${summary}${hint}`);
+        ? theme.fg(error ? "error" : "muted", `   ↳ ${summary} • `) + theme.fg("text", showMoreHintText())
+        : theme.fg(error ? "error" : "muted", `   ↳ ${summary}${hint}`);
       return [truncateToWidth(line, toolViewportWidth(width), "")];
     },
     invalidate() {},
   };
 }
 
-export function createViewerCcstyleResult(
-  toolName: string,
-  result: any,
-  options: any,
-  theme: any,
-  context: any,
-): Component {
-  return (
-    renderRichToolResult(toolName, result, options, theme, context) ??
-    renderFallbackResult(result, options, theme, context)
-  );
+export function createViewerCcstyleResult(toolName: string, result: any, options: any, theme: any, context: any): Component {
+  return renderRichToolResult(toolName, result, options, theme, context) ?? renderFallbackResult(result, options, theme, context);
 }
 
-export { ExpandedToolIoView };
+export type { DisplayConfigInput };

package/src/ui/conversation-blocks.ts

@@ -300,23 +300,25 @@ export function formatConversationMessages(
   const blocks: ConversationBlock[] = [];
   const usedBlockIds = new Set<string>();
   const callsById = new Map<string, ConversationBlock>();
-  const callsByName = new Map<string, ConversationBlock[]>();
+  const callsByName = new Map<string, { blocks: ConversationBlock[]; next: number }>();
 
   const registerCall = (name: string, block: ConversationBlock) => {
     callsById.set(block.toolCallId!, block);
     const nameKey = name.toLowerCase();
-    const candidates = callsByName.get(nameKey) ?? [];
-    candidates.push(block);
-    callsByName.set(nameKey, candidates);
+    const queue = callsByName.get(nameKey) ?? { blocks: [], next: 0 };
+    queue.blocks.push(block);
+    callsByName.set(nameKey, queue);
   };
   const unregisterCall = (block: ConversationBlock) => {
+    // Calls remain in their name queue as tombstones. Advancing its cursor is
+    // amortized O(1), unlike removing from the middle of a same-name array.
     if (block.toolCallId) callsById.delete(block.toolCallId);
-    const nameKey = (block.toolName ?? "tool").toLowerCase();
-    const candidates = callsByName.get(nameKey);
-    if (!candidates) return;
-    const index = candidates.indexOf(block);
-    if (index >= 0) candidates.splice(index, 1);
-    if (candidates.length === 0) callsByName.delete(nameKey);
+  };
+  const nextCallByName = (name: string): ConversationBlock | undefined => {
+    const queue = callsByName.get(name.toLowerCase());
+    if (!queue) return undefined;
+    while (queue.next < queue.blocks.length && queue.blocks[queue.next]?.toolStatus !== "pending") queue.next++;
+    return queue.blocks[queue.next];
   };
 
   for (let messageIndex = 0; messageIndex < messages.length; messageIndex++) {
@@ -368,7 +370,7 @@ export function formatConversationMessages(
       const direct = result.toolCallId ? callsById.get(result.toolCallId) : undefined;
       let match = direct;
       if (!match && result.toolName) {
-        match = callsByName.get(result.toolName.toLowerCase())?.[0];
+        match = nextCallByName(result.toolName);
       }
       if (match) {
         applyToolResult(match, result, maxToolResultChars);