@deepseek-harness-tui/dsh-tui 0.11.2 → 0.12.0

package/lib/types/components/SubagentDetailScene.js

@@ -6,8 +6,10 @@ import { Divider } from './design-system/Divider.js';
 import { ExitButton } from './SubagentDashboard.js';
 import { isPlainReturnInput } from '../utils/modifiers.js';
 import { toolNameColor } from './messages/AssistantToolUseMessage.js';
+import { Markdown } from './Markdown.js';
 import { getCliHighlightPromise } from '../terminal-utils/cliHighlight.js';
-import { isMinimalMode } from '../minimalMode.js';
+import { isMinimalUiMode } from '../minimalUiMode.js';
+import { THINKING_SETTLED_MARKER } from '../terminal-utils/figures.js';
 function formatDuration(ms) {
     if (ms < 1000)
         return `${ms}ms`;
@@ -21,16 +23,16 @@ function formatTimestamp(ts) {
     return new Date(ts).toLocaleTimeString();
 }
 function statusGlyph(status) {
-    const minimal = isMinimalMode();
+    const minimalUi = isMinimalUiMode();
     if (status === 'completed')
-        return { glyph: minimal ? '✓' : '🟢', color: minimal ? undefined : 'success', label: 'done' };
+        return { glyph: minimalUi ? '✓' : '🟢', color: minimalUi ? undefined : 'success', label: 'done' };
     if (status === 'failed')
-        return { glyph: minimal ? '×' : '🔴', color: minimal ? undefined : 'error', label: 'failed' };
+        return { glyph: minimalUi ? '×' : '🔴', color: minimalUi ? undefined : 'error', label: 'failed' };
     if (status === 'cancelled')
-        return { glyph: minimal ? '×' : '🔴', color: minimal ? undefined : 'error', label: 'cancelled' };
+        return { glyph: minimalUi ? '×' : '🔴', color: minimalUi ? undefined : 'error', label: 'cancelled' };
     if (status === 'unknown')
-        return { glyph: minimal ? '·' : '⚪', color: minimal ? undefined : 'subtle', label: 'history' };
-    return { glyph: minimal ? '·' : '🟡', color: minimal ? undefined : 'warning', label: 'running' };
+        return { glyph: minimalUi ? '·' : '⚪', color: minimalUi ? undefined : 'subtle', label: 'history' };
+    return { glyph: minimalUi ? '·' : '🟡', color: minimalUi ? undefined : 'warning', label: 'running' };
 }
 const PAGES = ['summary', 'output', 'tools'];
 /** One label/value row of the summary stats card. */
@@ -67,6 +69,39 @@ function JsonArgsText({ raw }) {
         return _jsx(Text, { wrap: "wrap", children: highlighted });
     return _jsx(Text, { dimColor: true, wrap: "wrap", children: flat });
 }
+function groupOutputEvents(events) {
+    const blocks = [];
+    for (const line of events) {
+        if (line.kind === 'thinking') {
+            const last = blocks[blocks.length - 1];
+            if (last !== undefined && last.kind === 'thinking')
+                last.lines.push(line);
+            else
+                blocks.push({ kind: 'thinking', lines: [line] });
+            continue;
+        }
+        // Consecutive prose lines are ONE markdown document: without the fold a
+        // `**bold**` line, its list items and its paragraph break would render as
+        // raw syntax separated by blank rows. Activity pointers and tool/error
+        // rows stay independent single lines.
+        if (line.kind === 'text' && !isActivityLine(line.text)) {
+            const last = blocks[blocks.length - 1];
+            if (last !== undefined && last.kind === 'prose')
+                last.lines.push(line);
+            else
+                blocks.push({ kind: 'prose', lines: [line] });
+            continue;
+        }
+        blocks.push({ kind: 'line', line });
+    }
+    return blocks;
+}
+/** The child's own status line reaches us as a text delta (\`⏵ reading …\`);
+ *  it is activity, not prose, so it renders as a dim pointer row. */
+const ACTIVITY_GLYPHS = ['⏵', '▶', '▸', '»'];
+function isActivityLine(text) {
+    return ACTIVITY_GLYPHS.includes(text.trimStart().slice(0, 1));
+}
 /**
  * SubagentDetailScene — full-screen paged detail view for one subagent.
  * Header block (identity + stats) stays fixed; the body pages through
@@ -86,6 +121,27 @@ export function SubagentDetailScene({ subagent, onBack, onInterrupt, }) {
     const info = statusGlyph(subagent.status);
     const totalTokens = subagent.tokens?.total ?? ((subagent.tokens?.input ?? 0) + (subagent.tokens?.output ?? 0) || 0);
     const pageIndex = PAGES.indexOf(page);
+    /** Folded reasoning runs (the transcript's thinking grammar). Enter flips
+     *  every run at once so one key stays predictable across thought steps. */
+    const [thinkingOpen, setThinkingOpen] = React.useState(false);
+    const blocks = groupOutputEvents(subagent.outputEvents);
+    const hasThinking = blocks.some(block => block.kind === 'thinking');
+    const settled = !isRunning;
+    // The deliverable is the LAST prose block: a `── Conclusion ──` rule goes in
+    // front of it once the run settles, so the answer is never the last line of
+    // a wall of reasoning.
+    const answerBlock = (() => {
+        if (!settled)
+            return -1;
+        for (let i = blocks.length - 1; i >= 0; i--) {
+            const block = blocks[i];
+            if (block.kind === 'prose' && block.lines.some(p => p.text.trim() !== ''))
+                return i;
+            if (block.kind === 'line' && block.line.kind === 'text' && block.line.text.trim() !== '')
+                return i;
+        }
+        return -1;
+    })();
     const turnPage = (delta) => {
         const next = (pageIndex + delta + PAGES.length) % PAGES.length;
         setPage(PAGES[next]);
@@ -94,6 +150,17 @@ export function SubagentDetailScene({ subagent, onBack, onInterrupt, }) {
     // tail -f: while the subagent runs and the output page is showing, follow
     // the newest streamed line. Page switches or settlement stop the follow so
     // manual ↑ scrolling wins.
+    // Expanding the reasoning grows the box past its viewport, and the renderer
+    // then treats the growth as "was at bottom" (maxScroll was 0 while the folded
+    // body fit) and re-pins the view to the bottom — pushing the fold header out
+    // of sight. Re-anchor AFTER that frame: the first immediate lands behind the
+    // renderer's own scheduling, and the second behind the re-pin frame it caused.
+    React.useEffect(() => {
+        if (page !== 'output')
+            return;
+        const first = setImmediate(() => scrollRef.current?.scrollTo?.(0));
+        return () => clearImmediate(first);
+    }, [thinkingOpen, page]);
     const outputLength = subagent.outputEvents.length;
     React.useEffect(() => {
         if (page !== 'output' || !isRunning)
@@ -133,7 +200,13 @@ export function SubagentDetailScene({ subagent, onBack, onInterrupt, }) {
         }
         if (isPlainReturnInput(input, key)) {
             event.stopImmediatePropagation();
-            onBack();
+            // Enter folds the reasoning while the output page is showing (the
+            // transcript's ctrl+o equivalent). Elsewhere it keeps its "leave the
+            // detail" meaning, which Esc and the ✕ button still provide.
+            if (page === 'output' && hasThinking)
+                setThinkingOpen(open => !open);
+            else
+                onBack();
             return;
         }
         event.stopImmediatePropagation();
@@ -142,6 +215,31 @@ export function SubagentDetailScene({ subagent, onBack, onInterrupt, }) {
         const active = page === name;
         return (_jsxs(React.Fragment, { children: [_jsx(Box, { onClick: () => setPage(name), backgroundColor: !active ? 'userMessageBackgroundHover' : undefined, children: _jsx(Text, { color: active ? 'accent' : undefined, bold: active, inverse: active, children: ` ${label} ` }) }), _jsx(Text, { dimColor: true, children: name === PAGES[PAGES.length - 1] ? '' : '│' })] }, name));
     };
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [_jsxs(Box, { flexDirection: "row", gap: 1, children: [_jsx(Text, { color: info.color, bold: true, children: info.glyph }), _jsx(Text, { bold: true, children: `${t('subagent-card-prefix')}${subagent.description}` }), _jsx(Text, { dimColor: true, children: "\u00B7" }), _jsx(Text, { color: info.color, children: info.label }), _jsx(Box, { flexGrow: 1 }), _jsx(ExitButton, { onClick: onBack })] }), _jsxs(Text, { children: [_jsx(Text, { children: subagent.model ?? subagent.provider ?? 'default' }), _jsxs(Text, { dimColor: true, children: [elapsed !== undefined ? ` · ${formatDuration(elapsed)} · ` : ' · ', totalTokens || '—', " tok \u00B7 ", subagent.toolCalls.length, " tools"] })] }), _jsxs(Text, { dimColor: true, children: [`${t('subagent-started')} ${formatTimestamp(subagent.startedAt)}`
-                        + (subagent.completedAt ? ` · ${t('subagent-completed')} ${formatTimestamp(subagent.completedAt)}` : ''), ` · id ${subagent.agentId}`] }), subagent.error && (_jsx(Box, { marginTop: 0, children: _jsx(Text, { color: "error", wrap: "wrap", children: `${t('subagent-error-label')}: ${subagent.error}` }) })), _jsxs(Box, { flexDirection: "row", gap: 0, marginTop: 1, children: [tab('summary', t('subagent-tab-summary')), tab('output', t('subagent-output-label')), tab('tools', t('subagent-tools')), _jsx(Text, { dimColor: true, children: `  ${pageIndex + 1}/${PAGES.length}` })] }), _jsx(Text, { dimColor: true, children: '─'.repeat(Math.max(20, Math.min(72, columns - 6))) }), _jsx(Box, { flexDirection: "column", paddingX: 1, maxHeight: Math.max(10, rows - 14), children: _jsxs(ScrollBox, { ref: scrollRef, flexDirection: "column", flexGrow: 1, children: [page === 'summary' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(StatGrid, { subagent: subagent, totalTokens: totalTokens, elapsed: elapsed, statusLabel: info.label, statusColor: info.color }), subagent.summary && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { dimColor: true, bold: true, children: '─ summary ' }), _jsx(Text, { wrap: "wrap", children: subagent.summary })] })), !subagent.summary && (_jsx(Text, { dimColor: true, children: isRunning ? t('subagent-no-output') : t('subagent-no-summary') }))] })), page === 'output' && (subagent.outputEvents.length === 0 && subagent.output.length === 0 ? (_jsx(Text, { dimColor: true, children: t('subagent-no-output') })) : (subagent.outputEvents.map((line, index) => (_jsxs(Text, { wrap: "wrap", dimColor: line.kind === 'thinking' || line.kind === 'system', color: line.kind === 'error' ? 'error' : undefined, children: [line.kind === 'thinking' ? '  ⌁ ' : '  ', line.text, !line.settled && isRunning ? ' ▍' : ''] }, index))))), page === 'tools' && (subagent.toolCalls.length === 0 ? (_jsx(Text, { dimColor: true, children: t('subagent-no-tools') })) : (subagent.toolCalls.map((tool, index) => (_jsxs(Box, { flexDirection: "column", marginTop: index === 0 ? 0 : 1, children: [_jsxs(Box, { flexDirection: "row", gap: 1, children: [_jsx(Text, { color: tool.status === 'failed' ? 'error' : tool.status === 'running' ? 'warning' : 'success', children: tool.status === 'running' ? '·' : tool.status === 'failed' ? '×' : '✓' }), _jsx(Text, { color: toolNameColor(tool.name), children: tool.name }), tool.endedAt && _jsx(Text, { dimColor: true, children: formatDuration(tool.endedAt - tool.startedAt) })] }), tool.argsPreview && (_jsx(Box, { flexDirection: "row", paddingLeft: 2, children: _jsx(JsonArgsText, { raw: tool.argsPreview }) })), tool.resultPreview && (_jsx(Box, { flexDirection: "row", paddingLeft: 2, children: _jsx(Text, { dimColor: true, wrap: "wrap", children: `⎿ ${tool.resultPreview}` }) })), tool.error && (_jsx(Box, { flexDirection: "row", paddingLeft: 2, children: _jsx(Text, { color: "error", wrap: "wrap", children: tool.error }) }))] }, tool.id ?? index)))))] }) }), _jsx(Divider, { color: "subtle", title: "" }), _jsxs(Box, { marginTop: 0, flexDirection: "row", children: [_jsx(Text, { dimColor: true, children: `←/→ ${t('subagent-hint-page')} · ↑/↓ ${t('subagent-hint-scroll')}` }), isRunning && onInterrupt && (_jsxs(_Fragment, { children: [_jsx(Text, { dimColor: true, children: ' · ' }), _jsx(Box, { onClick: () => onInterrupt(subagent.agentId), children: _jsx(Text, { dimColor: true, bold: true, color: "warning", children: "X interrupt" }) })] })), _jsx(Text, { dimColor: true, children: ` · Esc ${t('subagent-hint-back')}` })] })] }));
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [_jsxs(Box, { flexDirection: "row", gap: 1, children: [_jsx(Text, { color: info.color, bold: true, children: info.glyph }), _jsx(Text, { bold: true, children: `${t('subagent-card-prefix')}${subagent.description}` }), _jsx(Text, { dimColor: true, children: "\u00B7" }), _jsx(Text, { color: info.color, children: info.label }), subagent.mode === 'continuable' && _jsx(Text, { color: "warning", children: t('subagent-mode-continuable') }), subagent.mode === 'one-shot' && _jsx(Text, { dimColor: true, children: t('subagent-mode-one-shot') }), _jsx(Box, { flexGrow: 1 }), _jsx(ExitButton, { onClick: onBack })] }), _jsxs(Text, { children: [_jsx(Text, { children: subagent.model ?? subagent.provider ?? 'default' }), _jsxs(Text, { dimColor: true, children: [elapsed !== undefined ? ` · ${formatDuration(elapsed)} · ` : ' · ', totalTokens || '—', " tok \u00B7 ", subagent.toolCalls.length, " tools"] })] }), _jsxs(Text, { dimColor: true, children: [`${t('subagent-started')} ${formatTimestamp(subagent.startedAt)}`
+                        + (subagent.completedAt ? ` · ${t('subagent-completed')} ${formatTimestamp(subagent.completedAt)}` : ''), ` · id ${subagent.agentId.slice(0, 8)}`] }), subagent.error && (_jsx(Box, { marginTop: 0, children: _jsx(Text, { color: "error", wrap: "wrap", children: `${t('subagent-error-label')}: ${subagent.error}` }) })), _jsxs(Box, { flexDirection: "row", gap: 0, marginTop: 1, children: [tab('summary', t('subagent-tab-summary')), tab('output', subagent.outputEvents.length > 0 ? `${t('subagent-output-label')} ${subagent.outputEvents.length}` : t('subagent-output-label')), tab('tools', subagent.toolCalls.length > 0 ? `${t('subagent-tools')} ${subagent.toolCalls.length}` : t('subagent-tools')), _jsx(Text, { dimColor: true, children: `  ${pageIndex + 1}/${PAGES.length}` })] }), _jsx(Text, { dimColor: true, children: '─'.repeat(Math.max(20, Math.min(72, columns - 6))) }), _jsx(Box, { flexDirection: "column", paddingX: 1, maxHeight: Math.max(10, rows - 14), children: _jsxs(ScrollBox, { ref: scrollRef, flexDirection: "column", flexGrow: 1, children: [page === 'summary' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(StatGrid, { subagent: subagent, totalTokens: totalTokens, elapsed: elapsed, statusLabel: info.label, statusColor: info.color }), subagent.summary && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { dimColor: true, bold: true, children: '─ summary ' }), _jsx(Text, { wrap: "wrap", children: subagent.summary })] })), !subagent.summary && (_jsx(Text, { dimColor: true, children: isRunning ? t('subagent-no-output') : t('subagent-no-summary') }))] })), page === 'output' && (subagent.outputEvents.length === 0 && subagent.output.length === 0 ? (_jsx(Text, { dimColor: true, children: t('subagent-no-output') })) : (blocks.map((block, index) => {
+                            if (block.kind === 'thinking') {
+                                const text = block.lines.map(line => line.text).join('\n');
+                                const chars = text.replace(/\s+/g, '').length;
+                                const label = `${THINKING_SETTLED_MARKER} ${t('subagent-thinking-fold', { count: block.lines.length, chars })}`;
+                                const hint = thinkingOpen ? t('subagent-thinking-collapse') : t('subagent-thinking-expand');
+                                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { italic: true, dimColor: true, children: `${label}  ·  ${hint}` }), thinkingOpen ? (_jsx(Box, { flexDirection: "column", paddingLeft: 2, children: block.lines.map((line, i) => (_jsx(Text, { dimColor: true, italic: true, wrap: "wrap", children: line.text }, i))) })) : (_jsx(Text, { dimColor: true, italic: true, wrap: "truncate-end", children: `  ${block.lines[0]?.text.replace(/\s+/g, ' ').trim() ?? ''}` }))] }, `think-${index}`));
+                            }
+                            if (block.kind === 'prose') {
+                                const proseText = block.lines.map(p => p.text).join('\n');
+                                const proseUnsettled = isRunning && block.lines.some(p => p.settled === false);
+                                const isProseAnswer = index === answerBlock;
+                                return (_jsxs(Box, { flexDirection: "column", marginTop: index === 0 ? 0 : 1, children: [isProseAnswer && (_jsx(Text, { dimColor: true, children: `── ${t('subagent-conclusion')} ${'─'.repeat(Math.max(8, Math.min(60, columns - 16)))}` })), _jsx(Markdown, { dimColor: false, cacheTokens: true, children: proseText }), proseUnsettled && _jsx(Text, { dimColor: true, children: '▌' })] }, `prose-${index}`));
+                            }
+                            const line = block.line;
+                            const unsettled = !line.settled && isRunning ? ' ▍' : '';
+                            if (line.kind === 'text' && isActivityLine(line.text)) {
+                                return (_jsxs(Box, { flexDirection: "row", gap: 1, children: [_jsx(Text, { color: "accent", children: '⏵' }), _jsxs(Text, { dimColor: true, wrap: "truncate-end", children: [line.text.replace(/^[\s⏵▶▸»]+/, ''), unsettled] })] }, `act-${index}`));
+                            }
+                            const isAnswer = index === answerBlock;
+                            // Tool / error / system rows get a leading row gap so a wall
+                            // of streamed rows stops reading as one cramped paragraph.
+                            const rowGap = line.kind === 'tool' || line.kind === 'error' || line.kind === 'system';
+                            return (_jsxs(Box, { flexDirection: "column", marginTop: rowGap && index !== 0 ? 1 : 0, children: [isAnswer && (_jsx(Text, { dimColor: true, children: `── ${t('subagent-conclusion')} ${'─'.repeat(Math.max(8, Math.min(60, columns - 16)))}` })), _jsxs(Text, { wrap: "wrap", bold: isAnswer, dimColor: line.kind === 'system', color: line.kind === 'error' ? 'error' : line.kind === 'tool' ? 'accent' : undefined, children: [line.kind === 'tool' ? `● ${line.text}` : line.text, unsettled] })] }, `line-${index}`));
+                        }))), page === 'tools' && (subagent.toolCalls.length === 0 ? (_jsx(Text, { dimColor: true, children: t('subagent-no-tools') })) : (subagent.toolCalls.map((tool, index) => (_jsxs(Box, { flexDirection: "column", marginTop: index === 0 ? 0 : 1, children: [_jsxs(Box, { flexDirection: "row", gap: 1, children: [_jsx(Text, { color: tool.status === 'failed' ? 'error' : tool.status === 'running' ? 'warning' : 'success', children: tool.status === 'running' ? '·' : tool.status === 'failed' ? '×' : '✓' }), _jsx(Text, { color: toolNameColor(tool.name), children: tool.name }), tool.endedAt && _jsx(Text, { dimColor: true, children: formatDuration(tool.endedAt - tool.startedAt) })] }), tool.argsPreview && (_jsx(Box, { flexDirection: "row", paddingLeft: 2, children: _jsx(JsonArgsText, { raw: tool.argsPreview }) })), tool.resultPreview && (_jsx(Box, { flexDirection: "row", paddingLeft: 2, children: _jsx(Text, { dimColor: true, wrap: "wrap", children: `⎿ ${tool.resultPreview}` }) })), tool.error && (_jsx(Box, { flexDirection: "row", paddingLeft: 2, children: _jsx(Text, { color: "error", wrap: "wrap", children: tool.error }) }))] }, tool.id ?? index)))))] }) }), _jsx(Divider, { color: "subtle", title: "" }), _jsxs(Box, { marginTop: 0, flexDirection: "row", children: [_jsx(Text, { dimColor: true, children: `←/→ ${t('subagent-hint-page')} · ↑/↓ ${t('subagent-hint-scroll')}`
+                            + (page === 'output' && hasThinking ? ` · ${t('subagent-hint-fold')}` : '') }), isRunning && onInterrupt && (_jsxs(_Fragment, { children: [_jsx(Text, { dimColor: true, children: ' · ' }), _jsx(Box, { onClick: () => onInterrupt(subagent.agentId), children: _jsx(Text, { dimColor: true, bold: true, color: "warning", children: "X interrupt" }) })] })), _jsx(Text, { dimColor: true, children: ` · Esc ${t('subagent-hint-back')}` })] })] }));
 }

package/lib/types/components/WhaleGirl.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import type { TerminalImageSource } from '../ink/terminal-image.js';
 /**
  * The maid portrait (鲸鱼娘) that can stand in for the header's pixel whale
  * (settings `dsh-tui.whaleGirl`): the author-designed 30×30 true-color
@@ -26,4 +27,9 @@ export declare const WHALE_GIRL_CENTER = 19.5;
 export declare function WhaleGirlArt({ width }: {
     width?: number;
 }): React.ReactNode;
+/** The same heart-pose portrait used by the Star celebration, rendered as cells when image protocols are absent. */
+export declare function WhaleGirlHappyArt({ source, width }: {
+    source?: TerminalImageSource;
+    width?: number;
+}): React.ReactNode;
 //# sourceMappingURL=WhaleGirl.d.ts.map

package/lib/types/components/WhaleGirl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WhaleGirl.d.ts","sourceRoot":"","sources":["../../../src/components/WhaleGirl.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB;;;;;;;;GAQG;AAEH,4DAA4D;AAC5D,eAAO,MAAM,eAAe,EAAE,SAAS,MAAM,EAI5C,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,OAAO,CAAA;AAErC;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,KAAK,CAAC,SAAS,CAW3E"}
+{"version":3,"file":"WhaleGirl.d.ts","sourceRoot":"","sources":["../../../src/components/WhaleGirl.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAEnE;;;;;;;;GAQG;AAEH,4DAA4D;AAC5D,eAAO,MAAM,eAAe,EAAE,SAAS,MAAM,EAI5C,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,OAAO,CAAA;AAErC;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,KAAK,CAAC,SAAS,CAW3E;AAED,oHAAoH;AACpH,wBAAgB,iBAAiB,CAAC,EAAE,MAAM,EAAE,KAAU,EAAE,EAAE;IACxD,MAAM,CAAC,EAAE,mBAAmB,CAAA;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,GAAG,KAAK,CAAC,SAAS,CAoBlB"}

package/lib/types/components/WhaleGirl.js

@@ -1,4 +1,5 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import React from 'react';
 import { Box, Text } from '../ui.js';
 import { renderCellRows } from './Whale.js';
 import { WHALE_GIRL_COLS, WHALE_GIRL_SPRITE, WHALE_GIRL_SPRITE_ROWS } from './whaleGirlSprite.js';
@@ -30,3 +31,20 @@ export function WhaleGirlArt({ width }) {
     const pad = width === undefined ? 0 : Math.max(0, Math.floor((width - WHALE_GIRL_COLS) / 2));
     return (_jsx(Box, { flexDirection: "column", flexShrink: 0, width: width, children: WHALE_GIRL_ROWS.map((row, index) => (_jsxs(Text, { wrap: "truncate-end", children: [pad > 0 ? ' '.repeat(pad) : '', row] }, index))) }));
 }
+/** The same heart-pose portrait used by the Star celebration, rendered as cells when image protocols are absent. */
+export function WhaleGirlHappyArt({ source, width = 40 }) {
+    const rows = React.useMemo(() => {
+        if (source === undefined)
+            return WHALE_GIRL_ROWS;
+        return renderCellRows(WHALE_GIRL_COLS, 32, (x, y) => {
+            const sx = Math.min(source.width - 1, Math.floor((x + 0.5) * source.width / WHALE_GIRL_COLS));
+            const sy = Math.min(source.height - 1, Math.floor((y + 0.5) * source.height / 32));
+            const at = (sy * source.width + sx) * 4;
+            if ((source.data[at + 3] ?? 0) < 80)
+                return undefined;
+            return [source.data[at] ?? 0, source.data[at + 1] ?? 0, source.data[at + 2] ?? 0];
+        });
+    }, [source]);
+    const pad = Math.max(0, Math.floor((width - WHALE_GIRL_COLS) / 2));
+    return (_jsxs(Box, { flexDirection: "column", flexShrink: 0, width: width, children: [source === undefined && _jsx(Text, { color: "#f477a7", wrap: "truncate-end", children: '            ♥       ♥' }), rows.map((row, index) => (_jsxs(Text, { wrap: "truncate-end", children: [' '.repeat(pad), row] }, index)))] }));
+}

package/lib/types/components/messages/AssistantThinkingMessage.js

@@ -8,7 +8,7 @@ import { formatDuration } from '../../terminal-utils/format.js';
 import { THINKING_SPINNER_FRAMES, THINKING_SPINNER_INTERVAL_MS, THINKING_SETTLED_MARKER, } from '../../terminal-utils/figures.js';
 import { BRAND, ICE } from '../shimmer.js';
 import { interpolateColor } from '../Spinner/spinnerUtils.js';
-import { isMinimalMode } from '../../minimalMode.js';
+import { isMinimalUiMode } from '../../minimalUiMode.js';
 import { primaryComboString } from '../../utils/keymap.js';
 /** Preview body rows — a FIXED row count (kimicode-style constant-height
  *  ticker). Ink's truncate slices the whole string across newlines as one
@@ -48,10 +48,10 @@ export function AssistantThinkingMessage({ thinking, textFull, marginTopOnTurn,
         : '';
     // Kimi Code style blue pulse: the streaming glyph breathes along the
     // header's brand→ice ladder, one sine period per ~7 frames (≈0.56s) —
-    // lively without strobing. Minimal mode drops the color (plain glyph);
+    // lively without strobing. The minimal UI drops the color (plain glyph);
     // settled always keeps the plain dim anchor.
     const label = `${t('thinking-label')}${duration}${streaming ? '…' : ` ${t('hint-expand-ctrl-o', { key: primaryComboString('transcript') })}`}`;
-    const minimal = isMinimalMode();
+    const minimalUi = isMinimalUiMode();
     const pulse = (Math.sin(frame * 0.9) + 1) / 2;
     const pulseColor = interpolateColor(BRAND, ICE, pulse);
     const frameText = THINKING_SPINNER_FRAMES[frame % THINKING_SPINNER_FRAMES.length];
@@ -61,7 +61,7 @@ export function AssistantThinkingMessage({ thinking, textFull, marginTopOnTurn,
     const hoverProps = onClick !== undefined
         ? { onMouseEnter: () => setHovered(true), onMouseLeave: () => setHovered(false) }
         : {};
-    const header = streaming ? (_jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { children: minimal ? frameText : chalk.rgb(pulseColor.r, pulseColor.g, pulseColor.b).bold(frameText) }), _jsx(Text, { dimColor: !hovered, color: hovered ? 'text' : undefined, italic: true, children: ` ${label}` })] })) : (_jsx(Text, { italic: true, dimColor: !hovered, color: hovered ? 'text' : undefined, children: `${minimal ? '*' : THINKING_SETTLED_MARKER} ${label}` }));
+    const header = streaming ? (_jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { children: minimalUi ? frameText : chalk.rgb(pulseColor.r, pulseColor.g, pulseColor.b).bold(frameText) }), _jsx(Text, { dimColor: !hovered, color: hovered ? 'text' : undefined, italic: true, children: ` ${label}` })] })) : (_jsx(Text, { italic: true, dimColor: !hovered, color: hovered ? 'text' : undefined, children: `${minimalUi ? '*' : THINKING_SETTLED_MARKER} ${label}` }));
     if (preview) {
         // Live ticker: the model's last few reasoning lines, dimmed, one Text
         // per row so each truncates to the width independently, padded to a

package/lib/types/components/trajectory/MiniWake.d.ts

@@ -11,7 +11,7 @@ import type { WaveBand } from '../../dsh-adapter/types.js';
  * @returns Glyph count, or 0 when the strip should not render at all.
  */
 export declare function miniWakeWidth(columns: number): number;
-export declare function MiniWake({ band, hint, tick, }: {
+export declare function MiniWake({ band, hint, tick, onOpen, hoverHint, }: {
     /** The session projected onto {@link miniWakeWidth} columns. */
     band: WaveBand;
     /**
@@ -20,5 +20,15 @@ export declare function MiniWake({ band, hint, tick, }: {
      */
     hint?: string;
     tick: number;
+    /**
+     * Open the trajectory scene. The strip is the conversation's permanent
+     * pointer at that second view, so pointing AT it and clicking is the
+     * gesture the affordance implies — the key chord stays as the alternative,
+     * not the only way in.
+     */
+    onOpen?: () => void;
+    /** Key chord revealed while the pointer rests on the strip (the first-run
+     *  hint has already retired by then). */
+    hoverHint?: string;
 }): React.ReactNode;
 //# sourceMappingURL=MiniWake.d.ts.map

package/lib/types/components/trajectory/MiniWake.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MiniWake.d.ts","sourceRoot":"","sources":["../../../../src/components/trajectory/MiniWake.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,OAAO,KAAK,EAAE,QAAQ,EAAe,MAAM,4BAA4B,CAAA;AAwCvE;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAKrD;AAED,wBAAgB,QAAQ,CAAC,EACvB,IAAI,EACJ,IAAI,EACJ,IAAI,GACL,EAAE;IACD,gEAAgE;IAChE,IAAI,EAAE,QAAQ,CAAA;IACd;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;CACb,GAAG,KAAK,CAAC,SAAS,CAqClB"}
+{"version":3,"file":"MiniWake.d.ts","sourceRoot":"","sources":["../../../../src/components/trajectory/MiniWake.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,OAAO,KAAK,EAAE,QAAQ,EAAe,MAAM,4BAA4B,CAAA;AAwCvE;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAKrD;AAED,wBAAgB,QAAQ,CAAC,EACvB,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,SAAS,GACV,EAAE;IACD,gEAAgE;IAChE,IAAI,EAAE,QAAQ,CAAA;IACd;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;IACnB;6CACyC;IACzC,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,GAAG,KAAK,CAAC,SAAS,CAmDlB"}

package/lib/types/components/trajectory/MiniWake.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React from 'react';
 import chalk from 'chalk';
-import { Box, Text, useTheme } from '../../ui.js';
+import { Box, NoSelect, Text, useTheme } from '../../ui.js';
 import { getTheme } from '../../theme.js';
 import { alive, mix } from '../../trajectory/motion.js';
 import { parseRGB } from '../Spinner/spinnerUtils.js';
@@ -59,9 +60,10 @@ export function miniWakeWidth(columns) {
         return 8;
     return 0;
 }
-export function MiniWake({ band, hint, tick, }) {
+export function MiniWake({ band, hint, tick, onOpen, hoverHint, }) {
     const [themeName] = useTheme();
     const theme = getTheme(themeName);
+    const [hovered, setHovered] = React.useState(false);
     if (band.buckets.length === 0)
         return null;
     const logFloor = Math.log1p(Math.max(0, band.floor));
@@ -85,7 +87,11 @@ export function MiniWake({ band, hint, tick, }) {
         const colour = failed ? theme.error : channelColor(dominantChannel(bucket), theme);
         strip += chalk.hex(toHex(colour))(shown >= BLOCKS.length ? FULL : BLOCKS[shown - 1]);
     }
-    return (_jsxs(Box, { flexShrink: 0, flexDirection: "row", gap: 1, children: [_jsx(Text, { children: strip }), hint !== undefined ? _jsx(Text, { color: "subtle", children: hint }) : null] }));
+    // The hint slot narrates the affordance: first-run chord, then — while the
+    // pointer is on the strip — the chord again, because that is the moment the
+    // user is asking "what does this thing do".
+    const shownHint = hint ?? (hovered && onOpen !== undefined ? hoverHint : undefined);
+    return (_jsx(NoSelect, { children: _jsxs(Box, { flexShrink: 0, flexDirection: "row", gap: 1, onClick: onOpen, onMouseEnter: onOpen !== undefined ? () => setHovered(true) : undefined, onMouseLeave: onOpen !== undefined ? () => setHovered(false) : undefined, children: [_jsx(Text, { children: strip }), shownHint !== undefined ? _jsx(Text, { color: hovered && hint === undefined ? 'accent' : 'subtle', children: shownHint }) : null] }) }));
 }
 /** Theme colour → `#rrggbb`, the form chalk needs. */
 function toHex(colour) {

package/lib/types/dsh-adapter/channel/external-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"external-commands.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/external-commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,KAAK,EAAoB,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAKjF,OAAO,EAAkD,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1G,OAAO,KAAK,EAAqB,gBAAgB,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAcjH;0DAC0D;AAC1D,wBAAgB,4BAA4B,CAC1C,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE;IACJ,cAAc,EAAE,cAAc,GAAG,SAAS,CAAA;IAC1C,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,CAAA;IACpD,KAAK,IAAI,KAAK,CAAA;IACd,OAAO,IAAI,OAAO,CAAA;IAClB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAA;IACzC,MAAM,CAAC,OAAO,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;IAC3G,QAAQ,EAAE,cAAc,CAAA;IACxB,WAAW,IAAI,kBAAkB,GAAG,SAAS,CAAA;IAC7C,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;CACtG;mBA+HO,MAAM,YACF,MAAM,cACL,SAAS,gBAAgB,EAAE,KACrC,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;uBA2EtC,MAAM,YACF,MAAM,cACL,SAAS,gBAAgB,EAAE,KACrC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;EAG/B"}
+{"version":3,"file":"external-commands.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/external-commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,KAAK,EAAoB,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAKjF,OAAO,EAAkD,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1G,OAAO,KAAK,EAAqB,gBAAgB,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAcjH;0DAC0D;AAC1D,wBAAgB,4BAA4B,CAC1C,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE;IACJ,cAAc,EAAE,cAAc,GAAG,SAAS,CAAA;IAC1C,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,CAAA;IACpD,KAAK,IAAI,KAAK,CAAA;IACd,OAAO,IAAI,OAAO,CAAA;IAClB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAA;IACzC,MAAM,CAAC,OAAO,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;IAC3G,QAAQ,EAAE,cAAc,CAAA;IACxB,WAAW,IAAI,kBAAkB,GAAG,SAAS,CAAA;IAC7C,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;CACtG;mBA+HO,MAAM,YACF,MAAM,cACL,SAAS,gBAAgB,EAAE,KACrC,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;uBAiFtC,MAAM,YACF,MAAM,cACL,SAAS,gBAAgB,EAAE,KACrC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;EAG/B"}

package/lib/types/dsh-adapter/channel/external-commands.js

@@ -111,8 +111,6 @@ export function createExternalCommandInvoker(ctx, deps) {
     /** Run one DSH registry command (`/plan`, …) on the live agent while
      *  preserving its settled result kind for composer admission. */
     const invoke = async (name, rawInput, imageRefs = []) => {
-        const capture = deps.capture();
-        assertCapabilityShadowPolicy('host.commands.invoke', deps.runtime.mode, deps.runtime.slices);
         const service = deps.commandService;
         if (service === undefined)
             return undefined;
@@ -123,6 +121,14 @@ export function createExternalCommandInvoker(ctx, deps) {
         // apply another scope's owner policy.
         const definition = service.find(commandAgent, name);
         try {
+            // The channel-lifetime capture and the shadow/capability policy check
+            // live INSIDE the try: both can throw (a lease that ended between
+            // keystrokes, a shadow-mode denial), and `invoke` is an async action
+            // whose callers treat a rejection as unhandled — the same refusal must
+            // degrade to the settled `{ kind: 'error' }` outcome every other
+            // failure below uses.
+            const capture = deps.capture();
+            assertCapabilityShadowPolicy('host.commands.invoke', deps.runtime.mode, deps.runtime.slices);
             const signal = new AbortController().signal;
             const line = `/${name}${rawInput}`;
             const batch = await registryCommandImages(service, line, deps.composer.includeLegacyImageRefs(line, imageRefs), stagedSnapshot, signal);

package/lib/types/dsh-adapter/channel/job-projection.d.ts

@@ -24,5 +24,6 @@ export declare function createJobProjection(getState: () => Pick<ChannelState, '
     attach: (jobs: JobsRuntime | undefined, ownService?: (dispose: () => void) => void) => void;
     dropRows: () => void;
     reset: () => void;
+    reanchor: () => void;
 };
 //# sourceMappingURL=job-projection.d.ts.map

package/lib/types/dsh-adapter/channel/job-projection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"job-projection.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/job-projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAGnD,OAAO,EAAE,kBAAkB,EAAqB,KAAK,WAAW,EAAE,MAAM,YAAY,CAAA;AACpF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAW,UAAU,EAAE,MAAM,YAAY,CAAA;AAEnE;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,IAAI,CAAC,YAAY,EAAE,gBAAgB,GAAG,MAAM,GAAG,MAAM,CAAC,EACtE,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,CAAC,CAAA;IAC5C,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAA;IACxG,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,KAAK,IAAI,KAAK,CAAA;IACd,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAC1B;;;mBA4EqB,WAAW,GAAG,SAAS,eAAe,CAAC,OAAO,EAAE,MAAM,IAAI,KAAK,IAAI,KAAG,IAAI;oBAwD3E,IAAI;iBACP,IAAI;EAGvB"}
+{"version":3,"file":"job-projection.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/job-projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAGnD,OAAO,EAAE,kBAAkB,EAAqB,KAAK,WAAW,EAAE,MAAM,YAAY,CAAA;AACpF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAW,UAAU,EAAE,MAAM,YAAY,CAAA;AAEnE;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,IAAI,CAAC,YAAY,EAAE,gBAAgB,GAAG,MAAM,GAAG,MAAM,CAAC,EACtE,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,GAAG,KAAK,CAAC,CAAA;IAC5C,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAA;IACxG,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,KAAK,IAAI,KAAK,CAAA;IACd,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAC1B;;;mBA4FqB,WAAW,GAAG,SAAS,eAAe,CAAC,OAAO,EAAE,MAAM,IAAI,KAAK,IAAI,KAAG,IAAI;oBA4G3E,IAAI;iBACP,IAAI;oBAQD,IAAI;EAG1B"}

package/lib/types/dsh-adapter/channel/job-projection.js

@@ -9,6 +9,8 @@ import { BackgroundJobStore, formatJobDuration } from '../jobs.js';
 export function createJobProjection(getState, deps) {
     const jobRowsByJobId = new Map();
     let jobsRuntime;
+    /** The live attachment's conditional roster re-read (see `reanchor`). */
+    let reanchorActive;
     let detachActive;
     let attachmentToken;
     let attachmentCurrent = () => false;
@@ -30,6 +32,7 @@ export function createJobProjection(getState, deps) {
                 label: job.label,
                 status: job.status,
                 ...(job.detail === undefined ? {} : { detail: job.detail }),
+                ...(job.progress === undefined ? {} : { progress: job.progress }),
                 startedAt: job.startedAt,
                 ...(job.finishedAt === undefined ? {} : { finishedAt: job.finishedAt }),
                 outputLines: job.outputLines,
@@ -63,7 +66,10 @@ export function createJobProjection(getState, deps) {
                 return false;
             const job = store.get(id);
             try {
-                jobs.kill(id, deps.agent(), 'dsh-tui /jobs panel');
+                // The kernel fence compares job.owner.id === caller, so the caller
+                // MUST be the session id string — the Agent object matches nothing
+                // and every owned-job kill would throw "another session".
+                jobs.kill(id, sessionCaller(), 'dsh-tui /jobs panel');
             }
             catch {
                 return false;
@@ -74,6 +80,15 @@ export function createJobProjection(getState, deps) {
             return true;
         },
     };
+    /**
+     * Caller identity for the kernel fence: the owning session id string
+     * (`Agent.id`). The registry compares `job.owner.id === caller`, so the
+     * Agent object the channel holds is only good for extracting the id.
+     */
+    const sessionCaller = () => {
+        const agent = deps.agent();
+        return agent?.id;
+    };
     /**
      * Each service attachment has one idempotent disposer, dual-owned by the
      * Channel and (when injected) the service context. Reattachment revokes the
@@ -88,19 +103,53 @@ export function createJobProjection(getState, deps) {
         let detached = false;
         let detach;
         const current = () => !detached && attachmentToken === token && detachActive === detach && jobsRuntime === jobs && deps.owner.current();
+        // The caller the roster was last read with. `reanchor` compares against it
+        // so a bind that did NOT change the session stays a no-op — mounting binds
+        // the channel's own agent immediately after the service attaches, and
+        // re-reading there would be a second, redundant list().
+        let lastCaller;
+        let callerKnown = false;
         const refresh = () => {
             // Check before list(): retained callbacks must not touch a revoked or
             // replaced service, nor invoke any store/row work after owner disposal.
             if (!current())
                 return;
             try {
-                const snapshot = jobs.list(deps.agent());
+                const caller = sessionCaller();
+                lastCaller = caller;
+                callerKnown = true;
+                const snapshot = jobs.list(caller);
                 if (!current())
                     return;
                 store.replace(snapshot);
             }
             catch { /* optional service is disposing */ }
         };
+        /** Re-read only when the bound session actually changed. */
+        const reanchorThis = () => {
+            if (callerKnown && sessionCaller() === lastCaller)
+                return;
+            dropRows();
+            store.reset();
+            refresh();
+        };
+        /** One kernel `output` event: pull the ring increment past our cursor. */
+        const pullOutput = (id) => {
+            if (!current())
+                return;
+            if (jobs.readAt === undefined)
+                return;
+            const cursor = store.kernelCursorOf(id);
+            if (cursor === undefined)
+                return;
+            try {
+                const read = jobs.readAt(id, cursor, sessionCaller());
+                if (!current())
+                    return;
+                store.onKernelOutput(id, read);
+            }
+            catch { /* job gone or fenced mid-pull; roster refresh follows */ }
+        };
         // Publish the attachment identity before subscription: registries are
         // allowed to synchronously deliver their current snapshot from on*().
         // Every registration below is transactional because a second on*() can
@@ -118,6 +167,8 @@ export function createJobProjection(getState, deps) {
             }
             if (jobsRuntime === jobs)
                 jobsRuntime = undefined;
+            if (reanchorActive === reanchorThis)
+                reanchorActive = undefined;
             for (const dispose of disposers.splice(0))
                 dispose?.();
             // A service-context detach happens before channel teardown on remount;
@@ -130,7 +181,34 @@ export function createJobProjection(getState, deps) {
         detachActive = detach;
         attachmentToken = token;
         attachmentCurrent = current;
+        reanchorActive = reanchorThis;
         try {
+            const bus = jobs.events;
+            if (bus !== undefined && typeof bus.subscribe === 'function') {
+                // Kernel bus: lifecycle commits re-read the roster; output events
+                // pull non-consuming readAt increments with the store's own cursor.
+                // Subscribe to EVERY owner on purpose: this filter is captured at
+                // attach, but the channel still rebinds afterwards (dsh-tui opens a
+                // fresh session at boot and only then resumes the user's), and a filter
+                // frozen to the boot session starves the panel for good — the kernel
+                // drops every foreign-owner event, refresh() never runs again and the
+                // roster stays at the empty list read during attach. Nothing extra is
+                // exposed by widening it: the roster read is list(caller) and the ring
+                // pull is readAt(id, cursor, caller), both fenced with the caller AT
+                // CALL TIME, so another session's jobs fall out (and a foreign ring
+                // read throws into the contained catch).
+                disposers.push(bus.subscribe({ owners: 'all' }, event => {
+                    if (!current())
+                        return;
+                    try {
+                        if (event.type === 'output')
+                            pullOutput(event.id);
+                        else
+                            refresh();
+                    }
+                    catch { /* contained per-event; the next event re-syncs */ }
+                }));
+            }
             if (typeof jobs.onJobsChanged === 'function')
                 disposers.push(jobs.onJobsChanged(refresh));
             if (typeof jobs.onJobDone === 'function')
@@ -146,5 +224,12 @@ export function createJobProjection(getState, deps) {
     };
     const dropRows = () => { jobRowsByJobId.clear(); };
     const reset = () => { dropRows(); store.reset(); };
-    return { store, control, attach, dropRows, reset };
+    /**
+     * Re-anchor after the live agent changed. `reset()` runs while the OLD
+     * binding is still installed (resetSessionProjection precedes bindAgent), so
+     * it can only clear; the re-read has to happen here, once the new agent is
+     * bound, or the next session's jobs would only appear on its first event.
+     */
+    const reanchor = () => { reanchorActive?.(); };
+    return { store, control, attach, dropRows, reset, reanchor };
 }

package/lib/types/dsh-adapter/channel/mode-actions.d.ts

@@ -7,6 +7,19 @@ import type { ChannelState } from './types.js';
 import type { createChannelBinding } from './binding.js';
 type Binding = ReturnType<typeof createChannelBinding>;
 type ModeState = Pick<ChannelState, 'mode' | 'modeIndex' | 'emit'>;
+/**
+ * Fail-soft reporting for a session-mode write. The mutation path reaches
+ * kernel-owned state (`session.append`, `approval.setPolicy` → the agent
+ * inbox) that can legitimately refuse while a turn is publishing, and the
+ * keyboard entry point (`Shift+Tab`) cannot await it — a rejection there
+ * becomes an unhandledRejection, which the process guard treats as fatal and
+ * which kills the TUI with the session still open. A refused switch is a
+ * user-visible outcome, not a crash: log it, say so in the status line, and
+ * re-derive the indicator from the durable log so the UI cannot keep showing
+ * a mode the session never entered. Shared by the base actions and the
+ * permission-aware composition so both report the same way.
+ */
+export declare function reportModeSwitchFailure(ctx: Context, notify: ChannelState['notify'], refreshMode: () => void, error: unknown): void;
 /** Durable session-mode folds and transitions. Construction is inert; root wires it after state construction. */
 export declare function createModeActions(ctx: Context, state: ModeState, deps: {
     owner: {

package/lib/types/dsh-adapter/channel/mode-actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mode-actions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/mode-actions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAE5D,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC7E,OAAO,EAAsB,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAA;AAChG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAExD,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AACtD,KAAK,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC,CAAA;AAElE,iHAAiH;AACjH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE;IACJ,KAAK,EAAE;QAAE,OAAO,IAAI,OAAO,CAAA;KAAE,CAAA;IAC7B,OAAO,EAAE,qBAAqB,CAAA;IAC9B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,WAAW,CAAC,CAAA;IACzD,YAAY,EAAE,SAAS,eAAe,EAAE,CAAA;IACxC,cAAc,CAAC,EAAE;QAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAA;IAC9D,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAChF,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;CAC/B;uBAyDqB,IAAI;qBAkJE,OAAO,CAAC,IAAI,CAAC;sBAlEV,eAAe,sDAAgC,OAAO,CAAC,IAAI,CAAC;8BAyE1D,KAAK,CAAC,SAAS,CAAC,SAAS,YAAY,KAAG,IAAI;EA4B9E"}
+{"version":3,"file":"mode-actions.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/mode-actions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAE5D,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC7E,OAAO,EAAsB,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAA;AAChG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAExD,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AACtD,KAAK,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC,CAAA;AAElE;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,EAC9B,WAAW,EAAE,MAAM,IAAI,EACvB,KAAK,EAAE,OAAO,GACb,IAAI,CAUN;AAED,iHAAiH;AACjH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE;IACJ,KAAK,EAAE;QAAE,OAAO,IAAI,OAAO,CAAA;KAAE,CAAA;IAC7B,OAAO,EAAE,qBAAqB,CAAA;IAC9B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,WAAW,CAAC,CAAA;IACzD,YAAY,EAAE,SAAS,eAAe,EAAE,CAAA;IACxC,cAAc,CAAC,EAAE;QAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAA;IAC9D,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAChF,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;CAC/B;uBAyDqB,IAAI;qBA4JE,OAAO,CAAC,IAAI,CAAC;sBA1EV,eAAe,sDAA0B,OAAO,CAAC,IAAI,CAAC;8BAuFpD,KAAK,CAAC,SAAS,CAAC,SAAS,YAAY,KAAG,IAAI;EA4B9E"}