@timurproko/a1 0.2.6-dev.736 → 0.2.7-dev.1221

package/dist/integrations/pi/components/upstream/components/session-selector.js

@@ -1,5 +1,5 @@
 /**
- * Provenance: @earendil-works/pi-coding-agent 1.1.0 (MIT), commit abe508e1b89912adde45528136c3221eb69acdd7,
+ * Provenance: @earendil-works/pi-coding-agent 1.4.0 (MIT), commit 4a080252f06caf63a525d7873c5d94d3c23887e0,
  * packages/coding-agent/src/modes/interactive/components/session-selector.ts.
  * Modifications: Source-synchronized session selector port: preserve threaded/current/all scope,
  * search, sort, named/path filters, rename, delete confirmation, active-session protection,
@@ -7,11 +7,12 @@
  * keybindings/theme, canonical path handling, reverse-Tab scope cycling, and the shared bare-A1 modal
  * frame with standalone title, standard outer rules, stable filter/status row, progressive result
  * paging, aligned result columns, Session Tree selection roles, quiet in-field query syntax guidance,
- * and one-line bottom dynamic feedback and searchable-dialog shortcut footer. Selected session rows
- * use the blue selection surface while preserving title and metadata foregrounds; the active session
- * title uses success green independently of keyboard selection, with ordinary text weight.
+ * an accent dialog-search marker, and one-line bottom dynamic feedback and searchable-dialog shortcut
+ * footer. Selected session rows use the blue selection surface while preserving title and metadata
+ * foregrounds; the active session title uses success green independently of keyboard selection, with
+ * ordinary text weight.
  * Deviations: owned-modal-shortcut-hints, owned-resume-session-dialog,
- * owned-standard-dialog-selection.
+ * owned-standard-dialog-selection, owned-dialog-search-marker.
  */
 import { spawnSync } from "node:child_process";
 import { existsSync, realpathSync } from "node:fs";
@@ -20,7 +21,7 @@ import * as os from "node:os";
 import { Container, getKeybindings, Input, matchesKey, sliceByColumn, Spacer, Text, truncateToWidth, visibleWidth, } from "@earendil-works/pi-tui";
 import { KeybindingsManager } from "../adjacent/core/keybindings.js";
 import { DynamicBorder } from "../../../startup-public.js";
-import { addPiModalHeader, adoptPiModalFrame } from "../../modal-frame.js";
+import { addPiModalHeader, adoptPiModalFrame, renderPiModalSearchInput } from "../../modal-frame.js";
 import { DIALOG_CLOSE_SHORTCUT_HINT, paintPiBorder, piTheme, renderPiModalShortcutHints } from "../../theme.js";
 const theme = new Proxy({}, {
     get(_target, property) {
@@ -408,7 +409,7 @@ class SessionList {
     render(width) {
         const lines = [];
         // Render search input
-        lines.push(...this.searchInput.render(width));
+        lines.push(...renderPiModalSearchInput(this.searchInput, width));
         lines.push(""); // Blank line after search
         if (this.filteredSessions.length === 0) {
             let emptyMessage;

package/dist/integrations/pi/components/upstream/components/skill-invocation-message.d.ts

@@ -1,5 +1,5 @@
 /**
- * Provenance: @earendil-works/pi-coding-agent 1.1.0 (MIT), commit abe508e1b89912adde45528136c3221eb69acdd7,
+ * Provenance: @earendil-works/pi-coding-agent 1.4.0 (MIT), commit 4a080252f06caf63a525d7873c5d94d3c23887e0,
  * packages/coding-agent/src/modes/interactive/components/skill-invocation-message.ts.
  * Modifications: Mechanical port uses A1's public pi-tui instance, owned theme boundary, and
  * root-instance keybinding registry because the public coding-agent component closes over a second

package/dist/integrations/pi/components/upstream/components/skill-invocation-message.js

@@ -1,5 +1,5 @@
 /**
- * Provenance: @earendil-works/pi-coding-agent 1.1.0 (MIT), commit abe508e1b89912adde45528136c3221eb69acdd7,
+ * Provenance: @earendil-works/pi-coding-agent 1.4.0 (MIT), commit 4a080252f06caf63a525d7873c5d94d3c23887e0,
  * packages/coding-agent/src/modes/interactive/components/skill-invocation-message.ts.
  * Modifications: Mechanical port uses A1's public pi-tui instance, owned theme boundary, and
  * root-instance keybinding registry because the public coding-agent component closes over a second

package/dist/integrations/pi/components/upstream/components/status-indicator.d.ts

@@ -1,5 +1,5 @@
 /**
- * Provenance: @earendil-works/pi-coding-agent 1.1.0 (MIT), commit abe508e1b89912adde45528136c3221eb69acdd7,
+ * Provenance: @earendil-works/pi-coding-agent 1.4.0 (MIT), commit 4a080252f06caf63a525d7873c5d94d3c23887e0,
  * packages/coding-agent/src/modes/interactive/components/status-indicator.ts.
  * Modifications: Mechanical source port with public package-root keybinding, Loader, and owned
  * theme/countdown imports plus ECMAScript private fields.
@@ -24,7 +24,7 @@ export declare class RetryStatusIndicator extends StatusIndicator {
 }
 export type CompactionStatusReason = "manual" | "threshold" | "overflow";
 export declare class CompactionStatusIndicator extends StatusIndicator {
-    constructor(ui: TUI, reason: CompactionStatusReason);
+    constructor(ui: TUI, reason: CompactionStatusReason, colorFn?: (text: string) => string);
 }
 export declare class BranchSummaryStatusIndicator extends StatusIndicator {
     constructor(ui: TUI);

package/dist/integrations/pi/components/upstream/components/status-indicator.js

@@ -1,5 +1,5 @@
 /**
- * Provenance: @earendil-works/pi-coding-agent 1.1.0 (MIT), commit abe508e1b89912adde45528136c3221eb69acdd7,
+ * Provenance: @earendil-works/pi-coding-agent 1.4.0 (MIT), commit 4a080252f06caf63a525d7873c5d94d3c23887e0,
  * packages/coding-agent/src/modes/interactive/components/status-indicator.ts.
  * Modifications: Mechanical source port with public package-root keybinding, Loader, and owned
  * theme/countdown imports plus ECMAScript private fields.
@@ -47,12 +47,12 @@ export class RetryStatusIndicator extends StatusIndicator {
     }
 }
 export class CompactionStatusIndicator extends StatusIndicator {
-    constructor(ui, reason) {
+    constructor(ui, reason, colorFn) {
         const cancelHint = `(${keyText("app.interrupt")} to cancel)`;
         const label = reason === "manual"
             ? `Compacting context... ${cancelHint}`
             : `${reason === "overflow" ? "Context overflow detected, " : ""}Auto-compacting... ${cancelHint}`;
-        super("compaction", ui, spinner => piTheme().fg("accent", spinner), text => piTheme().fg("muted", text), label);
+        super("compaction", ui, colorFn ?? (spinner => piTheme().fg("accent", spinner)), colorFn ?? (text => piTheme().fg("muted", text)), label);
     }
 }
 export class BranchSummaryStatusIndicator extends StatusIndicator {

package/dist/integrations/pi/components/upstream/components/themed-text.d.ts

@@ -1,5 +1,5 @@
 /**
- * Provenance: @earendil-works/pi-coding-agent 1.1.0 (MIT), commit abe508e1b89912adde45528136c3221eb69acdd7,
+ * Provenance: @earendil-works/pi-coding-agent 1.4.0 (MIT), commit 4a080252f06caf63a525d7873c5d94d3c23887e0,
  * packages/coding-agent/src/modes/interactive/components/themed-text.ts.
  * Modifications: Integrated invalidation-aware text into A1's owned startup header and notices;
  * repository formatting only.

package/dist/integrations/pi/components/upstream/components/themed-text.js

@@ -1,5 +1,5 @@
 /**
- * Provenance: @earendil-works/pi-coding-agent 1.1.0 (MIT), commit abe508e1b89912adde45528136c3221eb69acdd7,
+ * Provenance: @earendil-works/pi-coding-agent 1.4.0 (MIT), commit 4a080252f06caf63a525d7873c5d94d3c23887e0,
  * packages/coding-agent/src/modes/interactive/components/themed-text.ts.
  * Modifications: Integrated invalidation-aware text into A1's owned startup header and notices;
  * repository formatting only.

package/dist/integrations/pi/components/upstream/components/thinking-selector.d.ts

@@ -1,5 +1,5 @@
 /**
- * Provenance: @earendil-works/pi-coding-agent 1.1.0 (MIT), commit abe508e1b89912adde45528136c3221eb69acdd7,
+ * Provenance: @earendil-works/pi-coding-agent 1.4.0 (MIT), commit 4a080252f06caf63a525d7873c5d94d3c23887e0,
  * packages/coding-agent/src/modes/interactive/components/thinking-selector.ts.
  * Modifications: Preserve the searchable thinking-level selector, current/default semantics,
  * selection, and focus while accepting the active bare-A1 cycle-key label from the shell, styling the
@@ -8,13 +8,14 @@
  * levels, and rendering exclusive radio-style default markers before level names, an item-adjacent
  * active checkmark, and aligned muted descriptions. Bare A1 persists defaults immediately on Space,
  * closes through the implicit Ctrl+C-capable selection-cancel action, and uses the shared compact
- * semantic shortcut row with Type/search guidance without advertising that alias. All list and border
- * colors use the owned theme and its explicit color mode. Selected rows use the shared bare-A1 blue
- * selection surface only around the rendered item span, with the existing accent arrow, normal-text
- * level, and preserved current/default/description roles. The comparison profile retains the public
- * pinned component.
+ * semantic shortcut row with Type/search guidance and an accent search marker without advertising that
+ * alias. All list and border colors use the owned theme and its explicit color mode. Selected rows use
+ * the shared bare-A1 blue selection surface only around the rendered item span, with the existing
+ * accent arrow, normal-text level, and preserved current/default/description roles. The comparison
+ * profile retains the public pinned component.
  * Deviations: owned-modal-shortcut-hints, owned-level-cycle-shortcut, owned-thinking-selector-heading,
- * owned-thinking-selector-controls, owned-dialog-ctrl-c-cancel, owned-standard-dialog-selection.
+ * owned-thinking-selector-controls, owned-dialog-ctrl-c-cancel, owned-standard-dialog-selection,
+ * owned-dialog-search-marker.
  */
 import { Container, type Focusable, SelectList } from "@earendil-works/pi-tui";
 export type ThinkingSelectorLevel = "off" | "minimal" | "low" | "medium" | "high" | "xhigh" | "max";

package/dist/integrations/pi/components/upstream/components/thinking-selector.js

@@ -1,5 +1,5 @@
 /**
- * Provenance: @earendil-works/pi-coding-agent 1.1.0 (MIT), commit abe508e1b89912adde45528136c3221eb69acdd7,
+ * Provenance: @earendil-works/pi-coding-agent 1.4.0 (MIT), commit 4a080252f06caf63a525d7873c5d94d3c23887e0,
  * packages/coding-agent/src/modes/interactive/components/thinking-selector.ts.
  * Modifications: Preserve the searchable thinking-level selector, current/default semantics,
  * selection, and focus while accepting the active bare-A1 cycle-key label from the shell, styling the
@@ -8,17 +8,18 @@
  * levels, and rendering exclusive radio-style default markers before level names, an item-adjacent
  * active checkmark, and aligned muted descriptions. Bare A1 persists defaults immediately on Space,
  * closes through the implicit Ctrl+C-capable selection-cancel action, and uses the shared compact
- * semantic shortcut row with Type/search guidance without advertising that alias. All list and border
- * colors use the owned theme and its explicit color mode. Selected rows use the shared bare-A1 blue
- * selection surface only around the rendered item span, with the existing accent arrow, normal-text
- * level, and preserved current/default/description roles. The comparison profile retains the public
- * pinned component.
+ * semantic shortcut row with Type/search guidance and an accent search marker without advertising that
+ * alias. All list and border colors use the owned theme and its explicit color mode. Selected rows use
+ * the shared bare-A1 blue selection surface only around the rendered item span, with the existing
+ * accent arrow, normal-text level, and preserved current/default/description roles. The comparison
+ * profile retains the public pinned component.
  * Deviations: owned-modal-shortcut-hints, owned-level-cycle-shortcut, owned-thinking-selector-heading,
- * owned-thinking-selector-controls, owned-dialog-ctrl-c-cancel, owned-standard-dialog-selection.
+ * owned-thinking-selector-controls, owned-dialog-ctrl-c-cancel, owned-standard-dialog-selection,
+ * owned-dialog-search-marker.
  */
 import { Container, fuzzyFilter, getKeybindings, Input, SelectList, Spacer, Text, } from "@earendil-works/pi-tui";
 import { DynamicBorder } from "../../../startup-public.js";
-import { addPiModalHeader, adoptPiModalFrame } from "../../modal-frame.js";
+import { addPiModalHeader, addPiModalSearchInput, adoptPiModalFrame } from "../../modal-frame.js";
 import { DIALOG_CLOSE_SHORTCUT_HINT, piTheme, renderPiModalListRow, renderPiModalShortcutHints } from "../../theme.js";
 const THINKING_SELECT_LIST_LAYOUT = {
     minPrimaryColumnWidth: 12,
@@ -88,7 +89,7 @@ export class OwnedThinkingSelectorComponent extends Container {
         this.addChild(new Spacer(1));
         this.searchInput = new Input();
         this.searchInput.onSubmit = () => this.selectList.handleInput("\r");
-        this.addChild(this.searchInput);
+        addPiModalSearchInput(this, this.searchInput);
         this.addChild(new Spacer(1));
         const initialList = this.buildSelectList(this.allItems, currentLevel);
         this.selectList = initialList.list;

package/dist/integrations/pi/components/upstream/components/tool-execution.d.ts

@@ -4,7 +4,6 @@ type ToolPresentationResult = Parameters<NonNullable<ToolDefinition["renderResul
     isError: boolean;
     durationMs?: number;
 };
-/** The caller-side merge 0.85.1 performs before handing a definition to the component: built-in renderers fill the gaps. */
 type ToolRendererInput = ToolRenderers | ToolDefinition<any, any, any>;
 export declare function mergeBuiltInRenderers(definition: ToolRendererInput | undefined, builtIn: ToolRendererInput | undefined): ToolRenderers | undefined;
 export interface ToolExecutionOptions {
@@ -15,7 +14,6 @@ export interface ToolExecutionOptions {
 export declare class ToolExecutionComponent extends Container {
     private contentBox;
     private contentText;
-    private contentTextRegion;
     private selfRenderContainer;
     private selfRenderHeight;
     private callRendererComponent;
@@ -43,9 +41,6 @@ export declare class ToolExecutionComponent extends Container {
     private result;
     private hideComponent;
     constructor(toolName: string, toolCallId: string, args: any, options: ToolExecutionOptions | undefined, toolDefinition: ToolRenderers | ToolDefinition<any, any, any> | undefined, ui: TUI, cwd: string);
-    private getCallRenderer;
-    private getResultRenderer;
-    private hasRendererDefinition;
     private getRenderShell;
     private getRenderContext;
     private createCallFallback;
@@ -55,7 +50,6 @@ export declare class ToolExecutionComponent extends Container {
     markExecutionStarted(): void;
     setArgsComplete(): void;
     updateResult(result: ToolPresentationResult, isPartial?: boolean): void;
-    /** End mount ownership without letting an obsolete conversion or extension callback repaint. */
     dispose(): void;
     setExpanded(expanded: boolean): void;
     setOutputPad(outputPad: number): void;
@@ -65,6 +59,8 @@ export declare class ToolExecutionComponent extends Container {
     render(width: number): string[];
     handleMouse(event: TuiMouseEvent): ReturnType<Container["handleMouse"]>;
     private updateDisplay;
+    private callTheme;
+    private appendRenderer;
     private composeDisplay;
     private getTextOutput;
     private formatToolExecution;

package/dist/integrations/pi/components/upstream/components/tool-execution.js

@@ -1,18 +1,61 @@
 /**
- * Provenance: @earendil-works/pi-coding-agent 1.1.0 (MIT), commit abe508e1b89912adde45528136c3221eb69acdd7,
+ * Provenance: @earendil-works/pi-coding-agent 1.4.0 (MIT), commit 4a080252f06caf63a525d7873c5d94d3c23887e0,
  * packages/coding-agent/src/modes/interactive/components/tool-execution.ts.
- * Modifications: Retain pinned shell and actual public tool-definition renderers. Replace private
- * index-keyed image conversion with current-source ownership, serial conversion, visible fallback, and
- * disposal; guard reentrant invalidation. Remap private types, definition factories, theme, and
- * generic text helpers to public or locally attributed equivalents. See
+ * Modifications: Retain pinned shell/public renderers. Own image conversion; replace private APIs with
+ * public/local equivalents. Use bare-A1 secondary-accent read ranges and concise collapse shortcut
+ * hints. Restore the enclosing default-shell background after nested renderer resets. Omit
+ * non-actionable image fallback rows when the terminal has no image protocol. See
  * docs/architecture/tool-image-presentation.md.
- * Deviations: current-tool-image-conversion-ownership.
+ * Deviations: current-tool-image-conversion-ownership, read-range-secondary-accent,
+ * concise-tool-expand-shortcut-hint, default-shell-background-reset-scoping,
+ * unsupported-image-fallback-omission.
  */
 import { stripVTControlCharacters } from "node:util";
-import { Box, Container, getCapabilities, getImageDimensions, imageFallback, MouseRegion, Spacer, Text } from "@earendil-works/pi-tui";
-import { createReadToolDefinition, createBashToolDefinition, createEditToolDefinition, createWriteToolDefinition, createGrepToolDefinition, createFindToolDefinition, createLsToolDefinition, keyHint, } from "../../../startup-public.js";
-import { piTheme } from "../theme/theme.js";
+import { Box, Container, getImageDimensions, imageFallback, MouseRegion, Spacer, Text } from "@earendil-works/pi-tui";
+import { createReadToolDefinition, createBashToolDefinition, createEditToolDefinition, createWriteToolDefinition, createGrepToolDefinition, createFindToolDefinition, createLsToolDefinition, keyHint, keyText, } from "../../../startup-public.js";
+import { renderPiModalShortcutHints } from "../../theme.js";
+import { isPiAccentProjectionEnabled, piTheme } from "../theme/theme.js";
 import { ToolImagePresentation } from "../../tool-image-presentation.js";
+function conciseExpandHint() {
+    return renderPiModalShortcutHints([{ key: keyText("app.tools.expand"), action: "expand" }]);
+}
+function withConciseExpandHint(component) {
+    return new Proxy(component, { get(target, property) {
+            if (property === "render")
+                return (width) => {
+                    const theme = piTheme(), key = keyText("app.tools.expand"), concise = conciseExpandHint();
+                    const compact = theme.fg("dim", ` (${key} to expand)`);
+                    return target.render(width).map(row => row.replaceAll(keyHint("app.tools.expand", "to expand"), concise)
+                        .replaceAll(compact, `${theme.fg("dim", " (")}${concise}${theme.fg("dim", ")")}`));
+                };
+            const value = Reflect.get(target, property, target);
+            return typeof value === "function" ? value.bind(target) : value;
+        } });
+}
+function enclosingToolBackground(theme, role) {
+    const background = theme.bg(role, "\u0000").split("\u0000")[0];
+    // Invariant: child defaults return to the enclosing shell, not the terminal canvas.
+    return text => theme.bg(role, text.replace(/\u001b\[([0-9:;]*)m/gu, (ansi, parameters) => {
+        const values = parameters.split(";");
+        let restore = false;
+        for (let index = 0; index < values.length; index++) {
+            const token = values[index], code = Number(token.split(":", 1)[0] || "0");
+            if (code === 0 || code === 49)
+                restore = true;
+            else if (code >= 40 && code <= 47 || code >= 100 && code <= 107)
+                restore = false;
+            else if (code === 38 || code === 48 || code === 58) {
+                if (code === 48)
+                    restore = false;
+                if (!token.includes(":")) {
+                    const mode = Number(values[index + 1]);
+                    index += mode === 2 ? 4 : mode === 5 ? 2 : 1;
+                }
+            }
+        }
+        return restore ? ansi + background : ansi;
+    }));
+}
 export function mergeBuiltInRenderers(definition, builtIn) {
     if (definition === undefined)
         return builtIn;
@@ -31,7 +74,6 @@ const definitions = { read: createReadToolDefinition, bash: createBashToolDefini
     write: createWriteToolDefinition, grep: createGrepToolDefinition, find: createFindToolDefinition, ls: createLsToolDefinition };
 const FALLBACK_PREVIEW_LINES = 10;
 const COLLAPSED_ARGS_CHARS = 100;
-/** Locally attributed equivalent of pinned Pi's private generic tool-call formatter. */
 function formatToolCallWithArgs(title, args, expanded) {
     const theme = piTheme();
     const header = theme.fg("toolTitle", theme.bold(title));
@@ -56,7 +98,6 @@ function formatToolCallWithArgs(title, args, expanded) {
 export class ToolExecutionComponent extends Container {
     contentBox;
     contentText;
-    contentTextRegion;
     selfRenderContainer;
     selfRenderHeight = 0;
     callRendererComponent;
@@ -90,8 +131,6 @@ export class ToolExecutionComponent extends Container {
         this.args = args;
         this.builtInToolDefinition = Object.hasOwn(definitions, toolName)
             ? definitions[toolName](cwd) : undefined;
-        // Rationale: 0.85.1 moved the built-in renderer fallback to the caller; A1 keeps it here so every caller of
-        // the owned component gets the built-in edit/read/bash renderers without reaching into the tool registry.
         this.toolDefinition = mergeBuiltInRenderers(toolDefinition, this.builtInToolDefinition);
         this.showImages = options.showImages ?? true;
         this.imageWidthCells = options.imageWidthCells ?? 60;
@@ -105,30 +144,17 @@ export class ToolExecutionComponent extends Container {
             this.ui.requestRender();
         });
         this.addChild(new Spacer(1));
-        // Always create all shell variants. contentBox is used for default renderer-based composition.
-        // selfRenderContainer is used when the tool renders its own framing.
-        // contentText is reserved for generic fallback rendering when no tool definition exists.
-        this.contentBox = new Box(1, 1, (text) => piTheme().bg("toolPendingBg", text));
-        this.contentText = new Text("", 1, 1, (text) => piTheme().bg("toolPendingBg", text));
-        this.contentTextRegion = this.createResultRegion(this.contentText);
+        this.contentBox = new Box(1, 1, enclosingToolBackground(piTheme(), "toolPendingBg"));
+        this.contentText = new Text("", 1, 1, enclosingToolBackground(piTheme(), "toolPendingBg"));
         this.selfRenderContainer = new Container();
-        if (this.hasRendererDefinition()) {
+        if (this.toolDefinition !== undefined) {
             this.addChild(this.getRenderShell() === "self" ? this.selfRenderContainer : this.contentBox);
         }
         else {
-            this.addChild(this.contentTextRegion);
+            this.addChild(this.createResultRegion(this.contentText));
         }
         this.updateDisplay();
     }
-    getCallRenderer() {
-        return this.toolDefinition?.renderCall;
-    }
-    getResultRenderer() {
-        return this.toolDefinition?.renderResult;
-    }
-    hasRendererDefinition() {
-        return this.toolDefinition !== undefined;
-    }
     getRenderShell() {
         return this.toolDefinition?.renderShell ?? "default";
     }
@@ -161,15 +187,14 @@ export class ToolExecutionComponent extends Container {
     createResultFallback() {
         const theme = piTheme();
         const output = this.getTextOutput();
-        if (!output) {
+        if (!output)
             return undefined;
-        }
         const lines = output.split("\n");
         const displayLines = this.expanded ? lines : lines.slice(0, FALLBACK_PREVIEW_LINES);
         const remaining = lines.length - displayLines.length;
         let text = displayLines.map((line) => theme.fg("toolOutput", line)).join("\n");
         if (remaining > 0) {
-            text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("app.tools.expand", "to expand")}${theme.fg("muted", ")")}`;
+            text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${conciseExpandHint()}${theme.fg("muted", ")")}`;
         }
         return new Text(text, 0, 0);
     }
@@ -200,7 +225,6 @@ export class ToolExecutionComponent extends Container {
         this.isPartial = isPartial;
         this.updateDisplay();
     }
-    /** End mount ownership without letting an obsolete conversion or extension callback repaint. */
     dispose() {
         this.disposed = true;
         this.images.dispose();
@@ -236,7 +260,7 @@ export class ToolExecutionComponent extends Container {
         if (this.hideComponent) {
             return [];
         }
-        if (this.hasRendererDefinition() && this.getRenderShell() === "self") {
+        if (this.toolDefinition !== undefined && this.getRenderShell() === "self") {
             const contentLines = this.selfRenderContainer.render(width);
             this.selfRenderHeight = contentLines.length;
             if (contentLines.length === 0 && this.imageComponents.length === 0) {
@@ -262,7 +286,7 @@ export class ToolExecutionComponent extends Container {
         return super.render(width);
     }
     handleMouse(event) {
-        if (!this.hasRendererDefinition() || this.getRenderShell() !== "self")
+        if (this.toolDefinition === undefined || this.getRenderShell() !== "self")
             return super.handleMouse(event);
         if (event.y <= 0 || event.y > this.selfRenderHeight)
             return undefined;
@@ -283,65 +307,52 @@ export class ToolExecutionComponent extends Container {
             this.updatingDisplay = false;
         }
     }
+    callTheme(theme, renderer) {
+        if (this.toolName !== "read" || renderer !== this.builtInToolDefinition?.renderCall || !isPiAccentProjectionEnabled)
+            return theme;
+        return new Proxy(theme, { get(target, property) {
+                if (property === "fg")
+                    return (...args) => target.fg(args[0] === "warning" ? "mdHeading" : args[0], args[1]);
+                const value = Reflect.get(target, property, target);
+                return typeof value === "function" ? value.bind(target) : value;
+            } });
+    }
+    appendRenderer(container, field, render, fallback, builtIn) {
+        if (render) {
+            try {
+                const component = render(this.getRenderContext(this[field]));
+                this[field] = component;
+                container.addChild(this.createResultRegion(builtIn ? withConciseExpandHint(component) : component));
+                return true;
+            }
+            catch {
+                this[field] = undefined;
+            }
+        }
+        const component = fallback();
+        if (component)
+            container.addChild(this.createResultRegion(component));
+        return component !== undefined;
+    }
     composeDisplay() {
         const theme = piTheme();
-        const bgFn = this.isPartial
-            ? (text) => theme.bg("toolPendingBg", text)
-            : this.result?.isError
-                ? (text) => theme.bg("toolErrorBg", text)
-                : (text) => theme.bg("toolSuccessBg", text);
+        const bgFn = enclosingToolBackground(theme, this.isPartial ? "toolPendingBg"
+            : this.result?.isError ? "toolErrorBg" : "toolSuccessBg");
         let hasContent = false;
         this.hideComponent = false;
-        if (this.hasRendererDefinition()) {
+        if (this.toolDefinition !== undefined) {
             const renderContainer = this.getRenderShell() === "self" ? this.selfRenderContainer : this.contentBox;
             if (renderContainer instanceof Box) {
                 renderContainer.setBgFn(bgFn);
                 renderContainer.setPaddingX(this.outputPad);
             }
             renderContainer.clear();
-            const callRenderer = this.getCallRenderer();
-            if (!callRenderer) {
-                renderContainer.addChild(this.createResultRegion(this.createCallFallback()));
-                hasContent = true;
-            }
-            else {
-                try {
-                    const component = callRenderer(this.args, theme, this.getRenderContext(this.callRendererComponent));
-                    this.callRendererComponent = component;
-                    renderContainer.addChild(this.createResultRegion(component));
-                    hasContent = true;
-                }
-                catch {
-                    this.callRendererComponent = undefined;
-                    renderContainer.addChild(this.createResultRegion(this.createCallFallback()));
-                    hasContent = true;
-                }
-            }
-            if (this.result) {
-                const resultRenderer = this.getResultRenderer();
-                if (!resultRenderer) {
-                    const component = this.createResultFallback();
-                    if (component) {
-                        renderContainer.addChild(this.createResultRegion(component));
-                        hasContent = true;
-                    }
-                }
-                else {
-                    try {
-                        const component = resultRenderer({ content: this.result.content, details: this.result.details }, { expanded: this.expanded, isPartial: this.isPartial }, theme, this.getRenderContext(this.resultRendererComponent));
-                        this.resultRendererComponent = component;
-                        renderContainer.addChild(this.createResultRegion(component));
-                        hasContent = true;
-                    }
-                    catch {
-                        this.resultRendererComponent = undefined;
-                        const component = this.createResultFallback();
-                        if (component) {
-                            renderContainer.addChild(this.createResultRegion(component));
-                            hasContent = true;
-                        }
-                    }
-                }
+            const call = this.toolDefinition?.renderCall;
+            hasContent = this.appendRenderer(renderContainer, "callRendererComponent", call ? context => call(this.args, this.callTheme(theme, call), context) : undefined, () => this.createCallFallback(), call === this.builtInToolDefinition?.renderCall);
+            const result = this.result;
+            if (result) {
+                const render = this.toolDefinition?.renderResult;
+                hasContent = this.appendRenderer(renderContainer, "resultRendererComponent", render ? context => render({ content: result.content, details: result.details }, { expanded: this.expanded, isPartial: this.isPartial }, theme, context) : undefined, () => this.createResultFallback(), render === this.builtInToolDefinition?.renderResult) || hasContent;
             }
         }
         else {
@@ -350,13 +361,9 @@ export class ToolExecutionComponent extends Container {
             this.contentText.setText(this.formatToolExecution());
             hasContent = true;
         }
-        for (const img of this.imageComponents) {
-            this.removeChild(img);
-        }
+        for (const child of [...this.imageComponents, ...this.imageSpacers])
+            this.removeChild(child);
         this.imageComponents = [];
-        for (const spacer of this.imageSpacers) {
-            this.removeChild(spacer);
-        }
         this.imageSpacers = [];
         this.images.update(this.result?.content ?? [], this.showImages);
         for (const imageComponent of this.images.components(this.imageWidthCells)) {
@@ -366,18 +373,15 @@ export class ToolExecutionComponent extends Container {
             this.imageComponents.push(imageComponent);
             this.addChild(imageComponent);
         }
-        if (this.hasRendererDefinition() && !hasContent && this.imageComponents.length === 0) {
+        if (this.toolDefinition !== undefined && !hasContent && this.imageComponents.length === 0) {
             this.hideComponent = true;
         }
     }
     getTextOutput() {
         if (!this.result)
             return "";
-        const text = this.result.content.filter(part => part.type === "text").map(part => Array.from(stripVTControlCharacters(part.text ?? "")).filter(char => {
-            const code = char.codePointAt(0);
-            return code === 9 || code === 10 || code > 31 && (code < 0xfff9 || code > 0xfffb);
-        }).join("")).join("\n");
-        if (getCapabilities().images && this.showImages)
+        const text = this.result.content.filter(part => part.type === "text").map(part => stripVTControlCharacters(part.text ?? "").replace(/[\u0000-\u0008\u000b-\u001f\ufff9-\ufffb]/gu, "")).join("\n");
+        if (this.showImages)
             return text;
         const indicators = this.result.content.filter(part => part.type === "image").map(part => imageFallback(part.mimeType ?? "image/unknown", part.data && part.mimeType ? getImageDimensions(part.data, part.mimeType) ?? undefined : undefined)).join("\n");
         return text && indicators ? `${text}\n${indicators}` : text || indicators;
@@ -386,13 +390,11 @@ export class ToolExecutionComponent extends Container {
         const theme = piTheme();
         let text = theme.fg("toolTitle", theme.bold(this.toolName));
         const content = JSON.stringify(this.args, null, 2);
-        if (content) {
+        if (content)
             text += `\n\n${content}`;
-        }
         const output = this.getTextOutput();
-        if (output) {
+        if (output)
             text += `\n${output}`;
-        }
         return text;
     }
 }

package/dist/integrations/pi/components/upstream/components/tree-selector.d.ts

@@ -1,18 +1,18 @@
 /**
- * Provenance: @earendil-works/pi-coding-agent 1.1.0 (MIT), commit abe508e1b89912adde45528136c3221eb69acdd7,
+ * Provenance: @earendil-works/pi-coding-agent 1.4.0 (MIT), commit 4a080252f06caf63a525d7873c5d94d3c23887e0,
  * packages/coding-agent/src/modes/interactive/components/tree-selector.ts.
  * Modifications: Port remaps public types/components plus owned keybindings/theme helpers while
  * preserving tree behavior; bare A1 uses compact modal chrome and label editing, four-mode
  * Models-style filter status with Tab/Shift+Tab directional cycling and concise all-first presentation
- * excluding internal bookkeeping, standard search input, blue full-row menu-arrow selection that
- * preserves per-entry semantic foregrounds and has no path bullets, accent entry labels, bracketed
- * timestamps, numeric result counters without duplicate label-time status, and a stateful time on/off
- * shortcut, semantic role colors with session naming for the system root, standard
- * paging/first-last/non-root containing-branch folding keys with a permanently expanded system session
- * entry even behind hidden metadata, single-character ellipses on both clipped edges with
- * bracket-delimiter preservation and selected-fragment highlighting, and Models-ordered semantic
+ * excluding internal bookkeeping, a standard accent-marked search input, blue full-row menu-arrow
+ * selection that preserves per-entry semantic foregrounds and has no path bullets, accent entry
+ * labels, bracketed timestamps, numeric result counters without duplicate label-time status, and a
+ * stateful time on/off shortcut, semantic role colors with session naming for the system root,
+ * standard paging/first-last/non-root containing-branch folding keys with a permanently expanded
+ * system session entry even behind hidden metadata, single-character ellipses on both clipped edges
+ * with bracket-delimiter preservation and selected-fragment highlighting, and Models-ordered semantic
  * Type/search shortcut footers without a redundant select hint.
- * Deviations: owned-modal-shortcut-hints, owned-session-tree-dialog.
+ * Deviations: owned-modal-shortcut-hints, owned-session-tree-dialog, owned-dialog-search-marker.
  */
 import { type Component, Container, type Focusable } from "@earendil-works/pi-tui";
 import { type SessionTreeNode } from "@earendil-works/pi-coding-agent";