@north-light/crouter 0.3.163 → 0.3.165

package/dist/clients/attach/__tests__/crtr-output.test.js

@@ -1568,15 +1568,22 @@ test('node and package mutations share compact outcome-first receipts', () => {
         assert.match(collapsed, /ctrl\+o to expand/, command);
     }
 });
-const PKG_PLUGIN_INSTALL_OUTPUT = ['- name: ai', '- scope: user', '', '/Users/silas/.crouter/plugins/ai'].join('\n');
-const PKG_PLUGIN_INSTALL_SHORT_PATH_OUTPUT = ['- name: ai', '- scope: user', '- path: /a'].join('\n');
+const PKG_PLUGIN_INSTALL_OUTPUT = [
+    '- name: ai',
+    '- scope: user',
+    '- transport: exec',
+    '- commands: {"mounts":["app"],"issues":[]}',
+    '',
+    '/Users/silas/.crouter/plugins/ai',
+].join('\n');
+const PKG_PLUGIN_INSTALL_SHORT_PATH_OUTPUT = ['- name: ai', '- scope: user', '- transport: http', '- path: /a'].join('\n');
 test('a crtr pkg plugin install card collapses to an installed status + scope/path digest, not the raw fields', () => {
     const def = createCrtrBashToolDefinition({ command: 'crtr pkg plugin install ai' });
     const collapsed = def
         .renderResult({ content: [{ type: 'text', text: PKG_PLUGIN_INSTALL_OUTPUT }] }, { expanded: false }, theme, {})
         .render(140)
         .join('\n');
-    assert.match(collapsed, /<success>installed ai<\/success>/);
+    assert.match(collapsed, /<success>installed ai · exec<\/success>/);
     assert.match(collapsed, /<muted>user · \/Users\/silas\/\.crouter\/plugins\/ai<\/muted>/);
     assert.doesNotMatch(collapsed, /- name:/);
     const expanded = def
@@ -1588,33 +1595,34 @@ test('a crtr pkg plugin install card collapses to an installed status + scope/pa
         .renderResult({ content: [{ type: 'text', text: PKG_PLUGIN_INSTALL_SHORT_PATH_OUTPUT }] }, { expanded: false }, theme, {})
         .render(140)
         .join('\n');
+    assert.match(shortPath, /<success>installed ai · http<\/success>/);
     assert.match(shortPath, /<muted>user · \/a<\/muted>/);
 });
-const PKG_PLUGIN_UPDATE_UPDATED_OUTPUT = ['1 updated:', '', '| name | updated | sha |', '| --- | --- | --- |', '| ai | true | def5678 |'].join('\n');
-const PKG_PLUGIN_UPDATE_CURRENT_OUTPUT = ['1 updated:', '', '| name | updated | sha |', '| --- | --- | --- |', '| ai | false | abc1234 |'].join('\n');
+const PKG_PLUGIN_UPDATE_UPDATED_OUTPUT = ['1 updated:', '', '| name | transport | updated | sha |', '| --- | --- | --- | --- |', '| ai | http | true |  |'].join('\n');
+const PKG_PLUGIN_UPDATE_CURRENT_OUTPUT = ['1 updated:', '', '| name | transport | updated | sha |', '| --- | --- | --- | --- |', '| ai | exec | false | abc1234 |'].join('\n');
 const PKG_PLUGIN_UPDATE_MULTI_OUTPUT = [
     '3 updated:',
     '',
-    '| name | updated | sha |',
-    '| --- | --- | --- |',
-    '| ai | true | aaa1111 |',
-    '| beta | false | bbb2222 |',
-    '| gamma | true | ccc3333 |',
+    '| name | transport | updated | sha |',
+    '| --- | --- | --- | --- |',
+    '| ai | exec | true | aaa1111 |',
+    '| beta | exec | false | bbb2222 |',
+    '| gamma | http | true |  |',
 ].join('\n');
-test('a crtr pkg plugin update card collapses to an updated/current status + sha, not the raw table', () => {
+test('a crtr pkg plugin update card collapses to an updated/current transport-aware status + sha, not the raw table', () => {
     const def = createCrtrBashToolDefinition({ command: 'crtr pkg plugin update --name ai' });
     const collapsed = def
         .renderResult({ content: [{ type: 'text', text: PKG_PLUGIN_UPDATE_UPDATED_OUTPUT }] }, { expanded: false }, theme, {})
         .render(140)
         .join('\n');
-    assert.match(collapsed, /<success>updated ai<\/success>/);
-    assert.match(collapsed, /<muted>def5678<\/muted>/);
-    assert.doesNotMatch(collapsed, /\| name \| updated \|/);
+    assert.match(collapsed, /<success>refreshed ai<\/success>/);
+    assert.match(collapsed, /<muted>http<\/muted>/);
+    assert.doesNotMatch(collapsed, /\| name \| transport \| updated \|/);
     const expanded = def
         .renderResult({ content: [{ type: 'text', text: PKG_PLUGIN_UPDATE_UPDATED_OUTPUT }] }, { expanded: true }, theme, {})
         .render(140)
         .join('\n');
-    assert.match(expanded, /\| name \| updated \| sha \|/);
+    assert.match(expanded, /\| name \| transport \| updated \| sha \|/);
     const current = def
         .renderResult({ content: [{ type: 'text', text: PKG_PLUGIN_UPDATE_CURRENT_OUTPUT }] }, { expanded: false }, theme, {})
         .render(140)
@@ -1626,7 +1634,7 @@ test('a crtr pkg plugin update card collapses to an updated/current status + sha
         .renderResult({ content: [{ type: 'text', text: PKG_PLUGIN_UPDATE_MULTI_OUTPUT }] }, { expanded: false }, theme, {})
         .render(140)
         .join('\n');
-    assert.match(multi, /2 updated · 1 already current/);
+    assert.match(multi, /2 updated · 1 already current · 1 HTTP/);
     const empty = multiDef
         .renderResult({ content: [{ type: 'text', text: '0 updated.' }] }, { expanded: false }, theme, {})
         .render(140)
@@ -1638,11 +1646,11 @@ test('a crtr pkg plugin update card collapses to an updated/current status + sha
     const malformedUpdate = [
         '3 updated:',
         '',
-        '| name | updated | sha |',
-        '| --- | --- | --- |',
-        '| ai | true | aaa1111 |',
-        '| beta | maybe | bbb2222 |',
-        '| gamma | false | ccc3333 |',
+        '| name | transport | updated | sha |',
+        '| --- | --- | --- | --- |',
+        '| ai | exec | true | aaa1111 |',
+        '| beta | exec | maybe | bbb2222 |',
+        '| gamma | http | false |  |',
     ].join('\n');
     const malformed = multiDef
         .renderResult({ content: [{ type: 'text', text: malformedUpdate }] }, { expanded: false }, theme, {})
@@ -1655,11 +1663,11 @@ const PKG_PLUGIN_LIST_OUTPUT = [
     '',
     '3 items:',
     '',
-    '| name | scope | version | enabled | source_marketplace | path |',
-    '| --- | --- | --- | --- | --- | --- |',
-    '| ai | user | 0.7.1 | true | crouter-official-marketplace | /Users/silas/.crouter/plugins/ai |',
-    '| beta | user | 1.0.0 | false | crouter-official-marketplace | /Users/silas/.crouter/plugins/beta |',
-    '| gamma | project | 2.3.0 | true | custom-market | /Users/silas/Code/cli/crouter/.crouter/plugins/gamma |',
+    '| name | scope | version | enabled | transport | source_marketplace | path |',
+    '| --- | --- | --- | --- | --- | --- | --- |',
+    '| ai | user | 0.7.1 | true | exec | crouter-official-marketplace | /Users/silas/.crouter/plugins/ai |',
+    '| beta | user | 1.0.0 | false |  | crouter-official-marketplace | /Users/silas/.crouter/plugins/beta |',
+    '| gamma | project | 2.3.0 | true | http | custom-market | /Users/silas/Code/cli/crouter/.crouter/plugins/gamma |',
 ].join('\n');
 test('a crtr pkg plugin list card collapses to a plugin/enabled count + name digest, not the raw table', () => {
     const def = createCrtrBashToolDefinition({ command: 'crtr pkg plugin list' });
@@ -1668,13 +1676,13 @@ test('a crtr pkg plugin list card collapses to a plugin/enabled count + name dig
         .render(140)
         .join('\n');
     assert.match(collapsed, /3 plugins · 2 enabled/);
-    assert.match(collapsed, /<muted>ai, beta, gamma<\/muted>/);
+    assert.match(collapsed, /<muted>ai \(exec\), beta, gamma \(http\)<\/muted>/);
     assert.doesNotMatch(collapsed, /\| name \| scope \|/);
     const expanded = def
         .renderResult({ content: [{ type: 'text', text: PKG_PLUGIN_LIST_OUTPUT }] }, { expanded: true }, theme, {})
         .render(140)
         .join('\n');
-    assert.match(expanded, /\| name \| scope \| version \|/);
+    assert.match(expanded, /\| name \| scope \| version \| enabled \| transport \|/);
     const empty = def
         .renderResult({ content: [{ type: 'text', text: '- total: 0\n\n0 items.' }] }, { expanded: false }, theme, {})
         .render(140)
@@ -1693,7 +1701,8 @@ const PKG_PLUGIN_SHOW_OUTPUT = [
     '- scope: user',
     '- path: /Users/silas/.crouter/plugins/ai',
     '- enabled: true',
-    '- manifest: {"name":"ai","version":"0.7.1","description":"AI helpers"}',
+    '- manifest: {"name":"ai","version":"0.7.1","description":"AI helpers","commands":"commands.json","transport":{"kind":"exec","executable":"bin/ai.js"}}',
+    '- commands: {"manifestPath":"/Users/silas/.crouter/plugins/ai/commands.json","mounts":["ai"],"issues":[]}',
     '',
     '2 docs:',
     '',
@@ -1717,7 +1726,7 @@ test('a crtr pkg plugin show card collapses to a name@version + enabled status +
         .renderResult({ content: [{ type: 'text', text: PKG_PLUGIN_SHOW_OUTPUT }] }, { expanded: false }, theme, {})
         .render(140)
         .join('\n');
-    assert.match(collapsed, /<success>ai@0\.7\.1 · enabled<\/success>/);
+    assert.match(collapsed, /<success>ai@0\.7\.1 · exec · enabled<\/success>/);
     assert.match(collapsed, /<muted>2 substrate docs<\/muted>/);
     assert.doesNotMatch(collapsed, /\| name \| path \|/);
     const expanded = def

package/dist/clients/attach/__tests__/edit-diff.test.js

@@ -1,9 +1,7 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
-import { initTheme } from '@earendil-works/pi-coding-agent';
-import { FOLDED_STATE_KEY } from '../render/tool-calls.js';
 import { createCrtrEditToolDefinition } from '../render/edit-diff.js';
-initTheme(undefined, false);
+import { FoldedToolCallController } from '../render/tool-calls.js';
 const theme = {
     fg: (_name, text) => text,
     bg: (_name, text) => text,
@@ -12,23 +10,26 @@ const theme = {
     getBgAnsi: (_name) => '',
     getColorMode: () => 'truecolor',
 };
-test('folded edit counts keep the executed diff when its speculative preview settles later', () => {
-    const definition = createCrtrEditToolDefinition(process.cwd());
-    const args = { path: 'example.ts', edits: [{ oldText: 'before', newText: 'after' }] };
-    const state = {};
-    const context = {
-        args,
-        argsComplete: false,
-        cwd: process.cwd(),
-        invalidate() { },
+test('edit cards stream argument diffs, then keep the executed result authoritative', () => {
+    const fold = new FoldedToolCallController();
+    const view = createCrtrEditToolDefinition(process.cwd(), fold);
+    const definition = view.definition;
+    const context = { cwd: process.cwd(), isError: false };
+    const streamedArgs = { path: 'example.ts', edits: [{ oldText: 'before', newText: 'streaming' }] };
+    const streamed = definition.renderCall(streamedArgs, theme, context).render(80).join('\n');
+    assert.match(streamed, /before/);
+    assert.match(streamed, /streaming/);
+    view.observeResult({
+        content: [{ type: 'text', text: 'edited' }],
+        details: { diff: '-10 before\n+10 executed\n+11 extra' },
         isError: false,
-        state,
-    };
-    definition.renderCall(args, theme, context);
-    definition.renderResult({ content: [{ type: 'text', text: 'edited' }], details: { diff: '- 1 before\n+ 1 after' } }, { isPartial: false }, theme, context);
-    state.callComponent.preview = { error: 'speculative preview completed after execution' };
-    state[FOLDED_STATE_KEY] = true;
-    const folded = definition.renderCall(args, theme, context).render(80).join('\n');
-    assert.match(folded, /\+1/);
+    }, false);
+    const laterArgs = { path: 'example.ts', edits: [{ oldText: 'before', newText: 'stale preview' }] };
+    const settled = definition.renderCall(laterArgs, theme, context).render(80).join('\n');
+    assert.match(settled, /executed/);
+    assert.doesNotMatch(settled, /stale preview/);
+    fold.setFolded(true);
+    const folded = definition.renderCall(laterArgs, theme, context).render(80).join('\n');
+    assert.match(folded, /\+2/);
     assert.match(folded, /-1/);
 });

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

@@ -25,12 +25,12 @@ export interface ChatViewOptions {
      *  the module defaults (faint + ANSI red) are used. */
     palette?: AttachPalette;
     /** Trailing refresh-yield cycles rendered at full fidelity; older cycles are
-     *  condensed to prose and frozen (see frozen-history.ts). Absent → the user's
-     *  `live_cycles` config setting, itself defaulting to 2. */
+     *  condensed to lightweight, reflowing content (see condensed-history.ts).
+     *  Absent → the user's `live_cycles` config setting, itself defaulting to 2. */
     liveCycles?: number;
-    /** Which messages of a condensed cycle survive into the frozen block. Absent →
-     *  the user's `condensed_history` config setting, itself defaulting to `none`
-     *  (cycle dividers only). */
+    /** Which messages of a condensed cycle survive into the condensed region.
+     *  Absent → the user's `condensed_history` config setting, itself defaulting
+     *  to `none` (cycle dividers only). */
     condensedHistory?: CondensedHistoryMode;
     /** Pre-colored banner lines pinned as the FIRST child of the chat container,
      *  above history (the crouton wordmark). Sits at the very top of the transcript
@@ -47,8 +47,8 @@ export declare class ChatView {
     /** Activity/status area below history. Holds working/compaction/retry loaders. */
     private readonly statusContainer;
     /** Where `append()` puts a component. Normally `historyContainer`; retargeted to
-     *  a scratch container while a frozen block is being built, so the very same
-     *  message-rendering path serves both. */
+     *  a nested container while condensed history is being built, so the same
+     *  message-rendering path serves both regions. */
     private appendTarget;
     /** Trailing cycles kept at full fidelity (config `live_cycles`). */
     private readonly liveCycles;
@@ -114,17 +114,17 @@ export declare class ChatView {
      *  reflow-on-resize is automatic — no scrollback reconstruction needed. */
     applySnapshot(snapshot: BrokerSnapshot): Promise<void>;
     /**
-     * Render the condensed form of the already-finished cycles ONCE and hand back a
-     * frozen line block (or undefined when nothing survived condensation).
+     * Build the condensed form of the already-finished cycles as a nested component
+     * container, or return undefined when nothing survives condensation.
      *
-     * Reuses `addMessageToChat` verbatim by retargeting `append()` at a scratch
-     * container, so condensed history is styled exactly like live history — the same
-     * renderer, with the tool traffic filtered out and the result flattened to text.
-     * Yields on the same cadence as the live build so a very long history still lets
-     * queued keystrokes through, and abandons itself when a newer welcome supersedes
-     * this generation.
+     * Reuses `addMessageToChat` by retargeting `append()` at the nested container, so
+     * condensed history uses the same renderer as live history with tool traffic
+     * filtered out. The outer history cache keeps stable-width frames cheap, while
+     * preserving the components lets pane-width changes reflow their content. The
+     * build yields on the live cadence and abandons itself when a newer welcome
+     * supersedes this generation.
      */
-    private buildFrozenBlock;
+    private buildCondensedBlock;
     /** Defer a live broker frame when a snapshot build is in flight. Returns true
      *  (and enqueues the replay closure) while building so the caller returns
      *  without mutating the half-rebuilt view; false when the caller may proceed.
@@ -141,8 +141,8 @@ export declare class ChatView {
     dispose(): void;
     /** Ctrl+O / app.tools.expand — flip global tool-output expansion and apply it to
      *  every rendered component that supports it. Returns the new expanded state so
-     *  the caller can surface a notice. Condensed cycles hold no tool components and
-     *  are frozen as text, so they are unaffected by design. */
+     *  the caller can surface a notice. Condensed cycles hold no tool components, so
+     *  they are unaffected by design. */
     toggleToolsExpanded(): boolean;
     /** The `fold finished tool calls` view setting (`/fold-tools`, Alt+C → w → f).
      *  Returns the new state so the caller can surface a notice. */
@@ -179,14 +179,14 @@ export declare class ChatView {
     /** Tool component with native viewer renderers for crouter-owned tool output. */
     private makeToolComponent;
     /** Append conversation content above the independent live status area — or into
-     *  the scratch container while a frozen block is under construction. */
+     *  the nested container while condensed history is under construction. */
     private append;
     /** Approximate render width for inline mermaid diagrams. Only affects
      *  termrender's trailing padding (stripped in the transform), so the terminal
      *  column count is close enough without threading the live pane width here. */
     private renderWidth;
     /** Number of rendered conversation components in the container currently being
-     *  appended to (history, or the frozen block's scratch container). */
+     *  appended to (live history or the nested condensed region). */
     private chatChildCount;
     /** Clear all chat content. */
     private resetChat;

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

@@ -26,21 +26,17 @@ import { attachMarkdownTheme } from '../config.js';
 import { ContextMessageComponent } from './context-message.js';
 import { CRTR_OUTPUT_CUSTOM_TYPE, CrtrOutputMessageComponent, createCrtrBashToolDefinition, } from './crtr-output.js';
 import { CRTR_CYCLE_DIVIDER_CUSTOM_TYPE } from '../../../core/runtime/session-cycles.js';
-import { SITUATIONAL_CONTEXT_CUSTOM_TYPE } from '../../../core/runtime/situational-context.js';
+import { generatedContextPresentation } from '../../../shared/generated-context.js';
 import { transformMessageDiagrams } from './diagram.js';
 import { styleAttachMarkdownHeadings, styleAttachMessageMarkdown, styleAttachSummaryMarkdown, } from './markdown-headings.js';
 import { createCrtrEditToolDefinition } from './edit-diff.js';
-import { FOLDED_STATE_KEY, createCrtrPlainBashToolDefinition, createCrtrReadToolDefinition, createCrtrWriteToolDefinition, } from './tool-calls.js';
+import { FoldedToolCallController, createCrtrPlainBashToolDefinition, createCrtrReadToolDefinition, createCrtrWriteToolDefinition, } from './tool-calls.js';
 import { ringCompletionBell } from '../chrome/completion-bell.js';
 import { extractFilePaths } from '../visible-paths.js';
-import { FrozenHistoryComponent, keepWhenCondensed, liveRegionStart } from './frozen-history.js';
+import { keepWhenCondensed, liveRegionStart } from './condensed-history.js';
 import { ViewerAssistantMessageComponent } from './assistant-message.js';
 import { readConfig, updateRawConfigAtomically } from '../../../core/config.js';
 import { DEFAULT_CONDENSED_HISTORY, DEFAULT_LIVE_CYCLES } from '../../../types.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). */
-const CONTEXT_INTRO_CUSTOM_TYPE = 'crtr-context';
 /** Theme-derived chrome colors (spinner / dim / error) are supplied by the
  *  attach command via `ChatViewOptions.palette` (built from the live theme in
  *  config.ts). pi does not re-export the raw `theme` instance, so when no
@@ -147,13 +143,10 @@ function stripBackground(line) {
     });
 }
 /** A tool component that can fold itself down to its CALL. pi's `ToolExecutionComponent`
- *  only knows expanded/collapsed, so the minimized state is crtr's — and the tool's own
- *  renderCall owns its folded form: every crtr-owned definition (read/write/edit/bash)
- *  reads the fold flag off its shared render-state bag and emits ONLY its one-line
- *  `<icon> <tool> <path>` header while folded. Folded render then paints just the call
- *  component (result and Box chrome dropped), so a wrapped path keeps its wrap rows
- *  naturally — no measuring or slicing of rendered ANSI rows. Tools without a crtr
- *  definition are not foldable and always render in full. */
+ *  only knows expanded/collapsed, so each crtr-owned definition receives a local fold
+ *  controller and captures the compact call component it renders. Folded render paints
+ *  that captured call directly, dropping result and Box chrome while letting a wrapped
+ *  path keep its natural rows. Tools without a crtr definition remain in full. */
 /** A one-line separator that appears only while its adjacent tool group is
  * folded. It stays in the transcript so toggling folded tools reflows the same
  * message/tool boundary without rebuilding the chat. */
@@ -174,30 +167,36 @@ class FoldedToolSeparator extends Spacer {
 }
 class MinimizableToolComponent extends ToolExecutionComponent {
     minimized = false;
-    foldable = false;
-    /** Only tools whose renderCall is fold-aware (the crtr-owned definitions) may
-     *  fold; chat-view marks them at construction. */
-    setFoldable(foldable) {
-        this.foldable = foldable;
+    expandedState = false;
+    foldController;
+    resultObserver;
+    /** A foldable definition owns its folded call component; an edit definition
+     *  may also observe results before the imported shell renders them. */
+    setToolView(foldController, resultObserver) {
+        this.foldController = foldController;
+        this.resultObserver = resultObserver;
     }
-    /** Flip the fold: expose it on the definitions' shared render-state bag, then
-     *  re-run `updateDisplay()` (the same path pi's own `setExpanded` uses) so the
-     *  fold-aware renderCall rebuilds the call component in its new form. NOT
-     *  `invalidate()` — pi's `ToolExecutionComponent.invalidate` recurses through
-     *  its renderer children and killed the viewer process. */
+    updateResult(...args) {
+        this.resultObserver?.(args[0], args[1] ?? false);
+        super.updateResult(...args);
+    }
+    setExpanded(expanded) {
+        this.expandedState = expanded;
+        super.setExpanded(expanded);
+    }
+    /** Flip the local fold state, then use the imported component's public
+     *  expansion setter to rebuild its call renderer at the current setting. */
     setMinimized(minimized) {
-        if (!this.foldable || this.minimized === minimized)
+        if (!this.foldController || this.minimized === minimized)
             return;
         this.minimized = minimized;
-        const internals = this;
-        internals.rendererState[FOLDED_STATE_KEY] = minimized;
-        internals.updateDisplay();
+        this.foldController.setFolded(minimized);
+        super.setExpanded(this.expandedState);
     }
     render(width) {
         if (!this.minimized)
             return super.render(width);
-        const call = this
-            .callRendererComponent;
+        const call = this.foldController?.callComponent();
         if (!call)
             return super.render(width);
         // trimEnd drops right-hand padding, which only existed to carry the
@@ -254,8 +253,8 @@ export class ChatView {
     /** Activity/status area below history. Holds working/compaction/retry loaders. */
     statusContainer = new Container();
     /** Where `append()` puts a component. Normally `historyContainer`; retargeted to
-     *  a scratch container while a frozen block is being built, so the very same
-     *  message-rendering path serves both. */
+     *  a nested container while condensed history is being built, so the same
+     *  message-rendering path serves both regions. */
     appendTarget = this.historyContainer;
     /** Trailing cycles kept at full fidelity (config `live_cycles`). */
     liveCycles;
@@ -369,18 +368,18 @@ export class ChatView {
         const renderedPendingTools = new Map();
         const messages = snapshot.messages;
         const lastIndex = messages.length - 1;
-        // Cycles older than the trailing `live_cycles` are condensed to prose and
-        // frozen into one flat line block BEFORE the live region is built, so the loop
-        // below only ever constructs components for the cycles you are actually
-        // working in. `liveStart` is 0 — condense nothing — until the node has yielded
-        // past the configured window, so a fresh node renders exactly as it always did.
+        // Cycles older than the trailing `live_cycles` are condensed into one nested
+        // container before the live region is built. It retains only configured prose
+        // and cycle seams, avoiding old tool components while still reflowing on pane
+        // resize. `liveStart` is 0 until the node has yielded past the configured
+        // window, so a fresh node renders at full fidelity.
         const liveStart = liveRegionStart(messages, this.liveCycles);
         if (liveStart > 0) {
-            const frozen = await this.buildFrozenBlock(messages.slice(0, liveStart), generation);
+            const condensed = await this.buildCondensedBlock(messages.slice(0, liveStart), generation);
             if (generation !== this.snapshotGeneration)
                 return;
-            if (frozen)
-                this.append(frozen);
+            if (condensed)
+                this.append(condensed);
         }
         for (let i = liveStart; i < messages.length; i++) {
             // Yield to the event loop every SNAPSHOT_YIELD_EVERY messages so queued
@@ -480,20 +479,20 @@ export class ChatView {
         this.replayDeferredFrames();
     }
     /**
-     * Render the condensed form of the already-finished cycles ONCE and hand back a
-     * frozen line block (or undefined when nothing survived condensation).
+     * Build the condensed form of the already-finished cycles as a nested component
+     * container, or return undefined when nothing survives condensation.
      *
-     * Reuses `addMessageToChat` verbatim by retargeting `append()` at a scratch
-     * container, so condensed history is styled exactly like live history — the same
-     * renderer, with the tool traffic filtered out and the result flattened to text.
-     * Yields on the same cadence as the live build so a very long history still lets
-     * queued keystrokes through, and abandons itself when a newer welcome supersedes
-     * this generation.
+     * Reuses `addMessageToChat` by retargeting `append()` at the nested container, so
+     * condensed history uses the same renderer as live history with tool traffic
+     * filtered out. The outer history cache keeps stable-width frames cheap, while
+     * preserving the components lets pane-width changes reflow their content. The
+     * build yields on the live cadence and abandons itself when a newer welcome
+     * supersedes this generation.
      */
-    async buildFrozenBlock(messages, generation) {
-        const scratch = new Container();
+    async buildCondensedBlock(messages, generation) {
+        const condensed = new Container();
         const previousTarget = this.appendTarget;
-        this.appendTarget = scratch;
+        this.appendTarget = condensed;
         try {
             let built = 0;
             for (const message of messages) {
@@ -515,10 +514,7 @@ export class ChatView {
         finally {
             this.appendTarget = previousTarget;
         }
-        const width = this.renderWidth();
-        const lines = scratch.render(width);
-        scratch.clear();
-        return lines.length > 0 ? new FrozenHistoryComponent(lines, width) : undefined;
+        return condensed.children.length > 0 ? condensed : undefined;
     }
     /** Defer a live broker frame when a snapshot build is in flight. Returns true
      *  (and enqueues the replay closure) while building so the caller returns
@@ -561,8 +557,8 @@ export class ChatView {
     // -------------------------------------------------------------------------
     /** Ctrl+O / app.tools.expand — flip global tool-output expansion and apply it to
      *  every rendered component that supports it. Returns the new expanded state so
-     *  the caller can surface a notice. Condensed cycles hold no tool components and
-     *  are frozen as text, so they are unaffected by design. */
+     *  the caller can surface a notice. Condensed cycles hold no tool components, so
+     *  they are unaffected by design. */
     toggleToolsExpanded() {
         this.toolOutputExpanded = !this.toolOutputExpanded;
         this.applyToolDisplay();
@@ -724,7 +720,7 @@ export class ChatView {
                         this.pendingTools.clear();
                     }
                     else {
-                        // Args complete → trigger diff computation for edit tools.
+                        // Finalize renderer caches now that every tool argument is complete.
                         for (const component of this.pendingTools.values()) {
                             component.setArgsComplete();
                             this.historyContainer.markDirty(component);
@@ -867,6 +863,20 @@ export class ChatView {
     // Rebuild path (ports addMessageToChat, interactive-mode.js:2483).
     // -------------------------------------------------------------------------
     addMessageToChat(message) {
+        // Crouter-generated context retains its runtime role (user vs custom) so
+        // delivery to the model is unchanged, but every attached view presents it
+        // through one compact disclosure contract. The shared classifier uses the
+        // producers' exact custom types/sentinels, so ordinary user prompts cannot
+        // accidentally acquire this treatment and saved transcripts gain it too.
+        const generated = generatedContextPresentation(message);
+        if (generated !== null &&
+            (message.role !== 'custom' || message.display === true)) {
+            this.pushTranscriptText(generated.body);
+            if (message.role === 'user' && this.chatChildCount() > 0)
+                this.append(new Spacer(1));
+            this.append(new ContextMessageComponent(generated.body, this.toolOutputExpanded, this.dimStyle, (s) => this.spinnerStyle(this.labelStyle(s)), generated.label, ` ${generated.summary} — ctrl+o to expand`));
+            return;
+        }
         switch (message.role) {
             case 'bashExecution': {
                 this.pushTranscriptText(message.output ?? '');
@@ -885,25 +895,6 @@ export class ChatView {
             case 'custom': {
                 if (message.display) {
                     this.pushTranscriptText(this.userMessageText(message));
-                    // The <crtr-context> bearings block folds to a one-liner under Ctrl+O
-                    // (the broker runs its renderer extension, so reimplement it natively).
-                    if (message.customType === CONTEXT_INTRO_CUSTOM_TYPE) {
-                        this.append(new ContextMessageComponent(this.userMessageText(message), this.toolOutputExpanded, this.dimStyle, 
-                        // Bold + active accent, so the [crtr context] label reads as a
-                        // distinct color against the dim rest of the line.
-                        (s) => this.spinnerStyle(this.labelStyle(s))));
-                        break;
-                    }
-                    // The hidden ambient `<situational-context>` update (canvas-inbox-watcher's
-                    // ~non-birth wake path). Rendered collapsed exactly like `crtr-context`
-                    // (same component, distinct label) so an existing-node ambient update is
-                    // never more prominent in the transcript than the bearings block it rides
-                    // alongside on fresh birth — the LLM sees the full content either way; only
-                    // the viewer's display treatment differs.
-                    if (message.customType === SITUATIONAL_CONTEXT_CUSTOM_TYPE) {
-                        this.append(new ContextMessageComponent(this.userMessageText(message), this.toolOutputExpanded, this.dimStyle, (s) => this.spinnerStyle(this.labelStyle(s)), 'situational context', ' ambient context update — ctrl+o to expand'));
-                        break;
-                    }
                     if (message.customType === CRTR_OUTPUT_CUSTOM_TYPE) {
                         this.append(new CrtrOutputMessageComponent(this.userMessageText(message), this.toolOutputExpanded, this.crtrOutputTheme()));
                         break;
@@ -1020,23 +1011,31 @@ export class ChatView {
     }
     /** Tool component with native viewer renderers for crouter-owned tool output. */
     makeToolComponent(name, id, args) {
-        const toolDefinition = name === 'bash'
-            ? (createCrtrBashToolDefinition(args) ?? createCrtrPlainBashToolDefinition(this.cwd))
-            : name === 'edit'
-                ? createCrtrEditToolDefinition(this.cwd)
-                : name === 'read'
-                    ? createCrtrReadToolDefinition(this.cwd)
-                    : name === 'write'
-                        ? createCrtrWriteToolDefinition(this.cwd)
-                        : undefined;
+        const fold = new FoldedToolCallController();
+        let resultObserver;
+        let toolDefinition;
+        if (name === 'bash') {
+            toolDefinition = createCrtrBashToolDefinition(args, fold) ?? createCrtrPlainBashToolDefinition(this.cwd, fold);
+        }
+        else if (name === 'edit') {
+            const edit = createCrtrEditToolDefinition(this.cwd, fold);
+            toolDefinition = edit.definition;
+            resultObserver = edit.observeResult;
+        }
+        else if (name === 'read') {
+            toolDefinition = createCrtrReadToolDefinition(this.cwd, fold);
+        }
+        else if (name === 'write') {
+            toolDefinition = createCrtrWriteToolDefinition(this.cwd, fold);
+        }
         let component;
         component = new MinimizableToolComponent(name, id, args, { showImages: this.showImages, imageWidthCells: this.imageWidthCells }, toolDefinition, this.componentTui(() => component), this.cwd);
-        component.setFoldable(toolDefinition !== undefined);
+        component.setToolView(toolDefinition === undefined ? undefined : fold, resultObserver);
         component.setExpanded(this.toolOutputExpanded);
         return component;
     }
     /** Append conversation content above the independent live status area — or into
-     *  the scratch container while a frozen block is under construction. */
+     *  the nested container while condensed history is under construction. */
     append(child) {
         this.appendTarget.addChild(child);
     }
@@ -1047,7 +1046,7 @@ export class ChatView {
         return Math.max(40, process.stdout.columns ?? 80);
     }
     /** Number of rendered conversation components in the container currently being
-     *  appended to (history, or the frozen block's scratch container). */
+     *  appended to (live history or the nested condensed region). */
     chatChildCount() {
         return this.appendTarget.children.length;
     }

package/dist/clients/attach/render/{frozen-history.d.ts → condensed-history.d.ts}

@@ -1,4 +1,3 @@
-import { type Component } from '@earendil-works/pi-tui';
 import type { CondensedHistoryMode } from '../../../types.js';
 /** A message from the broker snapshot, structurally. */
 type Message = {
@@ -6,7 +5,7 @@ type Message = {
     customType?: string;
 };
 export declare function isCycleDivider(message: Message): boolean;
-/** Does this message survive condensation into the frozen block? */
+/** Does this message survive into the condensed region? */
 export declare function keepWhenCondensed(message: Message, mode: CondensedHistoryMode): boolean;
 /**
  * Index into `messages` at which the LIVE (fully rendered) region begins.
@@ -19,20 +18,4 @@ export declare function keepWhenCondensed(message: Message, mode: CondensedHisto
  * single-yield node renders exactly as it always did.
  */
 export declare function liveRegionStart(messages: readonly Message[], liveCycles: number): number;
-/**
- * A settled block of pre-rendered transcript lines. Renders in O(1) at the width
- * it was frozen at, and clips (never reflows) when the pane is narrower. Ctrl+O /
- * Ctrl+T do not reach it: it holds no components to expand, only text.
- */
-export declare class FrozenHistoryComponent implements Component {
-    private readonly lines;
-    private readonly frozenWidth;
-    /** Last clip result, so a stable narrow pane clips once rather than per frame. */
-    private clipped;
-    constructor(lines: readonly string[], frozenWidth: number);
-    get lineCount(): number;
-    /** Nothing to recompute — the block is text, already laid out. */
-    invalidate(): void;
-    render(width: number): string[];
-}
 export {};