dsh-consumption-badge 1.3.2 → 1.3.3

package/README.md

@@ -249,6 +249,8 @@ no second settings page.
 | Slot labels | The action-row label and the settings tab title are **thunks**, resolved by the slot system at read time, so the tab renames itself on a switch |
 | Late service | If the `locale` service is provided after this plugin's `apply()` ran (boot order differs per composition), the first render retries the bind |
 | Missing service | Without the locale service everything falls back to Chinese — the plugin still works standalone |
+| Both dictionaries | The plugin registers **both** `zh` (identity: key→key) and `en`, so the Chinese result never depends on how a particular host build resolves a missing locale (some use `en` as the fallback locale, which would otherwise leak English into a Chinese UI) |
+| Language override | Settings → Usage → **Language**: `Follow shell` / `Chinese` / `English`. It overrides the shell for this plugin only, persists in `localStorage: dsh-consumption:language`, and is the escape hatch when a shell reports an unexpected locale |
 | Host errors | `lib/index.js` never returns localized prose: failures carry a language-neutral `code` + `detail` (and an English `error` for logs). The client maps `code` → copy in the active language, and prints the host's `error` only for an unknown code |
 
 Adding a language means adding one dictionary next to `DICT_EN`; the lookup order is
@@ -421,7 +423,7 @@ plugin by "running" it — a session-scoped dynamic plugin always dies with the
 - Do not hard-code user-visible English or Chinese in new JSX: call `tt('…')` with the Chinese copy
   as the key and add the English entry to `DICT_EN`. `check.mjs` fails if any `tt()` key has no
   English translation or if a translation still contains Chinese.
-- Self-check without booting DSH: `node check.mjs` (320 assertions over the route contract, the
+- Self-check without booting DSH: `node check.mjs` (334 assertions over the route contract, the
   client bundle contract, the pricing/aggregation maths and the bilingual copy). It lives outside
   the published `files` list.
 

package/lib/client.js

@@ -434,6 +434,8 @@ window.__ModuleLoader__.load({
       '按模型筛选；同时作为计价兜底': 'Filter by model; also the pricing fallback',
       '仅 {model}': 'only {model}',
       '日志 id {id}': 'log id {id}',
+      '语言': 'Language',
+      '跟随外壳': 'Follow shell',
       '{count} 个模型各自计价': '{count} models priced separately',
       '按 {model} 约还可跑 {tokens} tokens': 'about {tokens} tokens left at {model} prices',
       '金额按各模型官方价估算（DeepSeek 区分峰谷 ×1/×2，其它厂商按 USD 价 ×7.1 折人民币），仅供参考；数据源为本会话日志，刷新后自动恢复。': 'Costs are estimated from each model’s list price (DeepSeek applies peak/off-peak ×1/×2; other vendors are converted from USD at 7.1), for reference only; the source is this session log, restored automatically after a refresh.',
@@ -577,6 +579,30 @@ window.__ModuleLoader__.load({
     let boundTranslate = null
     let localeService = null
     let appCtx = null
+    // 插件自带的语言覆盖：'' = 跟随外壳，'zh' / 'en' = 用户显式指定。
+    // 存在的理由：外壳的 locale 服务在不同版本里回退策略不同（本版 FALLBACK_LOCALE=zh，
+    // 换成 en 的实现就会让中文界面吃 en 词典而显示英文），npm 包又装在别人的环境里，
+    // 所以这里既**显式注册 zh 词典**，也允许用户自己钉死语言。
+    const LS_LANGUAGE = 'dsh-consumption:language'
+    let languageOverride = readLanguage()
+
+    function readLanguage() {
+      const raw = lsGet(LS_LANGUAGE)
+      return raw === 'zh' || raw === 'en' ? raw : ''
+    }
+    function setLanguageOverride(next) {
+      const value = next === 'zh' || next === 'en' ? next : ''
+      languageOverride = value
+      lsSet(LS_LANGUAGE, value)
+    }
+    /** 语言下拉的选项（跟随外壳 / 中文 / English）。 */
+    function languageOptions() {
+      return [
+        { id: '', label: tt('跟随外壳') },
+        { id: 'zh', label: '中文' },
+        { id: 'en', label: 'English' },
+      ]
+    }
 
     /** Fill `{name}` placeholders (same template syntax as the locale service). */
     function applyParams(template, params) {
@@ -615,14 +641,20 @@ window.__ModuleLoader__.load({
       if (service === null || typeof service.register !== 'function' || typeof service.bind !== 'function') return
       // Only the `en` side is registered: the key already is the `zh` copy, and
       // the locale service resolves a miss to the key itself.
+      // 中英两侧都显式注册：zh 侧是恒等映射（key 就是中文原文），
+      // 这样中文界面的结果不再取决于宿主 locale 实现的回退策略（有的版本回退到 en）。
+      const dictZh = {}
+      for (const key in DICT_EN) {
+        if (Object.prototype.hasOwnProperty.call(DICT_EN, key)) dictZh[key] = key
+      }
       let ns = LOCALE_NS
       let dispose = null
       try {
-        dispose = service.register(ns, 'en', DICT_EN)
+        dispose = service.register(ns, { zh: dictZh, en: DICT_EN })
       } catch (e) {
         ns = LOCALE_NS + '#' + BUILD_TAG + '-' + Math.random().toString(36).slice(2, 7)
         try {
-          dispose = service.register(ns, 'en', DICT_EN)
+          dispose = service.register(ns, { zh: dictZh, en: DICT_EN })
           console.warn('[consumption-badge] previous dictionary still registered; bound a private locale namespace ' + ns)
         } catch (e2) {
           console.warn('[consumption-badge] locale dictionary registration failed: ' + msgOf(e2))
@@ -648,8 +680,16 @@ window.__ModuleLoader__.load({
       attachLocale(appCtx)
     }
 
-    /** Translate a key with the active locale; falls back to the key itself. */
+    /**
+     * 取当前语言的文案。优先级：用户显式选择 → 外壳 locale 服务 → 原文（中文）。
+     * 显式选中文时直接返回 key（中文就是 key 本身），完全不经过宿主，避免任何回退策略问题。
+     */
     function tt(key, params) {
+      if (languageOverride === 'zh') return applyParams(key, params)
+      if (languageOverride === 'en') {
+        const hit = Object.prototype.hasOwnProperty.call(DICT_EN, key) ? DICT_EN[key] : key
+        return applyParams(hit, params)
+      }
       if (localeService === null) ensureLocaleBound()
       if (boundTranslate !== null) {
         try {
@@ -671,8 +711,9 @@ window.__ModuleLoader__.load({
       }
     }
 
-    /** Active locale id ('zh' when the service is absent). */
+    /** Active locale id: 覆盖优先，其次外壳，最后按中文。 */
     function activeLocaleId() {
+      if (languageOverride !== '') return languageOverride
       try {
         const snapshot = localeService !== null && typeof localeService.getLocale === 'function' ? localeService.getLocale() : null
         if (snapshot && typeof snapshot.active === 'string' && snapshot.active) return snapshot.active
@@ -799,10 +840,10 @@ window.__ModuleLoader__.load({
 
     /* ================= 消耗弹窗背景样式（与个性化插件联动） ================= */
     const MODAL_STYLE_KEY = 'dsh-consumption:modal-style'
-    const BUILD_TAG = 'dcb-1.3.2'
+    const BUILD_TAG = 'dcb-1.3.3'
     // 本地版本：本包是零构建的手写客户端包，无法 import package.json，因此把版本号作为常量维护，
     // 并由 check.mjs 守卫与 package.json 严格一致（发布前不一致直接失败）。
-    const PLUGIN_VERSION = '1.3.2'
+    const PLUGIN_VERSION = '1.3.3'
     const PKG_NAME = 'dsh-consumption-badge'
     const UPDATE_REGISTRY_URL = 'https://registry.npmjs.org/' + PKG_NAME + '/latest'
     const UPDATE_COMMAND = 'dsh plugin --profile web update ' + PKG_NAME
@@ -1195,6 +1236,8 @@ window.__ModuleLoader__.load({
         currency: readCurrency(),
         // 模型筛选 / 计价兜底（'' = 全部模型，不筛选；同时作为查不到模型时的计价基准）。
         modelFilter: readModelFilter(),
+        // 语言覆盖（'' = 跟随外壳；'zh' / 'en' = 用户显式指定）。
+        language: readLanguage(),
         rates: null,
         ratesState: 'idle',
         ratesError: '',
@@ -1448,6 +1491,14 @@ window.__ModuleLoader__.load({
         emit()
         if (next !== 'CNY') ensureRates(false)
       }
+      /** 切换界面语言：'' 跟随外壳，或钉死 zh / en（落 localStorage，立即重绘）。 */
+      function setLanguage(next) {
+        const value = next === 'zh' || next === 'en' ? next : ''
+        if (state.language === value) return
+        setLanguageOverride(value)
+        state.language = value
+        emit()
+      }
       /** 强制刷新汇率（设置页的「刷新汇率」按钮）。 */
       function refreshRates() {
         state.rates = null
@@ -1627,6 +1678,7 @@ window.__ModuleLoader__.load({
         setCurrency: setCurrency,
         refreshRates: refreshRates,
         setModelFilter: setModelFilter,
+        setLanguage: setLanguage,
         openPanel: openPanel,
         closePanel: closePanel,
         setModalStyle: setModalStyle,
@@ -2672,6 +2724,7 @@ window.__ModuleLoader__.load({
       const setAllStats = s8[1]
       // 「模型」下拉的状态放在 store 里（弹层与设置页共享同一个选择）。
       const modelFilter = store.state.modelFilter
+      const language = store.state.language
       const s9 = React.useState(0)
       const setStoreTick = s9[1]
 
@@ -2928,6 +2981,18 @@ window.__ModuleLoader__.load({
             },
               h('option', { key: 'all', value: '' }, tt('全部模型')),
               modelOptionNodes(MODELS))),
+          // 语言：默认跟随外壳；外壳语言不对劲时可以直接钉死中文/英文。
+          h('div', { className: 'dcb-field' },
+            h('label', { className: 'dcb-field-label', htmlFor: 'dcb-language-select' }, tt('语言')),
+            h('select', {
+              id: 'dcb-language-select',
+              className: 'dcb-select',
+              value: language,
+              onChange: function (event) { store.setLanguage(event.target.value) },
+            },
+              languageOptions().map(function (opt) {
+                return h('option', { key: opt.id || 'auto', value: opt.id }, opt.label)
+              }))),
           // 显示币种：报价表永远是人民币，这里只决定展示时换算成什么货币。
           h('div', { className: 'dcb-field' },
             h('label', { className: 'dcb-field-label', htmlFor: 'dcb-currency-select' }, tt('货币')),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-consumption-badge",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "DSH Web UI plugin: a per-message consumption badge (tokens | estimated cost | peak/valley) plus a session detail modal with cumulative tokens, estimated cost, Beijing-time peak/off-peak pricing, a per-turn dual-axis chart, and the DeepSeek account balance",
   "keywords": [
     "deepseek-harness",