@hheei/pi-ext-ui 0.1.0 → 0.2.0

package/dist/renderer.js

@@ -1,9 +1,13 @@
+import { getLanguageFromPath, highlightCode, } from "@earendil-works/pi-coding-agent";
 import { stripTerminalSequences } from "@earendil-works/pi-tui";
+import { agentResultText, getRegisteredToolPresentationProvider, getToolPresentationProvider, } from "@hheei/pi-ext-core";
 import { applyPatchGlyph } from "./apply-patch-glyph.js";
 import { previewV4aOperations } from "./apply-patch-preview.js";
 import { applyPatchFacts, formatApplyPatchOperationRow, } from "./apply-patch-view.js";
 import { DiffView, diffStats } from "./diff-view.js";
-import { ToolView, } from "./tool-view.js";
+import { NestedCallsView } from "./nested-calls-view.js";
+import { formatToolHeaderText, ToolView, } from "./tool-view.js";
+import { getCapturedNestedCalls, recordToolExecutionEnd, recordToolExecutionStart, } from "./tracker.js";
 /** Tools with a pi-ext-ui-owned renderer. Other tools stay on Pi's renderer. */
 export const SPECIALIZED_TOOL_RENDERERS = [
     "edit",
@@ -14,217 +18,42 @@ export const SPECIALIZED_TOOL_RENDERERS = [
 ];
 /** Web-access tools use the shared folding shell while retaining their native body renderer. */
 export const WEB_ACCESS_TOOLS = ["web_search", "web_fetch", "web_open"];
-const APPLY_PATCH_TOOL_NAME = "apply_patch";
+import { APPLY_PATCH_TOOL_NAME, callStatsParts, EDIT_TOOL_NAME, editDiffSource, editPath, estimateStreamingTokens, extractHeavyInputCommand, extractNestedCalls, extractResultText, extractSummaryArg, formatCostUsd, formatDurationMs, formatTimeoutFact, inlinePresentation, isRecord, lineHunks, PYTHON_EVAL_TOOL_NAME, patchSummary, patchTextForCopy, pythonEvalFacts, resolveContainerStatus, toolPath, WRITE_TOOL_NAME, writePresentation, } from "./payload-parser.js";
+export { estimateStreamingTokens, inlinePresentation, } from "./payload-parser.js";
 const APPLY_PATCH_PREVIEW_STATE_KEY = "__piExtUiApplyPatchPreview";
-const PYTHON_EVAL_TOOL_NAME = "python_eval";
 const PYTHON_EVAL_TOOL_TITLE = "python_eval";
-const PYTHON_EVAL_DETAILS_FORMAT = "pi-ext-tools-python-eval";
-const EDIT_TOOL_NAME = "edit";
-const WRITE_TOOL_NAME = "write";
-const EDIT_VIEW_KEY = "__piExtToolsEditView";
-const WRITE_VIEW_KEY = "__piExtToolsWriteView";
 const SPECIALIZED_TOOL_SET = new Set(SPECIALIZED_TOOL_RENDERERS);
 const WEB_ACCESS_TOOL_SET = new Set(WEB_ACCESS_TOOLS);
 const CALL_VIEW_STATE_KEY = "__piExtUiCallView";
-const CODEMODE_OPTIONS_PREFIX = "// @options:";
-const CODEMODE_SCRIPT_HEADER = /^Script (?:completed|failed)\r?\nWall time ([\d.]+) seconds\r?\nOutput:\r?\n/;
-function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-export function estimateStreamingTokens(args) {
-    if (args === undefined || args === null)
-        return 0;
-    try {
-        const serialized = typeof args === "string" ? args : JSON.stringify(args);
-        if (!serialized || serialized === "{}")
-            return 0;
-        return Math.max(1, Math.ceil(serialized.length / 4));
-    }
-    catch {
-        return 0;
-    }
-}
-function formatDurationMs(ms) {
-    if (ms === undefined || !Number.isFinite(ms))
-        return "";
-    return ms < 1000 ? `${String(Math.round(ms))}ms` : `${(ms / 1000).toFixed(1)}s`;
-}
-function formatCostUsd(cost) {
-    if (cost === undefined || !Number.isFinite(cost) || cost <= 0)
-        return "";
-    return `$${cost >= 0.01 ? cost.toFixed(2) : cost.toPrecision(2)}`;
-}
-export function extractCodemodeHeaderFacts(args) {
-    if (!isRecord(args))
-        return "";
-    const options = {};
-    for (const [key, value] of Object.entries(args)) {
-        if (key !== "code" && value !== undefined && value !== null) {
-            options[key] = value;
-        }
-    }
-    if (typeof args.code === "string") {
-        const firstLine = args.code.split(/\r?\n/, 1)[0]?.trim() ?? "";
-        if (firstLine.startsWith(CODEMODE_OPTIONS_PREFIX)) {
-            try {
-                const parsed = JSON.parse(firstLine.slice(CODEMODE_OPTIONS_PREFIX.length).trim());
-                if (isRecord(parsed)) {
-                    Object.assign(options, parsed);
-                }
-            }
-            catch { }
-        }
-    }
-    const facts = [];
-    const timeoutMs = typeof options.timeout_ms === "number"
-        ? options.timeout_ms
-        : typeof options.timeout === "number"
-            ? options.timeout * 1000
-            : undefined;
-    if (timeoutMs !== undefined) {
-        const label = timeoutMs >= 1000 ? `${String(Math.round(timeoutMs / 1000))}s` : `${String(timeoutMs)}ms`;
-        facts.push(`(timeout ${label})`);
-    }
-    if (typeof options.max_output_tokens === "number") {
-        facts.push(`(tokens ${String(options.max_output_tokens)})`);
-    }
-    if (typeof options.target === "string" && options.target !== "local") {
-        facts.push(`(${options.target})`);
-    }
-    return facts.join(" ");
-}
-function extractSummaryArg(toolName, args) {
-    if (toolName === "codemode") {
-        return extractCodemodeHeaderFacts(args);
-    }
-    if (!isRecord(args))
-        return "";
-    for (const key of [
-        "query",
-        "queries",
-        "url",
-        "urls",
-        "source",
-        "claim",
-        "id",
-        "search_id",
-        "topic",
-        "path",
-        "pattern",
-    ]) {
-        const val = args[key];
-        if (typeof val === "string" && val.trim() !== "") {
-            return stripTerminalSequences(val.trim());
-        }
-        if (Array.isArray(val) && val.length > 0 && typeof val[0] === "string") {
-            const first = stripTerminalSequences(val[0].trim());
-            return val.length > 1 ? `${first} (+${String(val.length - 1)})` : first;
-        }
-    }
-    return "";
-}
-function extractHeavyInputCommand(toolName, args) {
-    if (!isRecord(args))
-        return undefined;
-    if (toolName === "bash" && typeof args.command === "string") {
-        return args.command.trim();
-    }
-    if (toolName === "python_eval" && typeof args.code === "string") {
-        return args.code.trim();
-    }
-    if (toolName === "codemode" && typeof args.code === "string") {
-        return args.code.trim();
-    }
+function detectCodeLanguage(toolName) {
+    if (toolName === "bash")
+        return "bash";
+    if (toolName === "python_eval")
+        return "python";
+    if (toolName === "codemode")
+        return "javascript";
     return undefined;
 }
-function extractNestedCalls(result) {
-    if (result === undefined || !isRecord(result.details))
-        return [];
-    const rawList = Array.isArray(result.details.calls)
-        ? result.details.calls
-        : Array.isArray(result.details.nestedCalls)
-            ? result.details.nestedCalls
-            : undefined;
-    if (rawList === undefined)
-        return [];
-    const items = [];
-    for (const entry of rawList) {
-        if (!isRecord(entry))
-            continue;
-        const name = typeof entry.name === "string"
-            ? entry.name
-            : typeof entry.toolName === "string"
-                ? entry.toolName
-                : undefined;
-        if (name === undefined)
-            continue;
-        const rawStatus = entry.status;
-        const status = rawStatus === "running" ||
-            rawStatus === "ok" ||
-            rawStatus === "error" ||
-            rawStatus === "cancelled"
-            ? rawStatus
-            : undefined;
-        const summary = typeof entry.args === "string" && entry.args.trim() !== ""
-            ? entry.args
-            : typeof entry.summary === "string"
-                ? entry.summary
-                : undefined;
-        items.push({
-            toolName: name,
-            summary,
-            status,
-            isError: entry.isError === true || status === "error",
-            isWarning: entry.isWarning === true || status === "cancelled",
-            durationMs: typeof entry.durationMs === "number" ? entry.durationMs : undefined,
-            cost: typeof entry.cost === "number" ? entry.cost : undefined,
-            error: typeof entry.error === "string" ? entry.error : undefined,
-        });
-    }
-    return items;
-}
-function extractResultText(toolName, result) {
-    const parts = [];
-    for (const block of result.content) {
-        if (block.type === "text" && block.text.trim() !== "") {
-            parts.push(stripTerminalSequences(block.text));
-        }
-    }
-    const joined = parts.join("\n");
-    if (toolName === "codemode") {
-        const match = CODEMODE_SCRIPT_HEADER.exec(joined);
-        const wallTimeSeconds = match?.[1] !== undefined ? Number.parseFloat(match[1]) : undefined;
-        const cleaned = joined.replace(CODEMODE_SCRIPT_HEADER, "").trim();
-        return { outputText: cleaned, wallTimeSeconds };
-    }
-    return { outputText: joined, wallTimeSeconds: undefined };
-}
-function callStatsParts(total, failCount) {
-    if (failCount > 0) {
-        return [`${String(total - failCount)} ok`, `${String(failCount)} failed`];
-    }
-    return [`${String(total)} ${total === 1 ? "call" : "calls"}`];
-}
-function resolveContainerStatus(params) {
-    if (params.selfFailed)
-        return "error";
-    if (params.hasChildren)
-        return "none";
-    if (params.isPartial)
-        return "running";
-    return params.isError ? "error" : "ok";
-}
-function createInputCodeSection(toolName, args, theme) {
+function createInputCodeSection(toolName, args, theme, railToken = "muted") {
     const raw = extractHeavyInputCommand(toolName, args);
     if (raw === undefined || raw === "")
         return undefined;
     const isShell = toolName === "bash";
-    const lines = raw
-        .replace(/\r/g, "")
-        .replace(/\t/g, "  ")
-        .split("\n")
-        .map((line, i) => theme.fg("mdCode", isShell ? (i === 0 ? `$ ${line}` : `  ${line}`) : line));
-    return { railToken: "muted", content: lines };
+    const clean = raw.replace(/\r/g, "").replace(/\t/g, "  ");
+    const lang = detectCodeLanguage(toolName);
+    let lines;
+    if (isShell) {
+        lines = clean.split("\n").map((line, i) => (i === 0 ? `$ ${line}` : `  ${line}`));
+    }
+    else {
+        try {
+            lines = highlightCode(clean, lang);
+        }
+        catch {
+            lines = clean.split("\n").map((line) => theme.fg("mdCode", line));
+        }
+    }
+    return { railToken, content: lines };
 }
 function formatArgsPreview(args) {
     if (args === undefined || args === null)
@@ -238,41 +67,25 @@ function formatArgsPreview(args) {
         return "";
     }
 }
-function nestedStatusGlyph(status, theme) {
-    switch (status) {
-        case "streaming":
-            return theme.fg("muted", "⋯");
-        case "running":
-            return theme.fg("accent", "◐");
-        case "ok":
-            return theme.fg("success", "✓");
-        case "warn":
-            return theme.fg("warning", "!");
-        case "error":
-            return theme.fg("error", "✗");
-        case "none":
-            return "";
-    }
-}
 /**
  * The host stacks a tool execution's call and result views. Following the
  * official edit renderer, the call view is stored in the shared renderer
  * state so the result renderer can hide it in place within the same
  * updateDisplay pass — no draw-time flags needed.
+ *
+ * The call row is left visible until a result view exists: hiding it here would
+ * blank the whole execution for as long as the tool produces no result yet.
  */
-function rememberCallView(context, view, toolName) {
+function rememberCallView(context, view) {
     if (isRecord(context.state)) {
         context.state[CALL_VIEW_STATE_KEY] = view;
     }
-    // A container tool's own row yields as soon as execution starts: nested rows and output
-    // carry the progress, so a spinner row on top would only duplicate them.
-    if ((toolName === "codemode" ||
-        toolName === PYTHON_EVAL_TOOL_NAME ||
-        toolName === APPLY_PATCH_TOOL_NAME) &&
-        context.executionStarted) {
-        view.hide();
-    }
 }
+/**
+ * A result view takes over from the call view. A container tool yields on any result,
+ * because its own row would duplicate the nested rows and output it now carries; every
+ * other tool keeps its call row until the final result.
+ */
 function hideCallView(context, toolName, isPartial) {
     if (toolName !== "codemode" &&
         toolName !== PYTHON_EVAL_TOOL_NAME &&
@@ -283,298 +96,6 @@ function hideCallView(context, toolName, isPartial) {
     if (view instanceof ToolView)
         view.hide();
 }
-function toolPath(args) {
-    let value = args;
-    if (typeof value === "string") {
-        try {
-            value = JSON.parse(value);
-        }
-        catch {
-            return "";
-        }
-    }
-    if (!isRecord(value))
-        return "";
-    return typeof value.path === "string" ? value.path.trim() : "";
-}
-function editPath(args) {
-    return toolPath(args);
-}
-function numericField(value, key) {
-    return isRecord(value) && typeof value[key] === "number" ? value[key] : undefined;
-}
-function writeStoredDiff(lines) {
-    const hunks = [];
-    let hunk = [];
-    const finish = () => {
-        if (hunk.length > 0)
-            hunks.push(hunk);
-        hunk = [];
-    };
-    for (const entry of lines) {
-        if (!isRecord(entry))
-            return undefined;
-        if (entry.type === "sep") {
-            finish();
-            continue;
-        }
-        if (entry.type !== "add" && entry.type !== "del" && entry.type !== "ctx")
-            return undefined;
-        if (typeof entry.content !== "string")
-            return undefined;
-        const line = entry.type === "del" ? entry.oldNum : entry.newNum;
-        if (typeof line !== "number")
-            return undefined;
-        hunk.push({ kind: entry.type, line, text: entry.content });
-    }
-    finish();
-    return hunks.length === 0
-        ? undefined
-        : { kind: "hunks", hunks: hunks.map((lines) => ({ lines })) };
-}
-/** Uses only the baseline and content already stored by the write tool. */
-function writePresentation(args, details) {
-    const view = isRecord(details) ? details[WRITE_VIEW_KEY] : undefined;
-    if (!isRecord(view))
-        return undefined;
-    if (view.kind === "noChange")
-        return { kind: "noChange" };
-    if (view.kind === "diff") {
-        const stored = Array.isArray(view.lines) ? writeStoredDiff(view.lines) : undefined;
-        if (stored === undefined)
-            return undefined;
-        const source = stored;
-        const stats = diffStats(source);
-        return stats === undefined
-            ? undefined
-            : {
-                kind: "diff",
-                source,
-                added: numericField(view, "added") ?? stats.added,
-                removed: numericField(view, "removed") ?? stats.removed,
-            };
-    }
-    if (view.kind !== "new" && view.kind !== "replace")
-        return undefined;
-    const content = typeof view.content === "string"
-        ? view.content
-        : isRecord(args) && typeof args.content === "string"
-            ? args.content
-            : undefined;
-    if (content === undefined)
-        return undefined;
-    const lines = numericField(view, "lines") ?? content.split("\n").length;
-    return {
-        kind: "content",
-        label: view.kind === "new" ? `new file (${String(lines)} lines)` : `wrote (${String(lines)} lines)`,
-        content,
-    };
-}
-function fileToolPresentation(toolName, args, details, isError) {
-    const path = toolPath(args);
-    if (toolName === "read") {
-        if (path === "")
-            return undefined;
-        return { summary: `read ${path}`, status: isError ? "error" : "ok" };
-    }
-    if (toolName === WRITE_TOOL_NAME) {
-        const presentation = isError ? undefined : writePresentation(args, details);
-        const delta = presentation?.kind === "diff"
-            ? ` (+${String(presentation.added)} -${String(presentation.removed)})`
-            : presentation?.kind === "content"
-                ? ` (${presentation.label})`
-                : presentation?.kind === "noChange"
-                    ? " (no changes)"
-                    : "";
-        if (path === "" && delta === "")
-            return undefined;
-        return {
-            summary: `${WRITE_TOOL_NAME} ${path}${delta}`.trim(),
-            status: isError ? "error" : presentation?.kind === "noChange" ? "none" : "ok",
-        };
-    }
-    return undefined;
-}
-/** Pi native edit persists a unified patch plus the same change as a numbered display diff. */
-function editDiffSource(details) {
-    if (!isRecord(details))
-        return undefined;
-    if (typeof details.patch === "string" && details.patch.trim() !== "") {
-        return { kind: "unifiedPatch", text: details.patch };
-    }
-    if (typeof details.diff === "string" && details.diff.trim() !== "") {
-        return displayDiffSource(details.diff);
-    }
-    return editViewSource(details[EDIT_VIEW_KEY]);
-}
-function displayDiffSource(diff) {
-    const hunks = [];
-    let current = [];
-    let pendingBreak = false;
-    for (const raw of diff.split(/\r?\n/)) {
-        if (raw === "")
-            continue;
-        const sign = raw.charAt(0);
-        const match = /^ *(\d+)? ?(.*)$/.exec(raw.slice(1));
-        const lineNumber = match?.[1];
-        if (lineNumber === undefined) {
-            pendingBreak = true;
-            continue;
-        }
-        if (pendingBreak && current.length > 0) {
-            hunks.push(current);
-            current = [];
-        }
-        pendingBreak = false;
-        const kind = sign === "+" ? "add" : sign === "-" ? "del" : "ctx";
-        current.push({ kind, line: Number(lineNumber), text: match?.[2] ?? "" });
-    }
-    if (current.length === 0)
-        return undefined;
-    hunks.push(current);
-    return { kind: "hunks", hunks: hunks.map((lines) => ({ lines })) };
-}
-function editViewSource(view) {
-    const hunks = editViewHunks(view);
-    return hunks.length === 0 ? undefined : { kind: "hunks", hunks };
-}
-function editViewHunks(view) {
-    if (!isRecord(view))
-        return [];
-    const ops = view.kind === "single" && isRecord(view.op)
-        ? [view.op]
-        : view.kind === "multi" && Array.isArray(view.ops)
-            ? view.ops.filter(isRecord)
-            : [];
-    return ops.flatMap((op) => hunksForEditOp(op));
-}
-function hunksForEditOp(op) {
-    if (typeof op.oldContent !== "string" || typeof op.newContent !== "string")
-        return [];
-    const startLine = typeof op.startLine === "number" && op.startLine > 0 ? op.startLine : 1;
-    return lineHunks(op.oldContent.replace(/\r\n/g, "\n"), op.newContent.replace(/\r\n/g, "\n"), startLine);
-}
-function splitFragment(text) {
-    if (text === "")
-        return [];
-    const lines = text.split("\n");
-    if (lines.at(-1) === "")
-        lines.pop();
-    return lines;
-}
-/** Line LCS of one stored before/after fragment. No file context is invented. */
-function lineHunks(before, after, startLine) {
-    const oldLines = splitFragment(before);
-    const newLines = splitFragment(after);
-    const oldCount = oldLines.length;
-    const newCount = newLines.length;
-    const lengths = Array.from({ length: oldCount + 1 }, () => Array(newCount + 1).fill(0));
-    for (let oldIndex = oldCount - 1; oldIndex >= 0; oldIndex -= 1) {
-        const row = lengths[oldIndex];
-        const next = lengths[oldIndex + 1];
-        if (row === undefined || next === undefined)
-            continue;
-        for (let newIndex = newCount - 1; newIndex >= 0; newIndex -= 1) {
-            row[newIndex] =
-                oldLines[oldIndex] === newLines[newIndex]
-                    ? (next[newIndex + 1] ?? 0) + 1
-                    : Math.max(next[newIndex] ?? 0, row[newIndex + 1] ?? 0);
-        }
-    }
-    const lines = [];
-    let oldIndex = 0;
-    let newIndex = 0;
-    let oldLine = startLine;
-    let newLine = startLine;
-    while (oldIndex < oldCount || newIndex < newCount) {
-        const row = lengths[oldIndex];
-        const next = lengths[oldIndex + 1];
-        if (oldIndex < oldCount && newIndex < newCount && oldLines[oldIndex] === newLines[newIndex]) {
-            lines.push({ kind: "ctx", line: newLine, text: oldLines[oldIndex] ?? "" });
-            oldIndex += 1;
-            newIndex += 1;
-            oldLine += 1;
-            newLine += 1;
-        }
-        else if (newIndex < newCount &&
-            (oldIndex === oldCount || (row?.[newIndex + 1] ?? 0) > (next?.[newIndex] ?? 0))) {
-            lines.push({ kind: "add", line: newLine, text: newLines[newIndex] ?? "" });
-            newIndex += 1;
-            newLine += 1;
-        }
-        else {
-            lines.push({ kind: "del", line: oldLine, text: oldLines[oldIndex] ?? "" });
-            oldIndex += 1;
-            oldLine += 1;
-        }
-    }
-    const changed = lines.some((line) => line.kind !== "ctx");
-    return changed ? [{ lines }] : [];
-}
-function patchTextForCopy(details) {
-    if (isRecord(details) && typeof details.patch === "string")
-        return details.patch;
-    const hunks = editViewHunks(isRecord(details) ? details[EDIT_VIEW_KEY] : undefined);
-    if (hunks.length === 0)
-        return undefined;
-    return (hunks
-        .map((hunk) => {
-        let oldStart = 0;
-        let newStart = 0;
-        let oldCount = 0;
-        let newCount = 0;
-        const body = hunk.lines.map((line) => {
-            if (line.kind !== "add") {
-                oldCount += 1;
-                if (oldStart === 0)
-                    oldStart = line.line;
-            }
-            if (line.kind !== "del") {
-                newCount += 1;
-                if (newStart === 0)
-                    newStart = line.line;
-            }
-            const sign = line.kind === "add" ? "+" : line.kind === "del" ? "-" : " ";
-            return sign + line.text;
-        });
-        if (body.length === 0)
-            return "";
-        const header = "@@ -" +
-            String(oldStart || 1) +
-            "," +
-            String(oldCount) +
-            " +" +
-            String(newStart || 1) +
-            "," +
-            String(newCount) +
-            " @@";
-        return [header, ...body].join("\n");
-    })
-        .filter((hunk) => hunk !== "")
-        .join("\n") || undefined);
-}
-/**
- * One compact nested summary for a file tool. Reports the delta only when the
- * caller actually has result details; a codemode nested record keeps arguments
- * alone, so it degrades to `<tool> <path>` instead of inventing counts.
- */
-export function inlinePresentation(toolName, args, details, isError) {
-    const fileTool = fileToolPresentation(toolName, args, details, isError);
-    if (fileTool !== undefined)
-        return fileTool;
-    if (toolName !== EDIT_TOOL_NAME)
-        return undefined;
-    const path = editPath(args);
-    const source = isError ? undefined : editDiffSource(details);
-    const stats = source === undefined ? undefined : diffStats(source);
-    if (path === "" && stats === undefined)
-        return undefined;
-    const label = path === "" ? EDIT_TOOL_NAME : `${EDIT_TOOL_NAME} ${path}`;
-    return {
-        summary: stats === undefined ? label : `${label} (+${String(stats.added)} -${String(stats.removed)})`,
-        status: isError ? "error" : "ok",
-    };
-}
 function formatNestedCallRow(call, theme) {
     const inline = inlinePresentation(call.toolName, call.summary, undefined, call.isError === true);
     const status = call.status === "running"
@@ -582,18 +103,18 @@ function formatNestedCallRow(call, theme) {
         : call.isWarning === true
             ? "warn"
             : (inline?.status ?? (call.isError === true ? "error" : "ok"));
-    const glyph = nestedStatusGlyph(status, theme);
-    const name = theme.fg("toolTitle", inline?.summary ?? call.toolName);
     const cleanArgs = inline !== undefined || call.summary === undefined
         ? ""
         : stripTerminalSequences(call.summary.trim());
     const truncatedArgs = cleanArgs.length > 72 ? `${cleanArgs.slice(0, 69)}…` : cleanArgs;
-    const summaryPart = truncatedArgs !== "" ? ` ${theme.fg("muted", truncatedArgs)}` : "";
-    const durText = formatDurationMs(call.durationMs);
-    const durationPart = durText !== "" ? ` ${theme.fg("dim", durText)}` : "";
     const costText = formatCostUsd(call.cost);
-    const costPart = costText !== "" ? ` ${theme.fg("dim", costText)}` : "";
-    return `${glyph} ${name}${summaryPart}${durationPart}${costPart}`;
+    return formatToolHeaderText({
+        status,
+        title: call.toolName,
+        summary: [inline?.summary ?? truncatedArgs, formatDurationMs(call.durationMs), costText]
+            .filter(Boolean)
+            .join(" · "),
+    }, theme);
 }
 function renderEditResult(params) {
     const { theme, context, result, renderOptions, defaultLevel, options } = params;
@@ -692,58 +213,21 @@ function renderWriteResult(params) {
         copyToClipboard: options?.copyToClipboard,
     });
 }
-/** Reads only the persisted `pi-ext-tools-eval` details; other shapes degrade to plain output. */
-function pythonEvalFacts(details) {
-    if (!isRecord(details) || details.format !== PYTHON_EVAL_DETAILS_FORMAT)
-        return undefined;
-    const rawRows = Array.isArray(details.rows) ? details.rows : [];
-    const rows = [];
-    for (const entry of rawRows) {
-        if (!isRecord(entry))
-            continue;
-        if (entry.kind === "text" && typeof entry.text === "string") {
-            rows.push({ kind: "text", text: entry.text });
-        }
-        else if (entry.kind === "display" && typeof entry.text === "string") {
-            rows.push({ kind: "display", text: entry.text });
-        }
-        else if (entry.kind === "result" && typeof entry.text === "string") {
-            rows.push({ kind: "result", text: entry.text });
-        }
-        else if (entry.kind === "tool" && isRecord(entry.trace)) {
-            const trace = entry.trace;
-            if (typeof trace.name !== "string")
-                continue;
-            rows.push({
-                kind: "tool",
-                name: trace.name,
-                args: trace.args,
-                durationMs: typeof trace.durationMs === "number" ? trace.durationMs : undefined,
-                error: typeof trace.error === "string" ? trace.error : undefined,
-            });
-        }
-    }
-    return {
-        rows,
-        error: typeof details.error === "string" ? details.error : undefined,
-    };
-}
 /** A nested file-tool row keeps its tool name; other tools degrade to name plus bounded args. */
 function formatEvalToolRow(row, theme) {
     const isError = row.error !== undefined;
     const inline = inlinePresentation(row.name, row.args, undefined, isError);
-    const glyph = nestedStatusGlyph(isError ? "error" : "ok", theme);
-    if (inline !== undefined) {
-        const durText = formatDurationMs(row.durationMs);
-        const durationPart = durText !== "" ? ` ${theme.fg("dim", durText)}` : "";
-        return `${glyph} ${theme.fg("toolTitle", inline.summary)}${durationPart}`;
-    }
     const summary = typeof row.args === "string" && row.args.trim() !== ""
         ? stripTerminalSequences(row.args.trim())
         : "";
     const truncated = summary.length > 72 ? `${summary.slice(0, 69)}…` : summary;
-    const summaryPart = truncated !== "" ? ` ${theme.fg("muted", truncated)}` : "";
-    return `${glyph} ${theme.fg("toolTitle", row.name)}${summaryPart}`;
+    return formatToolHeaderText({
+        status: isError ? "error" : "ok",
+        title: row.name,
+        summary: [inline?.summary ?? truncated, formatDurationMs(row.durationMs)]
+            .filter(Boolean)
+            .join(" · "),
+    }, theme);
 }
 function renderPythonEvalResult(params) {
     const { theme, context, result, renderOptions, defaultLevel, options } = params;
@@ -763,8 +247,8 @@ function renderPythonEvalResult(params) {
     if (isRecord(context.args)) {
         if (context.args.reset === true)
             parts.push("(reset)");
-        if (typeof context.args.timeout === "number")
-            parts.push(`(timeout ${String(context.args.timeout)}s)`);
+        if (typeof context.args.timeout_ms === "number")
+            parts.push(formatTimeoutFact(context.args.timeout_ms));
     }
     if (facts !== undefined) {
         if (toolRows.length > 0) {
@@ -789,20 +273,26 @@ function renderPythonEvalResult(params) {
             if (row.kind === "tool") {
                 outputRows.push(formatEvalToolRow(row, theme));
             }
+            else if (row.kind === "state") {
+                // The namespace report is metadata about the cell, not its output, so it stays muted.
+                outputRows.push(theme.fg("muted", row.text));
+            }
             else if (row.kind === "display" || row.kind === "result") {
                 const prefix = theme.fg("dim", `${row.kind}:`);
                 const lines = row.text.replace(/\r/g, "").split("\n");
                 for (let i = 0; i < lines.length; i++) {
-                    outputRows.push(i === 0 ? `${prefix} ${lines[i]}` : `  ${lines[i]}`);
+                    const lineText = theme.fg("dim", lines[i] ?? "");
+                    outputRows.push(i === 0 ? `${prefix} ${lineText}` : `  ${lineText}`);
                 }
             }
             else if (row.text !== "") {
-                outputRows.push(...row.text.replace(/\r/g, "").split("\n"));
+                const lines = row.text.replace(/\r/g, "").split("\n");
+                outputRows.push(...lines.map((l) => (isError ? theme.fg("error", l) : theme.fg("dim", l))));
             }
         }
         if (outputRows.length > 0) {
             sections.push({
-                railToken: isError ? "error" : "dim",
+                railToken: isError ? "error" : "success",
                 content: outputRows,
             });
         }
@@ -810,7 +300,11 @@ function renderPythonEvalResult(params) {
     else {
         const output = stripTerminalSequences(extractResultText(PYTHON_EVAL_TOOL_NAME, result).outputText);
         if (output !== "") {
-            sections.push({ railToken: isError ? "error" : "dim", content: output });
+            const rawLines = output.split("\n");
+            const outputLines = isError
+                ? rawLines.map((l) => theme.fg("error", l))
+                : rawLines.map((l) => theme.fg("dim", l));
+            sections.push({ railToken: isError ? "error" : "success", content: outputLines });
         }
     }
     const output = stripTerminalSequences(extractResultText(PYTHON_EVAL_TOOL_NAME, result).outputText);
@@ -860,7 +354,9 @@ function renderApplyPatchCallView(params) {
         state[APPLY_PATCH_PREVIEW_STATE_KEY] = stored;
     }
     const files = new Set(operations.map((operation) => operation.path)).size;
-    const summary = files > 0 ? `${String(files)} ${files === 1 ? "file" : "files"}` : "";
+    const summary = files > 0
+        ? patchSummary(files, operations.reduce((sum, operation) => sum + operation.addedLines, 0), operations.reduce((sum, operation) => sum + operation.removedLines, 0))
+        : "";
     const rows = operations.map((operation) => formatApplyPatchOperationRow({
         operationIndex: 0,
         kind: operation.kind,
@@ -910,11 +406,7 @@ function renderApplyPatchResultView(params) {
     const output = stripTerminalSequences(extractResultText(APPLY_PATCH_TOOL_NAME, result).outputText);
     const parts = [];
     if (facts !== undefined) {
-        const files = facts.operations.length;
-        if (files > 0)
-            parts.push(`${String(files)} ${files === 1 ? "file" : "files"}`);
-        if (facts.addedLines > 0 || facts.removedLines > 0)
-            parts.push(`+${String(facts.addedLines)} -${String(facts.removedLines)}`);
+        parts.push(patchSummary(new Set(facts.changedPaths).size, facts.addedLines, facts.removedLines));
     }
     const durText = formatDurationMs(context.durationMs);
     if (durText !== "")
@@ -1002,22 +494,31 @@ function renderSpecializedResult(params) {
     return undefined;
 }
 function renderGenericResult(params) {
-    const { toolName, theme, context, result, renderOptions, defaultLevel, originalRenderCall, originalRenderResult, options, } = params;
+    const { toolName, theme, context, result, renderOptions, defaultLevel, originalRenderCall, originalRenderResult, resolvePresentation, options, } = params;
     const heavyCmd = extractHeavyInputCommand(toolName, context.args);
     const nestedCalls = extractNestedCalls(result);
-    const isMetaTool = toolName === "codemode" || toolName === "subagent" || nestedCalls.length > 0;
+    const captured = toolName === "codemode"
+        ? (getCapturedNestedCalls(context.toolCallId) ??
+            (isRecord(result.details) &&
+                Array.isArray(result.details.__piExtUiCapturedCalls)
+                ? result.details
+                    .__piExtUiCapturedCalls
+                : undefined))
+        : undefined;
+    const childCalls = captured ?? nestedCalls;
+    const isMetaTool = toolName === "codemode" || toolName === "subagent" || childCalls.length > 0;
     const { outputText: rawOutput, wallTimeSeconds } = extractResultText(toolName, result);
     const isError = (context.isError ?? false) || (result.isError ?? false);
     const status = toolName === "codemode"
-        ? nestedCalls.length === 0 && isError
+        ? childCalls.length === 0 && isError
             ? "error"
             : "none"
         : isMetaTool
             ? resolveContainerStatus({
                 isError,
                 isPartial: renderOptions.isPartial === true,
-                hasChildren: nestedCalls.length > 0,
-                selfFailed: nestedCalls.length === 0 && isError,
+                hasChildren: childCalls.length > 0,
+                selfFailed: childCalls.length === 0 && isError,
             })
             : isError
                 ? "error"
@@ -1038,9 +539,9 @@ function renderGenericResult(params) {
         if (stripped !== "")
             summaryParts.push(stripped);
     }
-    if (isMetaTool && nestedCalls.length > 0) {
-        const failCount = nestedCalls.filter((c) => c.isError || c.isWarning).length;
-        summaryParts.push(...callStatsParts(nestedCalls.length, failCount));
+    if (isMetaTool && childCalls.length > 0) {
+        const failCount = childCalls.filter((c) => Boolean(c.isError || ("status" in c && c.status === "error"))).length;
+        summaryParts.push(...callStatsParts(childCalls.length, failCount));
     }
     if (context.durationMs !== undefined) {
         summaryParts.push(formatDurationMs(context.durationMs));
@@ -1048,28 +549,86 @@ function renderGenericResult(params) {
     else if (wallTimeSeconds !== undefined && Number.isFinite(wallTimeSeconds)) {
         summaryParts.push(formatDurationMs(wallTimeSeconds * 1000));
     }
-    const totalCost = nestedCalls.reduce((sum, c) => sum + (c.cost ?? 0), 0);
+    const totalCost = childCalls.reduce((sum, c) => sum + (c.cost ?? 0), 0);
     if (totalCost > 0) {
         summaryParts.push(formatCostUsd(totalCost));
     }
     const summary = summaryParts.join(" · ");
-    const collapsedRows = isMetaTool && nestedCalls.length > 0
-        ? nestedCalls.map((call) => formatNestedCallRow(call, theme))
+    const codemodeNestedView = toolName === "codemode" && childCalls.length > 0
+        ? new NestedCallsView({
+            calls: childCalls,
+            theme,
+            context,
+            resolveChildRenderer: (childName) => {
+                return {
+                    renderResult: (childResult, childOptions, childTheme, childCtx) => {
+                        const provider = resolvePresentation?.(childName);
+                        if (provider !== undefined) {
+                            return renderOwnedPresentation({
+                                toolName: childName,
+                                provider,
+                                result: childResult,
+                                theme: childTheme,
+                                context: childCtx,
+                                defaultLevel: childOptions.expanded ? 2 : 1,
+                                options,
+                            });
+                        }
+                        const specialized = renderSpecializedResult({
+                            toolName: childName,
+                            theme: childTheme,
+                            context: childCtx,
+                            result: childResult,
+                            renderOptions: childOptions,
+                            defaultLevel: childOptions.expanded ? 2 : 1,
+                            options,
+                        });
+                        if (specialized !== undefined)
+                            return specialized;
+                        return renderGenericResult({
+                            toolName: childName,
+                            theme: childTheme,
+                            context: childCtx,
+                            result: childResult,
+                            renderOptions: childOptions,
+                            defaultLevel: childOptions.expanded ? 2 : 1,
+                            originalRenderCall: undefined,
+                            originalRenderResult: undefined,
+                            resolvePresentation,
+                            options,
+                        });
+                    },
+                };
+            },
+            copyToClipboard: options?.copyToClipboard,
+            stateHolder: context.state,
+            resolvePresentation,
+            invalidate: () => context.invalidate(),
+        })
         : undefined;
-    const inputSection = createInputCodeSection(toolName, context.args, theme);
+    const collapsedRows = codemodeNestedView !== undefined
+        ? codemodeNestedView
+        : isMetaTool && nestedCalls.length > 0
+            ? nestedCalls.map((call) => formatNestedCallRow(call, theme))
+            : undefined;
+    const toolRailToken = isError
+        ? "error"
+        : renderOptions.isPartial
+            ? "accent"
+            : "success";
+    // Upper room (input code) uses neutral/muted rail; lower room (output) uses toolRailToken (success/error)
+    const inputSection = createInputCodeSection(toolName, context.args, theme, "muted");
     const sections = inputSection !== undefined ? [inputSection] : [];
-    const outputRailToken = isError ? "error" : renderOptions.isPartial ? "accent" : "dim";
     if (toolName === "codemode") {
+        // Nested tool calls belong only to collapsedRows (Level 0), hidden when expanded
         if (rawOutput !== "") {
-            const outputColor = isError ? "error" : "toolOutput";
-            const coloredLines = rawOutput
-                .replace(/\r/g, "")
-                .replace(/\t/g, "  ")
-                .split("\n")
-                .map((line) => theme.fg(outputColor, line));
+            const rawLines = rawOutput.replace(/\r/g, "").replace(/\t/g, "  ").split("\n");
+            const outputLines = isError
+                ? rawLines.map((line) => theme.fg("error", line))
+                : rawLines.map((line) => theme.fg("dim", line));
             sections.push({
-                railToken: outputRailToken,
-                content: coloredLines,
+                railToken: toolRailToken,
+                content: outputLines,
             });
         }
     }
@@ -1093,31 +652,60 @@ function renderGenericResult(params) {
             invalidate() { },
         };
         sections.push({
-            railToken: outputRailToken,
+            railToken: toolRailToken,
             content: lazyUpstreamComponent,
             maxLines: effectiveExpanded ? Number.POSITIVE_INFINITY : 9,
         });
     }
     else if (rawOutput !== "") {
-        const outputColor = isError ? "error" : "toolOutput";
-        const coloredLines = rawOutput.split("\n").map((line) => theme.fg(outputColor, line));
+        const rawLines = rawOutput.split("\n");
+        let outputLines;
+        if (isError) {
+            outputLines = rawLines.map((line) => theme.fg("error", line));
+        }
+        else if (toolName === "read" || toolPath(context.args) !== "") {
+            const filePath = toolPath(context.args);
+            const lang = filePath !== "" ? getLanguageFromPath(filePath) : undefined;
+            if (lang !== undefined) {
+                try {
+                    outputLines = highlightCode(rawOutput, lang);
+                }
+                catch {
+                    outputLines = rawLines;
+                }
+            }
+            else {
+                outputLines = rawLines;
+            }
+        }
+        else if (toolName === "bash") {
+            outputLines = rawLines.map((line) => theme.fg("dim", line));
+        }
+        else {
+            outputLines = rawLines;
+        }
         sections.push({
-            railToken: outputRailToken,
-            content: coloredLines,
+            railToken: toolRailToken,
+            content: outputLines,
         });
     }
     let copy;
-    if (heavyCmd !== undefined && heavyCmd !== "") {
+    if (toolName === "codemode") {
+        copy = undefined;
+    }
+    else if (heavyCmd !== undefined && heavyCmd !== "") {
+        const cleanOutput = stripTerminalSequences(rawOutput);
         copy = {
             primary: heavyCmd,
-            full: rawOutput !== "" ? `${heavyCmd}\n---\n${rawOutput}` : heavyCmd,
+            full: rawOutput !== "" ? `${heavyCmd}\n---\n${cleanOutput}` : heavyCmd,
         };
     }
     else if (rawOutput !== "") {
+        const cleanOutput = stripTerminalSequences(rawOutput);
         const argsFormatted = formatArgsPreview(context.args);
         copy = {
-            primary: rawOutput,
-            full: argsFormatted !== "" ? `${argsFormatted}\n\n${rawOutput}` : rawOutput,
+            primary: cleanOutput,
+            full: argsFormatted !== "" ? `${argsFormatted}\n\n${cleanOutput}` : cleanOutput,
         };
     }
     return new ToolView({
@@ -1127,6 +715,7 @@ function renderGenericResult(params) {
             status,
             summary,
         },
+        railToken: toolRailToken,
         collapsedRows,
         sections,
         copy,
@@ -1138,11 +727,90 @@ function renderGenericResult(params) {
         copyToClipboard: options?.copyToClipboard,
     });
 }
+function renderOwnedPresentation(params) {
+    const { toolName, provider, result, theme, context, defaultLevel, options } = params;
+    const presentation = provider(context.args, result, theme);
+    const isError = context.isError || result?.isError === true;
+    const pending = result === undefined || context.isPartial;
+    const isDiff = !isError && !pending && presentation.kind === "diff";
+    const status = isError
+        ? "error"
+        : pending
+            ? context.argsComplete
+                ? "running"
+                : "streaming"
+            : isDiff
+                ? "none"
+                : "ok";
+    const railToken = isError ? "error" : pending ? "accent" : "success";
+    const output = isError && result !== undefined
+        ? agentResultText(result)
+        : (presentation.output ?? (result === undefined ? "" : agentResultText(result)));
+    const sections = [];
+    if (presentation.request) {
+        sections.push({ railToken: "muted", content: stripTerminalSequences(presentation.request) });
+    }
+    if (isDiff) {
+        if (presentation.diff.trim() !== "") {
+            sections.push({
+                railToken: "dim",
+                content: new DiffView({
+                    theme,
+                    source: { kind: "unifiedPatch", text: presentation.diff },
+                }),
+            });
+        }
+    }
+    else if (output !== "") {
+        const lines = stripTerminalSequences(output).split("\n");
+        sections.push({
+            railToken,
+            content: isError ? lines.map((line) => theme.fg("error", line)) : lines,
+        });
+    }
+    const duration = result === undefined ? "" : formatDurationMs(context.durationMs);
+    const summary = [stripTerminalSequences(presentation.summary), duration]
+        .filter(Boolean)
+        .join(" · ");
+    const copy = presentation.copy === undefined
+        ? isDiff && presentation.diff.trim() !== ""
+            ? { primary: presentation.diff }
+            : undefined
+        : {
+            primary: stripTerminalSequences(presentation.copy.primary),
+            ...(presentation.copy.full === undefined
+                ? {}
+                : { full: stripTerminalSequences(presentation.copy.full) }),
+        };
+    return new ToolView({
+        theme,
+        header: { title: toolName, status, summary },
+        railToken,
+        collapsedRows: isError && output !== ""
+            ? output
+                .split("\n")
+                .slice(0, 1)
+                .map((line) => theme.fg("error", stripTerminalSequences(line)))
+            : presentation.collapsedRows?.map(stripTerminalSequences),
+        sections,
+        copy,
+        outputPad: context.outputPad,
+        stateHolder: context.state,
+        defaultLevel,
+        globalExpanded: context.expanded,
+        invalidate: () => context.invalidate(),
+        copyToClipboard: options?.copyToClipboard,
+    });
+}
 export function createCollapsibleToolRendererResolver(options) {
+    return createRendererResolver(options);
+}
+function createRendererResolver(options, resolvePresentation) {
     const defaultLevel = options?.defaultCollapsed === false ? 1 : 0;
     return (toolName, next) => {
         const upstream = next();
-        if (!shouldInterceptTool(toolName, options)) {
+        const provider = getToolPresentationProvider(upstream) ?? resolvePresentation?.(toolName);
+        if (provider === undefined && !shouldInterceptTool(toolName, options)) {
             return upstream;
         }
         const originalRenderCall = upstream?.renderCall;
@@ -1150,6 +818,18 @@ export function createCollapsibleToolRendererResolver(options) {
         return {
             renderShell: "self",
             renderCall(args, theme, context) {
+                if (provider !== undefined) {
+                    const view = renderOwnedPresentation({
+                        toolName,
+                        provider,
+                        theme,
+                        context: { ...context, args },
+                        defaultLevel,
+                        options,
+                    });
+                    rememberCallView(context, view);
+                    return view;
+                }
                 if (toolName === APPLY_PATCH_TOOL_NAME) {
                     const view = renderApplyPatchCallView({
                         theme,
@@ -1157,7 +837,7 @@ export function createCollapsibleToolRendererResolver(options) {
                         defaultLevel,
                         options,
                     });
-                    rememberCallView(context, view, toolName);
+                    rememberCallView(context, view);
                     return view;
                 }
                 if (toolName === EDIT_TOOL_NAME) {
@@ -1176,7 +856,7 @@ export function createCollapsibleToolRendererResolver(options) {
                         invalidate: () => context.invalidate(),
                         copyToClipboard: options?.copyToClipboard,
                     });
-                    rememberCallView(context, view, toolName);
+                    rememberCallView(context, view);
                     return view;
                 }
                 const isStreamingArgs = context.isPartial && !context.argsComplete;
@@ -1238,11 +918,26 @@ export function createCollapsibleToolRendererResolver(options) {
                     invalidate: () => context.invalidate(),
                     copyToClipboard: options?.copyToClipboard,
                 });
-                rememberCallView(context, view, toolName);
+                rememberCallView(context, view);
                 return view;
             },
             renderResult(result, renderOptions, theme, context) {
                 hideCallView(context, toolName, renderOptions.isPartial);
+                if (provider !== undefined) {
+                    return renderOwnedPresentation({
+                        toolName,
+                        provider,
+                        result,
+                        theme,
+                        context: {
+                            ...context,
+                            expanded: renderOptions.expanded,
+                            isPartial: renderOptions.isPartial,
+                        },
+                        defaultLevel,
+                        options,
+                    });
+                }
                 const specialized = renderSpecializedResult({
                     toolName,
                     theme,
@@ -1263,6 +958,7 @@ export function createCollapsibleToolRendererResolver(options) {
                     defaultLevel,
                     originalRenderCall,
                     originalRenderResult,
+                    resolvePresentation,
                     options,
                 });
             },
@@ -1270,5 +966,26 @@ export function createCollapsibleToolRendererResolver(options) {
     };
 }
 export function registerCollapsibleToolRenderer(pi, options) {
-    pi.registerToolRenderer(createCollapsibleToolRendererResolver(options));
+    if (typeof pi.on === "function") {
+        pi.on("tool_execution_start", (event) => {
+            recordToolExecutionStart(event);
+        });
+        pi.on("tool_execution_end", (event) => {
+            recordToolExecutionEnd(event);
+        });
+        pi.on("tool_result", (event) => {
+            const captured = getCapturedNestedCalls(event.toolCallId);
+            if (captured && captured.length > 0) {
+                const currentDetails = isRecord(event.details) ? event.details : {};
+                return {
+                    details: {
+                        ...currentDetails,
+                        __piExtUiCapturedCalls: captured,
+                    },
+                };
+            }
+            return undefined;
+        });
+    }
+    pi.registerToolRenderer(createRendererResolver(options, (name) => getRegisteredToolPresentationProvider(pi, name)));
 }