@mrclrchtr/supi-code-intelligence 4.10.0 → 5.0.0

package/src/tool/result/refactor.ts

@@ -3,7 +3,8 @@ import { createEvidenceList, type EvidenceList } from "../../analysis/evidence.t
 import type { ApplyResult } from "../../analysis/refactor/apply.ts";
 import type { RefactorPlan } from "../../session/refactor-plans.ts";
 import { assembledNextQueries, assembleToolResult, type ToolResultAssembly } from "./assembly.ts";
-import type { SearchDetails } from "./types.ts";
+import { createToolDisplaySection } from "./display.ts";
+import type { SearchDetails, ToolDisplaySection } from "./types.ts";
 
 export interface RefactorPlanAssemblyData {
   readonly plan: Readonly<RefactorPlan>;
@@ -14,6 +15,7 @@ export interface RefactorPlanAssemblyData {
 export interface RefactorPlanResultAssembly {
   readonly assembled: ToolResultAssembly<RefactorPlanAssemblyData>;
   readonly details: SearchDetails;
+  readonly displaySections: readonly ToolDisplaySection[];
 }
 
 export interface RefactorApplyAssemblyData {
@@ -24,6 +26,13 @@ export interface RefactorApplyAssemblyData {
 export interface RefactorApplyResultAssembly {
   readonly assembled: ToolResultAssembly<RefactorApplyAssemblyData>;
   readonly details: SearchDetails;
+  readonly displaySections: readonly ToolDisplaySection[];
+}
+
+function formatEdit(edit: FileEdit): string {
+  const range = edit.range;
+  const replacement = edit.newText.replace(/\n/g, " ↵ ");
+  return `${edit.file} L${range.start.line + 1}:${range.start.character + 1} → L${range.end.line + 1}:${range.end.character + 1}: ${replacement}`;
 }
 
 /** Assemble a bounded refactor plan and all facts needed by its renderers. */
@@ -59,6 +68,17 @@ export function assembleRefactorPlanDetails(
 
   return {
     assembled,
+    displaySections: [
+      createToolDisplaySection({
+        key: "refactor.edits",
+        title: "Proposed edits",
+        items: edits.items,
+        totalCount: edits.metadata.totalCount,
+        omittedCount: edits.metadata.omittedCount,
+        partialReason: edits.metadata.partialReason,
+        format: formatEdit,
+      }),
+    ],
     details: {
       confidence: assembled.confidence,
       scope: null,
@@ -98,8 +118,22 @@ export function assembleRefactorApplyDetails(
     provenance,
   });
 
+  const changedFiles = [...new Set(plan.edits.edits.map((edit) => edit.file))];
+
   return {
     assembled,
+    displaySections:
+      applyResult.kind === "applied"
+        ? [
+            createToolDisplaySection({
+              key: "refactor.changedFiles",
+              title: "Changed files",
+              items: changedFiles,
+              totalCount: changedFiles.length,
+              format: (file) => file,
+            }),
+          ]
+        : [],
     details: {
       confidence: assembled.confidence,
       scope: null,
@@ -107,9 +141,7 @@ export function assembleRefactorApplyDetails(
       omittedCount: assembled.totals.omittedCount,
       evidenceLists: [...assembled.evidenceLists],
       nextQueries: assembledNextQueries(assembled),
-      ...(applyResult.kind === "applied"
-        ? { changedFiles: [...new Set(plan.edits.edits.map((edit) => edit.file))] }
-        : {}),
+      ...(applyResult.kind === "applied" ? { changedFiles } : {}),
     },
   };
 }

package/src/tool/result/resolve.ts

@@ -10,7 +10,8 @@ import {
   type ResultProvenance,
   type ToolResultAssembly,
 } from "./assembly.ts";
-import type { ResolveDetails } from "./types.ts";
+import { createToolDisplaySection } from "./display.ts";
+import type { ResolveDetails, ToolDisplaySection } from "./types.ts";
 
 /** Presentation-neutral assembled code_resolve result. */
 export interface ResolveResultAssembly {
@@ -18,6 +19,7 @@ export interface ResolveResultAssembly {
   readonly cwd: string;
   readonly assembled: ToolResultAssembly<TargetWorkflowOutcome>;
   readonly details: ResolveDetails;
+  readonly displaySections: readonly ToolDisplaySection[];
 }
 
 interface ResolveProjection {
@@ -56,16 +58,19 @@ export function assembleResolveResult(
     provenance,
   });
 
+  const details = {
+    ...projection.details,
+    omittedCount: assembled.totals.omittedCount,
+    evidenceLists: [...assembled.evidenceLists],
+    nextQueries: assembledNextQueries(assembled),
+  };
+
   return Object.freeze({
     outcome,
     cwd,
     assembled,
-    details: {
-      ...projection.details,
-      omittedCount: assembled.totals.omittedCount,
-      evidenceLists: [...assembled.evidenceLists],
-      nextQueries: assembledNextQueries(assembled),
-    },
+    details,
+    displaySections: resolveDisplaySections(details),
   });
 }
 
@@ -233,6 +238,38 @@ function toTargetDetails(target: Readonly<TargetStoreEntry>, cwd: string) {
   };
 }
 
+function resolveDisplaySections(details: ResolveDetails): ToolDisplaySection[] {
+  if (details.targets.length > 0) {
+    return [
+      createToolDisplaySection({
+        key: "resolve.targets",
+        title: "Targets",
+        items: details.targets,
+        totalCount: details.targetCount,
+        omittedCount: details.omittedCount,
+        format: (target) =>
+          `${target.name ?? "anonymous"} (${target.kind ?? "unknown"}) — ${target.file}:${target.displayLine}:${target.displayCharacter} [${target.targetId}]`,
+      }),
+    ];
+  }
+
+  if (details.candidates && details.candidates.length > 0) {
+    return [
+      createToolDisplaySection({
+        key: "resolve.candidates",
+        title: "Candidates",
+        items: details.candidates,
+        totalCount: details.targetCount,
+        omittedCount: details.omittedCount,
+        format: (candidate) =>
+          `${candidate.rank}. ${candidate.name} (${candidate.kind ?? "unknown"}) — ${candidate.file}:${candidate.line}:${candidate.character} [${candidate.targetId}]`,
+      }),
+    ];
+  }
+
+  return [];
+}
+
 function resolveProvenance(outcome: TargetWorkflowOutcome): ResultProvenance[] {
   const sources = new Set<"semantic" | "structural">();
   if (outcome.kind === "resolved") {

package/src/tool/result/types.ts

@@ -19,6 +19,26 @@ import type {
 } from "../../session/target-store.ts";
 import type { ResultProvenance } from "./assembly.ts";
 
+/** Final state for a public tool result. */
+export type ToolResultStatus = "completed" | "invalid-input" | "disambiguation" | "unavailable";
+
+/** Truncation state for model-facing tool content. */
+export interface ToolOutputTruncationDetails {
+  truncated: boolean;
+  fullOutputPath?: string;
+}
+
+/** Bounded, structured rows for the expanded TUI body. */
+export interface ToolDisplaySection {
+  key: string;
+  title: string;
+  lines: readonly string[];
+  shownCount: number;
+  totalCount: number | null;
+  omittedCount: number | null;
+  partialReason: string | null;
+}
+
 // ── Anchored coordinate resolution metadata ───────────────────────────
 
 /**

package/src/types/execution.ts

@@ -6,6 +6,9 @@ import type {
   InspectDetails,
   ResolveDetails,
   SearchDetails,
+  ToolDisplaySection,
+  ToolOutputTruncationDetails,
+  ToolResultStatus,
 } from "../tool/result/types.ts";
 
 /**
@@ -26,6 +29,8 @@ import type {
  */
 export interface CodeIntelToolExecCtx {
   cwd: string;
+  /** Opaque identity for Debug Events directly owned by this public Tool call. */
+  operationId?: string;
   /** Abort signal from the agent runtime; forward to long-running subprocesses. */
   signal?: AbortSignal;
   /** Progress callback; long-running executors emit coarse beats, not chatty ones. */
@@ -39,13 +44,21 @@ export interface CodeIntelToolExecCtx {
   session: WorkspaceCodeIntelligenceSession;
 }
 
+/** Shared metadata attached to one persisted Code Intelligence result. */
+export interface CodeIntelResultDetails {
+  status?: ToolResultStatus;
+  message?: string;
+  displaySections?: readonly ToolDisplaySection[];
+  truncation?: ToolOutputTruncationDetails;
+}
+
 /** Tool result shape returned by executeAction. */
 export interface CodeIntelResult {
   content: string;
   details?:
-    | { type: "context"; data: ContextDetails }
-    | { type: "inspect"; data: InspectDetails }
-    | { type: "search"; data: SearchDetails }
-    | { type: "resolve"; data: ResolveDetails }
-    | { type: "health"; data: HealthDetails };
+    | (CodeIntelResultDetails & { type: "context"; data: ContextDetails })
+    | (CodeIntelResultDetails & { type: "inspect"; data: InspectDetails })
+    | (CodeIntelResultDetails & { type: "search"; data: SearchDetails })
+    | (CodeIntelResultDetails & { type: "resolve"; data: ResolveDetails })
+    | (CodeIntelResultDetails & { type: "health"; data: HealthDetails });
 }

package/src/types/index.ts

@@ -8,7 +8,11 @@ export {
 
 // ── Execution context and result ────────────────────────────────────────
 
-export type { CodeIntelResult, CodeIntelToolExecCtx } from "./execution.ts";
+export type {
+  CodeIntelResult,
+  CodeIntelResultDetails,
+  CodeIntelToolExecCtx,
+} from "./execution.ts";
 
 // ── Detail types ────────────────────────────────────────────────────────
 
@@ -23,4 +27,7 @@ export type {
   OrientationSectionDetails,
   ResolveDetails,
   SearchDetails,
+  ToolDisplaySection,
+  ToolOutputTruncationDetails,
+  ToolResultStatus,
 } from "../tool/result/types.ts";

package/src/ui/status-command.ts

@@ -52,7 +52,7 @@ export function registerCiStatusCommand(pi: ExtensionAPI): void {
               fetchDetailedDiagnostics: async (maxSeverity) => {
                 const lspState = getWorkspaceLspRuntime(ctx.cwd);
                 if (lspState.kind !== "ready") return [];
-                return lspState.runtime.getOutstandingDiagnostics(maxSeverity);
+                return lspState.runtime.getOutstandingDiagnostics(maxSeverity).entries;
               },
               onRefresh: async () => {
                 const fresh = await gatherCiStatusData(ctx.cwd, pi);
@@ -95,10 +95,11 @@ async function gatherCiStatusData(cwd: string, pi: ExtensionAPI): Promise<CiStat
   const semanticAvailable = servers.some(
     (server) => server.status === "running" && server.ready === true,
   );
-  const diagnostics =
+  const diagnosticSnapshot =
     lspState.kind === "ready" && semanticAvailable
       ? lspState.runtime.getOutstandingDiagnosticSummary(1)
-      : [];
+      : { entries: [], current: false };
+  const diagnostics = diagnosticSnapshot.entries;
   const semanticState = deriveSemanticCapabilityState(workspace, lspState, semanticAvailable);
 
   // Sort: errors desc, warnings desc, info desc, hints desc
@@ -123,6 +124,7 @@ async function gatherCiStatusData(cwd: string, pi: ExtensionAPI): Promise<CiStat
     diagnostics,
     serverInventoryAvailable,
     semanticAvailable,
+    diagnosticSnapshotCurrent: diagnosticSnapshot.current,
     capabilities: {
       semantic: semanticState,
       structural: {

package/src/ui/status-overlay.ts

@@ -37,6 +37,8 @@ export interface CiStatusData {
   serverInventoryAvailable: boolean;
   /** Whether diagnostics and semantic absence claims are currently supported. */
   semanticAvailable: boolean;
+  /** Whether tracked-file diagnostic counts prove the current document and workspace state. */
+  diagnosticSnapshotCurrent: boolean;
   /** Sorted: errors desc, then warnings desc, then info desc, then hints desc. */
   diagnostics: OutstandingDiagnosticSummaryEntry[];
   capabilities: {
@@ -373,6 +375,8 @@ export class CiStatusDialog {
     const t = this.theme;
     if (!this.data.semanticAvailable) {
       container.addChild(new Text(t.fg("dim", "  (diagnostics unavailable)"), 1, 0));
+    } else if (!this.data.diagnosticSnapshotCurrent) {
+      container.addChild(new Text(t.fg("warning", "  diagnostic snapshot is stale"), 1, 0));
     } else {
       container.addChild(new Text(t.fg("success", "  ✓ no issues"), 1, 0));
     }

package/src/ui/tui/common.ts

@@ -6,19 +6,47 @@
  * partial/error guards, and the shared simple-result pattern.
  */
 
-import { getMarkdownTheme, type Theme } from "@earendil-works/pi-coding-agent";
+import {
+  getMarkdownTheme,
+  type Theme,
+  type ToolRenderResultOptions,
+} from "@earendil-works/pi-coding-agent";
 import { Container, Markdown, Spacer, Text } from "@earendil-works/pi-tui";
 import { formatEvidenceBadge } from "@mrclrchtr/supi-core/evidence-badge";
+import { truncateDisplayText } from "../../tool/result/display.ts";
+import { renderToolDisplaySections } from "./display.ts";
+
+export { formatCallPath, formatCallValue, renderToolDisplaySections } from "./display.ts";
+
+import type {
+  ToolDisplaySection,
+  ToolOutputTruncationDetails,
+  ToolResultStatus,
+} from "../../tool/result/types.ts";
 
 // ── Result type ──────────────────────────────────────────────────
 
 /** Shape of a pi tool result consumed by renderResult functions. */
 export interface ToolResult {
   content: Array<{ type: string; text?: string }>;
-  details?: { type: string; data: Record<string, unknown> };
-  isError?: boolean;
+  details?: {
+    type: string;
+    data: Record<string, unknown>;
+    status?: ToolResultStatus;
+    message?: string;
+    displaySections?: readonly ToolDisplaySection[];
+    truncation?: ToolOutputTruncationDetails;
+  };
+}
+
+/** PI render context used by Code Intelligence result renderers. */
+export interface ToolRendererContext {
+  isError: boolean;
 }
 
+/** PI render options used by Code Intelligence result renderers. */
+export type ResultOptios = ToolRenderResultOptions;
+
 // ── Evidence key labels ──────────────────────────────────────────
 
 export const EVIDENCE_KEY_LABELS: Record<string, string> = {
@@ -142,7 +170,7 @@ export function renderMarkdownDetail(
   const markdownText = source.content?.find((c) => c.type === "text")?.text ?? "";
   if (!markdownText) return;
   container.addChild(new Spacer(1));
-  const divider = `${theme.fg("border", "────")} ${theme.fg("dim", "raw markdown")} ${theme.fg("border", "─".repeat(100))}`;
+  const divider = `${theme.fg("border", "────")} ${theme.fg("dim", "raw markdown")} ${theme.fg("border", "────")}`;
   container.addChild(new Text(divider, 0, 0));
   container.addChild(new Markdown(markdownText, 0, 0, getMarkdownTheme()));
 }
@@ -157,13 +185,62 @@ export function renderError(label: string, theme: Theme): Text {
   return new Text(theme.fg("error", label), 0, 0);
 }
 
-// ── Result options ───────────────────────────────────────────────
+/** Render an execution failure from PI's renderer context. */
+export function renderExecutionError(
+  context: ToolRendererContext | undefined,
+  label: string,
+  theme: Theme,
+): Text | null {
+  return context?.isError ? renderError(label, theme) : null;
+}
+
+/** Render a domain error encoded in structured result details. */
+export function renderDomainError(result: ToolResult, theme: Theme): Text | null {
+  const status = result.details?.status;
+  if (status !== "invalid-input" && status !== "disambiguation" && status !== "unavailable") {
+    return null;
+  }
+
+  const label =
+    status === "invalid-input"
+      ? "Invalid input"
+      : status === "disambiguation"
+        ? "Choose a target"
+        : "Unavailable";
+  const message = result.details?.message
+    ? `: ${truncateDisplayText(result.details.message, 160)}`
+    : "";
+  return renderError(`${label}${message}`, theme);
+}
+
+/** Render an invalid-input or unavailable result with its structured body. */
+export function renderDomainResult(
+  result: ToolResult,
+  options: ResultOptios,
+  theme: Theme,
+  error: Text,
+): Container | Text {
+  if (!options.expanded) return error;
+  const container = new Container();
+  container.addChild(error);
+  renderToolDisplaySections(container, result.details?.displaySections, theme);
+  renderMarkdownDetail(container, result, theme);
+  return container;
+}
 
-export interface ResultOptios {
-  expanded: boolean;
-  isPartial: boolean;
+/** Render the structured output-truncation disclosure. */
+export function renderTruncationDisclosure(result: ToolResult, theme: Theme): Text | null {
+  const truncation = result.details?.truncation;
+  if (!truncation?.truncated) return null;
+
+  const path = truncation.fullOutputPath
+    ? `; full output: ${truncateDisplayText(truncation.fullOutputPath, 160)}`
+    : "";
+  return new Text(theme.fg("warning", `Output truncated${path}`), 0, 0);
 }
 
+// ── Result options ───────────────────────────────────────────────
+
 // ── Shared simple-result renderer ─────────────────────────────────
 
 /**
@@ -172,19 +249,34 @@ export interface ResultOptios {
  *
  * Handles partial, error, compact, and expanded states uniformly.
  */
+// biome-ignore lint/complexity/useMaxParams: renderer signature keeps the shared helper convenient for each tool
 export function renderSimpleResult(
   result: ToolResult,
   options: ResultOptios,
   theme: Theme,
   partialLabel: string,
+  context?: ToolRendererContext,
 ): Container | Text {
   if (options.isPartial) return renderPartial(partialLabel, theme);
-  if (result.isError) return renderError("Tool failed", theme);
+
+  const executionError = renderExecutionError(context, "Tool failed", theme);
+  if (executionError) return executionError;
+
+  const domainError = renderDomainError(result, theme);
+  if (domainError) return renderDomainResult(result, options, theme, domainError);
 
   const data = result.details?.data as Record<string, unknown> | undefined;
   if (options.expanded) return buildExpandedView(result, data, theme);
 
-  return buildSimpleCompact(data, theme);
+  const compact = buildSimpleCompact(data, theme);
+  const truncation = renderTruncationDisclosure(result, theme);
+  if (!truncation) return compact;
+
+  const container = new Container();
+  container.addChild(compact);
+  container.addChild(new Spacer(1));
+  container.addChild(truncation);
+  return container;
 }
 
 function buildExpandedView(
@@ -197,7 +289,13 @@ function buildExpandedView(
   const header = buildSimpleHeader(data, theme);
   if (header) container.addChild(header);
 
+  renderToolDisplaySections(container, result.details?.displaySections, theme);
   renderStructuredDetailBody(container, data, theme);
+  const truncation = renderTruncationDisclosure(result, theme);
+  if (truncation) {
+    container.addChild(new Spacer(1));
+    container.addChild(truncation);
+  }
   renderMarkdownDetail(container, result, theme);
 
   return container;

package/src/ui/tui/display.ts

@@ -0,0 +1,48 @@
+import type { Theme } from "@earendil-works/pi-coding-agent";
+import { type Container, Text } from "@earendil-works/pi-tui";
+import { readToolDisplaySections, truncateDisplayText } from "../../tool/result/display.ts";
+import type { ToolDisplaySection } from "../../tool/result/types.ts";
+
+/** Render bounded structured rows for an expanded TUI body. */
+export function renderToolDisplaySections(
+  container: Container,
+  value: unknown,
+  theme: Theme,
+): void {
+  for (const section of readToolDisplaySections(value)) {
+    container.addChild(
+      new Text(theme.fg("dim", `${section.title}${formatDisplayBounds(section)}`), 0, 0),
+    );
+    for (const line of section.lines) {
+      container.addChild(new Text(theme.fg("muted", line), 0, 0));
+    }
+  }
+}
+
+function formatDisplayBounds(section: ToolDisplaySection): string {
+  if (section.totalCount === null) {
+    const omitted = section.omittedCount ? `; ${section.omittedCount} collected omitted` : "";
+    const reason = section.partialReason
+      ? `; more may exist — ${section.partialReason}`
+      : "; partial";
+    return ` (${section.shownCount}${omitted}${reason})`;
+  }
+  if (section.omittedCount && section.omittedCount > 0) {
+    return ` (${section.shownCount} of ${section.totalCount}; ${section.omittedCount} omitted)`;
+  }
+  return ` (${section.totalCount})`;
+}
+
+/** Format one call argument for a compact human transcript row. */
+export function formatCallValue(value: unknown, maxLength = 60): string | null {
+  if (typeof value !== "string" || value.length === 0) return null;
+  const normalized = value.replace(/\s+/g, " ").trim();
+  return truncateDisplayText(normalized, maxLength);
+}
+
+/** Show the final path segment while accepting both POSIX and Windows paths. */
+export function formatCallPath(value: unknown, maxLength = 60): string | null {
+  const formatted = formatCallValue(value, Number.MAX_SAFE_INTEGER);
+  if (!formatted) return null;
+  return formatCallValue(formatted.split(/[\\/]/).pop() ?? formatted, maxLength);
+}