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

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

@@ -1,6 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import React, { createContext, useContext, useEffect, useState } from 'react';
-import { isThemeAvailable, isLightThemeActive, registerCustomThemeResolver, setActiveThemeName, setAutoThemeBase, getAutoThemeBase, AUTO_THEME_NAME, } from '../../theme.js';
+import React, { createContext, useContext, useEffect, useState, useSyncExternalStore } from 'react';
+import { getTheme, isThemeAvailable, isLightThemeActive, registerCustomThemeResolver, setActiveThemeName, setAutoThemeBase, getAutoThemeBase, AUTO_THEME_NAME, THEME_NAMES, } from '../../theme.js';
+import { BRAND_THEMES, getActiveBrand, subscribeActiveBrand } from '../../branding.js';
 import instances from '../../ink/instances.js';
 import { resolveCustomTheme } from '../../customTheme.js';
 import { useRuntimeThemeSnapshot } from '../../hooks/useRuntimeThemeSnapshot.js';
@@ -78,7 +79,7 @@ export function ThemeProvider({ children, theme, themeHost, }) {
             return false;
         if (isThemeAvailable(forced))
             return true;
-        console.warn(`[dsh-tui] theme "${forced}" not found (built-ins: auto, light, dark, dark-ansi; static ~/.dsh-tui/themes/*.json; runtime plugin themes); falling back to auto-detection`);
+        console.warn(`[dsh-tui] theme "${forced}" not found (built-ins: ${AUTO_THEME_NAME}, ${THEME_NAMES.join(', ')}; static ~/.dsh-tui/themes/*.json; runtime plugin themes); falling back to auto-detection`);
         return false;
     });
     // `auto` (like the unforced path) stays null until detection settles, so
@@ -197,6 +198,8 @@ export function ThemeProvider({ children, theme, themeHost, }) {
             return false;
         }
         requestedThemeRef.current = name;
+        // /theme 手选是明确意愿：品牌默认档从此让位（见 renderedTheme 的锁定判定）。
+        brandThemeLockRef.current = true;
         setActive(name);
         if (name === AUTO_THEME_NAME)
             redetectAutoBase();
@@ -221,11 +224,45 @@ export function ThemeProvider({ children, theme, themeHost, }) {
             setActive(requested);
         }
     }, [active, redetectAutoBase, runtimeThemeSnapshot]);
-    const renderedTheme = active === null
-        ? 'dark'
-        : isThemeAvailable(active)
-            ? active
-            : AUTO_THEME_NAME;
+    // ── 品牌默认档（branding.ts）───────────────────────────────────────────
+    // Claude 后端（claude 品牌）时把默认主题档替换成 Claude 双主题（claude-dark
+    // / claude-paper，按解析档深浅自动落位）——启动页
+    // 与对话页跟着后端整体换色。锁定判定（用户表达过明确意愿时不覆盖）：
+    // - 显式 `theme` prop / `DSH_TUI_THEME`：锁；
+    // - 会话内 `/theme` 手选：锁（setTheme 置位）；
+    // - 启动时读到的 `~/.dsh-tui/theme.json` 持久化偏好：**不锁**——那是切换
+    //   品档联动之前的历史选择，压住「选了后端整个主题就变」的联动就再也
+    //   切不过去；想固定外观走 `/theme` 重选或设置项 `dsh-tui.brand`。
+    // 品牌经 useSyncExternalStore 订阅：`/settings` 切品牌 → Chat 调
+    // setActiveBrand → 这里即时换档，不重挂组件。
+    const brand = useSyncExternalStore(subscribeActiveBrand, getActiveBrand);
+    const brandThemeLockRef = React.useRef(theme !== undefined || envThemeOverride() !== undefined);
+    const renderedTheme = (() => {
+        const resolved = active === null
+            ? 'dark'
+            : isThemeAvailable(active)
+                ? active
+                : AUTO_THEME_NAME;
+        const brandThemes = BRAND_THEMES[brand];
+        if (brandThemes === undefined || brandThemeLockRef.current)
+            return resolved;
+        // 品牌双主题按解析档深浅落位：浅色终端（或历史 light 偏好）→ 浅色版，
+        // 深色 → 深色版——同一套品牌强调色，切明暗不丢品牌识别（claude 陶土橙、
+        // codex 薰衣草紫）。
+        const lightness = resolved === 'light' || (resolved === AUTO_THEME_NAME && autoBase === 'light') ? 'light' : 'dark';
+        return brandThemes[lightness];
+    })();
+    // 模块级镜像必须**在渲染期**写入（不是 effect）：markdown 把主题色烤进
+    // ANSI 字符串（链接 accent、行内代码 permission…），而它正是被这次 context
+    // 更新触发重渲染的——放进 effect 会让它读到上一帧的主题名，于是换主题后
+    // 链接颜色要等重启才更新。镜像只服务非 React 渲染（markdown/hyperlink）。
+    // 当前色板的**身份**：运行时主题在同一批里释放并重注册时名字不变，但 resolver
+    // 已经换了一个新色板对象（themes.ts 每次注册都新建并冻结）。context value 必须
+    // 跟着它换，否则消费者（含按色板身份 memo 的 Markdown）完全不重渲染，屏幕停在
+    // 旧色——切走再切回才刷新。放进 value 依赖即可：内置/静态主题的身份稳定，
+    // 不会因此多渲染。
+    const renderedPalette = getTheme(renderedTheme);
+    setActiveThemeName(renderedTheme);
     const value = React.useMemo(() => ({
         theme: renderedTheme,
         autoBase,
@@ -236,11 +273,7 @@ export function ThemeProvider({ children, theme, themeHost, }) {
         // 的终端会报一个跟画面对不上的颜色，那时宁可用纯白（浅色主题）或
         // 纯黑（深色主题）——深色终端上糊一块白底最突兀。
         terminalBackground: hexRgb(imageBackingColor(detectedBackground, renderedTheme)),
-    }), [renderedTheme, autoBase, setTheme, detectedBackground]);
-    useEffect(() => {
-        if (active !== null)
-            setActiveThemeName(renderedTheme);
-    }, [active, renderedTheme]);
+    }), [renderedTheme, renderedPalette, autoBase, setTheme, detectedBackground]);
     // Backdrop shade target: the detected terminal background when OSC 11
     // answered, else black/white by the rendered theme's lightness. `autoBase`
     // is a dependency because `auto` resolves through it.

package/lib/types/components/design-system/ThemedText.d.ts

@@ -50,6 +50,8 @@ export type Props = {
      * parking the native cursor on an inline caret cell).
      */
     readonly ref?: React.Ref<DOMElement>;
+    /** Typed paint metadata; see ink Text's decoration prop. */
+    readonly decoration?: Styles['decoration'];
     readonly children?: React.ReactNode;
 };
 /**
@@ -57,5 +59,5 @@ export type Props = {
  * in the dsh-TUI visual language). This lets components use
  * `color="subtle"`-style theme keys consistently.
  */
-export default function ThemedText({ color, backgroundColor, dimColor, bold, italic, underline, strikethrough, inverse, wrap, ref, children, }: Props): React.ReactNode;
+export default function ThemedText({ color, backgroundColor, dimColor, bold, italic, underline, strikethrough, inverse, wrap, ref, decoration, children, }: Props): React.ReactNode;
 //# sourceMappingURL=ThemedText.d.ts.map

package/lib/types/components/design-system/ThemedText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThemedText.d.ts","sourceRoot":"","sources":["../../../../src/components/design-system/ThemedText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAY,KAAK,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAGrD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,wCAEtB,CAAA;AAqBZ,MAAM,MAAM,KAAK,GAAG;IAClB;;OAEG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,GAAG,KAAK,CAAA;IAEpC;;OAEG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,KAAK,GAAG,KAAK,CAAA;IAE9C;;;OAGG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAE3B;;OAEG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAA;IAEvB;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;IAEzB;;OAEG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAA;IAE5B;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;IAEhC;;OAEG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAA;IAE1B;;OAEG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;IAElC;;;OAGG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAEpC,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CACpC,CAAA;AAED;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,KAAK,EACL,eAAe,EACf,QAAgB,EAChB,IAAY,EACZ,MAAc,EACd,SAAiB,EACjB,aAAqB,EACrB,OAAe,EACf,IAAa,EACb,GAAG,EACH,QAAQ,GACT,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CA6BzB"}
+{"version":3,"file":"ThemedText.d.ts","sourceRoot":"","sources":["../../../../src/components/design-system/ThemedText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAY,KAAK,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAGrD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,wCAEtB,CAAA;AAqBZ,MAAM,MAAM,KAAK,GAAG;IAClB;;OAEG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,GAAG,KAAK,CAAA;IAEpC;;OAEG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,KAAK,GAAG,KAAK,CAAA;IAE9C;;;OAGG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAE3B;;OAEG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAA;IAEvB;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;IAEzB;;OAEG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAA;IAE5B;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;IAEhC;;OAEG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAA;IAE1B;;OAEG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;IAElC;;;OAGG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAEpC,4DAA4D;IAC5D,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,CAAA;IAE1C,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CACpC,CAAA;AAED;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,KAAK,EACL,eAAe,EACf,QAAgB,EAChB,IAAY,EACZ,MAAc,EACd,SAAiB,EACjB,aAAqB,EACrB,OAAe,EACf,IAAa,EACb,GAAG,EACH,UAAU,EACV,QAAQ,GACT,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CA8BzB"}

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

@@ -27,7 +27,7 @@ function resolveColor(color, theme) {
  * in the dsh-TUI visual language). This lets components use
  * `color="subtle"`-style theme keys consistently.
  */
-export default function ThemedText({ color, backgroundColor, dimColor = false, bold = false, italic = false, underline = false, strikethrough = false, inverse = false, wrap = 'wrap', ref, children, }) {
+export default function ThemedText({ color, backgroundColor, dimColor = false, bold = false, italic = false, underline = false, strikethrough = false, inverse = false, wrap = 'wrap', ref, decoration, children, }) {
     const [themeName] = useTheme();
     const theme = getTheme(themeName);
     const hoverColor = React.useContext(TextHoverColorContext);
@@ -38,5 +38,5 @@ export default function ThemedText({ color, backgroundColor, dimColor = false, b
             ? theme.inactive
             : resolveColor(color, theme);
     const resolvedBackgroundColor = resolveColor(backgroundColor, theme);
-    return (_jsx(Text, { ref: ref, color: resolvedColor, backgroundColor: resolvedBackgroundColor, bold: bold, italic: italic, underline: underline, strikethrough: strikethrough, inverse: inverse, wrap: wrap, children: children }));
+    return (_jsx(Text, { ref: ref, color: resolvedColor, backgroundColor: resolvedBackgroundColor, bold: bold, italic: italic, underline: underline, strikethrough: strikethrough, inverse: inverse, wrap: wrap, decoration: decoration, children: children }));
 }

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

@@ -0,0 +1,55 @@
+import type { ToolFileDiff } from '../dsh-adapter/channel.js';
+/** The `patch` member of the union. */
+export type ToolPatchDiff = Extract<ToolFileDiff, {
+    readonly patch: string;
+}>;
+/** Whether a file diff carries a unified patch (vs old/new texts). */
+export declare const isPatchDiff: (diff: ToolFileDiff) => diff is ToolPatchDiff;
+/** One line of a hunk with its real file line numbers. */
+export interface PatchLine {
+    readonly kind: 'context' | 'del' | 'add';
+    readonly text: string;
+    /** Line number in the old file (context and removed lines). */
+    readonly oldNo?: number;
+    /** Line number in the new file (context and added lines). */
+    readonly newNo?: number;
+}
+/** One parsed hunk. */
+export interface PatchHunk {
+    readonly oldStart: number;
+    readonly newStart: number;
+    readonly lines: readonly PatchLine[];
+}
+/** One file's parsed patch. */
+export interface ParsedPatch {
+    readonly hunks: readonly PatchHunk[];
+    /** Added / removed line counts over every hunk (the `(+N -M)` stat). */
+    readonly added: number;
+    readonly removed: number;
+    /** The widest line number any hunk shows (gutter width). */
+    readonly maxLineNo: number;
+    /** No hunk could be read: the patch's own lines, shown as-is. */
+    readonly raw?: readonly string[];
+}
+/** Parse one file's patch (cached by its text, path and change kind). */
+export declare function parseFilePatch(diff: ToolPatchDiff): ParsedPatch;
+/**
+ * The header a patch file renders above its hunks. In a multi-file card
+ * every file gets a path row (`path` / `path → moved`, clickable, opening
+ * `target`) followed by a dim `suffix` (` · new file (+3 -0)`). A lone file
+ * already has its path in the card title, so it gets only the dim stat
+ * line (`(+1 -1)`, `new file (+3 -0)`, `→ moved.ts (+1 -1)`).
+ */
+export type PatchHeader = {
+    readonly kind: 'path';
+    readonly path: string;
+    readonly target: string;
+    readonly suffix: string;
+} | {
+    readonly kind: 'stat';
+    readonly text: string;
+};
+export declare function patchHeader(diff: ToolPatchDiff, parsed: ParsedPatch, multiFile: boolean): PatchHeader;
+/** The plain text of a header (split view separators, tests). */
+export declare const patchHeaderText: (header: PatchHeader) => string;
+//# sourceMappingURL=diffPatch.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"diffPatch.d.ts","sourceRoot":"","sources":["../../../src/components/diffPatch.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAG7D,uCAAuC;AACvC,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,YAAY,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAAA;AAE7E,sEAAsE;AACtE,eAAO,MAAM,WAAW,GAAI,MAAM,YAAY,KAAG,IAAI,IAAI,aAAgC,CAAA;AAEzF,0DAA0D;AAC1D,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,KAAK,GAAG,KAAK,CAAA;IACxC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,+DAA+D;IAC/D,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;IACvB,6DAA6D;IAC7D,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,uBAAuB;AACvB,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,KAAK,EAAE,SAAS,SAAS,EAAE,CAAA;CACrC;AAED,+BAA+B;AAC/B,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,SAAS,EAAE,CAAA;IACpC,wEAAwE;IACxE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,4DAA4D;IAC5D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,iEAAiE;IACjE,QAAQ,CAAC,GAAG,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CACjC;AAyED,yEAAyE;AACzE,wBAAgB,cAAc,CAAC,IAAI,EAAE,aAAa,GAAG,WAAW,CAqB/D;AAUD;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,GACnB;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAClG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AAEpD,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,GAAG,WAAW,CAarG;AAED,iEAAiE;AACjE,eAAO,MAAM,eAAe,GAAI,QAAQ,WAAW,KAAG,MAAiF,CAAA"}

package/lib/types/components/diffPatch.js

@@ -0,0 +1,142 @@
+/**
+ * The `patch` branch of a {@link ToolFileDiff} (N5): one file's unified diff
+ * hunks, as a backend that only has the patch reports them (Codex
+ * `fileChange`: `@@ -1,3 +1,3 @@\n one\n-two\n+TWO\n three\n`, no file
+ * headers). Both diff renderers — the unified card body and the two-pane
+ * SplitDiffView — read the parsed form from here, so they agree on line
+ * numbers and on the `(+N -M)` stat.
+ *
+ * Parsing uses jsdiff's `parsePatch` (file headers are synthesized when the
+ * text has none). A hunk whose line counts disagree with its header makes
+ * `parsePatch` throw; such a patch, and a headerless one jsdiff cannot
+ * place, falls back to a lenient line walk under the same rules. An `add` /
+ * `delete` change whose text holds no hunk at all is the file's raw
+ * content (Codex reports a new file that way) and becomes one all-added /
+ * all-removed hunk. Anything still without hunks keeps its raw lines
+ * (`raw`), so nothing the backend sent is silently dropped.
+ *
+ * Results are cached by patch text (bounded): a running card re-renders
+ * every second, and the same patch must not be re-parsed each time.
+ */
+import * as JsDiff from 'diff';
+import { t } from '../i18n.js';
+/** Whether a file diff carries a unified patch (vs old/new texts). */
+export const isPatchDiff = (diff) => 'patch' in diff;
+const HUNK_HEADER = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/u;
+/** Number the lines of one hunk from its starts. */
+function numberHunk(oldStart, newStart, rawLines) {
+    const lines = [];
+    let oldNo = oldStart;
+    let newNo = newStart;
+    for (const raw of rawLines) {
+        const marker = raw[0];
+        const text = raw.slice(1);
+        if (marker === ' ')
+            lines.push({ kind: 'context', text, oldNo: oldNo++, newNo: newNo++ });
+        else if (marker === '-')
+            lines.push({ kind: 'del', text, oldNo: oldNo++ });
+        else if (marker === '+')
+            lines.push({ kind: 'add', text, newNo: newNo++ });
+        // `` and stray lines carry no content.
+    }
+    return { oldStart, newStart, lines };
+}
+/** A start line as a header states it: `-0,0` (nothing on that side) still
+ *  numbers the first line it would hold as 1. */
+const startOf = (start, count) => (count === 0 && start === 0 ? 1 : start);
+/** The lenient walk: every `@@` header opens a hunk; ` `/`-`/`+` lines
+ *  belong to it until the next header, whatever its counts claim. */
+function lenientHunks(text) {
+    const hunks = [];
+    let current;
+    const close = () => {
+        if (current !== undefined)
+            hunks.push(numberHunk(current.oldStart, current.newStart, current.lines));
+    };
+    for (const line of text.split('\n')) {
+        const header = HUNK_HEADER.exec(line);
+        if (header !== null) {
+            close();
+            current = {
+                oldStart: startOf(Number(header[1]), header[2] === undefined ? undefined : Number(header[2])),
+                newStart: startOf(Number(header[3]), header[4] === undefined ? undefined : Number(header[4])),
+                lines: [],
+            };
+        }
+        else if (current !== undefined && (line.startsWith(' ') || line.startsWith('-') || line.startsWith('+') || line.startsWith('\\'))) {
+            current.lines.push(line);
+        }
+    }
+    close();
+    return hunks;
+}
+/** jsdiff's reading of the patch; undefined when it refuses it. */
+function jsdiffHunks(text, path) {
+    // Synthesize the file headers jsdiff expects before the first hunk.
+    const first = text.search(/^@@ /mu);
+    const preamble = first === -1 ? text : text.slice(0, first);
+    const withHeaders = /^--- /mu.test(preamble) ? text : `--- a/${path}\n+++ b/${path}\n${text}`;
+    try {
+        const files = JsDiff.parsePatch(withHeaders);
+        return files.flatMap(file => file.hunks.map(hunk => numberHunk(hunk.oldStart, hunk.newStart, hunk.lines)));
+    }
+    catch {
+        return undefined;
+    }
+}
+/** A raw-content add/delete as one hunk of added/removed lines. */
+function contentHunk(text, kind) {
+    const body = text.endsWith('\n') ? text.slice(0, -1) : text;
+    const marker = kind === 'add' ? '+' : '-';
+    return numberHunk(1, 1, body === '' ? [] : body.split('\n').map(line => `${marker}${line}`));
+}
+const CACHE_LIMIT = 64;
+const cache = new Map();
+/** Parse one file's patch (cached by its text, path and change kind). */
+export function parseFilePatch(diff) {
+    const key = `${diff.change ?? ''}\u0000${diff.path}\u0000${diff.patch}`;
+    const known = cache.get(key);
+    if (known !== undefined)
+        return known;
+    let hunks = /^@@ -\d/mu.test(diff.patch) ? jsdiffHunks(diff.patch, diff.path) ?? lenientHunks(diff.patch) : [];
+    if (hunks.length === 0 && (diff.change === 'add' || diff.change === 'delete') && diff.patch !== '')
+        hunks = [contentHunk(diff.patch, diff.change)];
+    let added = 0;
+    let removed = 0;
+    let maxLineNo = 0;
+    for (const hunk of hunks) {
+        for (const line of hunk.lines) {
+            if (line.kind === 'add')
+                added += 1;
+            else if (line.kind === 'del')
+                removed += 1;
+            maxLineNo = Math.max(maxLineNo, line.oldNo ?? 0, line.newNo ?? 0);
+        }
+    }
+    const raw = hunks.length === 0 && diff.patch.trim() !== '' ? diff.patch.replace(/\n$/u, '').split('\n') : undefined;
+    const parsed = { hunks, added, removed, maxLineNo, ...(raw === undefined ? {} : { raw }) };
+    if (cache.size >= CACHE_LIMIT)
+        cache.delete(cache.keys().next().value);
+    cache.set(key, parsed);
+    return parsed;
+}
+/** A moved file's destination (absent when it did not move). */
+const movedTo = (diff) => diff.movePath === undefined || diff.movePath === diff.path ? undefined : diff.movePath;
+/** The change-kind word of an added / deleted file. */
+const changeLabel = (diff) => diff.change === 'add' ? t('diff-patch-added') : diff.change === 'delete' ? t('diff-patch-deleted') : undefined;
+export function patchHeader(diff, parsed, multiFile) {
+    const moved = movedTo(diff);
+    const label = changeLabel(diff);
+    const stat = `(+${parsed.added} -${parsed.removed})`;
+    if (multiFile) {
+        return {
+            kind: 'path',
+            path: moved === undefined ? diff.path : `${diff.path} → ${moved}`,
+            target: moved ?? diff.path,
+            suffix: `${label === undefined ? '' : ` · ${label}`} ${stat}`,
+        };
+    }
+    return { kind: 'stat', text: [moved === undefined ? undefined : `→ ${moved}`, label, stat].filter((part) => part !== undefined).join(' ') };
+}
+/** The plain text of a header (split view separators, tests). */
+export const patchHeaderText = (header) => header.kind === 'path' ? `${header.path}${header.suffix}` : header.text;

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

@@ -0,0 +1,48 @@
+/** Kernel rows shared by the launchpad and picker. Detection is supplied by the host. */
+import { type KernelBackendId } from '../kernelPrefs.js';
+export { kernelDisplayName } from '../kernelPrefs.js';
+export type KernelUnavailableReason = 'kernel-unavailable-not-installed' | 'kernel-unavailable-auth-missing' | 'kernel-probing'
+/** The installable variant of not-installed: the row stays dim but Enter
+ *  opens the SDK install wizard instead of a dead-end toast. */
+ | 'kernel-not-installed-installable'
+/** Installed, but older than the backend supports (its hint says how to upgrade). */
+ | 'kernel-unavailable-too-old';
+/** Product-qualified version; unknown kernels keep the raw version. */
+export declare function kernelVersionLabel(id: string, version?: string): string | undefined;
+export interface KernelOption {
+    readonly id: KernelBackendId;
+    readonly labelKey: string;
+    readonly current: boolean;
+    readonly selectable: boolean;
+    readonly reasonKey?: KernelUnavailableReason;
+    /** A selectable row's caveat (signed out, but `/login` works in-session). */
+    readonly noteKey?: 'kernel-login-in-session';
+    /** An unavailable row's own guidance from detection (install / upgrade). */
+    readonly hint?: string;
+    readonly version?: string;
+    /** Not installed, but the host can install it (Enter opens the wizard). */
+    readonly installable?: boolean;
+}
+export interface KernelStatus {
+    readonly installed: boolean;
+    readonly auth?: 'ok' | 'missing' | 'unknown';
+    readonly version?: string;
+    /** A missing credential can be supplied after start (BackendDetection). */
+    readonly loginInSession?: true;
+    /** Detection's install / upgrade / sign-in guidance. */
+    readonly hint?: string;
+}
+/** DSH is always available. Optional kernels stay disabled until detection completes. */
+export declare function buildKernelCatalog(input: {
+    readonly current: string;
+    readonly dshVersion?: string;
+    readonly statuses?: Readonly<Record<string, KernelStatus>>;
+    /** The host provides an install path (the wizard callbacks): a dim
+     *  not-installed row of a kernel the wizard can install
+     *  (`KERNEL_INFO[id].installable`) then says "press Enter to install"
+     *  instead of a dead-end reason. */
+    readonly canInstallSdk?: boolean;
+}): readonly KernelOption[];
+/** Join the available version and unavailability reason without an empty subtitle. */
+export declare function kernelSubtitle(option: KernelOption, reason: (key: KernelUnavailableReason | 'kernel-login-in-session') => string): string | undefined;
+//# sourceMappingURL=kernelCatalog.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"kernelCatalog.d.ts","sourceRoot":"","sources":["../../../src/components/kernelCatalog.ts"],"names":[],"mappings":"AAAA,yFAAyF;AACzF,OAAO,EAAuC,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAErD,MAAM,MAAM,uBAAuB,GAC/B,kCAAkC,GAClC,iCAAiC,GACjC,gBAAgB;AAClB;gEACgE;GAC9D,kCAAkC;AACpC,qFAAqF;GACnF,4BAA4B,CAAA;AAEhC,uEAAuE;AACvE,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGnF;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAA;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAA;IAC5B,QAAQ,CAAC,SAAS,CAAC,EAAE,uBAAuB,CAAA;IAC5C,6EAA6E;IAC7E,QAAQ,CAAC,OAAO,CAAC,EAAE,yBAAyB,CAAA;IAC5C,4EAA4E;IAC5E,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;IACzB,2EAA2E;IAC3E,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,SAAS,CAAA;IAC5C,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;IACzB,2EAA2E;IAC3E,QAAQ,CAAC,cAAc,CAAC,EAAE,IAAI,CAAA;IAC9B,wDAAwD;IACxD,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,yFAAyF;AACzF,wBAAgB,kBAAkB,CAAC,KAAK,EAAE;IACxC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAA;IAC1D;;;wCAGoC;IACpC,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CACjC,GAAG,SAAS,YAAY,EAAE,CA+B1B;AAED,sFAAsF;AACtF,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,CAAC,GAAG,EAAE,uBAAuB,GAAG,yBAAyB,KAAK,MAAM,GAC3E,MAAM,GAAG,SAAS,CAMpB"}

package/lib/types/components/kernelCatalog.js

@@ -0,0 +1,53 @@
+/** Kernel rows shared by the launchpad and picker. Detection is supplied by the host. */
+import { KERNEL_IDS, KERNEL_INFO, isKernelId } from '../kernelPrefs.js';
+export { kernelDisplayName } from '../kernelPrefs.js';
+/** Product-qualified version; unknown kernels keep the raw version. */
+export function kernelVersionLabel(id, version) {
+    if (version === undefined || version === '')
+        return undefined;
+    return isKernelId(id) ? KERNEL_INFO[id].product + ' v' + version : version;
+}
+/** DSH is always available. Optional kernels stay disabled until detection completes. */
+export function buildKernelCatalog(input) {
+    return KERNEL_IDS.map(id => {
+        const status = input.statuses?.[id];
+        const signInLater = status?.auth === 'missing' && status.loginInSession === true;
+        const selectable = id === 'dsh' || (status !== undefined && status.installed && (status.auth !== 'missing' || signInLater));
+        // `!selectable` already implies `id !== 'dsh'` (the DSH row is always
+        // selectable), so an unselectable, undetected row is an install miss.
+        const installable = !selectable && status !== undefined && !status.installed && input.canInstallSdk === true && KERNEL_INFO[id].installable;
+        const reasonKey = status === undefined
+            ? 'kernel-probing'
+            : installable
+                ? 'kernel-not-installed-installable'
+                : status.installed && status.auth === 'missing'
+                    ? 'kernel-unavailable-auth-missing'
+                    // Not installed but a version was read: the binary is too old.
+                    : id === 'codex' && !status.installed && status.version !== undefined
+                        ? 'kernel-unavailable-too-old'
+                        : 'kernel-unavailable-not-installed';
+        const version = kernelVersionLabel(id, id === 'dsh' ? input.dshVersion : status?.version);
+        return {
+            id,
+            labelKey: KERNEL_INFO[id].labelKey,
+            current: input.current === id,
+            selectable,
+            ...(selectable ? {} : { reasonKey }),
+            ...(selectable || status?.hint === undefined || status.hint === '' ? {} : { hint: status.hint }),
+            ...(selectable && signInLater ? { noteKey: 'kernel-login-in-session' } : {}),
+            ...(installable ? { installable } : {}),
+            ...(version === undefined ? {} : { version }),
+        };
+    });
+}
+/** Join the available version and unavailability reason without an empty subtitle. */
+export function kernelSubtitle(option, reason) {
+    const parts = [];
+    if (option.version !== undefined && option.version !== '')
+        parts.push(option.version);
+    if (option.reasonKey !== undefined)
+        parts.push(reason(option.reasonKey));
+    if (option.noteKey !== undefined)
+        parts.push(reason(option.noteKey));
+    return parts.length === 0 ? undefined : parts.join(' \u00b7 ');
+}

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

@@ -1,9 +1,10 @@
 /**
  * 落地页的一个动作入口（第四版：状态驱动的"下一步建议"）。
  *
- * 动作仍然全部走**既有命令名**（第七版表：continue / home / settings /
- * jobs / update / star / help）——这一屏不新增行为，它只是把"当前状态下
- * 最可能的下一步"摆到台面上。知道了名字，键盘用户直接敲；鼠标用户点一下，
+ * 动作走命令名（第七版表 + 内核入口：continue / home / settings / backend
+ * / jobs / update / star / help）——除 backend 外全部是既有命令；backend 打开
+ * 内核选择器（选择器渲染与 runCommand 处理在 Chat 侧）。它把"当前状态下最
+ * 可能的下一步"摆到台面上。知道了名字，键盘用户直接敲；鼠标用户点一下，
  * 两条路落到同一个 `runCommand`。
  */
 export interface LaunchpadAction {
@@ -38,6 +39,9 @@ export interface LaunchpadActionState {
     readonly updateAvailable: boolean;
     /** 用量到档且从未 star（条件位③）。 */
     readonly starDue: boolean;
+    /** 当前内核（channel.backendCapabilities.backendId）；缺省 = 未知，内核
+     *  入口用不带名的短标签。 */
+    readonly backendId?: string | undefined;
 }
 /** Continue 标题的截断上限（显示宽度，含截断省略号）。 */
 export declare const LAUNCHPAD_CONTINUE_TITLE_MAX = 16;
@@ -49,13 +53,16 @@ export declare function truncateContinueTitle(title: string, max?: number): stri
 /**
  * 落地页第七版的核心纯函数：按状态快照决定入口行放什么。
  *
- * 版面（用户拍板的四格；第一格条件性缺席）：
+ * 版面（用户拍板的四格 + 内核入口；第一格条件性缺席，最多五格）：
  *
  *   1. `继续「<标题>」` —— 有可继续会话才画（无历史不放假动作）；
  *      快捷键 Alt+R（keymap 的 `continue` 动作，见 utils/keymap.ts）。
  *   2. `会话与工作区` —— 历史会话 + 工作区合并入口；命令用既有 `home`。
  *   3. `设置` —— /settings。
- *   4. 条件位，**按优先级取第一个成立者**（同时成立时高优先级胜出，
+ *   4. `内核` —— 打开内核选择器（backendId 已知时「内核 · Claude」；选择
+ *      器本体在 Chat 侧渲染）。窄屏装不下时它排在条件位**之后**被裁——
+ *      fitChips 整条取舍，条件位先让位。
+ *   5. 条件位，**按优先级取第一个成立者**（同时成立时高优先级胜出，
  *      回归按这张优先级表驱动）：
  *        ① jobsRunning → `后台任务`（/jobs）
  *        ② updateAvailable → `有新版本`（/update，走既有更新路径）
@@ -65,7 +72,7 @@ export declare function truncateContinueTitle(title: string, max?: number): stri
  * 第六版的 doctor 入口已删（第七版）：它的输出属于转录区，天然把人带进
  * 对话页，不适合留在"Esc 必须回启动页"的这一屏；首启/配置问题专属按钮
  * 也随之退役——首启由引导向导（盖在落地页之上）承担，provider 配置经
- * 向导或 /settings 可达。输出恒 ≤4 条。
+ * 向导或 /settings 可达。输出恒 ≤5 条。
  *
  * 纯函数：不改入参、不读环境、同样输入恒同样输出——表驱动回归钉死每个状态。
  */

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

@@ -1 +1 @@
-{"version":3,"file":"launchpadActions.d.ts","sourceRoot":"","sources":["../../../src/components/launchpadActions.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC9B,4BAA4B;IAC5B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,wBAAwB;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,sCAAsC;IACtC,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IAClD,6CAA6C;IAC7C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CACzB;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,oBAAoB;IACnC,wCAAwC;IACxC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9C,qBAAqB;IACrB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAA;IAC7B,qBAAqB;IACrB,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAA;IACjC,0BAA0B;IAC1B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAC1B;AAED,qCAAqC;AACrC,eAAO,MAAM,4BAA4B,KAAK,CAAA;AAE9C;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,SAA+B,GAAG,MAAM,CAY/F;AAkDD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,oBAAoB,GAAG,SAAS,eAAe,EAAE,CAkB/F"}
+{"version":3,"file":"launchpadActions.d.ts","sourceRoot":"","sources":["../../../src/components/launchpadActions.ts"],"names":[],"mappings":"AAGA;;;;;;;;GAQG;AACH,MAAM,WAAW,eAAe;IAC9B,4BAA4B;IAC5B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,wBAAwB;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,sCAAsC;IACtC,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IAClD,6CAA6C;IAC7C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CACzB;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,oBAAoB;IACnC,wCAAwC;IACxC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9C,qBAAqB;IACrB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAA;IAC7B,qBAAqB;IACrB,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAA;IACjC,0BAA0B;IAC1B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB;sBACkB;IAClB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACxC;AAED,qCAAqC;AACrC,eAAO,MAAM,4BAA4B,KAAK,CAAA;AAE9C;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,SAA+B,GAAG,MAAM,CAY/F;AA8DD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,oBAAoB,GAAG,SAAS,eAAe,EAAE,CAwB/F"}

package/lib/types/components/launchpadActions.js

@@ -1,4 +1,5 @@
 import { stringWidth } from '../ink/stringWidth.js';
+import { kernelDisplayName } from './kernelCatalog.js';
 /** Continue 标题的截断上限（显示宽度，含截断省略号）。 */
 export const LAUNCHPAD_CONTINUE_TITLE_MAX = 16;
 /**
@@ -43,6 +44,18 @@ const SETTINGS = {
     labelKey: 'launchpad-action-settings',
     command: 'settings',
 };
+/**
+ * 内核（第四格，固定入口）：打开内核选择器。当前内核已知时带名
+ * （「内核 · Claude」），未知（接线前）用短标签——kernelCatalog 的
+ * displayName 是品牌名的唯一来源。
+ */
+const BACKEND = {
+    id: 'backend',
+    labelKey: 'launchpad-action-backend',
+    // 命令名 = /kernel（LOCAL_COMMANDS 的登记名，requirement 'any'）：入口、
+    // 手敲命令与 Chat 的 case 'kernel' 三条路同一个名字，不给第二个别名。
+    command: 'kernel',
+};
 /** 条件位①：有后台任务在跑。 */
 const JOBS = {
     id: 'jobs',
@@ -70,13 +83,16 @@ const HELP = {
 /**
  * 落地页第七版的核心纯函数：按状态快照决定入口行放什么。
  *
- * 版面（用户拍板的四格；第一格条件性缺席）：
+ * 版面（用户拍板的四格 + 内核入口；第一格条件性缺席，最多五格）：
  *
  *   1. `继续「<标题>」` —— 有可继续会话才画（无历史不放假动作）；
  *      快捷键 Alt+R（keymap 的 `continue` 动作，见 utils/keymap.ts）。
  *   2. `会话与工作区` —— 历史会话 + 工作区合并入口；命令用既有 `home`。
  *   3. `设置` —— /settings。
- *   4. 条件位，**按优先级取第一个成立者**（同时成立时高优先级胜出，
+ *   4. `内核` —— 打开内核选择器（backendId 已知时「内核 · Claude」；选择
+ *      器本体在 Chat 侧渲染）。窄屏装不下时它排在条件位**之后**被裁——
+ *      fitChips 整条取舍，条件位先让位。
+ *   5. 条件位，**按优先级取第一个成立者**（同时成立时高优先级胜出，
  *      回归按这张优先级表驱动）：
  *        ① jobsRunning → `后台任务`（/jobs）
  *        ② updateAvailable → `有新版本`（/update，走既有更新路径）
@@ -86,7 +102,7 @@ const HELP = {
  * 第六版的 doctor 入口已删（第七版）：它的输出属于转录区，天然把人带进
  * 对话页，不适合留在"Esc 必须回启动页"的这一屏；首启/配置问题专属按钮
  * 也随之退役——首启由引导向导（盖在落地页之上）承担，provider 配置经
- * 向导或 /settings 可达。输出恒 ≤4 条。
+ * 向导或 /settings 可达。输出恒 ≤5 条。
  *
  * 纯函数：不改入参、不读环境、同样输入恒同样输出——表驱动回归钉死每个状态。
  */
@@ -98,14 +114,20 @@ export function resolveLaunchpadActions(state) {
             : state.starDue
                 ? STAR
                 : HELP;
+    // 内核入口：当前内核已知 → 带名（「内核 · Claude」）；未知（Chat 侧接线
+    // 前）→ 短标签。显示名走 kernelCatalog，与选择器和重启通知同源。
+    const backend = state.backendId === undefined
+        ? BACKEND
+        : { ...BACKEND, labelKey: 'launchpad-action-backend-named', values: { name: kernelDisplayName(state.backendId) } };
     const title = truncateContinueTitle(state.lastSessionTitle ?? '');
     if (title !== '') {
         return [
             { ...CONTINUE, labelKey: 'launchpad-action-continue-titled', values: { title } },
             SESSIONS_WORKSPACE,
             SETTINGS,
+            backend,
             conditional,
         ];
     }
-    return [SESSIONS_WORKSPACE, SETTINGS, conditional];
+    return [SESSIONS_WORKSPACE, SETTINGS, backend, conditional];
 }