dsh-tui-theme 0.3.0 → 0.3.1

package/README.md

@@ -79,7 +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` | 非粉主题下也显示状态行；关 = 仅在樱花粉三主题下显示（推荐保持关闭） |
+| `statusScope` | `pink-only` | 状态行展示：`pink-only` 仅樱花粉主题 / `all-themes` 所有主题 |
 
 三项装饰全关时状态行整体消失。另有仅 profile 层的开关（`cordis.patch.yml`，不出现在 /settings）：`autoInstallThemes`、`statusEnabled`。
 

package/cordis.patch.yml

@@ -13,4 +13,4 @@
         showGlyph: true
         showClock: true
         showTurns: true
-        showOnNonPinkThemes: false
+        statusScope: pink-only

package/lib/types/index.js

@@ -35,7 +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),
+    statusScope: z.union(['pink-only', 'all-themes']).default('pink-only'),
 });
 const DEFAULTS = {
     autoInstallThemes: true,
@@ -44,7 +44,7 @@ const DEFAULTS = {
     showGlyph: true,
     showClock: true,
     showTurns: true,
-    showOnNonPinkThemes: false,
+    statusScope: 'pink-only',
 };
 /**
  * Backstop delay for the cordis-layer follow decision on hosts without a
@@ -67,7 +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,
+        statusScope: config.statusScope ?? DEFAULTS.statusScope,
     };
     if (cordis.autoInstallThemes) {
         const result = installBundledThemes();

package/lib/types/settingsSection.js

@@ -35,7 +35,7 @@ export function registerPinkSettings(ctx, cordis, onDoc) {
             showGlyph: z.boolean(),
             showClock: z.boolean(),
             showTurns: z.boolean(),
-            showOnNonPinkThemes: z.boolean(),
+            statusScope: z.union(['pink-only', 'all-themes']),
         }));
         const emit = (doc) => {
             if (doc === null || typeof doc !== 'object')
@@ -112,15 +112,19 @@ function sectionDefinition(cordis) {
                 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.',
+                path: ['statusScope'],
+                label: 'Status line display',
+                descriptions: { zh: '状态行展示' },
+                hint: 'The blossom line is exclusive to the pink palettes by default; all-themes keeps it visible under other themes.',
                 hintDescriptions: {
-                    zh: '状态行属于樱花粉主题；关闭时在其他主题下不显示。',
+                    zh: '状态行默认为樱花粉主题专属；所有主题时在其他主题下同样显示。',
                 },
-                kind: 'boolean',
-                format: (value) => String(value ?? cordis.showOnNonPinkThemes),
+                kind: 'select',
+                options: [
+                    { value: 'pink-only', label: 'Pink themes only', descriptions: { zh: '樱花粉主题' } },
+                    { value: 'all-themes', label: 'All themes', descriptions: { zh: '所有主题' } },
+                ],
+                format: (value) => typeof value === 'string' ? value : (cordis.statusScope ?? 'pink-only'),
             },
         ],
     };

package/lib/types/statusLine.d.ts

@@ -9,10 +9,12 @@
  * 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.
+ * `statusScope: 'all-themes'` opts it into every other theme too.
  * @module dsh-tui-pink-theme/statusLine
  */
 import type { Context } from '@deepseek-ai/cordis';
+/** Which themes the blossom line renders under. */
+export type StatusScope = 'pink-only' | 'all-themes';
 export interface StatusOptions {
     /** Master switch (cordis-config layer only; not surfaced in /settings). */
     statusEnabled?: boolean;
@@ -22,8 +24,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;
+    /** Theme scope of the line (default: the pink palettes only). */
+    statusScope?: StatusScope;
 }
 /** 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;;;;;;;;;;;;;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"}
+{"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,mDAAmD;AACnD,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG,YAAY,CAAA;AAEpD,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,iEAAiE;IACjE,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B;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

@@ -9,7 +9,7 @@
  * 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.
+ * `statusScope: 'all-themes'` opts it into every other theme too.
  * @module dsh-tui-pink-theme/statusLine
  */
 import { join } from 'node:path';
@@ -68,7 +68,7 @@ export function startStatusLine(ctx, getEffective) {
                 // 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);
+                const themeAllows = eff.statusScope === 'all-themes' || isPinkThemeActive(dataDir);
                 if (eff.statusEnabled && themeAllows) {
                     if (eff.showGlyph)
                         parts.push(GLYPH);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-tui-theme",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "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",