@crouton-kit/crouter 0.3.32 → 0.3.34

package/dist/clients/attach/auth-pickers.js

@@ -1,7 +1,7 @@
-// auth-pickers.ts — native /login and /logout overlays for `crtr attach`.
+// auth-pickers.ts — native /login and /logout overlays for `crtr surface attach`.
 //
 // Runs pi's REAL OAuth/API-key login flow locally in the viewer process.
-// Since crtr attach is tmux-local only (viewer + broker = same machine, same
+// Since crtr surface attach is tmux-local only (viewer + broker = same machine, same
 // filesystem), we can construct a local AuthStorage pointing at the SAME
 // auth.json the broker uses — no socket round-trip needed for auth mutations.
 //

package/dist/clients/attach/canvas-panels.js

@@ -1,4 +1,4 @@
-// canvas-panels.ts — the subscribed-node panel for `crtr attach` (Unit Q).
+// canvas-panels.ts — the subscribed-node panel for `crtr surface attach` (Unit Q).
 //
 // Native reimplementation of canvas-nav.ts's BASE chrome (renderBase), reading
 // the subscription graph DIRECTLY from canvas.db via the shared nav-model layer
@@ -12,7 +12,7 @@
 // caller owns the Containers and the refresh trigger. beginFrame() memoizes the
 // canvas.db reads for this one build pass (mirrors canvas-nav's per-frame cache),
 // so a whole panel rebuild is a single fan-out of disk/db reads.
-import { beginFrame, cNode, managerOf, liveReports, climbRoot, computeSubtreeActivity, navLabel, coloredGlyph, truncate, tokensCell, cycleBadge, childBadge, liveBelowBadge, askBadge, activityCell, YELLOW, RESET, } from '../../core/canvas/nav-model.js';
+import { beginFrame, cNode, managerOf, liveReports, climbRoot, computeSubtreeActivity, navLabel, nodeGlyph, truncate, tokensCell, cycleBadge, childBadge, liveBelowBadge, askBadge, activityCell, YELLOW, RESET, } from '../../core/canvas/nav-model.js';
 /** Column widths for the aligned panel rows (visible columns). name is sized to
  *  the widest label across BOTH panels (capped); kind is wide enough for the
  *  longest persona kind (`orchestrator` = 12) so real kinds never truncate;
@@ -57,7 +57,7 @@ export function buildCanvasPanelLines(nodeId, asks, palette) {
         const kind = faint(nameCell(n?.kind ?? '', KIND_W));
         const tokens = muted(padStartVisible(tokensCell(id), TOK_W));
         const badges = `${cycleBadge(n)}${childBadge(n)}${liveBelowBadge(n, activity.activeBelow)}${askBadge(id, asks)}${activityCell(id, n)}`;
-        return truncate(` ${coloredGlyph(n)} ${name}  ${kind} ${tokens}${badges}`);
+        return truncate(` ${nodeGlyph(n)} ${name}  ${kind} ${tokens}${badges}`);
     };
     // --- managers panel (↑) ---
     const managers = [];

package/dist/clients/attach/chat-view.d.ts

@@ -50,6 +50,8 @@ export declare class ChatView {
     private streamingComponent;
     /** Tool-call id → its execution component, for the duration of the call. */
     private readonly pendingTools;
+    /** The `!` bash component currently streaming (between bash_start and bash_end). */
+    private bashComponent;
     /** The single active activity loader (working/compaction/retry), if any. */
     private activityLoader;
     /** While true, `append` skips re-pinning the status container (bulk rebuild). */
@@ -65,7 +67,7 @@ export declare class ChatView {
      *  else routes through `addMessageToChat`. The TUI's differential renderer +
      *  reflow-on-resize is automatic — no scrollback reconstruction needed. */
     applySnapshot(snapshot: BrokerSnapshot): void;
-    /** Stop any spinning activity loader. A one-shot `crtr attach` process lets its
+    /** Stop any spinning activity loader. A one-shot `crtr surface attach` process lets its
      *  timers die with the process, but if T7 reuses a ChatView across reconnects in
      *  one process it should call this on detach to avoid a leaked interval. */
     dispose(): void;
@@ -78,8 +80,16 @@ export declare class ChatView {
      *  the container, so the loop covers it too). Returns the new HIDDEN state. */
     toggleThinking(): boolean;
     handleEvent(event: AgentSessionEvent): void;
+    bashStart(command: string, excludeFromContext?: boolean): void;
+    bashOutput(chunk: string): void;
+    bashEnd(result: {
+        exitCode: number | undefined;
+        cancelled: boolean;
+        truncated: boolean;
+        fullOutputPath?: string;
+    }): void;
     private addMessageToChat;
-    /** Default-path tool component (toolDef undefined → builtin/default rendering). */
+    /** Tool component with native viewer renderers for crouter-owned tool output. */
     private makeToolComponent;
     /** Append a child while keeping the activity/status area pinned to the bottom. */
     private append;
@@ -92,6 +102,7 @@ export declare class ChatView {
     private setActivity;
     private showStatus;
     private showError;
+    private crtrOutputTheme;
     /** Extract the tool-call content items from an assistant message. */
     private assistantToolCalls;
     /** The text of the most recent assistant message, for `/copy`. Undefined when

package/dist/clients/attach/chat-view.js

@@ -1,4 +1,4 @@
-// chat-view.ts — the render half of `crtr attach` (Phase 4, T5).
+// chat-view.ts — the render half of `crtr surface attach` (Phase 4, T5).
 //
 // A direct port of pi's `InteractiveMode.handleEvent()`
 // (interactive-mode.js:2169-2462) + its rebuild path
@@ -15,14 +15,15 @@
 // (queue_update / session_info_changed / thinking_level_changed) are forwarded
 // to the optional `onFooterEvent` sink instead of rendered here.
 //
-// Custom-tool rendering (plan §3.3): extensions run in the broker, so the viewer
-// has no `ToolDefinition`. Every tool renders through the DEFAULT
-// `ToolExecutionComponent` path (toolDef = undefined) — builtin tools, diffs, and
-// partial-result streaming all work; only custom `renderCall`/`renderResult`
-// extensions degrade to the default, which is the decided Phase-4 behavior.
+// Custom-tool rendering: extensions run in the broker, so the viewer generally
+// has no extension `ToolDefinition`. The viewer supplies native renderers only
+// for crouter-owned message/tool types it understands; other extension
+// `renderCall`/`renderResult` hooks degrade to the default ToolExecutionComponent
+// path while builtin tools, diffs, and partial-result streaming keep working.
 import { Container, Loader, Spacer, Text } from '@earendil-works/pi-tui';
 import { AssistantMessageComponent, BashExecutionComponent, BranchSummaryMessageComponent, CompactionSummaryMessageComponent, CustomMessageComponent, getMarkdownTheme, parseSkillBlock, SkillInvocationMessageComponent, ToolExecutionComponent, UserMessageComponent, } from '@earendil-works/pi-coding-agent';
 import { ContextMessageComponent } from './context-message.js';
+import { CRTR_OUTPUT_CUSTOM_TYPE, CrtrOutputMessageComponent, createCrtrBashToolDefinition, } from './crtr-output-render.js';
 /** customType stamped on the injected `<crtr-context>` bearings block (mirrors
  *  CONTEXT_INTRO_CUSTOM_TYPE in canvas-context-intro.ts — kept as a local literal
  *  so the viewer never imports the in-process extension). */
@@ -73,6 +74,8 @@ export class ChatView {
     streamingComponent;
     /** Tool-call id → its execution component, for the duration of the call. */
     pendingTools = new Map();
+    /** The `!` bash component currently streaming (between bash_start and bash_end). */
+    bashComponent;
     /** The single active activity loader (working/compaction/retry), if any. */
     activityLoader;
     /** While true, `append` skips re-pinning the status container (bulk rebuild). */
@@ -178,7 +181,7 @@ export class ChatView {
         }
         this.tui.requestRender();
     }
-    /** Stop any spinning activity loader. A one-shot `crtr attach` process lets its
+    /** Stop any spinning activity loader. A one-shot `crtr surface attach` process lets its
      *  timers die with the process, but if T7 reuses a ChatView across reconnects in
      *  one process it should call this on detach to avoid a leaked interval. */
     dispose() {
@@ -382,6 +385,27 @@ export class ChatView {
         this.tui.requestRender();
     }
     // -------------------------------------------------------------------------
+    // `!` bash live stream (broker bash_start/bash_output/bash_end frames). Mirrors
+    // pi interactive mode's `!` handling: create the component on start, stream
+    // chunks into it, mark complete on end. The persisted `bashExecution` message
+    // also rides the next snapshot, so this only drives the LIVE view.
+    // -------------------------------------------------------------------------
+    bashStart(command, excludeFromContext) {
+        const component = new BashExecutionComponent(command, this.tui, excludeFromContext);
+        this.bashComponent = component;
+        this.append(component);
+        this.tui.requestRender();
+    }
+    bashOutput(chunk) {
+        this.bashComponent?.appendOutput(chunk);
+        this.tui.requestRender();
+    }
+    bashEnd(result) {
+        this.bashComponent?.setComplete(result.exitCode, result.cancelled, result.truncated ? { truncated: true } : undefined, result.fullOutputPath);
+        this.bashComponent = undefined;
+        this.tui.requestRender();
+    }
+    // -------------------------------------------------------------------------
     // Rebuild path (ports addMessageToChat, interactive-mode.js:2483).
     // -------------------------------------------------------------------------
     addMessageToChat(message) {
@@ -410,7 +434,10 @@ export class ChatView {
                         (s) => this.spinnerStyle(this.labelStyle(s))));
                         break;
                     }
-                    // No extension renderer in the viewer → default custom-message render.
+                    if (message.customType === CRTR_OUTPUT_CUSTOM_TYPE) {
+                        this.append(new CrtrOutputMessageComponent(this.userMessageText(message), this.toolOutputExpanded, this.crtrOutputTheme()));
+                        break;
+                    }
                     const component = new CustomMessageComponent(message, undefined, getMarkdownTheme());
                     component.setExpanded(this.toolOutputExpanded);
                     this.append(component);
@@ -463,9 +490,10 @@ export class ChatView {
     // -------------------------------------------------------------------------
     // Helpers
     // -------------------------------------------------------------------------
-    /** Default-path tool component (toolDef undefined → builtin/default rendering). */
+    /** Tool component with native viewer renderers for crouter-owned tool output. */
     makeToolComponent(name, id, args) {
-        const component = new ToolExecutionComponent(name, id, args, { showImages: this.showImages, imageWidthCells: this.imageWidthCells }, undefined, this.tui, this.cwd);
+        const toolDefinition = name === 'bash' ? createCrtrBashToolDefinition(args) : undefined;
+        const component = new ToolExecutionComponent(name, id, args, { showImages: this.showImages, imageWidthCells: this.imageWidthCells }, toolDefinition, this.tui, this.cwd);
         component.setExpanded(this.toolOutputExpanded);
         return component;
     }
@@ -511,6 +539,21 @@ export class ChatView {
         this.append(new Spacer(1));
         this.append(new Text(this.errorStyle(message), 1, 0));
     }
+    crtrOutputTheme() {
+        return {
+            fg: (name, text) => {
+                if (name === 'error')
+                    return this.errorStyle(text);
+                if (name === 'warning' || name === 'accent' || name === 'toolTitle' || name === 'success')
+                    return this.spinnerStyle(text);
+                if (name === 'muted')
+                    return this.dimStyle(text);
+                return text;
+            },
+            bg: (_name, text) => text,
+            bold: (text) => this.labelStyle(text),
+        };
+    }
     /** Extract the tool-call content items from an assistant message. */
     assistantToolCalls(message) {
         const content = message.content;

package/dist/clients/attach/clipboard-image.js

@@ -1,4 +1,4 @@
-// clipboard-image.ts — read the clipboard image for `crtr attach` (T6, review M1).
+// clipboard-image.ts — read the clipboard image for `crtr surface attach` (T6, review M1).
 //
 // pi's `readClipboardImage` is NOT re-exported (it lives behind a native
 // clipboard binding + Photon worker the package gates off `.`-only exports), so

package/dist/clients/attach/clipboard-text.js

@@ -1,4 +1,4 @@
-// clipboard-text.ts — write text to the system clipboard for `crtr attach` (/copy).
+// clipboard-text.ts — write text to the system clipboard for `crtr surface attach` (/copy).
 //
 // pi's clipboard binding is not re-exported (see clipboard-image.ts), so we shell
 // out to the platform clipboard tool, mirroring the read path: macOS `pbcopy`

package/dist/clients/attach/config-load.d.ts

@@ -63,11 +63,15 @@ export interface AttachPalette {
     error: (s: string) => string;
     /** Warning / transient notices. Same constraint as `error` → ANSI yellow. */
     warning: (s: string) => string;
-    /** Editor border when the input is in shell/bash mode (leading `!`). pi paints
-     *  this from its `bashMode` theme color (default `green`), which pi does NOT
-     *  re-export through its public surface — so, like `error`/`warning`, this is
-     *  the semantically-correct ANSI green, not an ad-hoc hardcode. */
+    /** Editor border for a SINGLE-`!` bash command (output IS added to the agent's
+     *  context). Dull/normal ANSI green — pi paints shell mode from its `bashMode`
+     *  theme color (default `green`), which pi does NOT re-export through its public
+     *  surface, so like `error`/`warning` this is the semantically-correct ANSI green. */
     bashMode: (s: string) => string;
+    /** Editor border for a `!!` bash command (output is HIDDEN from the agent).
+     *  BRIGHT ANSI green, so the more consequential "agent won't see this" form
+     *  reads as visually hotter than the plain `!`. */
+    bashModeAlt: (s: string) => string;
 }
 /**
  * Build the attach chrome's color palette from the LIVE theme. Call AFTER

package/dist/clients/attach/config-load.js

@@ -1,4 +1,4 @@
-// config-load.ts — load the user's pi keybindings + theme for `crtr attach` (M8).
+// config-load.ts — load the user's pi keybindings + theme for `crtr surface attach` (M8).
 //
 // These loaders are CLI-layer: pi does the *resolution* (the KeybindingsManager
 // matcher, `initTheme`) but the FILE reads are not reusable from pi, so we own
@@ -206,6 +206,7 @@ const FAINT = (s) => `\x1b[2m${s}\x1b[22m`;
 const RED = (s) => `\x1b[31m${s}\x1b[39m`;
 const YELLOW = (s) => `\x1b[33m${s}\x1b[39m`;
 const GREEN = (s) => `\x1b[32m${s}\x1b[39m`;
+const BRIGHT_GREEN = (s) => `\x1b[92m${s}\x1b[39m`;
 /**
  * Build the attach chrome's color palette from the LIVE theme. Call AFTER
  * `applyTheme()` — the colors are pulled from pi's `getMarkdownTheme()` /
@@ -237,6 +238,7 @@ export function attachPalette() {
         error: RED,
         warning: YELLOW,
         bashMode: GREEN,
+        bashModeAlt: BRIGHT_GREEN,
         surface: (line) => `${bgOn}${line.replace(/\x1b\[0m/g, `\x1b[0m${bgOn}`)}\x1b[49m`,
     };
 }

package/dist/clients/attach/crtr-output-render.d.ts

@@ -0,0 +1,48 @@
+import { Box } from '@earendil-works/pi-tui';
+type Theme = {
+    fg: (name: string, text: string) => string;
+    bg: (name: string, text: string) => string;
+    bold: (text: string) => string;
+};
+export declare const CRTR_OUTPUT_CUSTOM_TYPE = "crtr-output";
+export declare function stripHeredocBodies(command: string): string;
+export declare function isCrtrBashCommand(command: unknown): boolean;
+/** True when a crtr bash invocation's OWN argv carries a bare -h/--help
+ *  token — the dispatcher renders the leaf's schema, not a result, so it is
+ *  never useful to preview like a normal command's output (see
+ *  src/core/help.ts renderLeafArgv: schema text, not agent-facing result
+ *  text). Checked against extractCrtrInvocationTokens' tokens (scoped to the
+ *  crtr segment only, quote-aware), never the raw command string — a `-h`
+ *  appearing before the crtr segment (`echo -h && crtr canvas snapshot`),
+ *  after it (`crtr canvas snapshot && echo --help`), or inside a quoted
+ *  argument (`crtr node new "write about -h flags"`) must never count. This is
+ *  structural (every leaf's -h has the same shape), so it needs no per-leaf
+ *  metadata — unlike suppressOutput below, which is command-owned. */
+export declare function isCrtrHelpInvocation(command: unknown): boolean;
+/** Per-render preview state for a crtr bash invocation. Both fields are
+ *  synchronous and structural: isHelp from the invocation's own argv (above),
+ *  suppressOutput from the bundle-safe static registry (preview-registry.ts —
+ *  a hand-maintained mirror of the leaf's own `help.preview.suppressOutput`,
+ *  kept in sync by preview-registry-sync.test.ts). Neither needs an async
+ *  cross-process command-tree lookup, so there is no cache/resolver/invalidate
+ *  machinery here, and no path from the attach bundle into the command tree.
+ *  Command-owned computed summaries (memory read, memory lint, ...) are a
+ *  separate lookup entirely — render() below calls summarizePath
+ *  (preview-registry.ts) directly against the invocation's tokens, so there
+ *  is no field for it here. */
+export interface CrtrPreviewState {
+    isHelp: boolean;
+    suppressOutput: boolean;
+}
+export declare function commandPreviewMeta(command: string): CrtrPreviewState;
+export declare function renderCrtrOutputText(text: string, theme: Theme): string;
+export declare class CrtrOutputMessageComponent extends Box {
+    private readonly content;
+    private readonly theme;
+    private body;
+    private expanded;
+    constructor(content: string, expanded: boolean, theme: Theme);
+    setExpanded(expanded: boolean): void;
+}
+export declare function createCrtrBashToolDefinition(args: unknown): unknown | undefined;
+export {};