@deepseek-harness-tui/dsh-tui 0.13.0 → 0.14.0

package/lib/types/components/Markdown.js

@@ -1,16 +1,25 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import { marked } from 'marked';
-import { Box, Text } from '../ui.js';
-import { configureMarked, formatToken, stripPromptXMLTags } from '../terminal-utils/markdown.js';
+import { Box, Text, useTheme } from '../ui.js';
+import { getTheme } from '../theme.js';
+import { appendBlockText, configureMarked, formatToken, stripPromptXMLTags } from '../terminal-utils/markdown.js';
 import { getCliHighlightPromise } from '../terminal-utils/cliHighlight.js';
 import { isMermaidLang } from '../terminal-utils/mermaid.js';
 import { isMathBlockToken, isMathToken } from '../terminal-utils/math.js';
 import { getMathRendering, subscribeMathRendering } from '../tuiDisplayPrefs.js';
 import { MarkdownTable } from './MarkdownTable.js';
+import { CodeBlockFrame } from './CodeBlockFrame.js';
 import { MermaidDiagram } from './MermaidDiagram.js';
 import { InlineMathParagraph } from './InlineMathParagraph.js';
 import { MathBlock } from './MathBlock.js';
+/**
+ * Hang decoration for the ANSI text runs: a terminal-wrapped continuation
+ * lines up under its line's quote rails, list marker or indentation
+ * instead of falling back to column 0. One shared object, because the
+ * style diff and the measure/paint caches compare it by reference.
+ */
+const HANG_DECORATION = { hang: true };
 // ---- token 缓存 ----
 //
 // marked.lexer 在组件重挂载时是最贵的开销；消息内容不可变，相同文本
@@ -80,10 +89,14 @@ function lexWithCache(content, allowCache) {
  * Tokens that render as their own layout node (a width-aware component)
  * instead of joining the ANSI text run. StreamingMarkdown consults the same
  * predicate: a standalone node has a fixed one-row gap to its neighbours
- * rather than the newline-derived spacing of text blocks.
+ * rather than the newline-derived spacing of text blocks. Top-level
+ * fenced code is one too (CodeBlockFrame).
  */
 export function isStandaloneToken(token) {
-    return token.type === 'table' || isMermaidToken(token) || isMathBlockToken(token);
+    return (token.type === 'table' ||
+        token.type === 'code' ||
+        isMermaidToken(token) ||
+        isMathBlockToken(token));
 }
 /** Whether a paragraph holds inline math anywhere in its inline tokens. */
 function hasInlineMath(token) {
@@ -109,7 +122,7 @@ function renderTokensToNodes(tokens, highlight, dimColor, inlineMathImages) {
         if (!ansiText && textParts.length === 0)
             return;
         if (textParts.length === 0) {
-            nodes.push(_jsx(Text, { dimColor: dimColor, children: ansiText.trim() }, nodes.length));
+            nodes.push(_jsx(Text, { dimColor: dimColor, decoration: HANG_DECORATION, children: ansiText.trim() }, nodes.length));
         }
         else {
             textParts.push(ansiText);
@@ -123,7 +136,7 @@ function renderTokensToNodes(tokens, highlight, dimColor, inlineMathImages) {
             textParts[last] = textParts[last].trimEnd();
             // Each internal boundary replaces exactly one source newline with a
             // column-child boundary. Only the whole text span trims outer space.
-            nodes.push(_jsx(Box, { flexDirection: "column", children: textParts.slice(first, last + 1).map((part, index) => (_jsx(Text, { dimColor: dimColor, children: index + first < last ? part.slice(0, -1) : part }, index))) }, nodes.length));
+            nodes.push(_jsx(Box, { flexDirection: "column", children: textParts.slice(first, last + 1).map((part, index) => (_jsx(Text, { dimColor: dimColor, decoration: HANG_DECORATION, children: index + first < last ? part.slice(0, -1) : part }, index))) }, nodes.length));
         }
         ansiText = '';
         textParts = [];
@@ -153,8 +166,18 @@ function renderTokensToNodes(tokens, highlight, dimColor, inlineMathImages) {
             flushAnsiText();
             nodes.push(_jsx(MermaidDiagram, { token: token, highlight: highlight, dimColor: dimColor }, nodes.length));
         }
+        else if (token.type === 'code') {
+            // Top-level fences get the CodeBlockFrame (header/rail/padding);
+            // the mermaid branch above keeps diagram fences routed to
+            // MermaidDiagram (whose fallback re-enters the frame), and code
+            // nested in lists/quotes keeps formatToken's ANSI path.
+            flushAnsiText();
+            nodes.push(_jsx(CodeBlockFrame, { token: token, highlight: highlight, dimColor: dimColor }, nodes.length));
+        }
         else {
-            ansiText += formatToken(token, 0, null, null, highlight);
+            // appendBlockText inserts the row break after the (newline-free) hr
+            // divider when the next block does not open its own line.
+            ansiText = appendBlockText(ansiText, formatToken(token, 0, null, null, highlight));
             // A top-level token boundary keeps inline formatting and code fences
             // intact while letting the painter cull finished offscreen text blocks.
             if (ansiText.length >= TEXT_BLOCK_BUDGET && ansiText.endsWith('\n')) {
@@ -182,6 +205,12 @@ function MarkdownImpl({ children, dimColor = false, cacheTokens = true, inlineMa
     // Inline math is baked into the ANSI text, so the switch must invalidate
     // the memo below (MathBlock nodes subscribe on their own).
     const mathRendering = React.useSyncExternalStore(subscribeMathRendering, getMathRendering);
+    // 渲染结果把主题色烤进 ANSI（链接 accent、行内代码 permission、列表点…）。
+    // 消费主题上下文让这个 memo 组件在换主题时也重渲染（context 更新绕过
+    // React.memo）；memo 依赖取**调色板身份**而非名字——`auto` 明暗翻转时名字
+    // 不变但色板换了，只按名字会漏。
+    const [themeName] = useTheme();
+    const palette = getTheme(themeName);
     React.useEffect(() => {
         let mounted = true;
         void getCliHighlightPromise().then((loaded) => {
@@ -198,7 +227,7 @@ function MarkdownImpl({ children, dimColor = false, cacheTokens = true, inlineMa
         return renderTokensToNodes(lexWithCache(source, cacheTokens), highlight, dimColor, 
         // Dimmed text (thinking) cannot dim an image, so it keeps Unicode.
         inlineMathImages && mathRendering === 'image' && !dimColor);
-    }, [children, dimColor, highlight, cacheTokens, mathRendering, inlineMathImages]);
+    }, [children, dimColor, highlight, cacheTokens, mathRendering, inlineMathImages, palette]);
     return (_jsx(Box, { flexDirection: "column", gap: 1, children: renderedNodes }));
 }
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"MathBlock.d.ts","sourceRoot":"","sources":["../../../src/components/MathBlock.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,OAAO,EAAuC,KAAK,SAAS,EAAE,MAAM,2BAA2B,CAAA;AA+B/F,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,SAAS,CAAA;IAChB,QAAQ,EAAE,OAAO,CAAA;IACjB,oDAAoD;IACpD,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,wBAAgB,SAAS,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CA+FjF;AAgCD,sFAAsF;AACtF,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAK7D"}
+{"version":3,"file":"MathBlock.d.ts","sourceRoot":"","sources":["../../../src/components/MathBlock.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,OAAO,EAAuC,KAAK,SAAS,EAAE,MAAM,2BAA2B,CAAA;AA+B/F,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,SAAS,CAAA;IAChB,QAAQ,EAAE,OAAO,CAAA;IACjB,oDAAoD;IACpD,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,wBAAgB,SAAS,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CAiGjF;AAgCD,sFAAsF;AACtF,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAK7D"}

package/lib/types/components/MathBlock.js

@@ -75,7 +75,9 @@ export function MathBlock({ token, dimColor, forceWidth }) {
         // wrapped across it, so every visible row of the box carries the formula.
         const stackedFits = lines !== undefined && lines.length <= raster.rows &&
             lines.every(line => stringWidth(line) <= raster.columns);
-        const painted = (_jsx(Image, { ...(composited ? {} : { transparent: true }), presentation: "transcript", source: raster.source, width: raster.columns, height: raster.rows, alt: token.text, copyText: token.raw.trim(), children: _jsx(Box, { width: raster.columns, height: raster.rows, overflow: "hidden", children: _jsx(Text, { dimColor: true, wrap: stackedFits ? 'truncate' : 'wrap', children: stackedFits ? lines.join('\n') : renderInlineMath(token.text) ?? token.text }) }) }));
+        // A formula is line art: the transparent Sixel mask stays solid instead
+        // of dithering, so fraction bars and hairline strokes keep their ink.
+        const painted = (_jsx(Image, { ...(composited ? {} : { transparent: true }), lineArt: true, presentation: "transcript", source: raster.source, width: raster.columns, height: raster.rows, alt: token.text, copyText: token.raw.trim(), children: _jsx(Box, { width: raster.columns, height: raster.rows, overflow: "hidden", children: _jsx(Text, { dimColor: true, wrap: stackedFits ? 'truncate' : 'wrap', children: stackedFits ? lines.join('\n') : renderInlineMath(token.text) ?? token.text }) }) }));
         // A composited formula needs a real surface: the slot carries the terminal
         // background, so both the placement and its cells use that colour.
         const image = composited

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

@@ -1 +1 @@
-{"version":3,"file":"MermaidDiagram.d.ts","sourceRoot":"","sources":["../../../src/components/MermaidDiagram.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAOpC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAA;AA6BrE,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,CAAC,IAAI,CAAA;IAClB,SAAS,EAAE,YAAY,GAAG,IAAI,CAAA;IAC9B,QAAQ,EAAE,OAAO,CAAA;IACjB,oDAAoD;IACpD,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAmBD,wBAAgB,cAAc,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CAgCjG"}
+{"version":3,"file":"MermaidDiagram.d.ts","sourceRoot":"","sources":["../../../src/components/MermaidDiagram.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAOpC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAA;AA6BrE,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,CAAC,IAAI,CAAA;IAClB,SAAS,EAAE,YAAY,GAAG,IAAI,CAAA;IAC9B,QAAQ,EAAE,OAAO,CAAA;IACjB,oDAAoD;IACpD,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAmBD,wBAAgB,cAAc,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CAkCjG"}

package/lib/types/components/MermaidDiagram.js

@@ -5,7 +5,7 @@ import { useTerminalSize } from '../ink/hooks/use-terminal-size.js';
 import { stringWidth } from '../ink/stringWidth.js';
 import { getTheme } from '../theme.js';
 import { useTheme } from './design-system/ThemeProvider.js';
-import { formatToken } from '../terminal-utils/markdown.js';
+import { CodeBlockFrame } from './CodeBlockFrame.js';
 import { getMermaidEnginePromise, paintMermaidArt, peekMermaidEngine, renderMermaid, } from '../terminal-utils/mermaid.js';
 import { getMermaidDiagrams, subscribeMermaidDiagrams } from '../tuiDisplayPrefs.js';
 import { t } from '../i18n.js';
@@ -16,9 +16,9 @@ import { t } from '../i18n.js';
  * ```mermaid fence line is a code-block affordance and a diagram needs none.
  * Whenever there is no art to show (setting off, engine still loading or
  * unavailable, unsupported diagram type, nothing parsed, or the layout is
- * wider than the viewport) the block falls back to the ordinary code-block
- * rendering — fence line included, because that IS a code block — and a
- * too-wide diagram adds a caption with the width it needs.
+ * wider than the viewport) the block falls back to the shared
+ * CodeBlockFrame — because that IS a code block — and a too-wide diagram
+ * adds a caption with the width it needs.
  */
 /** Same viewport slack MarkdownTable keeps for gutters and message insets. */
 const SAFETY_MARGIN = 4;
@@ -55,7 +55,9 @@ export function MermaidDiagram({ token, highlight, dimColor, forceWidth }) {
     // every frame and re-lays out — sub-millisecond for a warm engine.
     const art = React.useMemo(() => (enabled && engine !== null ? renderMermaid(engine, token.text) : null), [enabled, engine, token.text]);
     if (art === null || art.width > width - INDENT_WIDTH - SAFETY_MARGIN) {
-        return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { dimColor: dimColor, children: formatToken(token, 0, null, null, highlight).trimEnd() }), art !== null && (_jsx(Text, { color: "inactive", children: INDENT + t('mermaid-too-wide', { width: art.width }) }))] }));
+        // No art to show: this IS a code block, so it falls back to the
+        // ordinary CodeBlockFrame (shared with plain fences).
+        return (_jsxs(Box, { flexDirection: "column", children: [_jsx(CodeBlockFrame, { token: token, highlight: highlight, dimColor: dimColor, forceWidth: forceWidth }), art !== null && (_jsx(Text, { color: "inactive", children: INDENT + t('mermaid-too-wide', { width: art.width }) }))] }));
     }
     return (_jsx(Text, { dimColor: dimColor, children: paintMermaidArt(art, theme).map(line => INDENT + line).join('\n') }));
 }

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

@@ -4,6 +4,7 @@ import type { ChatRow } from '../dsh-adapter/channel.js';
 import type { JobGroupFoldMode } from '../tuiDisplayPrefs.js';
 import type { TranscriptImage } from '../dsh-adapter/transcript-images.js';
 import type { DOMElement } from '../ink/dom.js';
+import type { Brand } from '../branding.js';
 import { type TimelineSnapshot } from '../ink/timeline-rail.js';
 import type { ToolBackground } from '../tuiDisplayPrefs.js';
 /**
@@ -25,7 +26,7 @@ import type { ToolBackground } from '../tuiDisplayPrefs.js';
  * any host.
  */
 export declare function displaySelectionPath(path: string, sessionCwd: string | undefined, caseInsensitive?: boolean): string;
-export declare function MessageList({ rows, expanded, expandedRows, selectedId, onToggleRow, streamViewToggledRows, onToggleStreamView, model, diffLayout, thinkingFold, jobGroupFold, toolBackground, foldTerminalCommand, smoothStreaming, activityFrames, showAll, onToggleAll, onLoadOlder, thinkingVisible, historyPaintEnabled, registerRowRef, scrollHandle, forceMountRowId, newSinceRowId, onUnseenCount, onTimeline, failureHintRowId, failureHint, onOpenSubagent, onOpenJobs, onOpenFile, sessionCwd, onPreviewImage, suppressImageGraphics, }: {
+export declare function MessageList({ rows, expanded, expandedRows, selectedId, onToggleRow, streamViewToggledRows, onToggleStreamView, model, diffLayout, thinkingFold, jobGroupFold, toolBackground, foldTerminalCommand, turnUsageRow, smoothStreaming, activityFrames, showAll, onToggleAll, onLoadOlder, olderHistory, thinkingVisible, historyPaintEnabled, fullscreen, registerRowRef, scrollHandle, forceMountRowId, newSinceRowId, onUnseenCount, onTimeline, failureHintRowId, failureHint, onOpenSubagent, onOpenSubagentView, onOpenJobs, onWatchJobOutput, onOpenFile, sessionCwd, onPreviewImage, suppressImageGraphics, }: {
     rows: readonly ChatRow[];
     expanded: boolean;
     expandedRows: ReadonlySet<number>;
@@ -48,6 +49,11 @@ export declare function MessageList({ rows, expanded, expandedRows, selectedId,
     toolBackground?: ToolBackground;
     /** Terminal-card header folding from the live channel settings. */
     foldTerminalCommand?: boolean;
+    /** Turn-usage ledger row from the live channel settings (default off):
+     *  off filters the rows out of the visible window BEFORE virtualization —
+     *  the ledger itself keeps feeding `turnUsage`, /tokens, /status and the
+     *  footer hover. */
+    turnUsageRow?: boolean;
     /** Smooth streaming reveal from the live channel settings (default off at
      *  this layer — embedders and verify harnesses keep exact-paint behavior;
      *  Chat passes the channel's `dsh-tui.smoothStreaming` value). */
@@ -58,8 +64,14 @@ export declare function MessageList({ rows, expanded, expandedRows, selectedId,
     showAll: boolean;
     onToggleAll: () => void;
     /** Restore folded-away older rows from the session log; shown only when
-     *  rows were folded. */
+     *  rows were folded (or `olderHistory` says more exists before them). */
     onLoadOlder?: () => void;
+    /** The session has history older than the first row (a compaction cut it
+     *  off before a resume): the "load earlier" divider shows without any
+     *  folded row. */
+    olderHistory?: boolean;
+    /** A job card on screen keeps its output tail fresh (returns the unwatch). */
+    onWatchJobOutput?: (id: string) => () => void;
     thinkingVisible?: boolean;
     /**
      * Whether rows outside the virtualization window must still be painted
@@ -70,6 +82,8 @@ export declare function MessageList({ rows, expanded, expandedRows, selectedId,
      * seconds of lex/highlight/layout before first paint).
      */
     historyPaintEnabled?: boolean;
+    /** Fullscreen layout: running tool cards show more live output lines. */
+    fullscreen?: boolean;
     /** Transcript search: register each row's DOM element for scroll-to-match. */
     registerRowRef?: (rowId: number, el: DOMElement | null) => void;
     /** Scroll viewport the list virtualizes against. */
@@ -114,6 +128,8 @@ export declare function MessageList({ rows, expanded, expandedRows, selectedId,
     failureHint?: string;
     /** 打开子代理详情场景（transcript 内点击子代理卡）。 */
     onOpenSubagent?: (agentId: string) => void;
+    /** 从转录里的子代理卡打开主屏只读 Agent View。 */
+    onOpenSubagentView?: (agentId: string, rowId: number) => void;
     /** 打开 /jobs 后台任务面板（transcript 内点击任务卡）。 */
     onOpenJobs?: (focusId?: string) => void;
     /** 点击工具卡内的文件路径（打开文件操作菜单）。 */
@@ -135,7 +151,7 @@ export declare function MessageList({ rows, expanded, expandedRows, selectedId,
  * welcome line. It scrolls away with the transcript once the conversation
  * fills the viewport.
  */
-export declare function LogoHeader({ model, effort, cwd, fontId, whale, whaleIdle, whaleGirl, starred, onStarClick, working, skipIntro, }: {
+export declare function LogoHeader({ model, effort, cwd, fontId, whale, whaleIdle, whaleGirl, brand, starred, onStarClick, working, skipIntro, }: {
     model: string;
     effort?: string | undefined;
     cwd: string;
@@ -147,6 +163,8 @@ export declare function LogoHeader({ model, effort, cwd, fontId, whale, whaleIdl
     whaleIdle?: boolean;
     /** Maid portrait swap (passed through to LogoV2; settings `dsh-tui.whaleGirl`). */
     whaleGirl?: boolean;
+    /** 品牌档（当前后端 → `resolveBrand`；见 `branding.ts`）。 */
+    brand?: Brand;
     /** 求 star 标语行被点击（一键 star；host 不传则不可点）。 */
     onStarClick?: () => void;
     /** 本次会话已 star（彩蛋换「捡到星星」版）。 */

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

@@ -1 +1 @@
-{"version":3,"file":"MessageList.d.ts","sourceRoot":"","sources":["../../../src/components/MessageList.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"MessageList.d.ts","sourceRoot":"","sources":["../../../src/components/MessageList.tsx"],"names":[],"mappings":"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"}

package/lib/types/components/MessageList.js

@@ -5,9 +5,8 @@ import { Box, Text, useTerminalSize } from '../ui.js';
 import { normalizeIdePath } from '../dsh-adapter/ide-channel.js';
 import { Divider } from './design-system/Divider.js';
 import { UserPromptMessage } from './messages/UserPromptMessage.js';
-import { AssistantTextMessage } from './messages/AssistantTextMessage.js';
-import { AssistantThinkingMessage } from './messages/AssistantThinkingMessage.js';
-import { AssistantToolUseMessage } from './messages/AssistantToolUseMessage.js';
+import { AssistantTextLeafRow, ThinkingLeafRow, ToolLeafRow } from './messages/TranscriptLeaves.js';
+import { liveOutputMaxLines, liveOutputRows } from './messages/liveOutputLines.js';
 import { SubagentMessage } from './Chat/SubagentMessage.js';
 import { JobCard } from './Chat/JobCard.js';
 import { JobGroupHeader } from './Chat/JobGroupHeader.js';
@@ -15,6 +14,7 @@ import { isMinimalUiMode } from '../minimalUiMode.js';
 import { noteFrameCause, noteListGeometry } from '../ink/geometry-trace.js';
 import { getTerminalFlushTick } from '../ink/flush-tick.js';
 import { TurnInterruptedRow } from './TurnInterruptedRow.js';
+import { TurnUsageRow } from './TurnUsageRow.js';
 import { LogoV2 } from './LogoV2.js';
 import { StreamingMarkdown } from './StreamingMarkdown.js';
 import { MessageMetadata } from './messages/MessageMetadata.js';
@@ -178,7 +178,7 @@ function jobStatusCode(status) {
         default: return 7;
     }
 }
-function signatureParts(row, columns, expanded, expandedRows, streamViewToggledRows, thinkingVisible, thinkingFold, diffLayout, foldTerminalCommand, model, failureHintRowId, failureHint, displayTextLen, sessionCwd) {
+function signatureParts(row, columns, expanded, expandedRows, streamViewToggledRows, thinkingVisible, thinkingFold, diffLayout, foldTerminalCommand, model, failureHintRowId, failureHint, displayTextLen, sessionCwd, fullscreen) {
     signatureScratch.length = 0;
     // Universal height inputs: width reflows every row; kind switches height
     // semantics wholesale; text length drives wrapping. `displayTextLen` is the
@@ -208,7 +208,17 @@ function signatureParts(row, columns, expanded, expandedRows, streamViewToggledR
             // Terminal header folding changes the header's height the same way
             // diffLayout changes the body's — without it, a /settings toggle
             // leaves already-mounted tool cards at their stale cached height.
-            foldTerminalCommand, tool?.status ?? '', tool?.resultText?.length ?? 0, tool?.resultFull?.length ?? 0, tool?.errorText?.length ?? 0, row.id === failureHintRowId ? failureHint ?? '' : '');
+            foldTerminalCommand, tool?.status ?? '', tool?.resultText?.length ?? 0, tool?.resultFull?.length ?? 0, tool?.errorText?.length ?? 0, 
+            // Source-fold disclosure and the uncapped terminal exit/signal tail
+            // change the card's height when they (dis)appear — the window fold
+            // drops payloads and a settled terminal view adds its verdict lines.
+            row.folded === true, tool?.resultView?.card ?? '', row.id === failureHintRowId ? failureHint ?? '' : '', 
+            // Live output rows of a running call (omitted header + lines): the
+            // count saturates once the tail fills the card's window, so a
+            // steady stream stops invalidating the cached height.
+            tool?.status === 'running'
+                ? liveOutputRows(tool.liveOutput, tool.liveOutputDropped ?? 0, liveOutputMaxLines(expanded || expandedRows.has(row.id), fullscreen))
+                : 0);
             break;
         }
         case 'subagent':
@@ -218,34 +228,29 @@ function signatureParts(row, columns, expanded, expandedRows, streamViewToggledR
             signatureScratch.push(row.subagent?.status ?? '', row.subagent?.toolCalls.length ?? 0, row.subagent?.outputLines.length ?? 0, row.subagent?.error?.length ?? 0);
             break;
         case 'job': {
-            // Card height inputs: the group decoration reshapes the row wholesale
-            // (the head adds the summary line, a folded run collapses into it, the
-            // rail shifts the body two columns right), the waterfall grows and
-            // shrinks with mirrored output, and settling drops the progress chip
-            // and the waterfall while it may add the detail tail. Missing any of
-            // them leaves an offscreen card's cached height stale → blank band /
-            // unreachable scroll bottom (the subagent card's lesson).
+            // Command expansion and group folding change the row height; output
+            // stays within a fixed two-row tail, independent of command expansion.
             const group = row.jobGroup;
-            signatureScratch.push(row.job?.status ?? '', 
-            // The label drives the card's height: it wraps inside its column and
-            // the rail is painted per line, so a label that lands later (the
-            // kernel fills it in after launch) must invalidate the cached height.
-            row.job?.label?.length ?? 0, row.job?.outputLines.length ?? 0, row.job?.detail?.length ?? 0, row.job?.progress?.length ?? 0, 
+            signatureScratch.push(expanded, expandedRows.has(row.id), row.job?.status ?? '', 
+            // Script text, including blank-line changes, determines expanded height.
+            row.job?.label ?? '', row.job?.outputLines.length ?? 0, row.job?.detail?.length ?? 0, row.job?.progress?.length ?? 0, 
             // The waterfall wraps its tail and keeps the last rows, so how much
             // text those tail lines carry decides how many rows actually paint.
             row.job === undefined
                 ? ''
-                : row.job.outputLines.slice(-4).map(line => line.text.length).join(','), 
-            // Grouped members all render with the same 2-cell rail, so the only
-            // shape inputs are "is it a member", "is it the head" and "is the run
-            // folded" (a folded head paints the summary alone).
-            group !== undefined, group?.head === true, group?.last === true, group?.folded === true);
+                : row.job.outputLines.slice(-2).map(line => `${line.text.length}:${line.gapBefore === true}`).join(','), 
+            // The group head adds a summary; folded groups hide their card bodies.
+            group !== undefined, group?.head === true, group?.folded === true);
             break;
         }
         case 'compact':
             // Folded one-liner vs full summary text.
             signatureScratch.push(expanded, expandedRows.has(row.id));
             break;
+        case 'turn-summary':
+            // Immutable payload, single truncate-end line: the kind switch alone
+            // covers the height semantics (content never changes after creation).
+            break;
         case 'user':
             // T06: the selection indicator line above the bubble adds one rendered
             // row whose text wraps with width — its presence and content length
@@ -277,7 +282,7 @@ function signatureParts(row, columns, expanded, expandedRows, streamViewToggledR
     }
     return signatureScratch;
 }
-export function MessageList({ rows, expanded, expandedRows, selectedId, onToggleRow, streamViewToggledRows = NO_STREAM_VIEW_TOGGLED, onToggleStreamView = NOOP_TOGGLE_STREAM_VIEW, model, diffLayout = 'auto', thinkingFold = 'preview', jobGroupFold = 'auto', toolBackground = 'none', foldTerminalCommand = false, smoothStreaming = false, activityFrames, showAll, onToggleAll, onLoadOlder, thinkingVisible = true, historyPaintEnabled = true, registerRowRef, scrollHandle, forceMountRowId, newSinceRowId, onUnseenCount, onTimeline, failureHintRowId, failureHint, onOpenSubagent, onOpenJobs, onOpenFile, sessionCwd, onPreviewImage, suppressImageGraphics = false, }) {
+export function MessageList({ rows, expanded, expandedRows, selectedId, onToggleRow, streamViewToggledRows = NO_STREAM_VIEW_TOGGLED, onToggleStreamView = NOOP_TOGGLE_STREAM_VIEW, model, diffLayout = 'auto', thinkingFold = 'preview', jobGroupFold = 'auto', toolBackground = 'none', foldTerminalCommand = false, turnUsageRow = false, smoothStreaming = false, activityFrames, showAll, onToggleAll, onLoadOlder, olderHistory, thinkingVisible = true, historyPaintEnabled = true, fullscreen = false, registerRowRef, scrollHandle, forceMountRowId, newSinceRowId, onUnseenCount, onTimeline, failureHintRowId, failureHint, onOpenSubagent, onOpenSubagentView, onOpenJobs, onWatchJobOutput, onOpenFile, sessionCwd, onPreviewImage, suppressImageGraphics = false, }) {
     const lang = React.useSyncExternalStore(subscribeLang, getLang);
     const hiddenCount = rows.length - RENDERED_ROW_CAP;
     // The thinking filter runs BEFORE virtualization so window indices line up.
@@ -328,6 +333,7 @@ export function MessageList({ rows, expanded, expandedRows, selectedId, onToggle
         visibleCache.showAll !== (showAll || hiddenCount <= 0) ||
         visibleCache.thinkingVisible !== thinkingVisible ||
         visibleCache.jobsSig !== jobsSig ||
+        visibleCache.turnRowOn !== turnUsageRow ||
         !streamBitsSame) {
         const sliced = showAll || hiddenCount <= 0
             ? rows
@@ -367,12 +373,18 @@ export function MessageList({ rows, expanded, expandedRows, selectedId, onToggle
         // objects (an in-place write throws on a frozen row and takes the TUI
         // down at startup — the resume/replay first frame delivers exactly
         // that shape).
-        const out = hasEmptyAssistant
+        let out = hasEmptyAssistant
             ? sliced.filter(row => !rendersEmptyAssistant(row) &&
                 (thinkingVisible || row.kind !== 'reasoning'))
             : thinkingVisible
                 ? sliced.slice()
                 : sliced.filter(row => row.kind !== 'reasoning');
+        // Turn-usage rows (settings `dsh-tui.turnUsageRow`, default off): a
+        // pure PRESENTATION gate — filtering here (not render-null) keeps the
+        // row out of the window entirely, so no cached height or mounted node
+        // survives the toggle. The ledger data itself is collected regardless.
+        if (!turnUsageRow)
+            out = out.filter(row => row.kind !== 'turn-summary');
         // --- consecutive-job groups ------------------------------------------
         // A batch of run_in_background calls lands as N adjacent job cards (the
         // projection pushes the whole roster in one sync) and EVERY card pays
@@ -499,6 +511,7 @@ export function MessageList({ rows, expanded, expandedRows, selectedId, onToggle
             margins,
             streamBits,
             jobsSig,
+            turnRowOn: turnUsageRow,
         };
         visGenRef.current++;
     }
@@ -631,7 +644,7 @@ export function MessageList({ rows, expanded, expandedRows, selectedId, onToggle
             // reasoning height at once, remounting the widened window over rows
             // whose rendering never changed (Yoga spike + measure churn for
             // nothing). Base parts cover the universal height inputs.
-            const parts = signatureParts(row, columns, expanded, expandedRows, streamViewToggledRows, thinkingVisible, thinkingFold, diffLayout, foldTerminalCommand, model, failureHintRowId, failureHint, revealDisplayLen(row, smoothStreaming), sessionCwd);
+            const parts = signatureParts(row, columns, expanded, expandedRows, streamViewToggledRows, thinkingVisible, thinkingFold, diffLayout, foldTerminalCommand, model, failureHintRowId, failureHint, revealDisplayLen(row, smoothStreaming), sessionCwd, fullscreen);
             const cachedParts = sigs.get(row.id);
             let same = false;
             if (cachedParts !== undefined && cachedParts.length === parts.length) {
@@ -1169,7 +1182,7 @@ export function MessageList({ rows, expanded, expandedRows, selectedId, onToggle
             localRefs.current.delete(rowId);
         registerRowRef?.(rowId, el);
     }, [registerRowRef]);
-    return (_jsxs(_Fragment, { children: [rows.some(row => row.folded) && (_jsx(ClickableDivider, { title: t('load-earlier'), onClick: onLoadOlder })), !showAll && hiddenCount > 0 && (_jsx(ClickableDivider, { title: t('show-previous-messages', { n: hiddenCount, key: primaryComboString('showAll') }), onClick: onToggleAll })), topPad > 0 && _jsx(Box, { height: topPad, flexShrink: 0 }), visibleRows
+    return (_jsxs(_Fragment, { children: [(olderHistory === true || rows.some(row => row.folded)) && (_jsx(ClickableDivider, { title: t('load-earlier'), onClick: onLoadOlder })), !showAll && hiddenCount > 0 && (_jsx(ClickableDivider, { title: t('show-previous-messages', { n: hiddenCount, key: primaryComboString('showAll') }), onClick: onToggleAll })), topPad > 0 && _jsx(Box, { height: topPad, flexShrink: 0 }), visibleRows
                 .slice(start, end)
                 .map((row) => {
                 // The pre-pass result keeps windowed rows at full-mount
@@ -1203,7 +1216,7 @@ export function MessageList({ rows, expanded, expandedRows, selectedId, onToggle
                 else if (row.kind === 'reasoning' && smoothStreaming) {
                     displayText = revealTextOf(`r${row.id}`, row.text, { enabled: true, active: displayStreaming });
                 }
-                return (_jsx(MemoRow, { rowId: row.id, kind: row.kind, text: displayText, images: row.images, textFull: row.kind === 'reasoning' ? row.text : undefined, executionTarget: row.executionTarget, selectionAttached: row.selectionAttached, streaming: displayStreaming, thinkingOpen: row.thinkingOpen === true, durationMs: row.durationMs, time: row.time, marginTopOnTurn: marginTopOnTurn, isSelected: selectedId === row.id, isExpanded: expandedRows.has(row.id), expanded: expanded, model: model, diffLayout: diffLayout, thinkingFold: thinkingFold, toolBackground: toolBackground, foldTerminalCommand: foldTerminalCommand, smoothStreaming: smoothStreaming, fresh: row.fresh === true, revealVersion: revealVersion, activityFrames: activityFrames, background: rowBackground(row.id), toolCallId: tool?.callId, toolName: tool?.name, toolArgsText: tool?.argsText, toolArgsFull: tool?.argsFull, toolStatus: tool?.status, toolResultText: tool?.resultText, toolResultFull: tool?.resultFull, toolErrorText: tool?.errorText, toolFootnote: failureHintRowId === row.id ? failureHint : undefined, toolCallView: tool?.callView, toolResultView: tool?.resultView, toolStartedAt: tool?.startedAt, toolDurationMs: tool?.durationMs, subagent: subagent, job: job, jobGroup: jobGroup, onToggleRow: onToggleRow, onToggleStreamView: onToggleStreamView, streamViewToggled: streamViewToggledRows.has(row.id), onOpenSubagent: onOpenSubagent, onOpenJobs: onOpenJobs, onOpenFile: onOpenFile, sessionCwd: sessionCwd, onPreviewImage: onPreviewImage, suppressImageGraphics: suppressImageGraphics, setRowRef: setRowRef }, row.id));
+                return (_jsx(MemoRow, { rowId: row.id, kind: row.kind, text: displayText, interruptBackend: row.interruptBackend, images: row.images, textFull: row.kind === 'reasoning' ? row.text : undefined, executionTarget: row.executionTarget, selectionAttached: row.selectionAttached, streaming: displayStreaming, thinkingOpen: row.thinkingOpen === true, durationMs: row.durationMs, reasoningTokens: row.reasoningTokens, time: row.time, marginTopOnTurn: marginTopOnTurn, isSelected: selectedId === row.id, isExpanded: expandedRows.has(row.id), expanded: expanded, model: model, diffLayout: diffLayout, thinkingFold: thinkingFold, toolBackground: toolBackground, foldTerminalCommand: foldTerminalCommand, smoothStreaming: smoothStreaming, fresh: row.fresh === true, revealVersion: revealVersion, activityFrames: activityFrames, background: rowBackground(row.id), toolCallId: tool?.callId, toolName: tool?.name, toolArgsText: tool?.argsText, toolArgsFull: tool?.argsFull, toolStatus: tool?.status, toolResultText: tool?.resultText, toolResultFull: tool?.resultFull, toolErrorText: tool?.errorText, toolFootnote: failureHintRowId === row.id ? failureHint : undefined, toolCallView: tool?.callView, toolResultView: tool?.resultView, toolStartedAt: tool?.startedAt, toolDurationMs: tool?.durationMs, toolSourceFolded: row.folded === true, toolLiveOutput: tool?.liveOutput, toolLiveOutputDropped: tool?.liveOutputDropped, fullscreen: fullscreen, turnUsage: row.turnUsage, subagent: subagent, job: job, jobGroup: jobGroup, onToggleRow: onToggleRow, onToggleStreamView: onToggleStreamView, streamViewToggled: streamViewToggledRows.has(row.id), onOpenSubagent: onOpenSubagent, onOpenSubagentView: onOpenSubagentView, onOpenJobs: onOpenJobs, onWatchJobOutput: onWatchJobOutput, onOpenFile: onOpenFile, sessionCwd: sessionCwd, onPreviewImage: onPreviewImage, suppressImageGraphics: suppressImageGraphics, setRowRef: setRowRef }, row.id));
             }), bottomPad > 0 && _jsx(Box, { height: bottomPad, flexShrink: 0 })] }));
 }
 /** Load-earlier / show-previous divider row with a mouse hover tint — the
@@ -1212,7 +1225,7 @@ function ClickableDivider({ title, onClick }) {
     const [hovered, setHovered] = useState(false);
     return (_jsx(Box, { marginTop: 1, onClick: onClick, onMouseEnter: () => setHovered(true), onMouseLeave: () => setHovered(false), backgroundColor: hovered ? 'userMessageBackgroundHover' : undefined, children: _jsx(Divider, { title: title }) }));
 }
-function TranscriptRow({ rowId, kind, text, images, textFull, executionTarget, selectionAttached, sessionCwd, streaming, thinkingOpen, durationMs, time, marginTopOnTurn, isSelected, isExpanded, expanded, model, diffLayout, smoothStreaming, fresh, revealVersion, thinkingFold, toolBackground, foldTerminalCommand, activityFrames, background, toolCallId, toolName, toolArgsText, toolArgsFull, toolStatus, toolResultText, toolResultFull, toolErrorText, toolFootnote, toolCallView, toolResultView, toolStartedAt, toolDurationMs, subagent, job, jobGroup, onToggleRow, onToggleStreamView, streamViewToggled, onOpenSubagent, onOpenJobs, onOpenFile, onPreviewImage, suppressImageGraphics, setRowRef, }) {
+function TranscriptRow({ rowId, kind, text, interruptBackend, images, textFull, executionTarget, selectionAttached, sessionCwd, streaming, thinkingOpen, durationMs, reasoningTokens, time, marginTopOnTurn, isSelected, isExpanded, expanded, model, diffLayout, smoothStreaming, fresh, revealVersion, thinkingFold, toolBackground, foldTerminalCommand, activityFrames, background, toolCallId, toolName, toolArgsText, toolArgsFull, toolStatus, toolResultText, toolResultFull, toolErrorText, toolFootnote, toolCallView, toolResultView, toolStartedAt, toolDurationMs, toolSourceFolded, toolLiveOutput, toolLiveOutputDropped, fullscreen, turnUsage, subagent, job, jobGroup, onToggleRow, onToggleStreamView, streamViewToggled, onOpenSubagent, onOpenSubagentView, onOpenJobs, onWatchJobOutput, onOpenFile, onPreviewImage, suppressImageGraphics, setRowRef, }) {
     const ref = React.useCallback((el) => {
         setRowRef(rowId, el);
     }, [setRowRef, rowId]);
@@ -1273,17 +1286,17 @@ function TranscriptRow({ rowId, kind, text, images, textFull, executionTarget, s
                                 path: displaySelectionPath(selectionAttached.path, sessionCwd),
                             })] })), text !== '' && (_jsx(UserPromptMessage, { text: displayText, marginTopOnTurn: marginTopOnTurn, isSelected: isSelected })), images !== undefined && (_jsx(Box, { marginTop: text === '' && marginTopOnTurn ? 1 : 0, children: _jsx(TranscriptImages, { images: images, onPreview: onPreviewImage, suppressGraphics: suppressImageGraphics }) }))] }));
         case 'assistant':
-            return streaming ? (_jsxs(Box, { alignItems: "flex-start", flexDirection: "row", marginTop: marginTopOnTurn ? 1 : 0, width: "100%", backgroundColor: background, ref: ref, onClick: foldClickable ? foldOnClick : undefined, children: [_jsx(Box, { minWidth: 2, children: _jsx(Text, { color: "text", children: "\u25CF" }) }), _jsxs(Box, { flexDirection: "column", children: [_jsx(StreamingMarkdown, { children: stripNarration(displayText) }), images !== undefined && _jsx(TranscriptImages, { images: images, indent: 0, onPreview: onPreviewImage, suppressGraphics: suppressImageGraphics })] })] })) : (_jsxs(Box, { width: "100%", flexDirection: "column", backgroundColor: background, ref: ref, onClick: foldClickable ? foldOnClick : undefined, children: [expanded && (_jsx(Box, { flexDirection: "row", justifyContent: "flex-end", gap: 1, marginTop: 1, children: _jsx(MessageMetadata, { timestamp: time, model: model }) })), _jsx(AssistantTextMessage, { text: stripNarration(displayText), marginTopOnTurn: marginTopOnTurn, isSelected: isSelected, isExpanded: isExpanded }), images !== undefined && _jsx(TranscriptImages, { images: images, onPreview: onPreviewImage, suppressGraphics: suppressImageGraphics })] }));
+            return streaming ? (_jsxs(Box, { alignItems: "flex-start", flexDirection: "row", marginTop: marginTopOnTurn ? 1 : 0, width: "100%", backgroundColor: background, ref: ref, onClick: foldClickable ? foldOnClick : undefined, children: [_jsx(Box, { minWidth: 2, children: _jsx(Text, { color: "text", children: "\u25CF" }) }), _jsxs(Box, { flexDirection: "column", children: [_jsx(StreamingMarkdown, { children: stripNarration(displayText) }), images !== undefined && _jsx(TranscriptImages, { images: images, indent: 0, onPreview: onPreviewImage, suppressGraphics: suppressImageGraphics })] })] })) : (_jsxs(Box, { width: "100%", flexDirection: "column", backgroundColor: background, ref: ref, onClick: foldClickable ? foldOnClick : undefined, children: [expanded && (_jsx(Box, { flexDirection: "row", justifyContent: "flex-end", gap: 1, marginTop: 1, children: _jsx(MessageMetadata, { timestamp: time, model: model }) })), _jsx(AssistantTextLeafRow, { text: stripNarration(displayText), marginTopOnTurn: marginTopOnTurn, isSelected: isSelected, isExpanded: isExpanded }), images !== undefined && _jsx(TranscriptImages, { images: images, onPreview: onPreviewImage, suppressGraphics: suppressImageGraphics })] }));
         case 'reasoning': {
             // The setting chooses the live default; a row click reverses it. Global
             // or per-row transcript expansion always wins and shows the full text.
             const turnOpen = streaming || thinkingOpen;
             const streamPreview = turnOpen && !expanded && !isExpanded &&
                 (streamViewToggled ? thinkingFold === 'full' : thinkingFold === 'preview');
-            return (_jsx(Box, { flexDirection: "column", ref: ref, children: _jsx(AssistantThinkingMessage, { thinking: text, textFull: textFull, marginTopOnTurn: marginTopOnTurn, streaming: streaming, preview: streamPreview, 
+            return (_jsx(Box, { flexDirection: "column", ref: ref, children: _jsx(ThinkingLeafRow, { thinking: text, textFull: textFull, marginTopOnTurn: marginTopOnTurn, streaming: streaming, preview: streamPreview, 
                     // Settled rows keep the fold-on-settle default and expand via
                     // expandedRows/Ctrl+O; a current-turn row is preview or full.
-                    verbose: isExpanded || expanded || (turnOpen && !streamPreview), durationMs: durationMs, isSelected: isSelected, onClick: turnOpen ? streamViewOnClick : foldOnClick }) }));
+                    verbose: isExpanded || expanded || (turnOpen && !streamPreview), durationMs: durationMs, reasoningTokens: reasoningTokens, isSelected: isSelected, onClick: turnOpen ? streamViewOnClick : foldOnClick }) }));
         }
         case 'tool': {
             if (toolCallId === undefined ||
@@ -1308,13 +1321,24 @@ function TranscriptRow({ rowId, kind, text, images, textFull, executionTarget, s
                 resultView: toolResultView,
                 startedAt: toolStartedAt,
                 durationMs: toolDurationMs,
+                ...(toolLiveOutput === undefined ? {} : { liveOutput: toolLiveOutput }),
+                ...(toolLiveOutputDropped === undefined ? {} : { liveOutputDropped: toolLiveOutputDropped }),
             };
-            return (_jsxs(Box, { flexDirection: "column", ref: ref, children: [_jsx(AssistantToolUseMessage, { tool: tool, marginTopOnTurn: marginTopOnTurn, verbose: isExpanded || expanded, isSelected: isSelected, isExpanded: isExpanded, footnote: toolFootnote, diffLayout: diffLayout, toolBackground: toolBackground, smoothReveal: smoothStreaming, fresh: fresh, revealVersion: revealVersion, foldTerminalCommand: foldTerminalCommand, onClick: foldOnClick, onOpenFile: onOpenFile }), images !== undefined && _jsx(TranscriptImages, { images: images, indent: 4, onPreview: onPreviewImage, suppressGraphics: suppressImageGraphics })] }));
+            return (_jsx(Box, { flexDirection: "column", ref: ref, children: _jsx(ToolLeafRow, { tool: tool, marginTopOnTurn: marginTopOnTurn, verbose: isExpanded || expanded, isSelected: isSelected, isExpanded: isExpanded, footnote: toolFootnote, diffLayout: diffLayout, toolBackground: toolBackground, smoothReveal: smoothStreaming, fresh: fresh, revealVersion: revealVersion, foldTerminalCommand: foldTerminalCommand, onClick: foldOnClick, onOpenFile: onOpenFile, images: images, onPreviewImage: onPreviewImage, suppressImageGraphics: suppressImageGraphics, sourceFolded: toolSourceFolded, fullscreen: fullscreen }) }));
         }
         case 'notice':
             return (_jsx(Box, { marginTop: 1, ref: ref, onClick: foldClickable ? foldOnClick : undefined, children: _jsx(Divider, { title: ` ${displayText} ` }) }));
         case 'interrupt':
-            return (_jsx(Box, { marginTop: 1, ref: ref, children: _jsx(TurnInterruptedRow, {}) }));
+            return (_jsx(Box, { marginTop: 1, ref: ref, children: _jsx(TurnInterruptedRow, { backendLabel: interruptBackend }) }));
+        case 'turn-summary':
+            // The turn's closing ledger: a quiet RIGHT-aligned
+            // emblem — metadata does not lead the reading flow. No top margin, it
+            // belongs to the block above. width="100%" is what makes flex-end mean
+            // the transcript's right margin (an auto-width row has nothing to push
+            // against).
+            if (turnUsage === undefined)
+                return null;
+            return (_jsx(Box, { paddingLeft: 2, width: "100%", flexDirection: "row", justifyContent: "flex-end", ref: ref, children: _jsx(TurnUsageRow, { usage: turnUsage }) }));
         case 'local':
             // `!` mode command echo.
             return (_jsx(Box, { marginTop: 1, backgroundColor: background, ref: ref, onClick: foldClickable ? foldOnClick : undefined, children: _jsxs(Text, { color: "bashBorder", children: ["!", executionTarget ? ` [${executionTarget}]` : '', " ", displayText] }) }));
@@ -1328,7 +1352,7 @@ function TranscriptRow({ rowId, kind, text, images, textFull, executionTarget, s
         case 'subagent':
             if (!subagent)
                 return null;
-            return (_jsx(Box, { flexDirection: "column", ref: ref, children: _jsx(SubagentMessage, { subagent: subagent, marginTopOnTurn: marginTopOnTurn, activityFrames: activityFrames, isExpanded: isExpanded, onClick: openSubagent }) }));
+            return (_jsx(Box, { flexDirection: "column", ref: ref, children: _jsx(SubagentMessage, { subagent: subagent, marginTopOnTurn: marginTopOnTurn, activityFrames: activityFrames, isExpanded: isExpanded, onClick: openSubagent, onOpenView: onOpenSubagentView === undefined ? undefined : () => onOpenSubagentView(subagent.agentId, rowId) }) }));
         case 'job': {
             if (!job)
                 return null;
@@ -1340,13 +1364,9 @@ function TranscriptRow({ rowId, kind, text, images, textFull, executionTarget, s
                 // The head's block margin moves UP to the group (the summary line
                 // is what separates the run from what precedes it); the card under
                 // it must not add a second blank line.
-                marginTop: groupHead && marginTopOnTurn ? 1 : 0, ref: ref, children: [groupHead && _jsx(JobGroupHeader, { group: jobGroup, onToggle: toggleJobGroup }), groupHead && jobGroup.folded ? null : (_jsx(JobCard, { job: job, marginTopOnTurn: groupHead ? false : marginTopOnTurn, 
-                        // The bracket hugs the CARDS: the summary line above stays
-                        // outside it, and the head/last member round the two ends in
-                        // place (no extra cap row) — see JobCard's `rail` prop.
-                        rail: jobGroup === undefined ? undefined : { open: jobGroup.head, close: jobGroup.last }, 
+                marginTop: groupHead && marginTopOnTurn ? 1 : 0, ref: ref, children: [groupHead && _jsx(JobGroupHeader, { group: jobGroup, onToggle: toggleJobGroup }), groupHead && jobGroup.folded ? null : (_jsx(JobCard, { job: job, expanded: isExpanded !== expanded, onToggle: toggleJobGroup, marginTopOnTurn: groupHead ? false : marginTopOnTurn, 
                         // Clicking a card opens the panel focused on THAT job, not the roster head.
-                        onClick: onOpenJobs === undefined ? undefined : () => onOpenJobs(job.id) }))] }));
+                        onClick: onOpenJobs === undefined ? undefined : () => onOpenJobs(job.id), onWatchOutput: onWatchJobOutput }))] }));
         }
     }
 }
@@ -1364,10 +1384,10 @@ const MemoRow = React.memo(TranscriptRow);
  * welcome line. It scrolls away with the transcript once the conversation
  * fills the viewport.
  */
-export function LogoHeader({ model, effort, cwd, fontId, whale = true, whaleIdle = true, whaleGirl = false, starred = false, onStarClick, working = false, skipIntro = false, }) {
+export function LogoHeader({ model, effort, cwd, fontId, whale = true, whaleIdle = true, whaleGirl = false, brand, starred = false, onStarClick, working = false, skipIntro = false, }) {
     // The minimal UI drops the whole splash (whale art AND wordmark) — only the
     // transcript and a bare status bar remain.
     if (isMinimalUiMode())
         return null;
-    return (_jsx(Box, { flexDirection: "column", marginBottom: 1, children: _jsx(LogoV2, { model: model, effort: effort, cwd: cwd, fontId: fontId, whale: whale, whaleIdle: whaleIdle, whaleGirl: whaleGirl, starred: starred, onStarClick: onStarClick, working: working, skipIntro: skipIntro }) }));
+    return (_jsx(Box, { flexDirection: "column", marginBottom: 1, children: _jsx(LogoV2, { model: model, effort: effort, cwd: cwd, fontId: fontId, whale: whale, whaleIdle: whaleIdle, whaleGirl: whaleGirl, brand: brand, starred: starred, onStarClick: onStarClick, working: working, skipIntro: skipIntro }) }));
 }

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

@@ -0,0 +1,20 @@
+import React from 'react';
+import type { BackendModeOption } from '../dsh-adapter/channel.js';
+/**
+ * `/permission` picker over a backend's native permission modes (the typed
+ * `modes` capability). Same visual family as the DSH preset picker
+ * (PermissionsPicker): one Pane + Select + hint line, the roster swapped
+ * for the backend's own mode list. The list is rendered verbatim —
+ * whatever `modes.list()` offers (including a session-start bypass
+ * opt-in) is what the user may pick; the TUI adds no filtering of its own.
+ */
+export declare function ModePicker({ modes, focusIndex, currentId, onPick, }: {
+    modes: readonly BackendModeOption[];
+    focusIndex: number;
+    /** The live mode id, for the selected-row checkmark. */
+    currentId: string | undefined;
+    /** Mouse pick (fullscreen): clicked row's absolute index (Chat applies
+     *  the same code path as the keyboard Enter). */
+    onPick?: (index: number) => void;
+}): React.ReactNode;
+//# sourceMappingURL=ModePicker.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ModePicker.d.ts","sourceRoot":"","sources":["../../../src/components/ModePicker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAElE;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,EACzB,KAAK,EACL,UAAU,EACV,SAAS,EACT,MAAM,GACP,EAAE;IACD,KAAK,EAAE,SAAS,iBAAiB,EAAE,CAAA;IACnC,UAAU,EAAE,MAAM,CAAA;IAClB,wDAAwD;IACxD,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B;qDACiD;IACjD,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;CACjC,GAAG,KAAK,CAAC,SAAS,CAqBlB"}

package/lib/types/components/ModePicker.js

@@ -0,0 +1,17 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { t } from '../i18n.js';
+import { Box, Text } from '../ui.js';
+import { Pane } from './design-system/Pane.js';
+import { Select } from './Select.js';
+import { HintLine } from './design-system/HintLine.js';
+/**
+ * `/permission` picker over a backend's native permission modes (the typed
+ * `modes` capability). Same visual family as the DSH preset picker
+ * (PermissionsPicker): one Pane + Select + hint line, the roster swapped
+ * for the backend's own mode list. The list is rendered verbatim —
+ * whatever `modes.list()` offers (including a session-start bypass
+ * opt-in) is what the user may pick; the TUI adds no filtering of its own.
+ */
+export function ModePicker({ modes, focusIndex, currentId, onPick, }) {
+    return (_jsx(Pane, { color: "permission", children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "remember", bold: true, children: t('permission-mode-picker-title') }) }), _jsx(Select, { options: modes.map(mode => ({ value: mode.id, label: mode.name, description: mode.description ?? mode.name })), focusIndex: focusIndex, selectedValue: currentId, onPick: onPick ? index => onPick(index) : undefined }), _jsx(Text, { dimColor: true, italic: true, children: _jsx(HintLine, { text: t('hint-confirm-exit') }) })] }) }));
+}

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

@@ -98,8 +98,8 @@ export interface PromptInputProps {
     /** Double-tap Esc with an empty input: open the rewind picker. */
     onRewindRequest?(): void;
     /**
-     * ← on an EMPTY prompt backgrounds this session and
-     * opens the agent view (with text, ← moves the caret as usual).
+     * ← on an EMPTY prompt opens the session manager. DSH backgrounds the
+     * session first; other backends keep it attached. With text, ← moves the caret.
      */
     onBackgroundRequest?(): void;
     /**