@deepseek-harness-tui/dsh-tui 0.8.5 → 0.8.7

package/lib/types/components/design-system/ThemedBox.js

@@ -12,7 +12,10 @@ function resolveColor(color, theme) {
         color.startsWith('ansi:')) {
         return color;
     }
-    return theme[color];
+    // Theme keys may be '' ("no color" in that theme) - collapse to undefined
+    // so empty tokens render as no background/foreground instead of feeding
+    // an empty color string to Ink.
+    return theme[color] || undefined;
 }
 /**
  * Theme-aware Box component that resolves theme color keys to raw colors

package/lib/types/components/design-system/ThemedText.js

@@ -20,8 +20,8 @@ function resolveColor(color, theme) {
         color.startsWith('ansi:')) {
         return color;
     }
-    // It's a theme key - resolve it
-    return theme[color];
+    // It's a theme key - resolve it ('' means "no color" in that theme)
+    return theme[color] || undefined;
 }
 /**
  * Theme-aware Text component that resolves theme color keys to raw colors

package/lib/types/components/messages/AssistantThinkingMessage.d.ts

@@ -5,6 +5,10 @@ type Props = {
     addMargin: boolean;
     /** True when Ctrl+O transcript/verbose mode is on — show the full text. */
     verbose: boolean;
+    /** True while the reasoning block is still streaming — the leading anchor
+     *  becomes a rotating braille spinner (Kimi Code style) and settles back
+     *  to the anchor once the step ends. */
+    streaming?: boolean;
     /** Streaming compact mode (thinkingFold=preview): a 3-row live ticker of
      *  the model's latest reasoning lines instead of the full block —
      *  kimicode-style constant height; the block never resizes mid-stream. */
@@ -16,12 +20,14 @@ type Props = {
     onClick?(): void;
 };
 /**
- * Thinking block: folded `∴ Thinking (ctrl+o to expand)`, expanded shows the
- * full reasoning text indented under `∴ Thinking…`, mirroring Claude Code's
- * `messages/AssistantThinkingMessage.tsx`. When the channel records the
- * reasoning duration, the label carries it (`∴ Thinking · 12s …`) — dsh-tui's
- * take on making thinking time visible in the transcript.
+ * Thinking block: folded `⚓ Thinking (ctrl+o to expand)`, expanded shows the
+ * full reasoning text indented under `⚓ Thinking…`. While the reasoning
+ * streams the leading mark is a rotating braille spinner (`⠋⠙⠹…`, Kimi Code
+ * style), settling back to the static anchor (`⚓`) once the turn ends. When
+ * the channel records the reasoning duration, the label carries it
+ * (`⚓ Thinking · 12s …`) — dsh-tui's take on making thinking time visible in
+ * the transcript.
  */
-export declare function AssistantThinkingMessage({ thinking, addMargin, verbose, preview, durationMs, isSelected, onClick, }: Props): React.ReactNode;
+export declare function AssistantThinkingMessage({ thinking, addMargin, verbose, streaming, preview, durationMs, isSelected, onClick, }: Props): React.ReactNode;
 export {};
 //# sourceMappingURL=AssistantThinkingMessage.d.ts.map

package/lib/types/components/messages/AssistantThinkingMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AssistantThinkingMessage.d.ts","sourceRoot":"","sources":["../../../../src/components/messages/AssistantThinkingMessage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAczB,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,MAAM,CAAA;IAChB,4DAA4D;IAC5D,SAAS,EAAE,OAAO,CAAA;IAClB,2EAA2E;IAC3E,OAAO,EAAE,OAAO,CAAA;IAChB;;8EAE0E;IAC1E,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,0EAA0E;IAC1E,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,wCAAwC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,OAAO,CAAC,IAAI,IAAI,CAAA;CACjB,CAAA;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,SAAS,EACT,OAAO,EACP,OAAe,EACf,UAAU,EACV,UAAkB,EAClB,OAAO,GACR,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CA2FzB"}
+{"version":3,"file":"AssistantThinkingMessage.d.ts","sourceRoot":"","sources":["../../../../src/components/messages/AssistantThinkingMessage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAuBzB,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,MAAM,CAAA;IAChB,4DAA4D;IAC5D,SAAS,EAAE,OAAO,CAAA;IAClB,2EAA2E;IAC3E,OAAO,EAAE,OAAO,CAAA;IAChB;;4CAEwC;IACxC,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;8EAE0E;IAC1E,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,0EAA0E;IAC1E,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,wCAAwC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,OAAO,CAAC,IAAI,IAAI,CAAA;CACjB,CAAA;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,SAAS,EACT,OAAO,EACP,SAAiB,EACjB,OAAe,EACf,UAAU,EACV,UAAkB,EAClB,OAAO,GACR,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CAwHzB"}

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

@@ -1,8 +1,14 @@
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React from 'react';
+import chalk from 'chalk';
 import { Box, Text } from '../../ui.js';
 import { t } from '../../i18n.js';
 import { StreamingMarkdown } from '../StreamingMarkdown.js';
 import { formatDuration } from '../../cc/format.js';
+import { THINKING_SPINNER_FRAMES, THINKING_SPINNER_INTERVAL_MS, THINKING_SETTLED_MARKER, } from '../../cc/figures.js';
+import { BRAND, ICE } from '../shimmer.js';
+import { interpolateColor } from '../Spinner/spinnerUtils.js';
+import { isMinimalMode } from '../../minimalMode.js';
 /** Preview body rows — a FIXED row count (kimicode-style constant-height
  *  ticker). Ink's truncate slices the whole string across newlines as one
  *  logical line, so a single joined Text collapses to 1-2 rows whenever
@@ -11,18 +17,39 @@ import { formatDuration } from '../../cc/format.js';
  *  to exactly this many rows, keeps the block height stream-independent. */
 const PREVIEW_ROWS = 3;
 /**
- * Thinking block: folded `∴ Thinking (ctrl+o to expand)`, expanded shows the
- * full reasoning text indented under `∴ Thinking…`, mirroring Claude Code's
- * `messages/AssistantThinkingMessage.tsx`. When the channel records the
- * reasoning duration, the label carries it (`∴ Thinking · 12s …`) — dsh-tui's
- * take on making thinking time visible in the transcript.
+ * Thinking block: folded `⚓ Thinking (ctrl+o to expand)`, expanded shows the
+ * full reasoning text indented under `⚓ Thinking…`. While the reasoning
+ * streams the leading mark is a rotating braille spinner (`⠋⠙⠹…`, Kimi Code
+ * style), settling back to the static anchor (`⚓`) once the turn ends. When
+ * the channel records the reasoning duration, the label carries it
+ * (`⚓ Thinking · 12s …`) — dsh-tui's take on making thinking time visible in
+ * the transcript.
  */
-export function AssistantThinkingMessage({ thinking, addMargin, verbose, preview = false, durationMs, isSelected = false, onClick, }) {
+export function AssistantThinkingMessage({ thinking, addMargin, verbose, streaming = false, preview = false, durationMs, isSelected = false, onClick, }) {
     if (!thinking)
         return null;
+    // Spinner frame (80ms cadence, only while the reasoning is still
+    // streaming — same pattern as BtwPanel's answering spinner).
+    const [frame, setFrame] = React.useState(0);
+    React.useEffect(() => {
+        if (!streaming)
+            return;
+        const interval = setInterval(() => setFrame(f => f + 1), THINKING_SPINNER_INTERVAL_MS);
+        return () => clearInterval(interval);
+    }, [streaming]);
     const duration = durationMs !== undefined && durationMs >= 1000
         ? ` · ${formatDuration(durationMs)}`
         : '';
+    // 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);
+    // settled always keeps the plain dim anchor.
+    const label = `${t('thinking-label')}${duration}${streaming ? '…' : ` ${t('hint-expand-ctrl-o')}`}`;
+    const minimal = isMinimalMode();
+    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];
+    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: true, italic: true, children: ` ${label}` })] })) : (_jsx(Text, { dimColor: true, italic: true, children: `${minimal ? '*' : 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
@@ -37,10 +64,10 @@ export function AssistantThinkingMessage({ thinking, addMargin, verbose, preview
         // Pad with single spaces — an empty-string Text renders with zero
         // height in ink, so '' padding would not hold the row open.
         const rows = Array.from({ length: PREVIEW_ROWS }, (_, i) => visible[i] ?? ' ');
-        return (_jsxs(Box, { flexDirection: "column", marginTop: addMargin ? 1 : 0, backgroundColor: isSelected ? 'messageActionsBackground' : undefined, onClick: onClick, children: [_jsxs(Text, { dimColor: true, italic: true, children: ["\u2234 ", t('thinking-label'), duration, "\u2026"] }), _jsx(Box, { flexDirection: "column", paddingLeft: 2, height: PREVIEW_ROWS, flexShrink: 0, overflow: "hidden", children: rows.map((line, i) => (_jsx(Text, { dimColor: true, italic: true, wrap: i === rows.length - 1 ? 'truncate-start' : 'truncate', children: i === 0 && clipped ? `…${line}` : line }, i))) })] }));
+        return (_jsxs(Box, { flexDirection: "column", marginTop: addMargin ? 1 : 0, backgroundColor: isSelected ? 'messageActionsBackground' : undefined, onClick: onClick, children: [header, _jsx(Box, { flexDirection: "column", paddingLeft: 2, height: PREVIEW_ROWS, flexShrink: 0, overflow: "hidden", children: rows.map((line, i) => (_jsxs(Box, { flexDirection: "row", height: 1, children: [_jsx(Text, { dimColor: true, italic: true, children: '│ ' }), _jsx(Box, { flexDirection: "row", flexGrow: 1, children: _jsx(Text, { dimColor: true, italic: true, wrap: i === rows.length - 1 ? 'truncate-start' : 'truncate', children: i === 0 && clipped ? `…${line}` : line }) })] }, i))) })] }));
     }
     if (!verbose) {
-        return (_jsx(Box, { marginTop: addMargin ? 1 : 0, backgroundColor: isSelected ? 'messageActionsBackground' : undefined, onClick: onClick, children: _jsxs(Text, { dimColor: true, italic: true, children: ["\u2234 ", t('thinking-label'), duration, " ", t('hint-expand-ctrl-o')] }) }));
+        return (_jsx(Box, { marginTop: addMargin ? 1 : 0, backgroundColor: isSelected ? 'messageActionsBackground' : undefined, onClick: onClick, children: header }));
     }
-    return (_jsxs(Box, { flexDirection: "column", gap: 1, marginTop: addMargin ? 1 : 0, width: "100%", backgroundColor: isSelected ? 'messageActionsBackground' : undefined, onClick: onClick, children: [_jsxs(Text, { dimColor: true, italic: true, children: ["\u2234 ", t('thinking-label'), duration, "\u2026"] }), _jsx(Box, { paddingLeft: 2, children: _jsx(StreamingMarkdown, { dimColor: true, children: thinking }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", gap: 1, marginTop: addMargin ? 1 : 0, width: "100%", backgroundColor: isSelected ? 'messageActionsBackground' : undefined, onClick: onClick, children: [header, _jsx(Box, { paddingLeft: 2, children: _jsx(StreamingMarkdown, { dimColor: true, children: thinking }) })] }));
 }

package/lib/types/components/messages/AssistantToolUseMessage.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import type { ToolRow } from '../../dsh-adapter/channel.js';
 import type { ToolBackground } from '../../tuiDisplayPrefs.js';
+import type { Theme } from '../../theme.js';
 type Props = {
     tool: ToolRow;
     /** Adds the top margin between messages (CC: addMargin). */
@@ -25,6 +26,7 @@ type Props = {
     /** Background treatment for the ordinary, unselected tool card surface. */
     toolBackground?: ToolBackground;
 };
+export declare function toolNameColor(raw: string): keyof Theme;
 /**
  * Tool-call card: `● Edit /path` header with a blinking status dot, then the
  * structured body under a `  ⎿  ` gutter — diff hunks in red/green, terminal

package/lib/types/components/messages/AssistantToolUseMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AssistantToolUseMessage.d.ts","sourceRoot":"","sources":["../../../../src/components/messages/AssistantToolUseMessage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,KAAK,EAA8C,OAAO,EAAE,MAAM,8BAA8B,CAAA;AAIvG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAE9D,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,OAAO,CAAA;IACb,4DAA4D;IAC5D,SAAS,EAAE,OAAO,CAAA;IAClB,iEAAiE;IACjE,OAAO,EAAE,OAAO,CAAA;IAChB,wCAAwC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,sEAAsE;IACtE,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,oEAAoE;IACpE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAA;IACzC,2EAA2E;IAC3E,cAAc,CAAC,EAAE,cAAc,CAAA;CAChC,CAAA;AAqND;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,EACtC,IAAI,EACJ,SAAS,EACT,OAAO,EACP,UAAkB,EAClB,UAAkB,EAClB,QAAQ,EACR,UAAmB,EACnB,cAAuB,GACxB,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CAgJzB"}
+{"version":3,"file":"AssistantToolUseMessage.d.ts","sourceRoot":"","sources":["../../../../src/components/messages/AssistantToolUseMessage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,OAAO,KAAK,EAA8C,OAAO,EAAE,MAAM,8BAA8B,CAAA;AAKvG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAE3C,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,OAAO,CAAA;IACb,4DAA4D;IAC5D,SAAS,EAAE,OAAO,CAAA;IAClB,iEAAiE;IACjE,OAAO,EAAE,OAAO,CAAA;IAChB,wCAAwC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,sEAAsE;IACtE,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,oEAAoE;IACpE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAA;IACzC,2EAA2E;IAC3E,cAAc,CAAC,EAAE,cAAc,CAAA;CAChC,CAAA;AAgFD,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,KAAK,CAKtD;AAwKD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,EACtC,IAAI,EACJ,SAAS,EACT,OAAO,EACP,UAAkB,EAClB,UAAkB,EAClB,QAAQ,EACR,UAAmB,EACnB,cAAuB,GACxB,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CAmKzB"}

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

@@ -1,9 +1,11 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { extname } from 'node:path';
 import { Box, Text, useTerminalSize } from '../../ui.js';
 import { stringWidth } from '../../ink/stringWidth.js';
 import { useAnimationFrame } from '../../ink/hooks/use-animation-frame.js';
 import { ToolUseLoader } from '../ToolUseLoader.js';
 import { SplitDiffView } from '../SplitDiffView.js';
+import { SyntaxText } from '../SyntaxText.js';
 import { formatDuration } from '../../cc/format.js';
 /** Tool display names: DSH emits lowercase tool ids (`bash`); Claude Code
  *  shows capitalized names (`Bash`). Map the common ones, fall back to the
@@ -28,6 +30,33 @@ function displayName(name) {
         return name;
     return name[0].toUpperCase() + name.slice(1);
 }
+function parseJsonArgs(args) {
+    try {
+        return JSON.parse(args);
+    }
+    catch {
+        return undefined;
+    }
+}
+function jsonArgsLanguage(args) {
+    return parseJsonArgs(args) === undefined ? undefined : 'json';
+}
+function filePathFromTool(tool, view) {
+    if (view !== undefined && 'path' in view && typeof view.path === 'string')
+        return view.path;
+    const parsed = parseJsonArgs(tool.argsFull ?? tool.argsText);
+    if (parsed !== null && typeof parsed === 'object') {
+        const record = parsed;
+        for (const key of ['file_path', 'path'])
+            if (typeof record[key] === 'string')
+                return record[key];
+    }
+    return undefined;
+}
+function languageFromPath(path) {
+    const language = path === undefined ? undefined : extname(path).slice(1).toLowerCase();
+    return language === '' ? undefined : language;
+}
 /** CC's collapsed text body keeps 3 lines (renderTruncatedContent). */
 const TEXT_BODY_MAX_LINES = 3;
 /** Diff bodies cap at the upstream chat row's 8 (dsh-client-ui-tool's
@@ -42,6 +71,20 @@ const add = (text) => ({ text, tone: 'add' });
 const del = (text) => ({ text, tone: 'del' });
 const dim = (text) => ({ text, tone: 'dim' });
 const plain = (text) => ({ text, tone: 'plain' });
+/** Tool-name color by category (mist-blue accents): read/search tools keep
+ *  the brand blue, file-mutating tools get the warm gold accent, exec /
+ *  terminal tools get mist cyan. Exported for the subagent card, which
+ *  mirrors the transcript tool-card name styling. */
+const TOOL_NAME_MUTATE = new Set(['edit', 'write', 'multiedit', 'notebookedit']);
+const TOOL_NAME_EXEC = new Set(['bash', 'bashpersistent', 'sh', 'shell', 'terminal']);
+export function toolNameColor(raw) {
+    const n = raw.toLowerCase();
+    if (TOOL_NAME_MUTATE.has(n))
+        return 'toolNameMutate';
+    if (TOOL_NAME_EXEC.has(n))
+        return 'toolNameExec';
+    return 'claude';
+}
 /** One side's text → display lines (upstream contentLines rule: empty text
  *  is zero lines; a single trailing newline is a terminator, not a line;
  *  interior blanks survive). */
@@ -62,7 +105,7 @@ function diffLines(diffs) {
     for (const diff of diffs) {
         if (diffs.length > 1) {
             if (diff.path !== prevPath)
-                out.push(plain(diff.path));
+                out.push({ text: diff.path, tone: 'path' });
             else
                 out.push(dim('⋯'));
         }
@@ -81,7 +124,7 @@ function contentLines(content) {
     const text = (content ?? []).map(block => (block.type === 'text' ? block.text ?? '' : '')).join('').trimEnd();
     if (text === '')
         return [];
-    return text.split('\n').map(dim);
+    return text.split('\n').map(plain);
 }
 /** Per-card body lines; unknown/absent shapes yield [] so the caller falls
  *  back to the raw result text. */
@@ -93,7 +136,7 @@ function viewLines(view) {
             // The call-side terminal card has no output yet; only presentResult's
             // does. `in` narrows the call/result union without extra types.
             const out = (('output' in view ? view.output : undefined) ?? '').trimEnd();
-            const lines = out === '' ? [] : out.split('\n').map(dim);
+            const lines = out === '' ? [] : out.split('\n').map(plain);
             if ('exitCode' in view && view.exitCode !== undefined && view.exitCode !== 0) {
                 lines.push({ text: `Exit code ${view.exitCode}`, tone: 'error' });
             }
@@ -117,7 +160,7 @@ function viewLines(view) {
             for (const file of view.files) {
                 lines.push(plain(file.path));
                 for (const match of file.matches) {
-                    lines.push(dim(`${match.lineNumber}: ${match.line}`));
+                    lines.push(plain(`${match.lineNumber}: ${match.line}`));
                 }
             }
             if (view.truncated)
@@ -156,21 +199,21 @@ function clipHeaderArgs(args) {
         return args;
     return `${args.slice(0, HEADER_ARGS_BUDGET)}…`;
 }
-function HeaderTitle({ name, title, isTerminal, displayArgs }) {
+function HeaderTitle({ name, title, isTerminal, displayArgs, argsLanguage, nameColor }) {
     if (title === undefined) {
-        return (_jsxs(_Fragment, { children: [_jsx(Box, { flexShrink: 0, children: _jsx(Text, { bold: true, wrap: "truncate-end", children: name }) }), displayArgs !== '' && (_jsx(Box, { flexWrap: "nowrap", children: _jsxs(Text, { children: ["(", clipHeaderArgs(displayArgs), ")"] }) }))] }));
+        return (_jsxs(_Fragment, { children: [_jsx(Box, { flexShrink: 0, children: _jsx(Text, { bold: true, color: nameColor, wrap: "truncate-end", children: name }) }), displayArgs !== '' && (_jsxs(Box, { flexWrap: "nowrap", children: [_jsx(Text, { children: "(" }), _jsx(SyntaxText, { text: clipHeaderArgs(displayArgs), sourceText: displayArgs, language: argsLanguage }), _jsx(Text, { children: ")" })] }))] }));
     }
     if (isTerminal) {
-        return (_jsxs(_Fragment, { children: [_jsx(Box, { flexShrink: 0, children: _jsx(Text, { bold: true, wrap: "truncate-end", children: name }) }), _jsx(Box, { flexWrap: "nowrap", children: _jsxs(Text, { children: ["(", title, ")"] }) })] }));
+        return (_jsxs(_Fragment, { children: [_jsx(Box, { flexShrink: 0, children: _jsx(Text, { bold: true, color: nameColor, wrap: "truncate-end", children: name }) }), _jsx(Box, { flexWrap: "nowrap", children: _jsxs(Text, { children: ["(", title, ")"] }) })] }));
     }
     const trimmed = title.trim();
     if (trimmed === '') {
-        return (_jsx(Box, { flexShrink: 0, children: _jsx(Text, { bold: true, wrap: "truncate-end", children: name }) }));
+        return (_jsx(Box, { flexShrink: 0, children: _jsx(Text, { bold: true, color: nameColor, wrap: "truncate-end", children: name }) }));
     }
     const space = trimmed.indexOf(' ');
     const head = space === -1 ? trimmed : trimmed.slice(0, space);
     const tail = space === -1 ? '' : trimmed.slice(space);
-    return (_jsx(Box, { flexWrap: "nowrap", children: _jsxs(Text, { bold: true, wrap: "truncate-end", children: [head, _jsx(Text, { bold: false, children: tail })] }) }));
+    return (_jsx(Box, { flexWrap: "nowrap", children: _jsxs(Text, { bold: true, color: nameColor, wrap: "truncate-end", children: [head, _jsx(Text, { bold: false, color: "text", children: tail })] }) }));
 }
 /**
  * Tool-call card: `● Edit /path` header with a blinking status dot, then the
@@ -188,6 +231,10 @@ export function AssistantToolUseMessage({ tool, addMargin, verbose, isSelected =
     // The settled view carries the applied diff / actual output; while running,
     // the call view already shows the pending change (CC's pending Edit diff).
     const view = tool.resultView ?? tool.callView;
+    const filePath = filePathFromTool(tool, view);
+    const syntaxLanguage = view?.card === 'read' || view?.card === 'generic' || view === undefined
+        ? languageFromPath(filePath)
+        : undefined;
     // presentResult may omit a title (terminal results carry output, not a
     // command) — then the call view's title stands.
     const headerTitle = tool.resultView?.title ?? tool.callView?.title;
@@ -218,13 +265,15 @@ export function AssistantToolUseMessage({ tool, addMargin, verbose, isSelected =
         if (view !== undefined)
             body = viewLines(view);
         if (body.length === 0 && result) {
-            body = result.trimEnd().split('\n').map(dim);
+            body = result.trimEnd().split('\n').map(plain);
         }
         if (isRunning && body.length === 0) {
             body = [dim(`Running… (${formatDuration(Math.max(0, Date.now() - (tool.startedAt ?? Date.now())))})`)];
         }
     }
     const cap = view?.card === 'diff' ? DIFF_BODY_MAX_LINES : TEXT_BODY_MAX_LINES;
+    const bodySource = body.map(line => line.text).join('\n');
+    const argsLanguage = jsonArgsLanguage(displayArgs);
     // The footnote rides OUTSIDE the cap: it is a pointer, not content, and a
     // long error body must not be the reason it disappears.
     const lines = capLines(body, cap, verbose);
@@ -238,13 +287,15 @@ export function AssistantToolUseMessage({ tool, addMargin, verbose, isSelected =
             ? 'toolCardBackground'
             : undefined;
     return (_jsx(Box, { ref: viewportRef, flexDirection: "row", justifyContent: "space-between", marginTop: addMargin ? 1 : 0, width: "100%", 
-        // Selection and per-row expansion remain higher-priority interaction
-        // highlights; the configured treatment applies only to an ordinary card.
-        backgroundColor: isSelected
-            ? 'messageActionsBackground'
-            : isExpanded
-                ? 'userMessageBackgroundHover'
-                : ordinaryBackground, children: _jsxs(Box, { flexDirection: "column", flexGrow: 1, children: [_jsxs(Box, { flexDirection: "row", flexWrap: "nowrap", minWidth: minWidth, children: [_jsx(ToolUseLoader, { shouldAnimate: isRunning, isUnresolved: isRunning, isError: isError, toolName: tool.name }), _jsx(HeaderTitle, { name: name, title: headerTitle, isTerminal: headerIsTerminal, displayArgs: displayArgs }), !isRunning && (_jsx(Box, { flexWrap: "nowrap", children: _jsx(Text, { dimColor: true, children: elapsedText }) }))] }), useSplitDiff && view?.card === 'diff' ? (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 3, flexShrink: 0, children: _jsx(Text, { dimColor: true, children: GUTTER_FIRST }) }), _jsx(SplitDiffView, { diffs: view.diffs, width: columns - 4, maxRows: DIFF_BODY_MAX_LINES, verbose: verbose, toolBackground: ordinaryToolBackground })] })) : (rendered.map((line, index) => (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 3, flexShrink: 0, children: _jsx(Text, { dimColor: true, children: index === 0 ? GUTTER_FIRST : GUTTER_REST }) }), _jsx(Box, { flexGrow: 1, children: _jsx(Text, { color: line.tone === 'add'
+        // Only selection paints a highlight; the configured treatment applies
+        // to an ordinary card. Diff line tints stay - they are content, not chrome.
+        backgroundColor: isSelected ? 'messageActionsBackground' : ordinaryBackground, children: _jsxs(Box, { flexDirection: "column", flexGrow: 1, children: [_jsxs(Box, { flexDirection: "row", flexWrap: "nowrap", minWidth: minWidth, children: [_jsx(ToolUseLoader, { shouldAnimate: isRunning, isUnresolved: isRunning, isError: isError, toolName: tool.name }), _jsx(HeaderTitle, { name: name, title: headerTitle, isTerminal: headerIsTerminal, displayArgs: displayArgs, argsLanguage: argsLanguage, nameColor: toolNameColor(tool.name) }), !isRunning && (_jsx(Box, { flexWrap: "nowrap", children: _jsx(Text, { dimColor: true, children: elapsedText }) }))] }), useSplitDiff && view?.card === 'diff' ? (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 3, flexShrink: 0, children: _jsx(Text, { dimColor: true, children: GUTTER_FIRST }) }), _jsx(SplitDiffView, { diffs: view.diffs, width: columns - 4, maxRows: DIFF_BODY_MAX_LINES, verbose: verbose, toolBackground: ordinaryToolBackground })] })) : (rendered.map((line, index) => (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 3, flexShrink: 0, children: _jsx(Text, { color: line.tone === 'add'
+                                    ? 'diffAddedWord'
+                                    : line.tone === 'del'
+                                        ? 'diffRemovedWord'
+                                        : line.tone === 'path'
+                                            ? 'ide'
+                                            : undefined, dimColor: line.tone !== 'add' && line.tone !== 'del' && line.tone !== 'path', children: index === 0 ? GUTTER_FIRST : GUTTER_REST }) }), _jsx(Box, { flexGrow: 1, children: _jsx(Text, { color: line.tone === 'add'
                                     ? 'diffAddedWord'
                                     : line.tone === 'del'
                                         ? 'diffRemovedWord'
@@ -252,5 +303,7 @@ export function AssistantToolUseMessage({ tool, addMargin, verbose, isSelected =
                                             ? 'error'
                                             : line.tone === 'hint'
                                                 ? 'subtle'
-                                                : undefined, dimColor: line.tone === 'dim', wrap: "wrap", children: line.text === '' ? ' ' : line.text }) })] }, index)))), useSplitDiff && footnote !== undefined && (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 3, flexShrink: 0, children: _jsx(Text, { dimColor: true, children: GUTTER_REST }) }), _jsx(Text, { color: "subtle", children: footnote })] }))] }) }));
+                                                : line.tone === 'path'
+                                                    ? 'ide'
+                                                    : undefined, dimColor: line.tone === 'dim', wrap: "wrap", children: line.tone === 'plain' && syntaxLanguage !== undefined ? (_jsx(SyntaxText, { text: line.text, sourceText: bodySource, lineIndex: index, language: syntaxLanguage })) : (line.text === '' ? ' ' : line.text) }) })] }, index)))), useSplitDiff && footnote !== undefined && (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 3, flexShrink: 0, children: _jsx(Text, { dimColor: true, children: GUTTER_REST }) }), _jsx(Text, { color: "subtle", children: footnote })] }))] }) }));
 }

package/lib/types/components/messages/UserPromptMessage.d.ts

@@ -5,15 +5,13 @@ type Props = {
     addMargin: boolean;
     /** Message-selection mode highlight. */
     isSelected?: boolean;
-    /** Row expanded on its own (persistent hover-grey background, CC). */
-    isExpanded?: boolean;
     onClick?(): void;
 };
 /**
- * User prompt bubble: `❯ text` on the theme's userMessageBackground grey
- * (mirroring Claude Code's `messages/UserPromptMessage.tsx` +
- * `HighlightedThinkingText.tsx`, with the ultrathink rainbow removed).
+ * User prompt bubble: `❯ text` in bold briefLabelYou gold with no background
+ * fill (Kimi Code style: the user turn gets a distinct bold tint so it reads
+ * apart from assistant text; only selection mode paints a highlight).
  */
-export declare function UserPromptMessage({ text, addMargin, isSelected, isExpanded, onClick, }: Props): React.ReactNode;
+export declare function UserPromptMessage({ text, addMargin, isSelected, onClick, }: Props): React.ReactNode;
 export {};
 //# sourceMappingURL=UserPromptMessage.d.ts.map

package/lib/types/components/messages/UserPromptMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UserPromptMessage.d.ts","sourceRoot":"","sources":["../../../../src/components/messages/UserPromptMessage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,yDAAyD;IACzD,SAAS,EAAE,OAAO,CAAA;IAClB,wCAAwC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,sEAAsE;IACtE,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,OAAO,CAAC,IAAI,IAAI,CAAA;CACjB,CAAA;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,IAAI,EACJ,SAAS,EACT,UAAkB,EAClB,UAAkB,EAClB,OAAO,GACR,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CAqBzB"}
+{"version":3,"file":"UserPromptMessage.d.ts","sourceRoot":"","sources":["../../../../src/components/messages/UserPromptMessage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,yDAAyD;IACzD,SAAS,EAAE,OAAO,CAAA;IAClB,wCAAwC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,OAAO,CAAC,IAAI,IAAI,CAAA;CACjB,CAAA;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,IAAI,EACJ,SAAS,EACT,UAAkB,EAClB,OAAO,GACR,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CA6BzB"}

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

@@ -1,15 +1,24 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { Box, Text } from '../../ui.js';
+import { Box, Text, useTerminalSize } from '../../ui.js';
 import { POINTER } from '../../cc/figures.js';
+import { stringWidth } from '../../ink/stringWidth.js';
+import { wrapWidth } from '../../sessions/format.js';
 /**
- * User prompt bubble: `❯ text` on the theme's userMessageBackground grey
- * (mirroring Claude Code's `messages/UserPromptMessage.tsx` +
- * `HighlightedThinkingText.tsx`, with the ultrathink rainbow removed).
+ * User prompt bubble: `❯ text` in bold briefLabelYou gold with no background
+ * fill (Kimi Code style: the user turn gets a distinct bold tint so it reads
+ * apart from assistant text; only selection mode paints a highlight).
  */
-export function UserPromptMessage({ text, addMargin, isSelected = false, isExpanded = false, onClick, }) {
-    return (_jsx(Box, { flexDirection: "column", marginTop: addMargin ? 1 : 0, backgroundColor: isSelected
-            ? 'messageActionsBackground'
-            : isExpanded
-                ? 'userMessageBackgroundHover'
-                : 'userMessageBackground', paddingRight: 1, onClick: onClick, children: _jsxs(Text, { children: [_jsxs(Text, { color: "subtle", children: [POINTER, " "] }), _jsx(Text, { color: "text", children: text })] }) }));
+export function UserPromptMessage({ text, addMargin, isSelected = false, onClick, }) {
+    const { columns } = useTerminalSize();
+    const promptPrefix = `${POINTER} `;
+    const prefixWidth = stringWidth(promptPrefix);
+    // Wrap here instead of letting Ink wrap the whole Text node. Ink starts an
+    // automatic continuation at column zero, while a prompt needs a hanging
+    // indent for both explicit newlines and width-based visual lines.
+    // Leave a small safety margin for the ScrollBox edge/scrollbar. The Text
+    // nodes below are explicitly wrapped, so they must never be wrapped again by
+    // Ink; a second wrap would move the continuation back to column zero.
+    const lines = wrapWidth(text, Math.max(1, columns - prefixWidth - 3));
+    const continuationIndent = ' '.repeat(prefixWidth);
+    return (_jsx(Box, { flexDirection: "column", marginTop: addMargin ? 1 : 0, backgroundColor: isSelected ? 'messageActionsBackground' : undefined, paddingRight: 1, onClick: onClick, children: lines.map((line, index) => (_jsxs(Text, { color: "briefLabelYou", bold: true, wrap: "truncate-end", children: [index === 0 ? `${POINTER} ` : continuationIndent, line] }, index))) }));
 }

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

@@ -8,6 +8,8 @@ import { type PreviewEntry, type SessionSummary } from './sessions/index.js';
 import type { ProviderSetupHost } from './providerWizard.js';
 import { type SessionModeSpec } from '../sessionModes.js';
 import { type StatusBarConfig, type ToolBackground } from '../tuiDisplayPrefs.js';
+import { type SubagentState } from './subagents.js';
+export type { SubagentState } from './subagents.js';
 import type { SpinnerMode } from '../components/Spinner/spinnerMode.js';
 import { type ActivityState } from 'dsh-working-activity/status';
 import { type TuiWorkspaceCommand, type TuiWorkspaceCommandResult, type TuiWorkspaceTarget } from './workspaces.js';
@@ -125,6 +127,31 @@ export interface ToolViewPresenter {
     call(name: string, rawArgs: string): ToolCallView | undefined;
     result(name: string, rawArgs: string, data: SessionEvent<'tool/result'>['data']): ToolResultView | undefined;
 }
+/**
+ * Subagent row: displays a subagent's lifecycle (started → running → completed/failed).
+ * Derived from agent.task events and history events.
+ */
+export interface SubagentControl {
+    interrupt(agentId: string): boolean;
+}
+export interface SubagentRow {
+    agentId: string;
+    runId?: string;
+    description: string;
+    provider?: string;
+    model?: string;
+    effort?: string;
+    status: SubagentState['status'];
+    startedAt: number;
+    completedAt?: number;
+    durationMs?: number;
+    outputLines: string[];
+    toolCalls: SubagentState['toolCalls'];
+    tokens?: SubagentState['tokens'];
+    summary?: string;
+    stopReason?: string;
+    error?: string;
+}
 /**
  * One rendered transcript row. The DSH session log is the source of truth:
  * rows are derived from `session/event` records (and the initial
@@ -132,7 +159,7 @@ export interface ToolViewPresenter {
  */
 export interface ChatRow {
     id: number;
-    kind: 'user' | 'assistant' | 'tool' | 'notice' | 'reasoning' | 'interrupt' | 'local' | 'local-output' | 'compact';
+    kind: 'user' | 'assistant' | 'tool' | 'notice' | 'reasoning' | 'interrupt' | 'local' | 'local-output' | 'compact' | 'subagent';
     /** Extra label for non-human user rows (e.g. `steering`). */
     label?: string;
     /** Actual execution location for `!command` rows. */
@@ -142,6 +169,8 @@ export interface ChatRow {
     streaming?: boolean;
     /** Present on `tool` rows; the card model. */
     tool?: ToolRow;
+    /** Present on `subagent` rows; the subagent state snapshot. */
+    subagent?: SubagentRow;
     /** Event wall-clock time (transcript-mode metadata, assistant rows). */
     time?: number;
     /** Present on `reasoning` rows once settled: thinking wall-clock duration. */
@@ -317,6 +346,9 @@ export interface Channel {
     readonly contextWindow: number | undefined;
     /** Reasoning effort of the latest request header, when the adapter sets one. */
     readonly reasoningEffort: string | undefined;
+    /** The live route's reasoning-effort level ids, low → high (the last entry
+     *  is the top tier). Consumed by top-tier-triggered UI (effort ignition). */
+    readonly effortLevels: readonly string[] | undefined;
     /** Usage of the most recent request (context share + cache hits come from
      *  this, not the running totals — each request's input IS the context). */
     readonly lastUsage: {
@@ -345,6 +377,11 @@ export interface Channel {
     readonly toolBackground: ToolBackground;
     /** Live status-footer visibility and compactness preferences. */
     readonly statusBar: Readonly<StatusBarConfig>;
+    /** Whether the header's pixel whale art shows (settings `dsh-tui.whale`). */
+    readonly whale: boolean;
+    /** Minimal mode (settings `dsh-tui.minimal`): no header splash, no emoji
+     *  glyphs, no decorative colors; code highlight and tool colors stay. */
+    readonly minimal: boolean;
     /** Whether the in-process working-activity line is shown (config.activity). */
     readonly activityEnabled: boolean;
     /** Whether the segmented context bar row shows in the status footer
@@ -426,6 +463,10 @@ export interface Channel {
         thinking: number;
         tools: number;
     };
+    /** Active subagents spawned by the current session. */
+    readonly subagents: readonly SubagentState[];
+    /** Native control operations; unavailable providers safely return false. */
+    readonly subagentControl: SubagentControl;
     subscribe: (listener: () => void) => () => void;
     /** Validate and persist a pasted image, returning its prompt placeholder. */
     stageImage(input: StagedImageInput): Promise<string>;
@@ -667,6 +708,8 @@ export interface ChannelState {
     contextWindow: number | undefined;
     /** Reasoning effort of the latest request header, when the adapter sets one. */
     reasoningEffort: string | undefined;
+    /** The live route's reasoning-effort level ids, low → high. */
+    effortLevels: readonly string[] | undefined;
     /** Usage of the most recent request (context share + cache hits). */
     lastUsage: {
         input: number;
@@ -701,6 +744,13 @@ export interface ChannelState {
     setToolBackground(background: ToolBackground): void;
     /** Apply status-footer preference changes. */
     setStatusBar(config: Partial<StatusBarConfig>): void;
+    /** Whale header art switch (see the public Channel type). */
+    whale: boolean;
+    /** Apply a whale-visibility change (see the public Channel type). */
+    setWhale(visible: boolean): void;
+    minimal: boolean;
+    /** Apply a minimal-mode change (see the public Channel type). */
+    setMinimal(enabled: boolean): void;
     /** Working-activity display switch (see the public Channel type). */
     activityEnabled: boolean;
     /** Context bar row switch (see the public Channel type). */
@@ -742,6 +792,9 @@ export interface ChannelState {
         thinking: number;
         tools: number;
     };
+    /** Active subagents roster (see the public Channel type). */
+    subagents: readonly SubagentState[];
+    subagentControl: SubagentControl;
     subscribe: (listener: () => void) => () => void;
     stageImage(input: StagedImageInput): Promise<string>;
     /** @internal event bump (the public `notify(text)` posts a notification). */
@@ -881,6 +934,10 @@ export declare function createChannel(ctx: Context, initialAgent: Agent, options
     toolBackground?: ToolBackground;
     /** Status-footer field visibility and compactness. */
     statusBar?: Partial<StatusBarConfig>;
+    /** Show the header's pixel whale art; default on. */
+    whale?: boolean;
+    /** Minimal mode; default off (settings `dsh-tui.minimal`). */
+    minimal?: boolean;
     /** Show the segmented context bar row in the status footer; default on
      *  (cordis.yml `contextBar: false` hides it, issue #29). */
     contextBar?: boolean;
@@ -978,5 +1035,4 @@ export interface MentionExpansion {
  * verbatim. Best-effort failures degrade to `missing`, never a failed send.
  */
 export declare function expandMentions(fs: MentionFs | undefined, cwd: string, text: string, attachments?: MentionAttachments, stagedImages?: ReadonlyMap<string, MentionImageBlock['attachment']>): Promise<MentionExpansion>;
-export {};
 //# sourceMappingURL=channel.d.ts.map