@mrclrchtr/supi-code-intelligence 4.9.0 → 5.0.0

package/src/tool/health/tui.ts

@@ -6,33 +6,43 @@ import type { Theme } from "@earendil-works/pi-coding-agent";
 import { Container, Spacer, Text } from "@earendil-works/pi-tui";
 import {
   type EvidenceEntry,
-  formatEvidenceEntry,
+  formatCallValue,
   type ResultOptios,
+  renderDomainError,
+  renderDomainResult,
   renderEvidenceLines,
+  renderExecutionError,
   renderMarkdownDetail,
   renderPartial,
+  renderToolDisplaySections,
+  renderTruncationDisclosure,
+  type ToolRendererContext,
   type ToolResult,
 } from "../../ui/tui/common.ts";
 import type { CodeHealthToolParams } from "./execute.ts";
+import { readPreviousRefreshStatus, readRefreshStatus } from "./refresh-status.ts";
 import { formatSemanticHealthState, readSemanticHealthState } from "./semantic-state.ts";
 
 /** ── renderCall ────────────────────────────────────────────────── */
 
-export function renderHealthCall(args: unknown, theme: Theme, _context: unknown): Text {
-  const params = (args ?? {}) as CodeHealthToolParams;
+export function renderHealthCall(
+  args: unknown,
+  theme: Theme,
+  _context: ToolRendererContext | undefined,
+): Text {
+  const params = (args ?? {}) as Partial<CodeHealthToolParams>;
   const sections =
     params.include === undefined
       ? "diag, servers"
-      : params.include.length > 0
-        ? params.include.join(", ")
+      : Array.isArray(params.include) && params.include.length > 0
+        ? params.include.map((section) => formatCallValue(section, 20) ?? "?").join(", ")
         : "none";
 
   let content = theme.fg("toolTitle", "code_health");
   content += ` ${theme.fg("accent", sections)}`;
 
-  if (params.scope) {
-    content += ` ${theme.fg("dim", params.scope)}`;
-  }
+  const scope = formatCallValue(params.scope);
+  if (scope) content += ` ${theme.fg("dim", scope)}`;
 
   return new Text(content, 0, 0);
 }
@@ -43,27 +53,29 @@ export function renderHealthResult(
   result: ToolResult,
   options: ResultOptios,
   theme: Theme,
-  _context: unknown,
+  context: ToolRendererContext | undefined,
 ): Container | Text {
-  if (options.isPartial) {
-    return renderPartial("Gathering workspace health…", theme);
-  }
+  if (options.isPartial) return renderPartial("Gathering workspace health…", theme);
 
-  const container = new Container();
   const data =
     result.details?.type === "health" ? (result.details.data as Record<string, unknown>) : null;
-
-  if (result.isError) {
-    container.addChild(new Text(theme.fg("error", "code_health failed"), 0, 0));
-    return container;
-  }
+  const executionError = renderExecutionError(context, "code_health failed", theme);
+  if (executionError) return executionError;
+  const domainError = renderDomainError(result, theme);
+  if (domainError) return renderDomainResult(result, options, theme, domainError);
 
   if (!options.expanded) {
-    container.addChild(buildCompactSummary(data, theme));
-    return container;
+    const compact = buildCompactSummary(data, theme);
+    const truncation = renderTruncationDisclosure(result, theme);
+    if (!truncation) return compact;
+    const compactContainer = new Container();
+    compactContainer.addChild(compact);
+    compactContainer.addChild(new Spacer(1));
+    compactContainer.addChild(truncation);
+    return compactContainer;
   }
 
-  // Expanded view
+  const container = new Container();
   container.addChild(buildStatusBar(data, theme));
   const capabilityWarnings = readCapabilityWarnings(data);
   if (capabilityWarnings.length > 0) {
@@ -72,8 +84,7 @@ export function renderHealthResult(
   }
   container.addChild(new Spacer(1));
   container.addChild(buildDiagnosticSummary(data, theme));
-  const diagnosticEntries = buildDiagnosticEntries(data, theme);
-  if (diagnosticEntries) container.addChild(diagnosticEntries);
+  renderToolDisplaySections(container, result.details?.displaySections, theme);
   container.addChild(buildHealthSectionSummary(data, theme));
 
   const lists = data?.evidenceLists as EvidenceEntry[] | undefined;
@@ -82,6 +93,11 @@ export function renderHealthResult(
     renderEvidenceLines(container, lists, theme);
   }
 
+  const truncation = renderTruncationDisclosure(result, theme);
+  if (truncation) {
+    container.addChild(new Spacer(1));
+    container.addChild(truncation);
+  }
   renderMarkdownDetail(container, result, theme);
 
   return container;
@@ -105,12 +121,22 @@ function buildCompactSummary(data: Record<string, unknown> | null, theme: Theme)
   const semanticRequested = sections.some(
     (section) => section.key === "diagnostics" || section.key === "servers",
   );
-  const segments = sections.map((section) => formatSectionSummary(section, undefined, theme));
+  const segments = sections.map((section) =>
+    formatSectionSummary(
+      section,
+      section.key === "diagnostics"
+        ? formatCompactDiagnosticEvidence(readDiagnosticEvidence(data))
+        : null,
+      theme,
+    ),
+  );
   if (semanticRequested) {
     const semanticStatus = readSemanticStatus(data);
     const statusColor = semanticStatus.startsWith("ready") ? "success" : "warning";
     segments.push(`${theme.fg("dim", "lsp")} ${theme.fg(statusColor, semanticStatus)}`);
   }
+  const previousRefresh = readPreviousRefreshStatus(data);
+  if (previousRefresh) segments.push(theme.fg("dim", previousRefresh));
   const capabilityWarningCount = readCapabilityWarnings(data).length;
   if (capabilityWarningCount > 0) {
     const label = capabilityWarningCount === 1 ? "capability warning" : "capability warnings";
@@ -123,20 +149,20 @@ function buildCompactSummary(data: Record<string, unknown> | null, theme: Theme)
 
 function formatSectionSummary(
   section: HealthSectionSummary,
-  evidence: EvidenceEntry | undefined,
+  coverage: string | null,
   theme: Theme,
 ): string {
   const label = sectionLabel(section.key);
+  const coverageSuffix = coverage ? ` (${coverage})` : "";
   if (section.status === "unavailable" || !section.available) {
-    return `${theme.fg("dim", label)} ${theme.fg("warning", "unavailable")}`;
+    return `${theme.fg("dim", label)} ${theme.fg("warning", "unavailable")}${coverageSuffix}`;
   }
   if (section.status === "partial") {
-    return `${theme.fg("dim", label)} ${theme.fg("warning", "partial")}`;
+    return `${theme.fg("dim", label)} ${theme.fg("warning", "partial")}${coverageSuffix}`;
   }
-  if (evidence) return theme.fg("success", theme.bold(formatEvidenceEntry(evidence)));
 
-  const suffix = section.key === "diagnostics" ? " with issues" : "";
-  return `${theme.fg("dim", label)} ${theme.fg("success", theme.bold(`${section.itemCount}`))}${theme.fg("muted", suffix)}`;
+  const suffix = section.key === "diagnostics" && !coverage ? " with issues" : "";
+  return `${theme.fg("dim", label)} ${theme.fg("success", theme.bold(`${section.itemCount}`))}${theme.fg("muted", suffix)}${coverageSuffix}`;
 }
 
 function buildStatusBar(data: Record<string, unknown> | null, theme: Theme): Text {
@@ -162,32 +188,6 @@ function buildStatusBar(data: Record<string, unknown> | null, theme: Theme): Tex
   return new Text(lines.join("  "), 0, 0);
 }
 
-function readRefreshStatus(data: Record<string, unknown> | null): string | null {
-  const refresh = readRecord(data?.refresh);
-  if (!refresh) return null;
-
-  switch (refresh.kind) {
-    case "completed": {
-      const attempted = readNumber(refresh.attemptedActiveClients);
-      const restarted = readNumber(refresh.restartedClients);
-      const stale = readRecord(refresh.staleAssessment);
-      const noOp = attempted === 0 && restarted === 0;
-      const base = noOp
-        ? "refresh completed no-op"
-        : `refresh completed: ${attempted} clients targeted, ${restarted} restarted`;
-      return stale?.suspected === true
-        ? `${base}; stale pattern suspected in ${readNumber(stale.matchedFileCount)} files`
-        : base;
-    }
-    case "failed":
-      return `refresh failed${typeof refresh.reason === "string" ? `: ${refresh.reason}` : ""}`;
-    case "not-attempted":
-      return "refresh not attempted";
-    default:
-      return null;
-  }
-}
-
 function diagnosticEmptySummary(data: Record<string, unknown> | null): string {
   return diagnosticScopeKind(data) === "file"
     ? "No errors or warnings for file"
@@ -200,12 +200,44 @@ function diagnosticScopeKind(data: Record<string, unknown> | null): string | nul
   return typeof scope?.kind === "string" ? scope.kind : null;
 }
 
-function readRecord(value: unknown): Record<string, unknown> | null {
-  return typeof value === "object" && value !== null ? (value as Record<string, unknown>) : null;
+function readDiagnosticEvidence(
+  data: Record<string, unknown> | null,
+): Record<string, unknown> | null {
+  return readRecord(readRecord(data?.diagnosticObservation)?.evidence);
 }
 
-function readNumber(value: unknown): number {
-  return typeof value === "number" ? value : 0;
+function formatCompactDiagnosticEvidence(evidence: Record<string, unknown> | null): string | null {
+  if (!evidence) return null;
+  const counts = [
+    evidence.requested,
+    evidence.confirmed,
+    evidence.unconfirmed,
+    evidence.failed,
+    evidence.removed,
+  ];
+  if (!counts.every(isEvidenceCount)) return null;
+  return `req ${evidence.requested} · conf ${evidence.confirmed} · unconf ${evidence.unconfirmed} · failed ${evidence.failed} · removed ${evidence.removed}`;
+}
+
+function formatDiagnosticEvidence(evidence: Record<string, unknown> | null): string | null {
+  if (!evidence) return null;
+  const counts = [
+    evidence.requested,
+    evidence.confirmed,
+    evidence.unconfirmed,
+    evidence.failed,
+    evidence.removed,
+  ];
+  if (!counts.every(isEvidenceCount)) return null;
+  return `${evidence.requested} requested, ${evidence.confirmed} confirmed, ${evidence.unconfirmed} unconfirmed, ${evidence.failed} failed, ${evidence.removed} removed`;
+}
+
+function isEvidenceCount(value: unknown): value is number {
+  return typeof value === "number" && Number.isInteger(value) && value >= 0;
+}
+
+function readRecord(value: unknown): Record<string, unknown> | null {
+  return typeof value === "object" && value !== null ? (value as Record<string, unknown>) : null;
 }
 
 interface RenderedCapabilityWarning {
@@ -268,14 +300,9 @@ function buildDiagnosticSummary(data: Record<string, unknown> | null, theme: The
   }
   const trackedFiles = diagnosticScopeKind(data) === "tracked-files";
   if (section.status === "partial") {
-    return new Text(
-      theme.fg(
-        "warning",
-        trackedFiles ? "Tracked-file diagnostics partial" : "Diagnostics partial",
-      ),
-      0,
-      0,
-    );
+    const coverage = formatDiagnosticEvidence(readDiagnosticEvidence(data));
+    const label = trackedFiles ? "Tracked-file diagnostics partial" : "Diagnostics partial";
+    return new Text(theme.fg("warning", coverage ? `${label} (${coverage})` : label), 0, 0);
   }
   if (section.itemCount === 0) {
     return new Text(theme.fg("success", diagnosticEmptySummary(data)), 0, 0);
@@ -289,36 +316,6 @@ function buildDiagnosticSummary(data: Record<string, unknown> | null, theme: The
   );
 }
 
-/** Render per-file diagnostic messages in expanded detailed mode. */
-function buildDiagnosticEntries(data: Record<string, unknown> | null, theme: Theme): Text | null {
-  const observation = readRecord(data?.diagnosticObservation);
-  const entries = observation?.entries;
-  if (!Array.isArray(entries) || entries.length === 0) return null;
-
-  const lines: string[] = [];
-  for (const raw of entries) {
-    const entry = readRecord(raw);
-    if (!entry || !Array.isArray(entry.messages) || entry.messages.length === 0) continue;
-    lines.push(theme.fg("dim", `  ${typeof entry.file === "string" ? entry.file : ""}`));
-    for (const rawMsg of entry.messages) {
-      const formatted = formatDiagnosticMessage(readRecord(rawMsg), theme);
-      if (formatted) lines.push(formatted);
-    }
-  }
-
-  return lines.length > 0 ? new Text(lines.join("\n"), 0, 0) : null;
-}
-
-function formatDiagnosticMessage(msg: Record<string, unknown> | null, theme: Theme): string | null {
-  if (!msg || typeof msg.message !== "string") return null;
-  const line = typeof msg.line === "number" ? `L${msg.line} ` : "";
-  const isError = msg.severity === "error";
-  const color = isError ? "error" : "warning";
-  const icon = isError ? "✖" : "⚠";
-  const source = typeof msg.source === "string" ? ` [${msg.source}]` : "";
-  return `    ${theme.fg(color, `${icon} ${line}${msg.severity}${source}`)}: ${msg.message}`;
-}
-
 function readHealthSections(data: Record<string, unknown> | null): HealthSectionSummary[] {
   const value = data?.sections;
   if (!Array.isArray(value)) return [];

package/src/tool/infra/workflow-control.ts

@@ -2,10 +2,18 @@ import type { WorkflowControl } from "../../session/workflow-control.ts";
 import type { CodeIntelToolExecCtx } from "../../types/index.ts";
 import { emitToolProgress } from "./progress.ts";
 
+/**
+ * Internal absolute deadline for one public code tool call. Pi supplies only
+ * a signal, so the adapter derives one bounded deadline per call.
+ */
+export const DEFAULT_WORKFLOW_DEADLINE_MS = 60_000;
+
 /** Translate Pi execution controls into presentation-free session controls. */
 export function toWorkflowControl(ctx: CodeIntelToolExecCtx): WorkflowControl {
   return {
+    operationId: ctx.operationId,
     signal: ctx.signal,
+    deadline: Date.now() + DEFAULT_WORKFLOW_DEADLINE_MS,
     progress: (event) => emitToolProgress(ctx.onUpdate, `${event.intent}: ${event.message}`),
   };
 }

package/src/tool/inspect/execute.ts

@@ -23,12 +23,18 @@ export async function executeInspectTool(
     return inspectErrorResult(`**Error:** ${outcome.message}`, {
       focusTarget: "invalid input",
       nextQueries: ["Provide an existing file and exact 1-based point"],
+      message: outcome.message,
     });
   }
 
   const assembly = assembleInspectResult(outcome.data, outcome.nextQueries);
   return {
     content: renderInspectResult(assembly),
-    details: { type: "inspect", data: assembly.details },
+    details: {
+      type: "inspect",
+      data: assembly.details,
+      status: "completed",
+      displaySections: assembly.displaySections,
+    },
   };
 }

package/src/tool/inspect/tui.ts

@@ -1,36 +1,44 @@
-/**
- * TUI renderer for code_inspect — renderCall + renderResult.
- */
+/** TUI renderer for code_inspect. */
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
-import { type ResultOptios, renderSimpleResult, type ToolResult } from "../../ui/tui/common.ts";
+import {
+  formatCallPath,
+  type ResultOptios,
+  renderSimpleResult,
+  type ToolRendererContext,
+  type ToolResult,
+} from "../../ui/tui/common.ts";
 
-/** ── renderCall ────────────────────────────────────────────────── */
-
-export function renderInspectCall(args: unknown, theme: Theme, _context: unknown): Text {
+/** Render the compact code_inspect call header. */
+export function renderInspectCall(
+  args: unknown,
+  theme: Theme,
+  _context: ToolRendererContext | undefined,
+): Text {
   const params = (args ?? {}) as {
-    point?: { file: string; line: number; character: number };
+    point?: { file?: unknown; line?: unknown; character?: unknown };
   };
 
   let content = theme.fg("toolTitle", "code_inspect");
-
-  if (params.point) {
-    const file = params.point.file.split("/").pop() ?? params.point.file;
-    content += ` ${theme.fg("accent", file)}`;
-    content += theme.fg("warning", `:${params.point.line}`);
-    content += theme.fg("dim", `:${params.point.character}`);
+  const point = params.point;
+  if (point && typeof point === "object") {
+    const file = formatCallPath(point.file);
+    if (file) content += ` ${theme.fg("accent", file)}`;
+    if (typeof point.line === "number") content += theme.fg("warning", `:${point.line}`);
+    if (typeof point.character === "number") {
+      content += theme.fg("dim", `:${point.character}`);
+    }
   }
 
   return new Text(content, 0, 0);
 }
 
-/** ── renderResult ──────────────────────────────────────────────── */
-
+/** Render code_inspect progress, status, and structured result details. */
 export function renderInspectResult(
   result: ToolResult,
   options: ResultOptios,
   theme: Theme,
-  _context: unknown,
+  context: ToolRendererContext | undefined,
 ): ReturnType<typeof renderSimpleResult> {
-  return renderSimpleResult(result, options, theme, "Inspecting…");
+  return renderSimpleResult(result, options, theme, "Inspecting…", context);
 }

package/src/tool/orientation/execute.ts

@@ -7,7 +7,11 @@ import type {
 import type { CodeIntelResult, CodeIntelToolExecCtx } from "../../types/index.ts";
 import { toWorkflowControl } from "../infra/workflow-control.ts";
 import { contextErrorResult } from "../result/errors.ts";
-import { assembleOrientationDetails, assembleOrientationResult } from "../result/orientation.ts";
+import {
+  assembleOrientationDetails,
+  assembleOrientationResult,
+  orientationCandidateDisplaySections,
+} from "../result/orientation.ts";
 import { renderOrientationResult } from "./markdown.ts";
 
 export interface CodeOrientationToolParams {
@@ -27,6 +31,7 @@ export async function executeOrientationTool(
   if (outcome.kind === "invalid-input") {
     return contextErrorResult(`**Error:** ${outcome.message}`, {
       nextQueries: ["Choose an existing path, module, or precise target"],
+      message: outcome.message,
     });
   }
   if (outcome.kind === "disambiguation" || outcome.kind === "kind-mismatch") {
@@ -52,11 +57,24 @@ export async function executeOrientationTool(
       candidates,
       nextQueries,
     });
-    return { content: lines.join("\n"), details: { type: "context", data: details } };
+    return {
+      content: lines.join("\n"),
+      details: {
+        type: "context",
+        data: details,
+        status: "completed",
+        displaySections: orientationCandidateDisplaySections(candidates, outcome.omittedCount),
+      },
+    };
   }
   const assembly = assembleOrientationResult(outcome.data);
   return {
     content: renderOrientationResult(assembly),
-    details: { type: "context", data: assembly.details },
+    details: {
+      type: "context",
+      data: assembly.details,
+      status: "completed",
+      displaySections: assembly.displaySections,
+    },
   };
 }

package/src/tool/orientation/tui.ts

@@ -1,63 +1,79 @@
+/** TUI renderer for code_orientation. */
 import { getMarkdownTheme, type Theme } from "@earendil-works/pi-coding-agent";
 import { Container, Markdown, Spacer, Text } from "@earendil-works/pi-tui";
 import {
   type EvidenceEntry,
+  formatCallPath,
+  formatCallValue,
   formatEvidenceEntry,
   type ResultOptios,
   readEvidenceEntries,
+  renderDomainError,
+  renderDomainResult,
+  renderExecutionError,
   renderPartial,
+  renderStructuredDetailBody,
+  renderToolDisplaySections,
+  renderTruncationDisclosure,
+  type ToolRendererContext,
   type ToolResult,
 } from "../../ui/tui/common.ts";
 import type { CodeOrientationToolParams } from "./execute.ts";
 
-/** ── renderCall ────────────────────────────────────────────────── */
-
-export function renderOrientationCall(args: unknown, theme: Theme, _context: unknown): Text {
-  const params = (args ?? {}) as CodeOrientationToolParams;
-
+/** Render the compact code_orientation call header. */
+export function renderOrientationCall(
+  args: unknown,
+  theme: Theme,
+  _context: ToolRendererContext | undefined,
+): Text {
+  const params = (args ?? {}) as Partial<CodeOrientationToolParams>;
   let content = theme.fg("toolTitle", "code_orientation");
+  const focus = params.focus;
 
-  if (!params.focus) {
+  if (!focus || typeof focus !== "object") {
     content += ` ${theme.fg("muted", "workspace")}`;
-  } else if ("path" in params.focus) {
-    const focus = params.focus.path.split("/").pop() ?? params.focus.path;
-    content += ` ${theme.fg("accent", focus)}`;
-  } else if ("module" in params.focus) {
-    content += ` ${theme.fg("accent", params.focus.module)}`;
-  } else {
+  } else if ("path" in focus) {
+    const path = formatCallPath(focus.path);
+    content += ` ${theme.fg("accent", path ?? "path?")}`;
+  } else if ("module" in focus) {
+    content += ` ${theme.fg("accent", formatCallValue(focus.module) ?? "module?")}`;
+  } else if ("target" in focus) {
     content += ` ${theme.fg("accent", "target")}`;
   }
 
   return new Text(content, 0, 0);
 }
 
-/** ── renderResult ──────────────────────────────────────────────── */
-
+/** Render code_orientation progress, status, and structured result details. */
 export function renderOrientationResult(
   result: ToolResult,
   options: ResultOptios,
   theme: Theme,
-  _context: unknown,
+  context: ToolRendererContext | undefined,
 ): Container | Text {
-  if (options.isPartial) {
-    return renderPartial("Orienting…", theme);
-  }
+  if (options.isPartial) return renderPartial("Orienting…", theme);
 
-  const container = new Container();
   const data =
     result.details?.type === "context" ? (result.details.data as Record<string, unknown>) : null;
   const markdownText = result.content.find((c) => c.type === "text")?.text ?? "";
 
-  if (result.isError) {
-    container.addChild(new Text(theme.fg("error", "code_orientation failed"), 0, 0));
-    return container;
-  }
+  const executionError = renderExecutionError(context, "code_orientation failed", theme);
+  if (executionError) return executionError;
+  const domainError = renderDomainError(result, theme);
+  if (domainError) return renderDomainResult(result, options, theme, domainError);
 
   if (!options.expanded) {
-    container.addChild(buildCompactSummary(data, theme));
-    return container;
+    const compact = buildCompactSummary(data, theme);
+    const truncation = renderTruncationDisclosure(result, theme);
+    if (!truncation) return compact;
+    const compactContainer = new Container();
+    compactContainer.addChild(compact);
+    compactContainer.addChild(new Spacer(1));
+    compactContainer.addChild(truncation);
+    return compactContainer;
   }
 
+  const container = new Container();
   container.addChild(buildHeader(data, theme));
 
   const target = data?.target as Record<string, unknown> | undefined;
@@ -67,7 +83,7 @@ export function renderOrientationResult(
       new Text(
         theme.fg(
           "muted",
-          `${String(target.name ?? "symbol")} — ${String(target.file ?? "")}:${String(target.displayLine ?? "")}`,
+          `${formatCallValue(target.name) ?? "symbol"} — ${formatCallPath(target.file) ?? ""}:${String(target.displayLine ?? "")}`,
         ),
         0,
         0,
@@ -75,10 +91,13 @@ export function renderOrientationResult(
     );
   }
 
-  const sections = (data?.renderedSections as string[] | undefined) ?? [];
-  if (sections.length > 0) {
+  renderToolDisplaySections(container, result.details?.displaySections, theme);
+  renderStructuredDetailBody(container, data ?? undefined, theme);
+
+  const truncation = renderTruncationDisclosure(result, theme);
+  if (truncation) {
     container.addChild(new Spacer(1));
-    container.addChild(new Text(theme.fg("dim", `Sections: ${sections.join(", ")}`), 0, 0));
+    container.addChild(truncation);
   }
 
   if (markdownText) {
@@ -90,8 +109,6 @@ export function renderOrientationResult(
   return container;
 }
 
-/** ── Helpers ───────────────────────────────────────────────────── */
-
 function buildCompactSummary(data: Record<string, unknown> | null, theme: Theme): Text {
   if (!data) return new Text(theme.fg("dim", "No orientation"), 0, 0);
 
@@ -112,9 +129,7 @@ function summarySegments(
 ): string[] {
   const segments: string[] = [];
   const evidence = orientationEvidence(data);
-  if (evidence) {
-    segments.push(theme.fg(badgeColor, theme.bold(formatEvidenceEntry(evidence))));
-  }
+  if (evidence) segments.push(theme.fg(badgeColor, theme.bold(formatEvidenceEntry(evidence))));
 
   const confidence = typeof data.confidence === "string" ? data.confidence : "";
   if (confidence && confidence !== "unavailable") {
@@ -122,7 +137,8 @@ function summarySegments(
   }
 
   const target = data.target as Record<string, unknown> | undefined;
-  if (target?.name) segments.push(theme.fg("muted", String(target.name)));
+  const targetName = formatCallValue(target?.name);
+  if (targetName) segments.push(theme.fg("muted", targetName));
 
   return segments;
 }

package/src/tool/refactor-apply/execute.ts

@@ -19,6 +19,7 @@ export async function executeRefactorApplyTool(
   if (outcome.kind === "invalid-input") {
     return searchErrorResult(`**Error:** ${outcome.message}`, {
       nextQueries: ["Generate a fresh plan with code_refactor_plan"],
+      message: outcome.message,
     });
   }
 
@@ -28,6 +29,8 @@ export async function executeRefactorApplyTool(
     details: {
       type: "search",
       data: assembly.details,
+      status: "completed",
+      displaySections: assembly.displaySections,
     },
   };
 }