dsh-tui-theme 0.3.0 → 0.3.2

package/README.md

@@ -1,120 +1,121 @@
-# dsh-tui-theme 🌸
-
-[dsh-TUI](https://github.com/ccch1mneyyy/dsh-TUI) 的樱花粉主题插件。一个包带来四种个性化，全部走官方接缝：
-
-| 个性化 | 接缝 | 说明 |
-| --- | --- | --- |
-| **三套粉色主题** | 主题（静态资产） | `pink-night` 夜樱 / `pink-day` 昼樱 / `pink-ansi` 樱·ANSI，启动时自动装进 `~/.dsh-tui/themes/` |
-| **自动跟随背景** | 启动时序 | 检测终端/系统背景色（OSC 11，与宿主同阈值），在昼樱/夜樱间自动切换——pink 版的 auto |
-| **花符状态行** | `tuiStatus` | 输入框上方一行小装饰：✿ · 时钟 · 实时轮数（默认仅粉主题下显示） |
-| **设置面板** | `tuiSettingsSections` | `/settings` 里一个可编辑区块，改完即时生效 |
-
-**明确不做的事**：不注册快捷键、不注册/修改任何命令、不拦截输入、不追加会话事件、不注入 system prompt。卸载即无痕（可选删除主题文件）。
-
-## 主题预览
-
-| 主题 | 基底 | 风格 |
-| --- | --- | --- |
-| `pink-night` 夜樱 | dark | 深梅紫底、玫瑰粉强调、粉鲸鱼吉祥物，96 键全覆盖 |
-| `pink-day` 昼樱 | light | 象牙粉底、墨梅正文、柔和玫瑰强调（已通过宿主浅色身份判定） |
-| `pink-ansi` 樱·ANSI | dark-ansi | 16 色 ANSI 回退，品牌色映射到 magenta 系 |
-
-三套均通过 dsh-TUI 官方校验器（零警告、全键覆盖）与 WCAG 对比度检查（正文 ≥ 11:1）。
-
-> 小知识：`pink-day` 的 `text` 写成 `rgb(61,43,51)` 而非 hex——宿主按 `text` 墨色亮度自动判定主题深浅，且只认 `rgb()` 格式。
-
-## 截图
-
-实测于 dsh-tui 0.9.0：
-
-| 昼樱 `pink-day` | 夜樱 `pink-night` |
-| :---: | :---: |
-| ![pink-day 主题界面](docs/screenshots/pink-day.png) | ![pink-night 主题界面](docs/screenshots/pink-night.png) |
-
-`/settings` 里的 pink-theme 区块（跟随终端背景 / 花符 / 时钟 / 轮数，保存即时生效）：
-
-![pink-theme 设置区块](docs/screenshots/settings.png)
-
-> 图中底栏上下文进度条的蓝色分段与 ❯ 提示符是宿主硬编码的，见下文[宿主限制](#受宿主限制目前无法定制的部分)。
-
-## 自动跟随终端背景
-
-设置里的“跟随终端背景”开启后（本部署默认开启）：
-
-- 每次启动检测终端背景（跟随系统主题的终端会随系统深浅变化），亮 → `pink-day`，暗 → `pink-night`，写入 `~/.dsh-tui/theme.json`，与宿主 `auto` 伪主题同款行为、同一亮度阈值；
-- 检测结果缓存在 `~/.dsh-tui/theme-follow.json`，因此切换在**启动瞬间**就生效；首次开启或系统刚翻转后的那次启动可能滞后一拍（与宿主 auto “重新选择或重启后跟上”一致）；
-- 开启此功能后 `/theme` 的选择由插件接管（每次启动都会按背景覆写）；关闭它即可恢复手动选择；
-- `DSH_TUI_THEME` 环境变量仍然最优先（宿主行为，插件不覆盖环境变量）。
-
-## 安装
-
-```sh
-# 方式一：从 npm（已发布）
-dsh plugin --profile dsh-tui add -w dsh-tui-theme
-
-# 方式二：从 GitHub
-dsh plugin --profile dsh-tui add -w github:xiaoxiaohaigui/dsh-tui-theme
-
-# 方式三：本地路径（开发/自用）
-dsh plugin --profile dsh-tui add -w /path/to/dsh-tui-theme
-```
-
-重启 dsh-TUI 后插件自动把三套主题复制进 `~/.dsh-tui/themes/`（**仅缺失时复制，绝不覆盖你已有的同名文件**），然后：
-
-```sh
-# 在 dsh-TUI 里
-/theme              # 选择器：夜樱 / 昼樱 / 樱·ANSI
-/theme pink-night   # 或直接切换（开启跟随后由插件接管）
-```
-
-## 配置
-
-配置有三层，优先级：`/settings` 用户层 > `cordis.yml` 配置层 > 内置默认值。
-
-`/settings` 里找到 **pink-theme** 区块即可编辑：
-
-| 字段 | 默认 | 说明 |
-| --- | --- | --- |
-| `followSystem` | 部署默认开 | 跟随终端背景：昼樱 ↔ 夜樱自动切换 |
-| `showGlyph` | `true` | 花符：开 = ✿ 开头，关 = 不显示 |
-| `showClock` | `true` | 显示 HH:MM 时钟 |
-| `showTurns` | `true` | 显示当前会话轮数（`N✦`，自本次启动起计） |
-| `showOnNonPinkThemes` | `false` | 非粉主题下也显示状态行；关 = 仅在樱花粉三主题下显示（推荐保持关闭） |
-
-三项装饰全关时状态行整体消失。另有仅 profile 层的开关（`cordis.patch.yml`，不出现在 /settings）：`autoInstallThemes`、`statusEnabled`。
-
-## 受宿主限制、目前无法定制的部分
-
-以下元素的颜色/形态由 dsh-TUI 宿主**硬编码**，不读取任何主题键，主题 JSON 与插件接缝都覆盖不到（dsh-TUI 0.9.0 实测）：
-
-| 元素 | 现状 | 位置（宿主源码） |
-| --- | --- | --- |
-| 输入框 ❯ 提示符 | 默认态无颜色参数（终端默认前景色，模型工作时变暗）；最高推理档充能动画用**写死的蓝色 ramp**（深色端 `#82B9FF` / 浅色端 `#1E5FEB`） | `EffortChargeGlyph.tsx`、`trajectory/effortIgnition.ts` |
-| 底栏上下文进度条分段色 | system / prompt / assistant / thinking / tools 五段为**写死的藏青→品牌蓝系**（`#22305F`→`#5A7CFF`），永远不随主题变化 | `screens/StatusMetrics.ts` |
-| 进度条空余段配色 | 宿主按 `themeName === 'light'` **字符串比较**取浅色配色——自定义浅色主题（如 pink-day）不等于 `'light'`，会拿到深色空余段，在浅色终端上偏深 | `screens/StatusLine.tsx` |
-| 状态行文字颜色 | 插件状态行（tuiStatus）由宿主统一以**无色 + 终端 dim** 渲染，插件无法指定颜色（✿ 行因此继承终端默认前景色） | `screens/Chat.tsx` |
-| 主界面组件与布局 | 顶栏像素鲸鱼、工具卡、输入框等宿主组件不可被插件替换或改布局——平台规则（内建优先，无组件替换接缝）；主题能碰的只有颜色层 | 宿主架构约定 |
-
-这些都需要上游 dsh-TUI 修改（例如：把充能色/进度条分段色接入主题键、空余段判断改用 `isLightThemeActive()`）。上游修复前，任何社区主题包都受同样约束。
-
-## 卸载
-
-```sh
-dsh plugin --profile dsh-tui remove -w dsh-tui-theme    # 移除插件
-rm ~/.dsh-tui/themes/pink-{night,day,ansi}.json         # 可选：删除主题文件
-rm ~/.dsh-tui/theme-follow.json                         # 可选：删除跟随缓存
-```
-
-## 开发
-
-```sh
-pnpm install && pnpm build   # tsc -> lib/types/
-npm run verify               # 沙盒测试（临时 HOME + 伪造 TTY，不碰真实 ~/.dsh-tui）
-```
-
-主题调色板改起来最直接：编辑 `themes/*.json` 后重新 `npm run verify`，再删掉 `~/.dsh-tui/themes/` 下对应文件让插件重装。
-
-## 兼容性
-
-- **dsh-TUI 版本下限：0.8.8**（全功能，含状态行与设置面板；0.9.0 实测）。更旧的宿主缺 `dsh-tui-extensions` 扩展面时，插件自动降级为“仅安装三套主题 + 背景跟随”，不报错。
-- Node `^22.19 || >=24`，纯 ESM，MIT。
+# dsh-tui-theme 🌸
+
+[dsh-TUI](https://github.com/ccch1mneyyy/dsh-TUI) 的樱花粉主题插件。一个包带来四种个性化，全部走官方接缝：
+
+| 个性化 | 接缝 | 说明 |
+| --- | --- | --- |
+| **三套粉色主题** | 主题（静态资产） | `pink-night` 夜樱 / `pink-day` 昼樱 / `pink-ansi` 樱·ANSI，启动时自动装进 `~/.dsh-tui/themes/` |
+| **自动跟随背景** | 启动时序 | 检测终端/系统背景色（OSC 11，与宿主同阈值），在昼樱/夜樱间自动切换——pink 版的 auto |
+| **花符状态行** | `tuiStatus` | 输入框上方一行小装饰：✿ · 时钟 · 实时轮数（默认仅粉主题下显示） |
+| **设置面板** | `tuiSettingsSections` | `/settings` 里一个可编辑区块，改完即时生效 |
+
+**明确不做的事**：不注册快捷键、不注册/修改任何命令、不拦截输入、不追加会话事件、不注入 system prompt。卸载即无痕（可选删除主题文件）。
+
+## 主题预览
+
+| 主题 | 基底 | 风格 |
+| --- | --- | --- |
+| `pink-night` 夜樱 | dark | 深梅紫底、玫瑰粉强调、粉鲸鱼吉祥物，96 键全覆盖 |
+| `pink-day` 昼樱 | light | 象牙粉底、墨梅正文、柔和玫瑰强调（已通过宿主浅色身份判定） |
+| `pink-ansi` 樱·ANSI | dark-ansi | 16 色 ANSI 回退，品牌色映射到 magenta 系 |
+
+三套均通过 dsh-TUI 官方校验器（零警告、全键覆盖）与 WCAG 对比度检查（正文 ≥ 11:1）。
+
+> 小知识：`pink-day` 的 `text` 写成 `rgb(61,43,51)` 而非 hex——宿主按 `text` 墨色亮度自动判定主题深浅，且只认 `rgb()` 格式。
+
+## 截图
+
+实测于 dsh-tui 0.9.0：
+
+| 昼樱 `pink-day` | 夜樱 `pink-night` |
+| :---: | :---: |
+| ![pink-day 主题界面](docs/screenshots/pink-day.png) | ![pink-night 主题界面](docs/screenshots/pink-night.png) |
+
+`/settings` 里的 pink-theme 区块（跟随终端背景 / 花符 / 时钟 / 轮数，保存即时生效）：
+
+![pink-theme 设置区块](docs/screenshots/settings.png)
+
+> 图中底栏上下文进度条的蓝色分段与 ❯ 提示符是宿主硬编码的，见下文[宿主限制](#受宿主限制目前无法定制的部分)。
+
+## 自动跟随终端背景
+
+设置里的“跟随终端背景”开启后（本部署默认开启）：
+
+- 每次启动检测终端背景（跟随系统主题的终端会随系统深浅变化），亮 → `pink-day`，暗 → `pink-night`，写入 `~/.dsh-tui/theme.json`，与宿主 `auto` 伪主题同款行为、同一亮度阈值；
+- 检测结果缓存在 `~/.dsh-tui/theme-follow.json`，因此切换在**启动瞬间**就生效；首次开启或系统刚翻转后的那次启动可能滞后一拍（与宿主 auto “重新选择或重启后跟上”一致）；
+- 开启此功能后 `/theme` 的选择由插件接管（每次启动都会按背景覆写）；关闭它即可恢复手动选择；
+- `DSH_TUI_THEME` 环境变量仍然最优先（宿主行为，插件不覆盖环境变量）。
+
+## 安装
+
+```sh
+# 方式一：从 npm（已发布）
+dsh plugin --profile dsh-tui add -w dsh-tui-theme
+
+# 方式二：从 GitHub
+dsh plugin --profile dsh-tui add -w github:xiaoxiaohaigui/dsh-tui-theme
+
+# 方式三：本地路径（开发/自用）
+dsh plugin --profile dsh-tui add -w /path/to/dsh-tui-theme
+```
+
+重启 dsh-TUI 后插件自动把三套主题复制进 `~/.dsh-tui/themes/`（**仅缺失时复制，绝不覆盖你已有的同名文件**），然后：
+
+```sh
+# 在 dsh-TUI 里
+/theme              # 选择器：夜樱 / 昼樱 / 樱·ANSI
+/theme pink-night   # 或直接切换（开启跟随后由插件接管）
+```
+
+## 配置
+
+配置有三层，优先级：`/settings` 用户层 > `cordis.yml` 配置层 > 内置默认值。
+
+`/settings` 里找到 **pink-theme** 区块即可编辑：
+
+| 字段 | 默认 | 说明 |
+| --- | --- | --- |
+| `followSystem` | 部署默认开 | 跟随终端背景：昼樱 ↔ 夜樱自动切换 |
+| `showGlyph` | `true` | 花符：开 = ✿ 开头，关 = 不显示 |
+| `showClock` | `true` | 显示 HH:MM 时钟 |
+| `showTurns` | `true` | 显示当前会话轮数（`N✦`，自本次启动起计） |
+| `statusScope` | `pink-only` | 状态行展示：`pink-only` 仅樱花粉主题 / `all-themes` 所有主题 |
+
+三项装饰全关时状态行整体消失。另有仅 profile 层的开关（`cordis.patch.yml`，不出现在 /settings）：`autoInstallThemes`、`statusEnabled`。
+
+## 受宿主限制、目前无法定制的部分
+
+以下元素的颜色/形态由 dsh-TUI 宿主**硬编码**，不读取任何主题键，主题 JSON 与插件接缝都覆盖不到（dsh-TUI 0.9.0 实测）：
+
+| 元素 | 现状 | 位置（宿主源码） |
+| --- | --- | --- |
+| 输入框 ❯ 提示符 | 默认态无颜色参数（终端默认前景色，模型工作时变暗）；最高推理档充能动画用**写死的蓝色 ramp**（深色端 `#82B9FF` / 浅色端 `#1E5FEB`） | `EffortChargeGlyph.tsx`、`trajectory/effortIgnition.ts` |
+| 底栏上下文进度条分段色 | system / prompt / assistant / thinking / tools 五段为**写死的藏青→品牌蓝系**（`#22305F`→`#5A7CFF`），永远不随主题变化 | `screens/StatusMetrics.ts` |
+| 进度条空余段配色 | 宿主按 `themeName === 'light'` **字符串比较**取浅色配色——自定义浅色主题（如 pink-day）不等于 `'light'`，会拿到深色空余段，在浅色终端上偏深 | `screens/StatusLine.tsx` |
+| 状态行文字颜色 | 插件状态行（tuiStatus）由宿主统一以**无色 + 终端 dim** 渲染，插件无法指定颜色（✿ 行因此继承终端默认前景色） | `screens/Chat.tsx` |
+| 输入框块状光标 | 宿主挂载期间隐藏终端原生光标（`?25l`），输入框光标由应用以**反色字符**自绘（`<Text inverse>`），颜色即主题 text/background 的反色——OSC 12 光标色只能染到不可见的原生光标，插件无法给输入光标上色（辅助功能模式 `CLAUDE_CODE_ACCESSIBILITY=1` 下原生光标才可见） | `ink/components/App.tsx`、`components/PromptInput.tsx` |
+| 主界面组件与布局 | 顶栏像素鲸鱼、工具卡、输入框等宿主组件不可被插件替换或改布局——平台规则（内建优先，无组件替换接缝）；主题能碰的只有颜色层 | 宿主架构约定 |
+
+这些都需要上游 dsh-TUI 修改（例如：把充能色/进度条分段色接入主题键、空余段判断改用 `isLightThemeActive()`、给输入光标增加主题键）。上游修复前，任何社区主题包都受同样约束。
+
+## 卸载
+
+```sh
+dsh plugin --profile dsh-tui remove -w dsh-tui-theme    # 移除插件
+rm ~/.dsh-tui/themes/pink-{night,day,ansi}.json         # 可选：删除主题文件
+rm ~/.dsh-tui/theme-follow.json                         # 可选：删除跟随缓存
+```
+
+## 开发
+
+```sh
+npm install && npm run build # tsc -> lib/types/
+npm run verify               # 沙盒测试（临时 HOME + 伪造 TTY，不碰真实 ~/.dsh-tui）
+```
+
+主题调色板改起来最直接：编辑 `themes/*.json` 后重新 `npm run verify`，再删掉 `~/.dsh-tui/themes/` 下对应文件让插件重装。
+
+## 兼容性
+
+- **dsh-TUI 版本下限：0.8.8**（全功能，含状态行与设置面板；0.9.0 实测）。更旧的宿主缺 `dsh-tui-extensions` 扩展面时，插件自动降级为“仅安装三套主题 + 背景跟随”，不报错。
+- Node `^22.19 || >=24`，纯 ESM，MIT。

package/cordis.patch.yml

@@ -1,16 +1,16 @@
-# Bundle patch for dsh-tui-theme: insert the plugin as a profile row.
-# The plugin only consumes optional seams (themes dir, tuiStatus,
-# tuiSettingsSections, settings) and never registers shortcuts or commands.
-# followSystem opts this deployment into background-follow (the schema
-# default is off for generic installs).
-- insert:
-    - id: dsh-tui-theme
-      name: 'dsh-tui-theme'
-      config:
-        autoInstallThemes: true
-        statusEnabled: true
-        followSystem: true
-        showGlyph: true
-        showClock: true
-        showTurns: true
-        showOnNonPinkThemes: false
+# Bundle patch for dsh-tui-theme: insert the plugin as a profile row.
+# The plugin only consumes optional seams (themes dir, tuiStatus,
+# tuiSettingsSections, settings) and never registers shortcuts or commands.
+# followSystem opts this deployment into background-follow (the schema
+# default is off for generic installs).
+- insert:
+    - id: dsh-tui-theme
+      name: 'dsh-tui-theme'
+      config:
+        autoInstallThemes: true
+        statusEnabled: true
+        followSystem: true
+        showGlyph: true
+        showClock: true
+        showTurns: true
+        statusScope: pink-only

package/lib/types/autoTheme.d.ts

@@ -45,19 +45,29 @@ export declare function applyCachedFollow(dataDir: string): string | undefined;
  * Best effort: no TTY, an unresponsive terminal, or a parse failure just
  * leaves the previous state intact. Runs before the host's own stdin
  * parsing is mounted; raw mode is restored to whatever it was.
+ *
+ * Keystroke safety: the 'data' listener consumes every byte of the window
+ * (the terminal multiplexes replies and keypresses on one stream). Anything
+ * that is not part of the OSC 11 reply is re-emitted through stdin.emit on
+ * teardown, so input typed mid-window reaches the host parser intact.
  * @param dataDir - The host data directory (~/.dsh-tui).
+ * @param isActive - Live follow gate: a false return (follow turned off
+ *   mid-window) makes finish() skip the pref write — off preserves the
+ *   manual choice even for an in-flight detection.
  * @param stdout - Injectable for tests.
  * @param stdin - Injectable for tests.
  * @param setTimeoutFn - Injectable for tests.
  * @returns The detected light-ness, or undefined when unavailable.
  */
-export declare function refreshDetectedBackground(dataDir: string, stdout?: NodeJS.WriteStream, stdin?: NodeJS.ReadStream, setTimeoutFn?: typeof setTimeout): Promise<boolean | undefined>;
+export declare function refreshDetectedBackground(dataDir: string, isActive?: () => boolean, stdout?: NodeJS.WriteStream, stdin?: NodeJS.ReadStream, setTimeoutFn?: typeof setTimeout): Promise<boolean | undefined>;
 /**
  * The whole follow sequence for apply(): cached value now (pre-mount),
  * fresh detection for the next boot.
  * @param dataDir - The host data directory (~/.dsh-tui).
+ * @param isActive - Live follow gate, re-queried when an in-flight reply
+ *   lands (follow may be switched off in /settings during the window).
  * @param log - Info sink for the applied/refreshed outcomes.
  */
-export declare function runFollowSystem(dataDir: string, log: (message: string) => void): void;
+export declare function runFollowSystem(dataDir: string, isActive: () => boolean, log: (message: string) => void): void;
 export {};
 //# sourceMappingURL=autoTheme.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"autoTheme.d.ts","sourceRoot":"","sources":["../../src/autoTheme.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAeH,UAAU,WAAW;IACnB,KAAK,EAAE,OAAO,CAAA;IACd,EAAE,EAAE,MAAM,CAAA;CACX;AA4BD,+DAA+D;AAC/D,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGjE;AAED,yDAAyD;AACzD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAErE;AAED,2CAA2C;AAC3C,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAGxE;AAMD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAEzD;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQrE;AAcD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,MAAM,CAAC,WAA4B,EAC3C,KAAK,GAAE,MAAM,CAAC,UAA0B,EACxC,YAAY,GAAE,OAAO,UAAuB,GAC3C,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAmD9B;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAC7B,IAAI,CAYN"}
+{"version":3,"file":"autoTheme.d.ts","sourceRoot":"","sources":["../../src/autoTheme.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAqBH,UAAU,WAAW;IACnB,KAAK,EAAE,OAAO,CAAA;IACd,EAAE,EAAE,MAAM,CAAA;CACX;AA4BD,+DAA+D;AAC/D,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGjE;AAED,yDAAyD;AACzD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAErE;AAED,2CAA2C;AAC3C,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAGxE;AAMD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAEzD;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQrE;AAcD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,MAAM,OAAoB,EACpC,MAAM,GAAE,MAAM,CAAC,WAA4B,EAC3C,KAAK,GAAE,MAAM,CAAC,UAA0B,EACxC,YAAY,GAAE,OAAO,UAAuB,GAC3C,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAgF9B;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,OAAO,EACvB,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAC7B,IAAI,CAYN"}

package/lib/types/autoTheme.js

@@ -27,6 +27,12 @@ const QUERY = '\x1b]11;?\x07';
 // OSC 11 reply: rgb:RRRR/GGGG/BBBB with 1-4 hex digits per channel, BEL or
 // ST terminated.
 const REPLY = /\x1b\]11;rgb:([0-9a-fA-F]{1,4})\/([0-9a-fA-F]{1,4})\/([0-9a-fA-F]{1,4})(?:\x07|\x1b\\)/;
+// DA1 sentinel: every terminal since VT100 answers CSI c. The host's own
+// terminal-querier uses this to avoid timeouts — a DA1 reply arriving before
+// any OSC 11 reply proves the terminal will never answer OSC 11, so the
+// window closes immediately instead of running out the full timeout.
+const DA1_QUERY = '\x1b[c';
+const DA1_REPLY = /\x1b\[\?[0-9;]*c/;
 const DETECT_TIMEOUT_MS = 400;
 function prefPath(dir) {
     return join(dir, 'theme.json');
@@ -108,13 +114,21 @@ function isLightBackground(r, g, b) {
  * Best effort: no TTY, an unresponsive terminal, or a parse failure just
  * leaves the previous state intact. Runs before the host's own stdin
  * parsing is mounted; raw mode is restored to whatever it was.
+ *
+ * Keystroke safety: the 'data' listener consumes every byte of the window
+ * (the terminal multiplexes replies and keypresses on one stream). Anything
+ * that is not part of the OSC 11 reply is re-emitted through stdin.emit on
+ * teardown, so input typed mid-window reaches the host parser intact.
  * @param dataDir - The host data directory (~/.dsh-tui).
+ * @param isActive - Live follow gate: a false return (follow turned off
+ *   mid-window) makes finish() skip the pref write — off preserves the
+ *   manual choice even for an in-flight detection.
  * @param stdout - Injectable for tests.
  * @param stdin - Injectable for tests.
  * @param setTimeoutFn - Injectable for tests.
  * @returns The detected light-ness, or undefined when unavailable.
  */
-export function refreshDetectedBackground(dataDir, stdout = process.stdout, stdin = process.stdin, setTimeoutFn = setTimeout) {
+export function refreshDetectedBackground(dataDir, isActive = () => true, stdout = process.stdout, stdin = process.stdin, setTimeoutFn = setTimeout) {
     return new Promise(resolve => {
         if (stdout.isTTY !== true || stdin.isTTY !== true) {
             resolve(undefined);
@@ -130,19 +144,41 @@ export function refreshDetectedBackground(dataDir, stdout = process.stdout, stdi
         }
         let buffer = '';
         let settled = false;
-        const finish = (light) => {
+        // Push the window's leftover bytes back for the host's input parser.
+        // unshift() returns them to the stream's internal buffer, which both the
+        // host's pull-mode 'readable' pump (mounted later) and any flowing-mode
+        // 'data' listener consume; the emit() fallback covers a torn-down stream
+        // where unshift refuses to work. Keystrokes typed during detection used
+        // to be silently dropped here. latin1 is byte-exact.
+        const replayLeftover = (leftover) => {
+            if (leftover === '')
+                return;
+            try {
+                stdin.unshift(Buffer.from(leftover, 'latin1'));
+            }
+            catch {
+                try {
+                    stdin.emit('data', Buffer.from(leftover, 'latin1'));
+                }
+                catch {
+                    // Best effort: input preservation must never throw from a detector.
+                }
+            }
+        };
+        const finish = (light, leftover) => {
             if (settled)
                 return;
             settled = true;
             clearTimeout(timer);
             stdin.removeListener('data', onData);
+            replayLeftover(leftover);
             try {
                 stdin.setRawMode?.(wasRaw);
             }
             catch {
                 // Stream already torn down — nothing to restore.
             }
-            if (light !== undefined) {
+            if (light !== undefined && isActive()) {
                 writeFollowCache(light, dataDir);
                 const target = themeForBackground(light);
                 if (readThemePref(dataDir) !== target) {
@@ -154,29 +190,42 @@ export function refreshDetectedBackground(dataDir, stdout = process.stdout, stdi
         const onData = (chunk) => {
             buffer += typeof chunk === 'string' ? chunk : chunk.toString('latin1');
             const match = REPLY.exec(buffer);
-            if (match === null)
+            if (match !== null) {
+                const light = isLightBackground(channel8(match[1] ?? ''), channel8(match[2] ?? ''), channel8(match[3] ?? ''));
+                const leftover = buffer.slice(0, match.index) + buffer.slice(match.index + match[0].length);
+                finish(light, leftover);
                 return;
-            finish(isLightBackground(channel8(match[1] ?? ''), channel8(match[2] ?? ''), channel8(match[3] ?? '')));
+            }
+            // DA1 arrived before any OSC 11 reply: this terminal skips OSC 11
+            // entirely (host querier pattern) — stop waiting. Bytes after the DA1
+            // reply can only be input, so they come along.
+            const da1 = DA1_REPLY.exec(buffer);
+            if (da1 !== null) {
+                const leftover = buffer.slice(0, da1.index) + buffer.slice(da1.index + da1[0].length);
+                finish(undefined, leftover);
+            }
         };
-        const timer = setTimeoutFn(() => finish(undefined), DETECT_TIMEOUT_MS);
+        const timer = setTimeoutFn(() => finish(undefined, buffer), DETECT_TIMEOUT_MS);
         if (stdin.isPaused())
             stdin.resume();
         stdin.on('data', onData);
-        stdout.write(QUERY);
+        stdout.write(QUERY + DA1_QUERY);
     });
 }
 /**
  * The whole follow sequence for apply(): cached value now (pre-mount),
  * fresh detection for the next boot.
  * @param dataDir - The host data directory (~/.dsh-tui).
+ * @param isActive - Live follow gate, re-queried when an in-flight reply
+ *   lands (follow may be switched off in /settings during the window).
  * @param log - Info sink for the applied/refreshed outcomes.
  */
-export function runFollowSystem(dataDir, log) {
+export function runFollowSystem(dataDir, isActive, log) {
     const applied = applyCachedFollow(dataDir);
     if (applied !== undefined && existsSync(prefPath(dataDir))) {
         log(`follow: applied cached background (${applied})`);
     }
-    void refreshDetectedBackground(dataDir).then(light => {
+    void refreshDetectedBackground(dataDir, isActive).then(light => {
         if (light === undefined) {
             log('follow: terminal background unavailable, keeping current choice');
         }

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,CAQrC,CAAA;AAyBF;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,MAAW,GAAG,IAAI,CAiE7D"}
+{"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,CAsE7D"}

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();
@@ -90,8 +90,11 @@ export function apply(ctx, config = {}) {
     // write would, and toggling followSystem in /settings re-decides live.
     let followActive;
     const dataDir = join(homeDir(), '.dsh-tui');
+    // Live gate for in-flight detections: a reply that lands after the user
+    // turned follow off must not rewrite the pref.
+    const followEnabled = () => followActive === true;
     const startFollow = () => {
-        runFollowSystem(dataDir, message => {
+        runFollowSystem(dataDir, followEnabled, message => {
             ctx.logger.info(`dsh-tui-theme: ${message}`);
         });
     };
@@ -112,11 +115,13 @@ export function apply(ctx, config = {}) {
     // applies instead. The delay lets any pending service registration (and
     // its callback) land first — it no-ops once followActive is settled, and
     // stays inside the host's own 300ms pre-mount settings gate either way.
-    setTimeout(() => {
+    const fallbackTimer = setTimeout(() => {
         if (followActive === undefined && cordis.followSystem) {
             followActive = true;
             startFollow();
         }
     }, FOLLOW_FALLBACK_MS);
+    fallbackTimer.unref?.();
+    ctx.effect(() => () => clearTimeout(fallbackTimer));
     startStatusLine(ctx, () => effective);
 }

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,CA4CN"}
+{"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,CAoDN"}

package/lib/types/settingsSection.js

@@ -30,29 +30,36 @@ import z from '@deepseek-ai/schemastery';
 export function registerPinkSettings(ctx, cordis, onDoc) {
     ctx.inject(['settings'], settingsCtx => {
         const settings = settingsCtx.settings;
-        const scope = settings.register(settingsNamespace('dsh-tui-theme'), z.object({
-            followSystem: z.boolean(),
-            showGlyph: z.boolean(),
-            showClock: z.boolean(),
-            showTurns: z.boolean(),
-            showOnNonPinkThemes: z.boolean(),
-        }));
-        const emit = (doc) => {
-            if (doc === null || typeof doc !== 'object')
-                return;
-            const clean = {};
-            for (const [key, value] of Object.entries(doc)) {
-                if (value !== undefined)
-                    clean[key] = value;
-            }
-            onDoc(clean);
-        };
-        // Own the watcher on the inject-scoped ledger so it survives exactly as
-        // long as this activation (scope.watch's disposer is otherwise leaked).
-        settingsCtx.effect(() => {
-            emit(scope.get());
-            return scope.watch(emit);
-        });
+        try {
+            const scope = settings.register(settingsNamespace('dsh-tui-theme'), z.object({
+                followSystem: z.boolean(),
+                showGlyph: z.boolean(),
+                showClock: z.boolean(),
+                showTurns: z.boolean(),
+                statusScope: z.union(['pink-only', 'all-themes']),
+            }));
+            const emit = (doc) => {
+                if (doc === null || typeof doc !== 'object')
+                    return;
+                const clean = {};
+                for (const [key, value] of Object.entries(doc)) {
+                    if (value !== undefined)
+                        clean[key] = value;
+                }
+                onDoc(clean);
+            };
+            // Own the watcher on the inject-scoped ledger so it survives exactly as
+            // long as this activation (scope.watch's disposer is otherwise leaked).
+            settingsCtx.effect(() => {
+                emit(scope.get());
+                return scope.watch(emit);
+            });
+        }
+        catch (error) {
+            // A duplicate registration (hot reload race) or a stricter host must
+            // not take the plugin — or the TUI — down.
+            settingsCtx.logger.warn(`dsh-tui-pink-theme: settings namespace registration failed: ${String(error)}`);
+        }
     });
     ctx.inject(['tuiSettingsSections'], sectionsCtx => {
         const sections = sectionsCtx
@@ -112,15 +119,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,CA8DvF"}

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';
@@ -61,6 +61,7 @@ export function startStatusLine(ctx, getEffective) {
         const turns = new Map();
         let current;
         let dispose;
+        let lastText;
         const render = () => {
             try {
                 const eff = getEffective();
@@ -68,7 +69,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);
@@ -79,6 +80,9 @@ export function startStatusLine(ctx, getEffective) {
                     }
                 }
                 const text = parts.join(' · ');
+                if (text === lastText)
+                    return;
+                lastText = text;
                 // The trailing identity must be the inject-scoped context (the same
                 // activation the traceable binds as caller) — the plugin's outer ctx
                 // is a different activation view and would be silently rejected.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-tui-theme",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "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",
@@ -24,6 +24,7 @@
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",
+    "preverify": "npm run build",
     "verify": "node scripts/verify.mjs"
   },
   "license": "MIT",