@north-light/crouter 0.3.170 → 0.3.172

package/dist/cli.js

@@ -4,7 +4,7 @@ import { openSync } from 'node:fs';
 import { enableCompileCache } from 'node:module';
 import { fileURLToPath } from 'node:url';
 import { runCli } from './core/command.js';
-import { resolveRoot, hydrateAbsentStoresAndRebuild } from './build-root.js';
+import { resolveRoot } from './build-root.js';
 import { maybeBootRoot } from './core/runtime/front-door.js';
 import { maybeAutoUpdate } from './core/auto-update.js';
 import { ensureOfficialMarketplace, ensureProjectScope } from './core/bootstrap.js';
@@ -57,12 +57,8 @@ async function main() {
     ensureOfficialMarketplace(process.argv);
     ensureProjectScope(process.argv);
     maybeAutoUpdate(process.argv);
-    // Pass the one-shot unknown-first-token retry seam: on a first-token miss with
-    // absent HTTP-plugin stores, hydrate them once, rebuild, and re-walk.
-    // A recognized core first token resolves in `resolveRoot`'s fast path and never
-    // reaches a first-token miss, so the seam stays off the core fast path.
     mark('cli.dispatch_start');
-    await runCli(root, process.argv, { onUnknownFirstTokenMiss: hydrateAbsentStoresAndRebuild });
+    await runCli(root, process.argv);
     mark('cli.dispatch_done');
 }
 main().catch((err) => {

package/dist/clients/attach/__tests__/attach-chrome-remote.test.js

@@ -31,7 +31,6 @@ import { recordFault } from '../../../core/runtime/fault.js';
 import { BG_ATTACHED } from '../../../core/canvas/nav-model.js';
 import { resolveKeybindings } from '../../../core/keybindings/index.js';
 import { dispatchSlashCommand, slashCommandList } from '../slash/dispatch.js';
-import { resolveInitialMode, requestModeSwitch } from '../session/mode.js';
 import { tagAttachPane, untagAttachPane } from '../session/pane-tag.js';
 import { createMemoryRefRefreshCoordinator } from '../session/editor-inventory.js';
 import { InputController } from '../input/controller.js';
@@ -94,6 +93,8 @@ const IDENTITY_PALETTE = {
     bold: (s) => s,
     error: (s) => s,
     warning: (s) => s,
+    diffAdded: (s) => s,
+    diffRemoved: (s) => s,
     bashMode: (s) => s,
     bashModeAlt: (s) => s,
     surface: (s) => s,
@@ -244,7 +245,7 @@ test('GraphOverlay suppresses every local-read adornment for a RemoteCanvasSourc
 });
 // ---------------------------------------------------------------------------
 // Phase 3 review 2 — the ENCLOSING attach viewer (slash commands, pane tag,
-// detach-reap, Alt+Shift+P mode-switch), not just the GraphOverlay/panel rendering
+// detach-reap), not just the GraphOverlay/panel rendering
 // the fix above already covers. Same adversarial shape: seed colliding LOCAL
 // state for the remote node id `a`, then assert the remote path never touches
 // it — and, symmetrically, that the LOCAL path is byte-for-byte unchanged
@@ -269,17 +270,14 @@ function fakeSlashContext(remote, nodeId) {
     };
     return { ctx, notices, sent };
 }
-test('slash autocomplete structurally omits the local-only native canvas commands (/promote, /resume-node, /context) in remote mode, and keeps them in local mode', () => {
+test('slash autocomplete structurally omits local-only native canvas commands in remote mode and keeps them in local mode', () => {
     const remoteNames = slashCommandList(undefined, true).map((c) => c.name);
     assert.ok(!remoteNames.includes('promote'), `remote autocomplete must not offer /promote: ${remoteNames.join(',')}`);
     assert.ok(!remoteNames.includes('resume-node'), `remote autocomplete must not offer /resume-node: ${remoteNames.join(',')}`);
     assert.ok(!remoteNames.includes('context'), `remote autocomplete must not offer /context: ${remoteNames.join(',')}`);
-    // Remote-safe canvas commands stay offered.
-    assert.ok(remoteNames.includes('graph'), 'remote autocomplete must still offer /graph (already remote-safe)');
-    assert.ok(remoteNames.includes('view'), 'remote autocomplete must still offer /view (self-contained popup)');
-    // Local (remote=false, the default) is unchanged — all five canvas commands.
+    assert.ok(remoteNames.includes('graph'), 'remote autocomplete must still offer /graph');
     const localNames = slashCommandList().map((c) => c.name);
-    for (const name of ['graph', 'promote', 'resume-node', 'view', 'context']) {
+    for (const name of ['graph', 'promote', 'resume-node', 'context']) {
         assert.ok(localNames.includes(name), `local autocomplete must still offer /${name}: ${localNames.join(',')}`);
     }
 });
@@ -293,9 +291,7 @@ test('dispatchSlashCommand no-ops /promote, /resume-node, /context in remote mod
         assert.match(notices[0], /not available for a remote attach/, `${cmd} must notify the remote-unsafe message, not proceed into its local handler: ${notices[0]}`);
     }
     assert.equal(sent.length, 0, 'no command frame must ever be sent for a gated remote canvas command');
-    // /graph and /view are UNaffected by the remote gate (graph is already
-    // remote-safe via GraphOverlay's own `remote` handling; view is self-
-    // contained). Neither reaches the remote-unsafe notice.
+    // /graph is remote-safe via GraphOverlay's own `remote` handling.
     notices.length = 0;
     ctx.onGraph = () => notices.push('graph-toggled');
     dispatchSlashCommand('/graph', ctx);
@@ -332,30 +328,6 @@ test('dispatchSlashCommand leaves the LOCAL (non-remote) path for /promote, /res
             delete process.env['TMUX_PANE'];
     }
 });
-test('resolveInitialMode/requestModeSwitch never touch the local mode-switch read/write for a remote attach, and are unchanged for local', () => {
-    let reads = 0;
-    const readMode = (_cwd, _nodeId) => {
-        reads++;
-        return 'plan'; // poisoned value — must never surface for remote
-    };
-    assert.equal(resolveInitialMode('/tmp/cwd', 'a', true, readMode), 'normal', 'remote must always start normal');
-    assert.equal(reads, 0, 'remote must never read the local mode-switch current file');
-    assert.equal(resolveInitialMode('/tmp/cwd', 'a', false, readMode), 'plan', 'local must read through unchanged');
-    assert.equal(reads, 1, 'local must call the injected local reader exactly once');
-    let writes = 0;
-    let lastWrite;
-    const writeRequest = (cwd, nodeId, mode) => {
-        writes++;
-        lastWrite = { cwd, nodeId, mode };
-    };
-    const remoteOk = requestModeSwitch('/tmp/cwd', 'a', true, 'spec', writeRequest);
-    assert.equal(remoteOk, false, 'remote Alt+Shift+P must no-op (return false)');
-    assert.equal(writes, 0, 'remote must never write the local mode-switch request file');
-    const localOk = requestModeSwitch('/tmp/cwd', 'a', false, 'spec', writeRequest);
-    assert.equal(localOk, true, 'local Alt+Shift+P must still write through');
-    assert.equal(writes, 1, 'local must call the injected local writer exactly once');
-    assert.deepEqual(lastWrite, { cwd: '/tmp/cwd', nodeId: 'a', mode: 'spec' });
-});
 test('tagAttachPane/untagAttachPane never tag/untag the pane for a remote attach, and are unchanged for local', () => {
     let calls = [];
     const setOpt = (pane, name, value) => {

package/dist/clients/attach/__tests__/attach-keybindings.test.js

@@ -13,6 +13,8 @@ const PALETTE = {
     bold: (s) => s,
     error: (s) => s,
     warning: (s) => s,
+    diffAdded: (s) => s,
+    diffRemoved: (s) => s,
     bashMode: (s) => s,
     bashModeAlt: (s) => s,
     surface: (s) => s,
@@ -28,41 +30,49 @@ test('attach direct and private control input dispatch through the same action m
         'crtr.attach.detach': ['ctrl+x'],
         'crtr.attach.clear-or-detach': [],
         'crtr.attach.graph.toggle': [],
-        'crtr.mode.cycle': ['alt+x'],
+        'crtr.attach.help.toggle': ['alt+shift+k'],
+        'crtr.attach.inbox.toggle': [],
         'crtr.attach.model-ladder.next': ['alt+z'],
         'crtr.attach.model-ladder.previous': ['alt+y'],
         'crtr.attach.command.inspect': ['alt+shift+h'],
         'crtr.attach.file-review': [],
         'crtr.attach.profile-files': [],
+        'crtr.attach.whip': [],
     });
     const calls = [];
     const actions = {
         'crtr.attach.detach': () => calls.push('detach'),
         'crtr.attach.clear-or-detach': () => calls.push('clear'),
         'crtr.attach.graph.toggle': () => calls.push('graph'),
-        'crtr.mode.cycle': () => calls.push('mode'),
+        'crtr.attach.help.toggle': () => calls.push('help'),
+        'crtr.attach.inbox.toggle': () => calls.push('inbox'),
         'crtr.attach.model-ladder.next': () => calls.push('ladder'),
         'crtr.attach.model-ladder.previous': () => calls.push('ladder-back'),
         'crtr.attach.command.inspect': () => calls.push('inspect'),
         'crtr.attach.file-review': () => calls.push('review'),
         'crtr.attach.profile-files': () => calls.push('profile-files'),
+        'crtr.attach.whip': () => calls.push('whip'),
     };
     assert.equal(dispatchAttachBinding(bindings, '\x18', actions), true);
     assert.equal(dispatchAttachBinding(bindings, '\x04', actions), false, 'old detach must not reach the listener action');
     assert.equal(dispatchAttachBinding(bindings, '\x1bg', actions), false, 'disabled graph must not reach the listener action');
-    assert.equal(dispatchAttachBinding(bindings, '\x1bx', actions), true);
-    assert.equal(dispatchAttachBinding(bindings, '\x1bP', actions), false, 'old mode key must not reach the listener action');
+    assert.equal(dispatchAttachBinding(bindings, '\x1bx', actions), false, 'removed mode key must stay ordinary input');
+    assert.equal(dispatchAttachBinding(bindings, '\x1bP', actions), false, 'removed mode key must stay ordinary input');
     assert.equal(dispatchAttachBinding(bindings, '\x1bz', actions), true);
     assert.equal(dispatchAttachBinding(bindings, '\x1bm', actions), false, 'old ladder key must not reach the listener action');
     assert.equal(dispatchAttachBinding(bindings, '\x1by', actions), true);
     assert.equal(dispatchAttachBinding(bindings, '\x1bM', actions), false, 'old ladder-back key must not reach the listener action');
     assert.equal(dispatchAttachBinding(bindings, '\x1b[72;4u', actions), true);
+    assert.equal(dispatchAttachBinding(bindings, '\x1b[75;4u', actions), true);
     assert.equal(dispatchAttachBinding(bindings, '\x06', actions), false, 'disabled direct binding must stay disabled');
     const privateInput = encodeAttachControlInput('crtr.attach.profile-files');
     const privateAction = decodeAttachControlInput(privateInput);
     assert.equal(privateAction, 'crtr.attach.profile-files');
     dispatchAttachAction(privateAction, actions);
-    assert.deepEqual(calls, ['detach', 'mode', 'ladder', 'ladder-back', 'inspect', 'profile-files']);
+    const helpPrivateInput = encodeAttachControlInput('crtr.attach.help.toggle');
+    assert.equal(decodeAttachControlInput(helpPrivateInput), 'crtr.attach.help.toggle');
+    dispatchAttachAction('crtr.attach.help.toggle', actions);
+    assert.deepEqual(calls, ['detach', 'ladder', 'ladder-back', 'inspect', 'help', 'profile-files', 'help']);
     assert.equal(decodeAttachControlInput(`${privateInput}x`), undefined, 'whole-input decoding must be exact');
     assert.equal(decodeAttachControlInput('\x1b_crtr;crtr.attach.not-real\x1b\\'), undefined, 'unknown actions must stay ordinary input');
     assert.deepEqual(extractAttachControlInput(`before${privateInput}after`), {
@@ -83,28 +93,34 @@ test('closed-inbox footer hint resolves the configured inbox shortcut(s)', () =>
     // Disabled: omit the shortcut clause and fall back to the CLI affordance,
     // never render the word "Disabled".
     const disabled = inboxOpenHint(resolveKeybindings({ 'crtr.tmux.inbox.toggle': [] }));
-    assert.equal(disabled, 'hl inbox open');
+    assert.equal(disabled, 'crtr human list');
     assert.doesNotMatch(disabled, /Disabled/);
 });
-test('attach startup and reload replace the dispatch/GRAPH snapshots and install each tmux snapshot', () => {
+test('attach startup and reload replace the dispatch/GRAPH snapshots and install each complete tmux snapshot', () => {
     const first = resolveKeybindings({ 'crtr.attach.detach': ['ctrl+x'], 'crtr.graph.focus': ['f'] });
     const second = resolveKeybindings({
         'crtr.attach.detach': ['ctrl+z'],
         'crtr.graph.focus': ['r'],
         'crtr.graph.revive': [],
     });
-    const snapshots = [first, second];
+    const settings = [
+        { bindings: first, tmuxPassthrough: ['crtr.attach.detach'] },
+        { bindings: second, tmuxPassthrough: ['crtr.attach.copy.message'] },
+    ];
     const graphSnapshots = [];
     const installed = [];
-    let active = refreshAttachBindingSnapshot(() => snapshots.shift(), (bindings) => graphSnapshots.push(bindings), () => true, (bindings) => installed.push(bindings));
-    assert.equal(matchesAttachBinding(active, 'crtr.attach.detach', '\x18'), true, 'startup snapshot drives attach dispatch');
-    assert.equal(active.gestures('crtr.graph.focus')[0], 'f', 'startup snapshot reaches GRAPH');
-    active = refreshAttachBindingSnapshot(() => snapshots.shift(), (bindings) => graphSnapshots.push(bindings), () => true, (bindings) => installed.push(bindings));
-    assert.equal(matchesAttachBinding(active, 'crtr.attach.detach', '\x18'), false, 'reload replaces the old attach snapshot');
-    assert.equal(matchesAttachBinding(active, 'crtr.attach.detach', '\x1a'), true, 'reload dispatches through the new attach snapshot');
-    assert.equal(active.gestures('crtr.graph.focus')[0], 'r', 'reload replaces GRAPH bindings too');
+    let active = refreshAttachBindingSnapshot(() => settings.shift(), (bindings) => graphSnapshots.push(bindings), () => true, (bindings, tmuxPassthrough) => installed.push({ bindings, tmuxPassthrough }));
+    assert.equal(matchesAttachBinding(active.bindings, 'crtr.attach.detach', '\x18'), true, 'startup snapshot drives attach dispatch');
+    assert.equal(active.bindings.gestures('crtr.graph.focus')[0], 'f', 'startup snapshot reaches GRAPH');
+    active = refreshAttachBindingSnapshot(() => settings.shift(), (bindings) => graphSnapshots.push(bindings), () => true, (bindings, tmuxPassthrough) => installed.push({ bindings, tmuxPassthrough }));
+    assert.equal(matchesAttachBinding(active.bindings, 'crtr.attach.detach', '\x18'), false, 'reload replaces the old attach snapshot');
+    assert.equal(matchesAttachBinding(active.bindings, 'crtr.attach.detach', '\x1a'), true, 'reload dispatches through the new attach snapshot');
+    assert.equal(active.bindings.gestures('crtr.graph.focus')[0], 'r', 'reload replaces GRAPH bindings too');
     assert.deepEqual(graphSnapshots, [first, second]);
-    assert.deepEqual(installed, [first, second], 'the unified tmux installer receives startup and reload snapshots');
+    assert.deepEqual(installed, [
+        { bindings: first, tmuxPassthrough: ['crtr.attach.detach'] },
+        { bindings: second, tmuxPassthrough: ['crtr.attach.copy.message'] },
+    ], 'the unified tmux installer receives startup and reload settings snapshots');
 });
 test('GRAPH navigation and hints use effective bindings rather than default literals', () => {
     const bindings = resolveKeybindings({

package/dist/clients/attach/__tests__/context-message.test.js

@@ -1,7 +1,7 @@
 // Regression coverage for the attach viewer's display-only folding of
 // crouter-generated context. The body must stay agent-visible and expandable,
-// while bearings, situational updates, fresh-revive kickoffs, context nudges,
-// and node inbox digests share one compact renderer by default.
+// while bearings, situational updates, fresh-revive kickoffs, runtime steering,
+// recovery prompts, and node inbox digests share one compact renderer by default.
 import assert from 'node:assert/strict';
 import { readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
@@ -13,7 +13,7 @@ import { applyTheme, attachMarkdownTheme } from '../config.js';
 import { ChatView } from '../render/chat-view.js';
 import { ContextMessageComponent } from '../render/context-message.js';
 import { styleAttachMarkdownHeadings } from '../render/markdown-headings.js';
-import { CONTEXT_NUDGE_CUSTOM_TYPE, REVIVE_KICKOFF_SENTINEL, generatedContextPresentation, } from '../../../shared/generated-context.js';
+import { AUTH_FAULT_RECOVERY_BODY, CONNECTION_FAULT_RECOVERY_BODY, CONTEXT_INTRO_CUSTOM_TYPE, CONTEXT_NUDGE_CUSTOM_TYPE, PROVIDER_FAULT_RECOVERY_BODY, REVIVE_KICKOFF_SENTINEL, RUNTIME_RESTART_CONTINUATION, STALL_REPROMPT, formatModelFallbackRecovery, formatPersonaTransition, formatStructuredOutputReprompt, generatedContextExpandedBody, generatedContextPresentation, } from '../../../shared/generated-context.js';
 const HERE = dirname(fileURLToPath(import.meta.url));
 const CHAT_VIEW = readFileSync(join(HERE, '..', 'render/chat-view.ts'), 'utf8');
 const identity = (s) => s;
@@ -23,7 +23,9 @@ test('collapsed by default: body text is not rendered until expanded', () => {
     const collapsed = new ContextMessageComponent(body, false, identity, identity, 'situational context', ' hint');
     const collapsedRender = collapsed.render(80);
     const collapsedLines = collapsedRender.join('\n');
-    assert.equal(collapsedRender.length, 1, 'a collapsed row has no surrounding blank line');
+    assert.equal(collapsedRender.length, 3, 'a collapsed row has one blank line above and below');
+    assert.equal(collapsedRender[0], '');
+    assert.equal(collapsedRender.at(-1), '');
     assert.match(collapsedLines, /\[situational context\]/);
     assert.doesNotMatch(collapsedLines, /mid-checkout/, 'collapsed state must never leak the body');
     collapsed.setExpanded(true);
@@ -34,7 +36,7 @@ test('collapsed by default: body text is not rendered until expanded', () => {
     assert.deepEqual(expandedRender.slice(0, -1), normalUserRender, 'expanded generated context uses the ordinary user-message surface');
     assert.equal(expandedRender.at(-1), '', 'an expanded block leaves one blank line below its body');
 });
-test('generated rows add no leading spacer after prior transcript content', async () => {
+test('generated rows have a leading spacer after prior transcript content', async () => {
     const container = new Container();
     const tui = { requestRender() { }, terminal: { rows: 40 } };
     const view = new ChatView(tui, container, { toolOutputExpanded: false });
@@ -49,7 +51,74 @@ test('generated rows add no leading spacer after prior transcript content', asyn
     const lines = container.render(80).map((line) => line.replace(/\x1b\[[0-9;]*m/g, ''));
     const generatedIndex = lines.findIndex((line) => line.includes('[crtr revive]'));
     assert.notEqual(generatedIndex, -1);
-    assert.match(lines[generatedIndex - 1] ?? '', /before/, 'the collapsed row follows prior content directly');
+    assert.equal(lines[generatedIndex - 1], '', 'the collapsed row has one blank line above it');
+    assert.equal(lines[generatedIndex + 1], '', 'the collapsed row has one blank line below it');
+});
+test('adjacent padded transcript blocks share one blank boundary row', async () => {
+    const container = new Container();
+    const tui = { requestRender() { }, terminal: { rows: 40 } };
+    const view = new ChatView(tui, container, { toolOutputExpanded: false });
+    await view.applySnapshot({
+        messages: [
+            { role: 'assistant', content: [{ type: 'text', text: 'before' }], stopReason: 'stop' },
+            {
+                role: 'custom',
+                customType: CONTEXT_INTRO_CUSTOM_TYPE,
+                display: true,
+                content: 'bearings body',
+            },
+            { role: 'user', content: `${REVIVE_KICKOFF_SENTINEL} — full disk bearings` },
+        ],
+        stats: {},
+        state: { isStreaming: false },
+    });
+    const lines = container.render(80).map((line) => line.replace(/\x1b\[[0-9;]*m/g, ''));
+    const bearingsIndex = lines.findIndex((line) => line.includes('[crtr context]'));
+    const reviveIndex = lines.findIndex((line) => line.includes('[crtr revive]'));
+    assert.notEqual(bearingsIndex, -1);
+    assert.equal(reviveIndex, bearingsIndex + 2, 'the two padded blocks share exactly one blank row');
+    assert.equal(lines[bearingsIndex + 1], '');
+});
+test('Ctrl+O expands context, revive, and inbox details without unfolding continuations', async () => {
+    const container = new Container();
+    const tui = { requestRender() { }, terminal: { rows: 40 } };
+    const view = new ChatView(tui, container, { toolOutputExpanded: false });
+    const internals = view;
+    internals.summarizeToolCalls = true;
+    internals.foldSettledTools = true;
+    internals.showGroupSummaries = true;
+    await view.applySnapshot({
+        messages: [
+            {
+                role: 'custom',
+                customType: CONTEXT_INTRO_CUSTOM_TYPE,
+                display: true,
+                content: '<auto-loaded-context>\nloaded INDEX.md content\n</auto-loaded-context>',
+            },
+            { role: 'user', content: `${REVIVE_KICKOFF_SENTINEL}\n<yield-message>resume from this note</yield-message>` },
+            { role: 'user', content: RUNTIME_RESTART_CONTINUATION },
+            {
+                role: 'custom',
+                customType: CONTEXT_NUDGE_CUSTOM_TYPE,
+                display: true,
+                content: '[crtr] Context ~150k. private context reminder',
+            },
+            { role: 'user', content: 'From child-node-123 — 1 update:\n  [update] private inbox detail' },
+        ],
+        stats: {},
+        state: { isStreaming: false },
+    });
+    assert.doesNotMatch(container.render(80).join('\n'), /loaded INDEX\.md content|resume from this note|runtime-restart-continuation|private context reminder|private inbox detail/);
+    assert.deepEqual(view.toggleToolsExpanded(), { kind: 'summaries', shown: false });
+    assert.equal(internals.toolOutputExpanded, true);
+    const expanded = container.render(80).join('\n');
+    assert.match(expanded, /loaded INDEX\.md content/);
+    assert.match(expanded, /resume from this note/);
+    assert.doesNotMatch(expanded, /runtime-restart-continuation|private context reminder/);
+    assert.match(expanded, /private inbox detail/, 'an expanded inbox card shows the actual delivered update');
+    assert.deepEqual(view.toggleToolsExpanded(), { kind: 'summaries', shown: true });
+    assert.equal(internals.toolOutputExpanded, false);
+    assert.doesNotMatch(container.render(80).join('\n'), /loaded INDEX\.md content|resume from this note|runtime-restart-continuation|private context reminder|private inbox detail/);
 });
 test('the crtr-context label/hint keep their defaults when callers omit the new params', () => {
     const bearings = new ContextMessageComponent('some bearings body', false, identity, identity);
@@ -57,6 +126,45 @@ test('the crtr-context label/hint keep their defaults when callers omit the new
     assert.match(line, /\[crtr context\]/);
     assert.match(line, /orienting bearings/);
 });
+test('expanded crtr context and revive cards disclose memory and the yield note only', () => {
+    const contextBody = [
+        '<crtr-bearings>',
+        'node and project details that stay folded',
+        '</crtr-bearings>',
+        '<memory kind="knowledge">',
+        'memory catalog that stays folded',
+        '</memory>',
+        '<auto-loaded-context>',
+        '<memory kind="knowledge" name="project">',
+        'loaded INDEX.md content',
+        '</memory>',
+        '</auto-loaded-context>',
+        '<project_context>',
+        'environment details that stay folded',
+        '</project_context>',
+    ].join('\n');
+    const context = generatedContextPresentation({
+        role: 'custom',
+        customType: CONTEXT_INTRO_CUSTOM_TYPE,
+        content: contextBody,
+    });
+    assert.equal(generatedContextExpandedBody(context), '<memory kind="knowledge" name="project">\nloaded INDEX.md content\n</memory>');
+    const reviveBody = [
+        `${REVIVE_KICKOFF_SENTINEL} — full disk bearings`,
+        '<roadmap>roadmap details that stay folded</roadmap>',
+        '<yield-message>',
+        'Resume the migration from the recorded checkpoint.',
+        '</yield-message>',
+        '<context-dir>context listing that stays folded</context-dir>',
+    ].join('\n');
+    const revive = generatedContextPresentation({ role: 'user', content: reviveBody });
+    assert.equal(generatedContextExpandedBody(revive), 'Resume the migration from the recorded checkpoint.');
+    const noYield = generatedContextPresentation({
+        role: 'user',
+        content: `${REVIVE_KICKOFF_SENTINEL}\n<yield-message/>`,
+    });
+    assert.equal(generatedContextExpandedBody(noYield), '');
+});
 test('fresh-revive kickoff and both context-nudge roles classify as generated context', () => {
     const revive = generatedContextPresentation({
         role: 'user',
@@ -80,7 +188,35 @@ test('fresh-revive kickoff and both context-nudge roles classify as generated co
     assert.equal(inbox?.label, 'crtr inbox');
     assert.equal(inbox?.summary, '2 updates from child-node-123');
 });
+test('runtime steering and recovery prompts classify without hiding their full bodies', () => {
+    const personaBody = formatPersonaTransition('You are now an orchestrator.');
+    const persona = generatedContextPresentation({ role: 'user', content: personaBody });
+    assert.equal(persona?.kind, 'persona-transition');
+    assert.equal(persona?.body, personaBody);
+    const structuredBody = formatStructuredOutputReprompt(JSON.stringify({ type: 'object' }, null, 2));
+    assert.equal(generatedContextPresentation({ role: 'user', content: STALL_REPROMPT })?.summary, 'completion required');
+    assert.equal(generatedContextPresentation({ role: 'user', content: structuredBody })?.summary, 'structured output required');
+    const recoveries = [
+        [AUTH_FAULT_RECOVERY_BODY, 'provider credentials updated'],
+        [CONNECTION_FAULT_RECOVERY_BODY, 'network connection restored'],
+        [PROVIDER_FAULT_RECOVERY_BODY, 'provider retry'],
+        [formatModelFallbackRecovery('old/model', 'new/model:high', 'credential'), 'model route changed'],
+        [formatModelFallbackRecovery('custom(provider)/model', 'new/model:high', 'not-found'), 'model route changed'],
+        [RUNTIME_RESTART_CONTINUATION, 'continuing from where it left off'],
+    ];
+    for (const [body, summary] of recoveries) {
+        const presentation = generatedContextPresentation({ role: 'user', content: body });
+        assert.equal(presentation?.kind, 'recovery');
+        assert.equal(presentation?.label, 'crouter continuation');
+        assert.equal(presentation?.summary, summary);
+        assert.equal(presentation?.body, body);
+    }
+    assert.equal(generatedContextPresentation({ role: 'user', content: 'continue' }), null, 'a human one-word continue is not mistaken for runtime recovery');
+    const unmarkedModelRecovery = formatModelFallbackRecovery('custom(provider)/model', 'new/model:high', 'not-found').split('\n').slice(1, -1).join('\n');
+    assert.equal(generatedContextPresentation({ role: 'user', content: unmarkedModelRecovery }), null, 'a human message matching the recovery prose lacks the producer marker');
+});
 test('render/chat-view.ts routes the shared generated-context classification through the foldable component', () => {
     assert.match(CHAT_VIEW, /generatedContextPresentation\(message\)/);
+    assert.match(CHAT_VIEW, /generatedContextExpandedBody\(generated\)/);
     assert.match(CHAT_VIEW, /new ContextMessageComponent\(/);
 });

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

@@ -28,7 +28,7 @@ test('detects crtr in bash command position, not heredoc body prose', () => {
     assert.equal(isCrtrBashCommand('crtr node new -h'), true);
     assert.equal(isCrtrBashCommand('crtr node inspect snapshot --node abc'), true);
     assert.equal(isCrtrBashCommand('crtr sys daemon status'), true);
-    assert.equal(isCrtrBashCommand('npm test && /usr/local/bin/crouter surface view run inbox'), true);
+    assert.equal(isCrtrBashCommand('npm test && /usr/local/bin/crouter surface web serve'), true);
     assert.equal(isCrtrBashCommand("cat <<'EOF'\nask about crtr node new\nEOF\necho done"), false);
     assert.equal(isCrtrBashCommand('echo crtr node new'), false);
 });
@@ -51,6 +51,13 @@ test('styles crtr structural output and status glyphs', () => {
     assert.match(rendered, /<success>● active/);
     assert.match(rendered, /<error>Command exited/);
 });
+test('crtr results do not invalidate their owning tool component', () => {
+    let ownerInvalidations = 0;
+    const def = createCrtrBashToolDefinition({ command: 'crtr canvas dashboard' });
+    const component = def.renderResult({ content: [{ type: 'text', text: 'dashboard' }] }, { expanded: false }, theme, { invalidate: () => { ownerInvalidations++; } });
+    component.invalidate?.();
+    assert.equal(ownerInvalidations, 0);
+});
 // Help output is structural schema text, never a command result, so the
 // viewer detects it from the invocation itself and gives it help-specific
 // collapsed chrome rather than treating it as a normal result preview.
@@ -442,7 +449,7 @@ test('renderCall uses a mapped Nerd Font glyph and one line for every mapped roo
         { command: 'crtr pkg plugin list', iconTokens: ['pkg', 'plugin', 'list'], path: 'pkg plugin list' },
         { command: 'crtr push update', iconTokens: ['push', 'update'], path: 'push update' },
         { command: 'crtr search web', iconTokens: ['search', 'web'], path: 'search web' },
-        { command: 'crtr surface view list', iconTokens: ['surface', 'view', 'list'], path: 'surface view list' },
+        { command: 'crtr surface attach to demo', iconTokens: ['surface', 'attach', 'to'], path: 'surface attach to demo' },
         { command: 'crtr sys doctor', iconTokens: ['sys', 'doctor'], path: 'sys doctor' },
     ];
     for (const { command, iconTokens, path } of cases) {
@@ -506,7 +513,7 @@ const WIDE_GENERIC_TABLE_OUTPUT = [
     ...Array.from({ length: 24 }, (_, i) => `| plugin-${String(i).padStart(2, '0')} | 1.0.${i} | This is a deliberately over-wide description cell that used to wrap the collapsed card mid-cell for row ${i} | ${i % 2 === 0 ? 'enabled' : 'disabled'} |`),
 ].join('\n');
 test('generic collapsed fallback renders wide GFM tables aligned, clipped, and row-capped instead of raw pipe rows', () => {
-    const def = createCrtrBashToolDefinition({ command: 'crtr surface view run catalog' });
+    const def = createCrtrBashToolDefinition({ command: 'crtr surface web serve' });
     const rendered = def
         .renderResult({ content: [{ type: 'text', text: WIDE_GENERIC_TABLE_OUTPUT }] }, { expanded: false }, plainTheme, {})
         .render(58)
@@ -531,7 +538,7 @@ const HEADERLESS_TABLE_TAIL_OUTPUT = [
     '| mr2ejzaw-6f70e858 | preview-roadmap | /Users/silasrhyneer/Code/cli/crouter | done |',
 ].join('\n');
 test('generic collapsed fallback aligns a header-less truncated table tail by column count', () => {
-    const def = createCrtrBashToolDefinition({ command: 'crtr surface view run catalog' });
+    const def = createCrtrBashToolDefinition({ command: 'crtr surface web serve' });
     const rendered = def
         .renderResult({ content: [{ type: 'text', text: HEADERLESS_TABLE_TAIL_OUTPUT }] }, { expanded: false }, plainTheme, {})
         .render(64)
@@ -544,7 +551,7 @@ test('generic collapsed fallback aligns a header-less truncated table tail by co
     assert.equal(rows[1].indexOf('/Users'), rows[2].indexOf('/Users'));
 });
 test('generic collapsed fallback renders the pi truncation marker as one muted line', () => {
-    const def = createCrtrBashToolDefinition({ command: 'crtr surface view run catalog' });
+    const def = createCrtrBashToolDefinition({ command: 'crtr surface web serve' });
     const marker = '[Showing lines 951-1000 of 1000 (50.0KB limit). Full output: /tmp/pi-bash-output.log]';
     const rendered = def
         .renderResult({ content: [{ type: 'text', text: `last retained line\n${marker}` }] }, { expanded: false }, theme, {})
@@ -560,7 +567,7 @@ const NO_EDGE_PIPE_TABLE_OUTPUT = [
     'beta | 2.1.0 | disabled',
 ].join('\n');
 test('generic collapsed fallback aligns a GFM table whose rows omit both outer pipes', () => {
-    const def = createCrtrBashToolDefinition({ command: 'crtr surface view run catalog' });
+    const def = createCrtrBashToolDefinition({ command: 'crtr surface web serve' });
     const rendered = def
         .renderResult({ content: [{ type: 'text', text: NO_EDGE_PIPE_TABLE_OUTPUT }] }, { expanded: false }, plainTheme, {})
         .render(60)
@@ -575,7 +582,7 @@ test('generic collapsed fallback aligns a GFM table whose rows omit both outer p
     assert.equal(alphaRow.indexOf('1.0.0'), betaRow.indexOf('2.1.0'));
 });
 test('a stray line containing a single literal pipe is not mistaken for a table row', () => {
-    const def = createCrtrBashToolDefinition({ command: 'crtr surface view run catalog' });
+    const def = createCrtrBashToolDefinition({ command: 'crtr surface web serve' });
     const rendered = def
         .renderResult({ content: [{ type: 'text', text: 'warning: use x | y instead' }] }, { expanded: false }, plainTheme, {})
         .render(60)
@@ -1213,7 +1220,7 @@ test('crtr push urgent/final cards collapse to a one-line outcome + report basen
 // always just durable queue state, so the card collapses to one posted line.
 // The summarizer keys on the stable `Queued for the human` prefix; the inbox-
 // affordance tail resolves per call, so this fixture pins one resolved form.
-const QUEUED_FOLLOW_UP = 'Queued for the human. Their answer is pushed to your inbox and wakes you when they respond — never poll, verify it opened, or block. To see the queue, press ⌥I (or run `hl inbox open` at a terminal).';
+const QUEUED_FOLLOW_UP = 'Queued for the human. Their answer is pushed to your inbox and wakes you when they respond — never poll, verify it opened, or block. To see the queue, press ⌥I in a node viewer (or run `crtr human list` for the queue).';
 const HUMAN_ASK_QUEUED_OUTPUT = [
     '- job_id: mrASK0001',
     '',
@@ -1237,29 +1244,32 @@ test('a crtr human ask card collapses to a posted status + question teaser, not
     assert.match(expanded, /job_id: mrASK0001/);
     assert.match(expanded, /wakes you when they respond/);
 });
-const HUMAN_REVIEW_QUEUED_OUTPUT = [
+const HUMAN_REVIEW_NEW_OUTPUT = [
     '- job_id: mrREV0001',
     '',
     '**dir:** /Users/silas/Code/cli/crouter',
     '',
-    '**output:** /Users/silas/Code/cli/crouter/spec.review.md',
+    '**output:** /Users/silas/Code/cli/crouter/feedback.json',
     '',
-    `**follow_up:** ${QUEUED_FOLLOW_UP}`,
+    '- review_id: review-0001',
+    '',
+    '**follow_up:** The review is live for the person in the attach viewer with its companion agent. Approval is pushed to the origin inbox when submitted.',
 ].join('\n');
-test('a crtr human review card collapses to a posted status + file basename, not the raw fields', () => {
-    const def = createCrtrBashToolDefinition({ command: 'crtr human review /Users/silas/Code/cli/crouter/spec.md' });
+test('a crtr human review new card collapses to its live companion status + file basename, not the raw fields', () => {
+    const def = createCrtrBashToolDefinition({ command: 'crtr human review new /Users/silas/Code/cli/crouter/spec.md --subtitle "Review the implementation."' });
     const collapsed = def
-        .renderResult({ content: [{ type: 'text', text: HUMAN_REVIEW_QUEUED_OUTPUT }] }, { expanded: false }, theme, {})
+        .renderResult({ content: [{ type: 'text', text: HUMAN_REVIEW_NEW_OUTPUT }] }, { expanded: false }, theme, {})
         .render(140)
         .join('\n');
-    assert.match(collapsed, /<accent>review posted: spec\.md → waiting on human<\/accent>/);
+    assert.match(collapsed, /<accent>review posted: spec\.md → live with companion<\/accent>/);
     assert.doesNotMatch(collapsed, /- job_id:/);
     const expanded = def
-        .renderResult({ content: [{ type: 'text', text: HUMAN_REVIEW_QUEUED_OUTPUT }] }, { expanded: true }, theme, {})
+        .renderResult({ content: [{ type: 'text', text: HUMAN_REVIEW_NEW_OUTPUT }] }, { expanded: true }, theme, {})
         .render(140)
         .join('\n');
     assert.match(expanded, /job_id: mrREV0001/);
-    assert.match(expanded, /wakes you when they respond/);
+    assert.match(expanded, /review_id: review-0001/);
+    assert.match(expanded, /Approval is pushed to the origin inbox when\s+submitted/);
 });
 const HUMAN_LIST_OUTPUT = [
     '- total: 2',
@@ -1955,7 +1965,6 @@ const SYS_SETUP_OUTPUT = [
     '',
     'Packages:',
     '- pi-crtr-extensions — crtr companion extensions. (installed)',
-    '- pi-mode-switch — Alt+Shift+P mode cycling. (installed)',
     '- pi-claude-oauth-adapter — OAuth adapter. (not installed)',
     '',
     'System deps:',
@@ -1971,7 +1980,7 @@ test('a crtr sys setup card collapses to an ok/pending step digest, not the raw
         .renderResult({ content: [{ type: 'text', text: SYS_SETUP_OUTPUT }] }, { expanded: false }, theme, {})
         .render(140)
         .join('\n');
-    assert.match(collapsed, /<warning>3 ok · 2 pending<\/warning>/);
+    assert.match(collapsed, /<warning>2 ok · 2 pending<\/warning>/);
     assert.match(collapsed, /<muted>pi-claude-oauth-adapter, nvim<\/muted>/);
     assert.doesNotMatch(collapsed, /Packages:/);
     const expanded = def
@@ -1984,7 +1993,7 @@ test('a crtr sys setup card collapses to an ok/pending step digest, not the raw
         .renderResult({ content: [{ type: 'text', text: SYS_SETUP_OUTPUT.replace('(not installed)', '(installed)').replace('brew install neovim', '✓ installed') }] }, { expanded: false }, theme, {})
         .render(140)
         .join('\n');
-    assert.match(allOk, /<success>5 steps ok<\/success>/);
+    assert.match(allOk, /<success>4 steps ok<\/success>/);
 });
 const SYS_DOCTOR_PASS_OUTPUT = [
     '- ok: true',
@@ -2090,28 +2099,3 @@ test('a crtr sys feedback card collapses to a filed/saved-locally pointer, not t
         .join('\n');
     assert.match(expanded, /gh not available: not found/);
 });
-const SURFACE_VIEW_LIST_OUTPUT = [
-    'canvas             Canvas             [builtin]  Live agent graph — who is working, who is blocked',
-    'chat               Chat               [builtin]  Portable chat-as-a-view core',
-    'workspace-sidebar  Workspace          [builtin]  Left rail for `crtr workspace` — this graph + other agents in this cwd',
-].join('\n');
-test('a crtr surface view list card collapses to a view count + id digest, not the raw rows', () => {
-    const def = createCrtrBashToolDefinition({ command: 'crtr surface view list' });
-    const collapsed = def
-        .renderResult({ content: [{ type: 'text', text: SURFACE_VIEW_LIST_OUTPUT }] }, { expanded: false }, theme, {})
-        .render(140)
-        .join('\n');
-    assert.match(collapsed, /3 views/);
-    assert.match(collapsed, /<muted>canvas, chat, workspace-sidebar<\/muted>/);
-    assert.doesNotMatch(collapsed, /Live agent graph/);
-    const expanded = def
-        .renderResult({ content: [{ type: 'text', text: SURFACE_VIEW_LIST_OUTPUT }] }, { expanded: true }, theme, {})
-        .render(140)
-        .join('\n');
-    assert.match(expanded, /Live agent graph/);
-    const empty = def
-        .renderResult({ content: [{ type: 'text', text: 'No views found. Scaffold one with the view new leaf.' }] }, { expanded: false }, theme, {})
-        .render(140)
-        .join('\n');
-    assert.match(empty, /No views found/);
-});

package/dist/clients/attach/__tests__/diagram.test.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
-import { ensureRenderer, isRendererReady } from '@crouton-kit/humanloop';
+import { ensureRenderer, isRendererReady } from '../../../core/termrender/termrender.js';
 import { transformDiagramFences } from '../render/diagram.js';
 // This asserts a REAL termrender render (box-drawing glyphs), so it only holds
 // once the managed renderer is provisioned — true in the full tier and on a dev