dsh-tui-theme 0.2.2 → 0.3.0

package/README.md

@@ -6,7 +6,7 @@
 | --- | --- | --- |
 | **三套粉色主题** | 主题（静态资产） | `pink-night` 夜樱 / `pink-day` 昼樱 / `pink-ansi` 樱·ANSI，启动时自动装进 `~/.dsh-tui/themes/` |
 | **自动跟随背景** | 启动时序 | 检测终端/系统背景色（OSC 11，与宿主同阈值），在昼樱/夜樱间自动切换——pink 版的 auto |
-| **花符状态行** | `tuiStatus` | 输入框上方一行小装饰：✿ · 时钟 · 实时轮数 |
+| **花符状态行** | `tuiStatus` | 输入框上方一行小装饰：✿ · 时钟 · 实时轮数（默认仅粉主题下显示） |
 | **设置面板** | `tuiSettingsSections` | `/settings` 里一个可编辑区块，改完即时生效 |
 
 **明确不做的事**：不注册快捷键、不注册/修改任何命令、不拦截输入、不追加会话事件、不注入 system prompt。卸载即无痕（可选删除主题文件）。
@@ -79,6 +79,7 @@ dsh plugin --profile dsh-tui add -w /path/to/dsh-tui-theme
 | `showGlyph` | `true` | 花符：开 = ✿ 开头，关 = 不显示 |
 | `showClock` | `true` | 显示 HH:MM 时钟 |
 | `showTurns` | `true` | 显示当前会话轮数（`N✦`，自本次启动起计） |
+| `showOnNonPinkThemes` | `false` | 非粉主题下也显示状态行；关 = 仅在樱花粉三主题下显示（推荐保持关闭） |
 
 三项装饰全关时状态行整体消失。另有仅 profile 层的开关（`cordis.patch.yml`，不出现在 /settings）：`autoInstallThemes`、`statusEnabled`。
 

package/cordis.patch.yml

@@ -13,3 +13,4 @@
         showGlyph: true
         showClock: true
         showTurns: true
+        showOnNonPinkThemes: false

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAKlD,OAAO,EAAwB,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEjF,eAAO,MAAM,IAAI,kBAAkB,CAAA;AAEnC,wDAAwD;AACxD,MAAM,MAAM,MAAM,GAAG,eAAe,CAAA;AAUpC,eAAO,MAAM,MAAM,EAAE,WAAW,CAAC,MAAM,CAOrC,CAAA;AAwBF;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,MAAW,GAAG,IAAI,CAgE7D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAKlD,OAAO,EAAwB,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEjF,eAAO,MAAM,IAAI,kBAAkB,CAAA;AAEnC,wDAAwD;AACxD,MAAM,MAAM,MAAM,GAAG,eAAe,CAAA;AAUpC,eAAO,MAAM,MAAM,EAAE,WAAW,CAAC,MAAM,CAQrC,CAAA;AAyBF;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,MAAW,GAAG,IAAI,CAiE7D"}

package/lib/types/index.js

@@ -35,6 +35,7 @@ export const Config = z.object({
     showGlyph: z.boolean().default(true),
     showClock: z.boolean().default(true),
     showTurns: z.boolean().default(true),
+    showOnNonPinkThemes: z.boolean().default(false),
 });
 const DEFAULTS = {
     autoInstallThemes: true,
@@ -43,6 +44,7 @@ const DEFAULTS = {
     showGlyph: true,
     showClock: true,
     showTurns: true,
+    showOnNonPinkThemes: false,
 };
 /**
  * Backstop delay for the cordis-layer follow decision on hosts without a
@@ -65,6 +67,7 @@ export function apply(ctx, config = {}) {
         showGlyph: config.showGlyph ?? DEFAULTS.showGlyph,
         showClock: config.showClock ?? DEFAULTS.showClock,
         showTurns: config.showTurns ?? DEFAULTS.showTurns,
+        showOnNonPinkThemes: config.showOnNonPinkThemes ?? DEFAULTS.showOnNonPinkThemes,
     };
     if (cordis.autoInstallThemes) {
         const result = installBundledThemes();

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

@@ -1 +1 @@
-{"version":3,"file":"settingsSection.d.ts","sourceRoot":"","sources":["../../src/settingsSection.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAEpD,+EAA+E;AAC/E,MAAM,MAAM,eAAe,GAAG,aAAa,GAAG;IAC5C,sEAAsE;IACtE,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,oEAAoE;IACpE,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAcD;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,GACpC,IAAI,CA2CN"}
+{"version":3,"file":"settingsSection.d.ts","sourceRoot":"","sources":["../../src/settingsSection.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAEpD,+EAA+E;AAC/E,MAAM,MAAM,eAAe,GAAG,aAAa,GAAG;IAC5C,sEAAsE;IACtE,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,oEAAoE;IACpE,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAcD;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,GACpC,IAAI,CA4CN"}

package/lib/types/settingsSection.js

@@ -35,6 +35,7 @@ export function registerPinkSettings(ctx, cordis, onDoc) {
             showGlyph: z.boolean(),
             showClock: z.boolean(),
             showTurns: z.boolean(),
+            showOnNonPinkThemes: z.boolean(),
         }));
         const emit = (doc) => {
             if (doc === null || typeof doc !== 'object')
@@ -110,6 +111,17 @@ function sectionDefinition(cordis) {
                 kind: 'boolean',
                 format: (value) => String(value ?? cordis.showTurns),
             },
+            {
+                path: ['showOnNonPinkThemes'],
+                label: 'Show on non-pink themes',
+                descriptions: { zh: '非粉主题下也显示' },
+                hint: 'The blossom line belongs to the pink palettes; off keeps it hidden while another theme is active.',
+                hintDescriptions: {
+                    zh: '状态行属于樱花粉主题；关闭时在其他主题下不显示。',
+                },
+                kind: 'boolean',
+                format: (value) => String(value ?? cordis.showOnNonPinkThemes),
+            },
         ],
     };
 }

package/lib/types/statusLine.d.ts

@@ -5,6 +5,11 @@
  * live turn count of the current session (seam one, read-only — nothing is
  * ever appended to the session log). The host owns rendering and
  * sanitization; text is scalars only.
+ *
+ * The line belongs to the pink palettes: by default it only renders while a
+ * pink theme is active (checked per render with the host's own theme
+ * precedence, so a mid-session /theme switch takes effect on the next tick);
+ * `showOnNonPinkThemes` opts it into every other theme too.
  * @module dsh-tui-pink-theme/statusLine
  */
 import type { Context } from '@deepseek-ai/cordis';
@@ -17,6 +22,8 @@ export interface StatusOptions {
     showClock?: boolean;
     /** Include the live turn count of the current session. */
     showTurns?: boolean;
+    /** Also render while a non-pink theme is active (default: pink only). */
+    showOnNonPinkThemes?: boolean;
 }
 /** Fully-resolved status knobs. */
 export type EffectiveStatus = Required<StatusOptions>;

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

@@ -1 +1 @@
-{"version":3,"file":"statusLine.d.ts","sourceRoot":"","sources":["../../src/statusLine.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAKlD,MAAM,WAAW,aAAa;IAC5B,2EAA2E;IAC3E,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,sCAAsC;IACtC,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,+BAA+B;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,0DAA0D;IAC1D,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED,mCAAmC;AACnC,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAA;AAoBrD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,GAAG,IAAI,CAsDvF"}
+{"version":3,"file":"statusLine.d.ts","sourceRoot":"","sources":["../../src/statusLine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAOlD,MAAM,WAAW,aAAa;IAC5B,2EAA2E;IAC3E,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,sCAAsC;IACtC,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,+BAA+B;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,0DAA0D;IAC1D,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,yEAAyE;IACzE,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B;AAED,mCAAmC;AACnC,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAA;AAwCrD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,GAAG,IAAI,CA2DvF"}

package/lib/types/statusLine.js

@@ -5,11 +5,37 @@
  * live turn count of the current session (seam one, read-only — nothing is
  * ever appended to the session log). The host owns rendering and
  * sanitization; text is scalars only.
+ *
+ * The line belongs to the pink palettes: by default it only renders while a
+ * pink theme is active (checked per render with the host's own theme
+ * precedence, so a mid-session /theme switch takes effect on the next tick);
+ * `showOnNonPinkThemes` opts it into every other theme too.
  * @module dsh-tui-pink-theme/statusLine
  */
+import { join } from 'node:path';
+import { homeDir } from './themeAssets.js';
+import { readThemePref } from './autoTheme.js';
 const GLYPH = '✿';
 const STATUS_KEY = 'dsh-tui-theme';
 const CLOCK_TICK_MS = 15_000;
+/** The bundled themes this garnish belongs to. */
+const PINK_THEMES = new Set(['pink-night', 'pink-day', 'pink-ansi']);
+/**
+ * The active theme name by the host's own precedence: DSH_TUI_THEME first,
+ * then the persisted ~/.dsh-tui/theme.json pref. The unforced path (OSC 11
+ * auto-detection) only ever resolves to a builtin palette, never a pink one,
+ * so "no pref" means non-pink.
+ */
+function activeThemeName(dataDir) {
+    const env = process.env.DSH_TUI_THEME;
+    if (env !== undefined && env !== '')
+        return env;
+    return readThemePref(dataDir);
+}
+function isPinkThemeActive(dataDir) {
+    const name = activeThemeName(dataDir);
+    return name !== undefined && PINK_THEMES.has(name);
+}
 function clockText() {
     // "HH:MM" from toTimeString()'s "HH:MM:SS GMT…" prefix — locale independent.
     return new Date().toTimeString().slice(0, 5);
@@ -29,6 +55,7 @@ function clockText() {
  *   edits land live without restarting anything).
  */
 export function startStatusLine(ctx, getEffective) {
+    const dataDir = join(homeDir(), '.dsh-tui');
     ctx.inject(['tuiStatus'], statusCtx => {
         const status = statusCtx.tuiStatus;
         const turns = new Map();
@@ -38,7 +65,11 @@ export function startStatusLine(ctx, getEffective) {
             try {
                 const eff = getEffective();
                 const parts = [];
-                if (eff.statusEnabled) {
+                // The line is pink garnish: off on other themes unless opted in.
+                // The theme check runs here (not once at startup) so a mid-session
+                // /theme switch lands on the next tick or session event.
+                const themeAllows = eff.showOnNonPinkThemes || isPinkThemeActive(dataDir);
+                if (eff.statusEnabled && themeAllows) {
                     if (eff.showGlyph)
                         parts.push(GLYPH);
                     if (eff.showClock)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-tui-theme",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "Sakura-pink themes for dsh-TUI with terminal-background auto-follow (pink-day/pink-night), a blossom status line, and a /settings section. No shortcuts, no commands.",
   "type": "module",
   "main": "lib/types/index.js",