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

package/lib/types/theme.js

@@ -1,12 +1,22 @@
 /**
- * dsh-tui color themes — Gentle Mist Blue (雾蓝) family, plus the Claude
- * Code orange adaptation.
+ * dsh-tui color themes — Gentle Mist Blue (雾蓝), Sakura Pink (樱), and the
+ * Claude Code brand adaptation.
  *
- * Two truecolor palettes share one identity: mist blues carry brand, focus,
- * and interaction; body text stays neutral. `light` uses white panel surfaces
- * (#FFFFFF) and ink text (#343945) for light terminals; `dark` is its
- * dark-terminal adaptation (warm off-white text, accent-soft blues).
- * `dark-ansi` is the 16-color fallback for terminals without truecolor.
+ * Gentle Mist Blue (雾蓝) is the default family. Two truecolor palettes share
+ * one identity: mist blues carry brand, focus, and interaction; body text
+ * stays neutral. `light` uses white panel surfaces (#FFFFFF) and ink text
+ * (#343945) for light terminals; `dark` is its dark-terminal adaptation (warm
+ * off-white text, accent-soft blues). `dark-ansi` is the 16-color fallback for
+ * terminals without truecolor.
+ *
+ * Sakura Pink (樱) is the optional second family. Sakura pink carries brand,
+ * focus and interaction, and the surfaces stay warm so the palette reads soft
+ * rather than neon: `pink-day` for light terminals, `pink-night` for dark
+ * ones, `pink-ansi` as the 16-color fallback. The three keep the same role
+ * split as the mist family, so switching families changes hue, not the
+ * contrast structure every component relies on. `mascotBody` has no upstream
+ * consumer, so all three keep the mist family's orange rather than a pink that
+ * never renders.
  *
  * The active palette is chosen at startup by querying the terminal background
  * (OSC 11) — see ThemeProvider.
@@ -22,7 +32,8 @@
  * from the terminal background detected via OSC 11 (which tracks the system
  * theme in terminals that follow it). ThemeProvider re-runs detection every
  * time `auto` is selected and pushes the result through setAutoThemeBase(),
- * so getTheme('auto') always serves the currently detected palette.
+ * so getTheme('auto') always serves the currently detected palette. `auto`
+ * spans the mist family only; the sakura family is selected explicitly.
  */
 const RETIRED_THEME_KEYS = [
     "briefLabelClaude",
@@ -76,8 +87,25 @@ export function normalizeThemeKey(value) {
 export function isThemeColorKey(value) {
     return typeof value === 'string' && normalizeThemeKey(value) !== undefined;
 }
-/** The built-in theme names, in display order. */
-export const THEME_NAMES = ['dark', 'dark-ansi', 'light', 'claude-dark', 'claude-paper', 'codex-lavender', 'codex-paper'];
+/**
+ * The built-in theme names, in display order. The sakura family repeats the
+ * mist family's own ordering (dark, ansi, light) so the picker reads as two
+ * parallel groups rather than an appended list; the brand pairs (claude,
+ * codex) land last — they are served as brand defaults, not picked as a
+ * family.
+ */
+export const THEME_NAMES = [
+    'dark',
+    'dark-ansi',
+    'light',
+    'pink-night',
+    'pink-ansi',
+    'pink-day',
+    'claude-dark',
+    'claude-paper',
+    'codex-lavender',
+    'codex-paper',
+];
 /**
  * Whether a name is a built-in palette (THEME_NAMES membership, never the base
  * roles a theme file may overlay).
@@ -199,8 +227,8 @@ const darkTheme = {
     cursor: '',
     mascotBody: rgb('#D98A63'), // Warm mascot orange
     inputBackground: rgb('#000000'),
-    userMessageBackground: '', // user turn: no fill, gold bold text only (Kimi style)
-    userMessageBackgroundHover: rgb('#3B5BDB'), // hover/expand: blue block with gold text
+    userMessageBackground: '', // user turn: no fill, bold tinted text only (Kimi style)
+    userMessageBackgroundHover: rgb('#3B5BDB'), // hover/expand: blue block with tinted text
     messageActionsBackground: rgb('#2E333D'),
     selectionBg: rgb('#3B4A66'), // Mist-blue tint on dark
     bashMessageBackgroundColor: rgb('#2C3038'),
@@ -209,7 +237,8 @@ const darkTheme = {
     rate_limit_empty: rgb('#3C414B'),
     fastMode: rgb('#E09A58'),
     fastModeShimmer: rgb('#EAB478'),
-    userPromptLabel: rgb('#FFDF80'),
+    // 用户消息披 Claude 档陶土红（跨内核轮换：每家内核的用户消息用另一家的招牌色）
+    userPromptLabel: rgb('#D77757'),
     subagentBullet: rgb('#D194AE'),
     subagentDescription: rgb('#E8E6E0'),
     subagentModel: rgb('#8D95A6'),
@@ -270,7 +299,8 @@ const claudeDarkTheme = {
     inactive: rgb('#B8B2A8'),
     inactiveShimmer: rgb('#D5CFC5'),
     subtle: rgb('#817C74'),
-    userPromptLabel: rgb('#D77757'),
+    // 用户消息披 DeepSeek 档雾蓝（跨内核轮换，见 darkTheme.userPromptLabel）
+    userPromptLabel: rgb('#7DA1DE'),
     fastMode: rgb('#D77757'),
     fastModeShimmer: rgb('#E68A69'),
     chromeYellow: rgb('#DFA25B'),
@@ -377,7 +407,7 @@ const lightTheme = {
     cursor: '',
     mascotBody: rgb('#D98A63'), // Warm mascot orange
     inputBackground: rgb('#F6F3ED'),
-    userMessageBackground: '', // user turn: no fill in light mode, gold text only
+    userMessageBackground: '', // user turn: no fill in light mode, tinted text only
     userMessageBackgroundHover: rgb('#DCE4FB'), // subtle blue tint on hover/expand
     messageActionsBackground: rgb('#E4D9E5'),
     selectionBg: rgb('#D5DEF2'), // Mist-blue tint on warm white
@@ -387,7 +417,8 @@ const lightTheme = {
     rate_limit_empty: rgb('#DDD5C7'),
     fastMode: rgb('#D98E4A'),
     fastModeShimmer: rgb('#E2A465'),
-    userPromptLabel: rgb('#A67600'),
+    // 用户消息披 Claude 档深化陶土红（浅底对应档，跨内核轮换）
+    userPromptLabel: rgb('#C96442'),
     subagentBullet: rgb('#C07A93'),
     subagentDescription: rgb('#343945'),
     subagentModel: rgb('#8991A0'),
@@ -447,7 +478,8 @@ const claudePaperTheme = {
     inactive: rgb('#67625B'),
     inactiveShimmer: rgb('#4E4943'),
     subtle: rgb('#969087'),
-    userPromptLabel: rgb('#C96442'),
+    // 用户消息披 DeepSeek 档主蓝（浅底对应档，跨内核轮换）
+    userPromptLabel: rgb('#3F6CC4'),
     fastMode: rgb('#C96442'),
     fastModeShimmer: rgb('#B85738'),
     chromeYellow: rgb('#B97929'),
@@ -539,7 +571,8 @@ const codexLavenderTheme = {
     inactive: rgb('#B8B8C4'),
     inactiveShimmer: rgb('#D5D5DE'),
     subtle: rgb('#7D7D8A'),
-    userPromptLabel: rgb('#A69BE8'),
+    // 用户消息披 DeepSeek 档亮金（跨内核轮换：Codex 用户消息用旧 dsh 金）
+    userPromptLabel: rgb('#FFDF80'),
     fastMode: rgb('#A69BE8'),
     fastModeShimmer: rgb('#C5BFEE'),
     chromeYellow: rgb('#D8AE62'),
@@ -628,7 +661,8 @@ const codexPaperTheme = {
     inactive: rgb('#5F5F6C'),
     inactiveShimmer: rgb('#4E4E58'),
     subtle: rgb('#8D8D98'),
-    userPromptLabel: rgb('#8A7ED9'),
+    // 用户消息披 DeepSeek 档深金（浅底对应档，跨内核轮换）
+    userPromptLabel: rgb('#A67600'),
     fastMode: rgb('#8A7ED9'),
     fastModeShimmer: rgb('#6B5CC8'),
     chromeYellow: rgb('#AF7B2E'),
@@ -754,7 +788,9 @@ const darkAnsiTheme = {
     rate_limit_empty: 'ansi:white',
     fastMode: 'ansi:redBright',
     fastModeShimmer: 'ansi:redBright',
-    userPromptLabel: 'ansi:yellowBright',
+    // 陶土红的 16 色近似（DSH 用户消息跨内核轮换；与 error/fastMode 同用
+    // redBright，靠粗体和行首 ❯ 区分——ANSI 底盘没有更近的暖橙槽）
+    userPromptLabel: 'ansi:redBright',
     subagentBullet: 'ansi:magentaBright',
     subagentDescription: 'ansi:whiteBright',
     subagentModel: 'ansi:white',
@@ -764,6 +800,242 @@ const darkAnsiTheme = {
     subagentStatusCompleted: 'ansi:greenBright',
     subagentStatusFailed: 'ansi:redBright',
 };
+/**
+ * Sakura Pink's context-bar ramp: the bloom deepens from plum to the pale petal
+ * tip. Night and day share the first four steps; `pink-day` steps only the tip
+ * back (see its `contextBarTools`).
+ */
+const PINK_BAR_RAMP = {
+    contextBarSystem: rgb('#6E1B3C'), // plum
+    contextBarPrompt: rgb('#9B2C55'),
+    contextBarAssistant: rgb('#C24D78'),
+    contextBarThinking: rgb('#E879A0'),
+    contextBarTools: rgb('#F7B7CC'), // pale petal tip
+};
+/**
+ * Sakura Pink dark adaptation. Pinks come from the bloom (#F27BA6–#F8AFC6);
+ * neutrals are warm (derived from #F0E4E9/#2B1E25) so the palette reads soft
+ * rather than neon on a dark terminal. Role base: `dark`.
+ */
+const pinkNightTheme = {
+    autoAccept: rgb('#B598D9'),
+    bashBorder: rgb('#E08CA8'),
+    accent: rgb('#F27BA6'),
+    toolNameMutate: rgb('#E5C07B'),
+    toolNameExec: rgb('#72C4CF'),
+    accentShimmer: rgb('#F8AFC6'),
+    activity: rgb('#F27BA6'),
+    activityShimmer: rgb('#F8AFC6'),
+    permission: rgb('#F2A0BF'),
+    permissionShimmer: rgb('#F8C1D6'),
+    planMode: rgb('#7FB596'),
+    ide: rgb('#E0709A'),
+    promptBorder: rgb('#6E4A58'),
+    promptBorderShimmer: rgb('#E08CA8'),
+    text: rgb('#F0E4E9'),
+    inverseText: rgb('#2B1E25'),
+    inactive: rgb('#A8929C'),
+    inactiveShimmer: rgb('#C4B0B9'),
+    subtle: rgb('#77646D'),
+    suggestion: rgb('#F2A0BF'),
+    remember: rgb('#F2A0BF'),
+    background: rgb('#D9648F'),
+    success: rgb('#8FC9A4'),
+    error: rgb('#E66A6A'),
+    warning: rgb('#E3B56C'),
+    merged: rgb('#B598D9'),
+    warningShimmer: rgb('#F0CB8E'),
+    diffAdded: rgb('#2E3A2F'),
+    diffRemoved: rgb('#402A31'),
+    diffAddedDimmed: rgb('#2F3630'),
+    diffRemovedDimmed: rgb('#392830'),
+    diffAddedWord: rgb('#5E9B72'),
+    diffRemovedWord: rgb('#C96B7B'),
+    toolCardBackground: rgb('#2E2229'),
+    toolCardBackgroundDim: rgb('#241A20'),
+    toolDotExec: rgb('#7FB596'),
+    toolDotRead: rgb('#7FB6C9'),
+    toolDotWrite: rgb('#C29BDF'),
+    toolDotWeb: rgb('#F27BA6'),
+    toolDotTask: rgb('#E0A0AE'),
+    syntaxKeyword: rgb('#E08CA8'),
+    syntaxString: rgb('#8FC9A4'),
+    syntaxComment: rgb('#857481'),
+    syntaxNumber: rgb('#E3B56C'),
+    syntaxFunction: rgb('#7FC4CE'),
+    syntaxType: rgb('#C29BDF'),
+    syntaxVariable: rgb('#DDD2D8'),
+    syntaxOperator: rgb('#A8929C'),
+    syntaxPunctuation: rgb('#8A7680'),
+    syntaxConstant: rgb('#E0709A'),
+    professionalBlue: rgb('#E08CA8'),
+    chromeYellow: rgb('#E3B56C'),
+    mascotBody: rgb('#D98A63'),
+    inputBackground: rgb('#000000'),
+    userMessageBackground: '',
+    userMessageBackgroundHover: rgb('#7E3A55'),
+    messageActionsBackground: rgb('#362A31'),
+    selectionBg: rgb('#55303E'),
+    bashMessageBackgroundColor: rgb('#2E242A'),
+    memoryBackgroundColor: rgb('#322630'),
+    rate_limit_fill: rgb('#F27BA6'),
+    rate_limit_empty: rgb('#43333B'),
+    fastMode: rgb('#E09A58'),
+    fastModeShimmer: rgb('#ECB478'),
+    userPromptLabel: rgb('#FFDF80'),
+    subagentBullet: rgb('#E0A0BE'),
+    subagentDescription: rgb('#F0E4E9'),
+    subagentModel: rgb('#A8929C'),
+    subagentElapsed: rgb('#A8929C'),
+    subagentToolName: rgb('#F27BA6'),
+    subagentStatusRunning: rgb('#F27BA6'),
+    subagentStatusCompleted: rgb('#8FC9A4'),
+    subagentStatusFailed: rgb('#E66A6A'),
+    // The family's bar ramp and crest. `ignition` carries the brand pink rather
+    // than the neon #FF2D6F it started at — the crest reads as a glow, and a
+    // fully saturated magenta made it the loudest thing on a dark terminal (the
+    // softer crest also clears more contrast on the band: 6.56:1 against
+    // `ignitionDim`, up from 4.71:1).
+    ...PINK_BAR_RAMP,
+    ignition: rgb('#F27BA6'),
+    ignitionDim: rgb('#241A20'),
+    cursor: '',
+};
+/**
+ * Sakura Pink light adaptation. Warm off-white panels (#FBF3F0) under ink text
+ * (#3D2B33), with the same bloom pinks carrying brand and focus. Role base:
+ * `light`.
+ */
+const pinkDayTheme = {
+    autoAccept: rgb('#8F6BAC'),
+    bashBorder: rgb('#C05C7E'),
+    accent: rgb('#DE6E96'),
+    toolNameMutate: rgb('#8A6A00'),
+    toolNameExec: rgb('#0E7A8A'),
+    accentShimmer: rgb('#F2A0BF'),
+    activity: rgb('#E879A0'),
+    activityShimmer: rgb('#F2A0BF'),
+    permission: rgb('#D5517F'),
+    permissionShimmer: rgb('#E879A0'),
+    planMode: rgb('#43916B'),
+    ide: rgb('#C43D6C'),
+    promptBorder: rgb('#EFC4D4'),
+    promptBorderShimmer: rgb('#D988A9'),
+    text: rgb('#3D2B33'),
+    inverseText: rgb('#FBF3F0'),
+    inactive: rgb('#9A8790'),
+    inactiveShimmer: rgb('#9E6E82'),
+    subtle: rgb('#B3A3AC'),
+    suggestion: rgb('#D5517F'),
+    remember: rgb('#B03A63'),
+    background: rgb('#D5517F'),
+    success: rgb('#3E9468'),
+    error: rgb('#C24D5C'),
+    warning: rgb('#B97F2E'),
+    merged: rgb('#8F6BAC'),
+    warningShimmer: rgb('#CE9840'),
+    diffAdded: rgb('#DFF0E2'),
+    diffRemoved: rgb('#F7E0E4'),
+    diffAddedDimmed: rgb('#E8F3EA'),
+    diffRemovedDimmed: rgb('#F9E9EC'),
+    diffAddedWord: rgb('#8CCFA4'),
+    diffRemovedWord: rgb('#E6A3B0'),
+    toolCardBackground: rgb('#F9ECF1'),
+    toolCardBackgroundDim: rgb('#F2E0E9'),
+    toolDotExec: rgb('#4E7A5A'),
+    toolDotRead: rgb('#3F7E8F'),
+    toolDotWrite: rgb('#7A5CA8'),
+    toolDotWeb: rgb('#C24D78'),
+    toolDotTask: rgb('#B04A5A'),
+    syntaxKeyword: rgb('#C24470'),
+    syntaxString: rgb('#3F805F'),
+    syntaxComment: rgb('#8B7F88'),
+    syntaxNumber: rgb('#A6602B'),
+    syntaxFunction: rgb('#2E7E8A'),
+    syntaxType: rgb('#7E55A4'),
+    syntaxVariable: rgb('#3D2B33'),
+    syntaxOperator: rgb('#5F5260'),
+    syntaxPunctuation: rgb('#A3959E'),
+    syntaxConstant: rgb('#A84472'),
+    professionalBlue: rgb('#CE5A80'),
+    chromeYellow: rgb('#C99A3F'),
+    mascotBody: rgb('#D98A63'),
+    inputBackground: rgb('#FBF3F0'),
+    userMessageBackground: '',
+    userMessageBackgroundHover: rgb('#F0DCE6'),
+    messageActionsBackground: rgb('#F3E4EB'),
+    selectionBg: rgb('#F3D7E0'),
+    bashMessageBackgroundColor: rgb('#F5EAE0'),
+    memoryBackgroundColor: rgb('#F3E4EB'),
+    rate_limit_fill: rgb('#D988A9'),
+    rate_limit_empty: rgb('#E8DAD2'),
+    fastMode: rgb('#D98E4A'),
+    fastModeShimmer: rgb('#E2A465'),
+    userPromptLabel: rgb('#A67600'),
+    subagentBullet: rgb('#C05C7E'),
+    subagentDescription: rgb('#3D2B33'),
+    subagentModel: rgb('#9A8790'),
+    subagentElapsed: rgb('#9A8790'),
+    subagentToolName: rgb('#D5517F'),
+    subagentStatusRunning: rgb('#D5517F'),
+    subagentStatusCompleted: rgb('#3E9468'),
+    subagentStatusFailed: rgb('#C24D5C'),
+    // The night preset's ramp, with only the pale tip stepped back: the night's
+    // #F7B7CC sits at 1.36:1 against the #E8E8E8 free fill, the day tip #EE8FB0
+    // at 1.86:1. The crest cannot follow the night's either — #F27BA6 is 2.14:1
+    // on this palette's blush, so the wave deepens for the same reason the
+    // built-in light pair does. `ignitionDim` is the near-white blush the wave
+    // rides on, mirroring the mist light preset's #F0F0F2.
+    ...PINK_BAR_RAMP,
+    contextBarTools: rgb('#EE8FB0'),
+    ignition: rgb('#B03A63'),
+    ignitionDim: rgb('#FFE3EC'),
+    cursor: '',
+};
+/**
+ * Sakura Pink in the 16 standard ANSI colors, for terminals without truecolor.
+ * Magenta carries brand, matching the truecolor variants. Role base:
+ * `dark-ansi`, deliberately: the 16-color space has no pink slots, so 56 of
+ * the 81 keys are the base's own values and only the ones listed here shift.
+ * `cursor` stays empty like every other built-in (the inverse-video caret).
+ */
+const pinkAnsiTheme = {
+    ...darkAnsiTheme,
+    // Brand, focus and activity: the magenta pair replaces the base's blue pair.
+    accent: 'ansi:magentaBright',
+    accentShimmer: 'ansi:magentaBright',
+    activity: 'ansi:magentaBright',
+    activityShimmer: 'ansi:magentaBright',
+    permission: 'ansi:magentaBright',
+    permissionShimmer: 'ansi:magentaBright',
+    ide: 'ansi:magenta',
+    suggestion: 'ansi:magentaBright',
+    remember: 'ansi:magentaBright',
+    background: 'ansi:magentaBright',
+    toolDotWeb: 'ansi:magenta',
+    syntaxKeyword: 'ansi:magentaBright',
+    // A real override, not a leftover: the base's `syntaxType` is magenta too
+    // (like `syntaxKeyword` here), so deleting this line would collide the two.
+    syntaxType: 'ansi:blueBright',
+    professionalBlue: 'ansi:magentaBright',
+    // Tinted surfaces.
+    userMessageBackgroundHover: 'ansi:magenta',
+    selectionBg: 'ansi:magenta',
+    rate_limit_fill: 'ansi:magentaBright',
+    subagentStatusRunning: 'ansi:magentaBright',
+    // The 16-color bar ladder: the base's dark anchor, the two magentas that
+    // carry the sakura brand, then white/whiteBright as the pale tip (the
+    // 16-color space has no paler pink). The ignition wave is drawn column by
+    // column in truecolor, so its pair stays hex — an `ansi:*` value there falls
+    // back to the blue pair instead of rendering — and its crest matches the
+    // truecolor night preset rather than the neon #FF2D6F.
+    contextBarPrompt: 'ansi:magenta',
+    contextBarAssistant: 'ansi:magentaBright',
+    contextBarThinking: 'ansi:white',
+    contextBarTools: 'ansi:whiteBright',
+    ignition: rgb('#F27BA6'),
+    ignitionDim: rgb('#241A20'),
+};
 const normalizedThemeCache = new WeakMap();
 /** Include every own value so a mutable legacy resolver cannot serve stale data. */
 function themeObjectSignature(raw) {
@@ -824,7 +1096,8 @@ export function getTheme(themeName) {
         case 'dark-ansi':
             return darkAnsiTheme;
         // Built-in bases must resolve without touching the custom-theme resolver
-        // (same reasoning as `dark` above).
+        // (same reasoning as `dark` above); the sakura family and the brand pairs
+        // follow the same rule.
         case 'claude-dark':
             return claudeDarkTheme;
         case 'claude-paper':
@@ -833,6 +1106,12 @@ export function getTheme(themeName) {
             return codexLavenderTheme;
         case 'codex-paper':
             return codexPaperTheme;
+        case 'pink-night':
+            return pinkNightTheme;
+        case 'pink-ansi':
+            return pinkAnsiTheme;
+        case 'pink-day':
+            return pinkDayTheme;
         case AUTO_THEME_NAME:
             return autoBase === 'light' ? lightTheme : darkTheme;
         default: {
@@ -869,9 +1148,17 @@ export function isLightThemeActive(themeName) {
     // Built-ins answer by palette identity, never by luminance. An ANSI palette
     // has no parseable ink at all, and a future truecolor tweak must not silently
     // flip a whole family's contrast direction.
-    if (theme === lightTheme || theme === claudePaperTheme || theme === codexPaperTheme)
+    if (theme === lightTheme ||
+        theme === pinkDayTheme ||
+        theme === claudePaperTheme ||
+        theme === codexPaperTheme)
         return true;
-    if (theme === darkTheme || theme === darkAnsiTheme || theme === claudeDarkTheme || theme === codexLavenderTheme)
+    if (theme === darkTheme ||
+        theme === darkAnsiTheme ||
+        theme === pinkNightTheme ||
+        theme === pinkAnsiTheme ||
+        theme === claudeDarkTheme ||
+        theme === codexLavenderTheme)
         return false;
     // 自定义或运行时主题：按文本墨色亮度判定——浅底配深墨（ink）、深底配亮墨。
     // 调色板的 background 字段是徽标填充色而非终端背景，不能作判据。墨色走

package/lib/types/themeCatalog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"themeCatalog.d.ts","sourceRoot":"","sources":["../../src/themeCatalog.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAKL,KAAK,KAAK,EACX,MAAM,YAAY,CAAA;AACnB,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,kBAAkB,CAAA;AACzB,OAAO,KAAK,EAAE,YAAY,EAAwB,MAAM,yBAAyB,CAAA;AAEjF,mCAAmC;AACnC,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAA;AAE1E,2DAA2D;AAC3D,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAA;IACnC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;IACrB,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,CAAA;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CACvB;AAwGD,0EAA0E;AAC1E,wBAAgB,gBAAgB,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,SAAS,iBAAiB,EAAE,CAMlF;AAED,iDAAiD;AACjD,eAAO,MAAM,UAAU,yBAAmB,CAAA;AAU1C,8EAA8E;AAC9E,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,YAAY,GAAG,iBAAiB,GAAG,SAAS,CA6BlG;AAED,sEAAsE;AACtE,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,YAAY,GAAG,KAAK,GAAG,SAAS,CAExF;AAED,kEAAkE;AAClE,eAAO,MAAM,YAAY,0BAAoB,CAAA;AAE7C,2EAA2E;AAC3E,wBAAgB,UAAU,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,SAAS,MAAM,EAAE,CAEjE;AAED,iEAAiE;AACjE,eAAO,MAAM,cAAc,mBAAa,CAAA"}
+{"version":3,"file":"themeCatalog.d.ts","sourceRoot":"","sources":["../../src/themeCatalog.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAKL,KAAK,KAAK,EACX,MAAM,YAAY,CAAA;AACnB,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,kBAAkB,CAAA;AACzB,OAAO,KAAK,EAAE,YAAY,EAAwB,MAAM,yBAAyB,CAAA;AAEjF,mCAAmC;AACnC,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAA;AAE1E,2DAA2D;AAC3D,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAA;IACnC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;IACrB,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,CAAA;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CACvB;AA4HD,0EAA0E;AAC1E,wBAAgB,gBAAgB,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,SAAS,iBAAiB,EAAE,CAMlF;AAED,iDAAiD;AACjD,eAAO,MAAM,UAAU,yBAAmB,CAAA;AAU1C,8EAA8E;AAC9E,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,YAAY,GAAG,iBAAiB,GAAG,SAAS,CA6BlG;AAED,sEAAsE;AACtE,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,YAAY,GAAG,KAAK,GAAG,SAAS,CAExF;AAED,kEAAkE;AAClE,eAAO,MAAM,YAAY,0BAAoB,CAAA;AAE7C,2EAA2E;AAC3E,wBAAgB,UAAU,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,SAAS,MAAM,EAAE,CAEjE;AAED,iEAAiE;AACjE,eAAO,MAAM,cAAc,mBAAa,CAAA"}

package/lib/types/themeCatalog.js

@@ -20,10 +20,29 @@ function entry(name, displayName, source, theme, base, file) {
         ...(file === undefined ? {} : { file }),
     });
 }
+/**
+ * The role each built-in plays as a `base`. The mist and sakura rows play one
+ * of the three classic roles (their own names are not bases); the brand pairs
+ * play the dark/light role of their brand family — the brand adaptation of
+ * `dark`/`light` (their own names are bases too, see THEME_BASE_NAMES).
+ * Total over THEME_NAMES, so a new built-in must decide a role to compile.
+ */
+const BUILT_IN_BASE = {
+    dark: 'dark',
+    'dark-ansi': 'dark-ansi',
+    light: 'light',
+    'pink-night': 'dark',
+    'pink-ansi': 'dark-ansi',
+    'pink-day': 'light',
+    'claude-dark': 'dark',
+    'claude-paper': 'light',
+    'codex-lavender': 'dark',
+    'codex-paper': 'light',
+};
 function builtInEntries() {
     return [
         entry(AUTO_THEME_NAME, AUTO_THEME_NAME, 'auto', getTheme(AUTO_THEME_NAME)),
-        ...THEME_NAMES.map(name => entry(name, name, 'builtin', getTheme(name), name)),
+        ...THEME_NAMES.map(name => entry(name, name, 'builtin', getTheme(name), BUILT_IN_BASE[name])),
     ];
 }
 function staticEntries(specs, seen) {
@@ -118,7 +137,7 @@ export function resolveThemeEntry(name, host) {
         return entry(name, name, 'auto', getTheme(AUTO_THEME_NAME));
     const builtIn = THEME_NAMES.find(candidate => candidate === name);
     if (builtIn !== undefined)
-        return entry(builtIn, builtIn, 'builtin', getTheme(builtIn), builtIn);
+        return entry(builtIn, builtIn, 'builtin', getTheme(builtIn), BUILT_IN_BASE[builtIn]);
     const spec = findStaticSpec(name);
     if (spec !== undefined)
         return entry(spec.name, spec.displayName, 'static', buildTheme(spec), spec.base, spec.file);

package/lib/types/tips.js

@@ -315,8 +315,8 @@ export const TIPS = [
     {
         id: 'cmd-model',
         group: 'commands',
-        zh: '/model 换模型会 fork 续聊，历史不丢',
-        en: '/model forks to continue: history is preserved',
+        zh: '/model 同会话换模型，历史不丢',
+        en: '/model switches in place: session and history are preserved',
     },
     {
         id: 'cmd-effort',
@@ -405,8 +405,8 @@ export const TIPS = [
     {
         id: 'cmd-plugins',
         group: 'commands',
-        zh: '/plugins check <清单路径> 诊断插件兼容性',
-        en: '/plugins check <manifest> diagnoses plugin compatibility',
+        zh: '/plugin check <清单路径> 诊断插件兼容性',
+        en: '/plugin check <manifest> diagnoses plugin compatibility',
     },
     {
         id: 'cmd-update',

package/lib/types/tuiSettingsFile.d.ts

@@ -0,0 +1,56 @@
+export interface TuiSettingsDocument {
+    readonly version: 1;
+    /** The sparse user layer: only what the user set. */
+    readonly values: Readonly<Record<string, unknown>>;
+    /** The one-time import from the DSH profile patch (absent = never ran). */
+    readonly imported?: {
+        readonly from: string;
+        readonly at: number;
+    };
+}
+export declare const TUI_SETTINGS_FILE: string;
+/** The document, or undefined when there is none yet. A broken file reads as
+ *  an empty layer (and is not re-imported over). Never throws. */
+export declare function readTuiSettings(file?: string): TuiSettingsDocument | undefined;
+/**
+ * Before the first write over a document `readTuiSettings` could not parse,
+ * keep its original bytes beside it as `<file>.corrupt-<timestamp>` (mode
+ * 0600). Returns the backup path; throws when the bytes cannot be preserved
+ * — the caller must then not replace the file.
+ */
+export declare function backupUnreadableTuiSettings(file?: string): string;
+/** Write the document atomically; throws when it cannot be written. */
+export declare function writeTuiSettings(document: TuiSettingsDocument, file?: string): void;
+/**
+ * Write the document only when there is none yet; false when another process
+ * created it first. The complete file appears at once (a hard link of the
+ * temporary, which fails on an existing name); a filesystem without hard links
+ * falls back to an exclusive create, which never replaces a document either.
+ * Throws when it cannot be written.
+ */
+export declare function createTuiSettings(document: TuiSettingsDocument, file?: string): boolean;
+/** The DSH profile's own patch layer, where DSH persisted the `/settings` layer. */
+export declare function profilePatchPath(profile: string): string;
+/**
+ * The `dsh-tui` row's `config` in a DSH profile patch, restricted to `keys`
+ * (the editable fields; deployment fields such as the provider route stay in
+ * the profile). Undefined when the file or the row is missing or unreadable.
+ * `!!js` expressions are not evaluated: such a field is skipped (a top-level
+ * one's source is recorded in `expressions`, when given).
+ */
+export declare function readProfileTuiSettings(path: string, keys: readonly string[], expressions?: Map<string, string>): Record<string, unknown> | undefined;
+/**
+ * The `ns` section of the `/settings` user layer older DSH hosts kept in
+ * `<DSH home>/settings.yaml` (dsh-settings-file), restricted to `keys`. A DSH
+ * that has since moved the document into the profile patch leaves it as
+ * `settings.yaml.imported`; `pending` tells the two apart (a pending document
+ * still overrides the patch, an imported one is already beneath it).
+ */
+export declare function readLegacyTuiSettings(ns: string, keys: readonly string[]): {
+    readonly from: string;
+    readonly pending: boolean;
+    readonly values: Record<string, unknown>;
+} | undefined;
+/** `over` laid on `under`: nested records merge, anything else replaces. */
+export declare function mergeSettingsLayers(under: Readonly<Record<string, unknown>>, over: Readonly<Record<string, unknown>>): Record<string, unknown>;
+//# sourceMappingURL=tuiSettingsFile.d.ts.map

package/lib/types/tuiSettingsFile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tuiSettingsFile.d.ts","sourceRoot":"","sources":["../../src/tuiSettingsFile.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;IACnB,qDAAqD;IACrD,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IAClD,2EAA2E;IAC3E,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;CACnE;AAED,eAAO,MAAM,iBAAiB,QAAkC,CAAA;AAEhE;kEACkE;AAClE,wBAAgB,eAAe,CAAC,IAAI,GAAE,MAA0B,GAAG,mBAAmB,GAAG,SAAS,CAiBjG;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,GAAE,MAA0B,GAAG,MAAM,CAIpF;AAID,uEAAuE;AACvE,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,mBAAmB,EAAE,IAAI,GAAE,MAA0B,GAAG,IAAI,CAUtG;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,mBAAmB,EAAE,IAAI,GAAE,MAA0B,GAAG,OAAO,CAsB1G;AAED,oFAAoF;AACpF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAExD;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAqBpJ;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GAAG,SAAS,CAerL;AAED,4EAA4E;AAC5E,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAO9I"}