deepseek-harness-wallet 0.3.3 → 0.3.5

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project are documented in this file.
 
+## 0.3.5 - 2026-08-27
+
+- 修复 BigModel / Z.ai 中国区 Coding Plan 接口将 `TOKENS_LIMIT` 改名为 `CREDIT_LIMIT` 后被误判为“套餐接口返回格式已变化”的问题；兼容新旧字段，支持只有新额度字段的响应，并在接口提供时显示已用/总量、剩余量和重置时间。 / Fixed BigModel / Z.ai China Coding Plan responses being misclassified as “the plan response format changed” after `TOKENS_LIMIT` was renamed to `CREDIT_LIMIT`; both names are supported, credit-only responses are accepted, and available used/total, remaining, and reset values are shown when provided.
+- 增加新旧字段共存时优先保留信息更完整的额度数据，并补充接口归一化与回归测试；当前 126/126 测试通过。 / Prefer the richer quota record when old and new names coexist, with normalization and regression coverage; 126/126 tests pass.
+
+## 0.3.4 - 2026-08-25
+
+- 修复 DSH Desktop 重启后部分插件设置因 WebView origin/localStorage 命名空间变化而丢失的问题：显示内容、输入框标签、仅显示余额、标签比例、提醒、峰谷卡和永久删除偏好现在会即时写入浏览器并同步备份到本地 `wallet.json`；宿主已有值优先恢复，宿主缺失的旧设置才从浏览器迁移，避免旧标签页在重启后反向覆盖新选择。 / Fixed wallet preferences disappearing after a DSH Desktop restart when the WebView origin/localStorage namespace changes: display, composer-label, primary-value, scale, reminder, peak-card, and permanent-delete preferences now write locally and mirror into `wallet.json`; existing host values restore authoritatively, while browser values migrate only for host-missing keys so stale tabs cannot undo newer choices after restart (Fixes #31).
+- 新增受白名单和长度限制的 `/api/wallet/preferences` 读写接口，拒绝未知键和敏感字段；偏好沿用账本的主备恢复、失败锁写和退出前刷新机制。 / Added an allowlisted, length-bounded `/api/wallet/preferences` endpoint that rejects unknown or sensitive fields and inherits the ledger's backup recovery, fail-closed writes, and shutdown flush behavior.
+- 新增宿主完整重载、Desktop 本地键丢失恢复、恶意字段拒绝和 keepalive 双写回归测试；当前 123/123 测试通过。 / Added host-reload persistence, missing-Desktop-key hydration, malicious-field rejection, and keepalive dual-write regressions; 123/123 tests pass.
+
 ## 0.3.3 - 2026-08-25
 
 - 新增通用官方套餐适配器契约，并首批接入 Z.ai Coding Plan 全球区与中国区；每个来源固定绑定官方域名和独立的 DSH 凭据引用，浏览器不会收到 Key、接口路径或原始响应。 / Added a generic official subscription-plan adapter contract with initial Z.ai Coding Plan Global and China adapters; each source is pinned to its official domain and its own DSH credential reference, while the browser receives no key, endpoint path, or raw response.

package/README.md

@@ -14,7 +14,7 @@
 
 > A local-first companion that keeps account status, per-conversation usage, completion reminders, official recharge, flexible layout, and host-gated session controls beside the DSH composer.
 
-> **Version:** v0.3.3 is the current stable release on GitHub and npm.
+> **Version:** v0.3.5 is the current stable release on GitHub and npm.
 
 > If DeepSeek Harness Control Center helps you, please consider leaving a ⭐ Star. Thank you!
 
@@ -73,13 +73,13 @@ Details: [compatibility](#browser-desktop-and-os-compatibility) · [data and tru
 
 ## Install
 
-From npm (stable v0.3.3):
+From npm (stable v0.3.5):
 
 ```sh
 dsh plugin --profile web add deepseek-harness-wallet
 ```
 
-or from GitHub `main` (current v0.3.3 source):
+or from GitHub `main` (current v0.3.5 source):
 
 ```sh
 dsh plugin --profile web add github:feibi-mochi/deepseek-harness-control-center

package/index.js

@@ -33,7 +33,7 @@ const OFFICIAL_PROVIDER = 'deepseek-official'
 // DeepSeek's official paid-API bucket by the wrapper-provider alias control.
 const PLAN_PROVIDER_IDS = new Set(PLAN_ADAPTERS.map((adapter) => adapter.provider))
 const RECHARGE_URL = 'https://platform.deepseek.com/top_up'
-const PLUGIN_VERSION = '0.3.3'
+const PLUGIN_VERSION = '0.3.5'
 const PRICING_SOURCE_URL = 'https://api-docs.deepseek.com/zh-cn/quick_start/pricing/'
 const PRICING_SYNC_INTERVAL_MS = 6 * 60 * 60_000
 const PRICING_SYNC_TIMEOUT_MS = 8_000
@@ -49,7 +49,7 @@ const ACCOUNTS_CRYPTO_VERSION = 1
 const CREDENTIAL_REF = 'DEEPSEEK_API_KEY'
 const DEFAULT_THRESHOLD = 5
 const BALANCE_REFRESH_MS = 60_000
-const STORE_VERSION = 4
+const STORE_VERSION = 5
 const HISTORY_VERSION = 1
 const HISTORY_RETENTION_DAYS = 365
 const HISTORY_MAX_EVENTS = 20_000
@@ -59,6 +59,22 @@ const PLAN_REFRESH_MS = 5 * 60_000
 const PLAN_STALE_MS = 15 * 60_000
 const PLAN_REFRESH_TIMEOUT_MS = 12_000
 const PLAN_RESPONSE_MAX_BYTES = 1_000_000
+const UI_PREFERENCE_KEYS = new Set([
+  'dshw-chip-style-v1',
+  'dshw-chip-balance-only-v1',
+  'dshw-data-visibility-v1',
+  'dshw-chip-scale-v1',
+  'dshw-completion-notify-v1',
+  'dshw-low-blink-v1',
+  'dshw-peakring-v1',
+  'dshw-peak-orient-v1',
+  'dshw-peak-recharge-v1',
+  'dshw-peak-scale-v1',
+  'dshw-peak-dock-v1',
+  'dshw-peaknotify-v1',
+  'dshw-permanent-delete-v1',
+])
+const UI_PREFERENCE_VALUE_MAX = 500
 
 // Beijing (UTC+8, no DST) weekday peak windows: 09:00-12:00 and 14:00-18:00.
 // From 2026-08-23 00:00 Beijing, Saturday and Sunday are off-peak all day.
@@ -886,6 +902,17 @@ export function isOfficialProvider(provider, extraProviders) {
   return Array.isArray(extraProviders) && extraProviders.includes(provider)
 }
 
+export function normalizeUiPreferences(value) {
+  const source = value !== null && typeof value === 'object' && !Array.isArray(value) ? value : {}
+  const normalized = {}
+  for (const [key, entry] of Object.entries(source)) {
+    if (!UI_PREFERENCE_KEYS.has(key)) continue
+    if (typeof entry !== 'string' || entry.length > UI_PREFERENCE_VALUE_MAX || /[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/.test(entry)) continue
+    normalized[key] = entry
+  }
+  return normalized
+}
+
 function repairPlanProviderSessionUsage(sessions, historySource, atMs) {
   const rawEvents = historySource !== null && typeof historySource === 'object' && !Array.isArray(historySource)
     && historySource.events !== null && typeof historySource.events === 'object' && !Array.isArray(historySource.events)
@@ -949,6 +976,7 @@ export function normalizeStoreData(value, atMs = Date.now()) {
     officialProviders: normalizeProviderList(source.officialProviders),
     knownProviders: normalizeProviderList(source.knownProviders),
     plans: normalizePlanSnapshotCache(source.plans, atMs),
+    preferences: normalizeUiPreferences(source.preferences),
   }
   if (Object.hasOwn(source, 'history')) {
     normalized.history = normalizeHistory(source.history, atMs)
@@ -964,7 +992,7 @@ let usageStorageRecovered = false
 let usageStoreSkipBackupOnce = false
 
 function emptyStoreData() {
-  return { version: STORE_VERSION, thresholds: { CNY: DEFAULT_THRESHOLD }, accountThresholds: {}, sessions: {}, officialProviders: [], knownProviders: [], plans: {}, history: emptyHistory() }
+  return { version: STORE_VERSION, thresholds: { CNY: DEFAULT_THRESHOLD }, accountThresholds: {}, sessions: {}, officialProviders: [], knownProviders: [], plans: {}, preferences: {}, history: emptyHistory() }
 }
 
 function readStoreFile(path) {
@@ -2025,6 +2053,27 @@ export function apply(ctx, config) {
         return json(res, 200, { ok: true, pricing: pricingSnapshot() })
       },
     })
+    const disposePreferences = ctx.webServer.register({
+      kind: 'exact',
+      path: '/api/wallet/preferences',
+      handler: async (req, res) => {
+        if (req.method === 'GET') return json(res, 200, { ok: true, entries: { ...store.preferences } })
+        if (req.method !== 'POST') return json(res, 405, { ok: false, error: 'method-not-allowed' })
+        if (usageStorageLocked) return json(res, 423, { ok: false, error: 'usage-storage-locked' })
+        const body = await readBody(req)
+        const entries = body && body.entries
+        if (entries === null || typeof entries !== 'object' || Array.isArray(entries)) {
+          return json(res, 400, { ok: false, error: 'entries object is required' })
+        }
+        const keys = Object.keys(entries)
+        if (keys.length > UI_PREFERENCE_KEYS.size) return json(res, 400, { ok: false, error: 'invalid-preferences' })
+        const patch = normalizeUiPreferences(entries)
+        if (Object.keys(patch).length !== keys.length) return json(res, 400, { ok: false, error: 'invalid-preferences' })
+        store.preferences = normalizeUiPreferences({ ...store.preferences, ...patch })
+        scheduleSave(ctx.logger)
+        return json(res, 200, { ok: true, entries: { ...store.preferences } })
+      },
+    })
     const disposeThreshold = ctx.webServer.register({
       kind: 'exact',
       path: '/api/wallet/threshold',
@@ -2226,6 +2275,7 @@ historyEventCount = store.history && store.history.events ? Object.keys(store.hi
       disposeSnapshot()
       disposeHealth()
       disposePricingRefresh()
+      disposePreferences()
       disposeThreshold()
       disposeRefresh()
       disposeClear()

package/lib/client.js

@@ -23,7 +23,7 @@ window.__ModuleLoader__.load({
 
     var POLL_MS = 15000
     // Keep in lockstep with package.json; a test enforces the sync.
-    var WALLET_VERSION = '0.3.3'
+    var WALLET_VERSION = '0.3.5'
     var CONFIRM_KEY = 'dsh-wallet-recharge-confirmed'
     var CHIP_LAYOUT_KEY = 'dshw-chip-layout-v4'
     var PANEL_POS_KEY = 'dshw-panel-pos-v1'
@@ -52,6 +52,12 @@ window.__ModuleLoader__.load({
     var CHIP_EDGE_MARGIN = 2
     var CHIP_EDGE_SNAP = 32
     var CHIP_HOME_SNAP = 96
+    var BACKED_PREFERENCE_KEYS = new Set([
+      CHIP_STYLE_KEY, CHIP_BALANCE_ONLY_KEY, DATA_VISIBILITY_KEY, CHIP_SCALE_KEY,
+      NOTIFY_CONFIG_KEY, LOW_BLINK_KEY, PEAK_RING_KEY, PEAK_ORIENT_KEY,
+      PEAK_RECHARGE_KEY, PEAK_SCALE_KEY, PEAK_DOCK_KEY, PEAK_NOTIFY_KEY,
+      PERMANENT_DELETE_KEY
+    ])
 
     /**
      * Platform-specific behavior lives here. Desktop wrappers may define
@@ -88,10 +94,12 @@ window.__ModuleLoader__.load({
             try {
               nativeStorage.setItem(key, value)
               delete memoryOnly[key]
+              queuePersistentPreference(key, value)
               return
             } catch (e) { /* fall through to the memory-only marker */ }
           }
           memoryOnly[key] = true
+          queuePersistentPreference(key, value)
         },
         removeItem: function (key) {
           delete memory[key]
@@ -293,6 +301,116 @@ window.__ModuleLoader__.load({
     }
 
     var compatibility = createCompatibilityAdapter(window)
+    var preferenceBackupQueue = Object.create(null)
+    var preferenceBackupTimer = null
+    var preferenceBackupRetries = 0
+    var preferenceHydrationPromise = null
+    var preferenceTouchedKeys = new Set()
+
+    function queuePersistentPreference(key, value) {
+      if (!BACKED_PREFERENCE_KEYS.has(key) || typeof value !== 'string') return
+      preferenceTouchedKeys.add(key)
+      preferenceBackupQueue[key] = value
+      preferenceBackupRetries = 0
+      if (preferenceBackupTimer === null) {
+        if (typeof window.setTimeout === 'function') preferenceBackupTimer = window.setTimeout(flushPersistentPreferences, 80)
+        else void flushPersistentPreferences()
+      }
+    }
+
+    function flushPersistentPreferences() {
+      if (preferenceBackupTimer !== null) {
+        if (typeof window.clearTimeout === 'function') window.clearTimeout(preferenceBackupTimer)
+        preferenceBackupTimer = null
+      }
+      var entries = preferenceBackupQueue
+      preferenceBackupQueue = Object.create(null)
+      if (Object.keys(entries).length === 0 || typeof fetch !== 'function') return Promise.resolve(null)
+      return fetch('/api/wallet/preferences', {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ entries: entries }),
+        keepalive: true
+      }).then(function (response) {
+        if (!response || response.ok === false) throw new Error('preference-backup-failed')
+        preferenceBackupRetries = 0
+        return typeof response.json === 'function' ? response.json() : null
+      }).catch(function () {
+        Object.keys(entries).forEach(function (key) {
+          if (!Object.hasOwn(preferenceBackupQueue, key)) preferenceBackupQueue[key] = entries[key]
+        })
+        if (preferenceBackupRetries < 3 && preferenceBackupTimer === null && typeof window.setTimeout === 'function') {
+          preferenceBackupRetries += 1
+          preferenceBackupTimer = window.setTimeout(flushPersistentPreferences, preferenceBackupRetries * 750)
+        }
+        return null
+      })
+    }
+
+    function localPreferenceEntries() {
+      var entries = {}
+      BACKED_PREFERENCE_KEYS.forEach(function (key) {
+        var value = compatibility.storage.getItem(key)
+        if (typeof value === 'string') entries[key] = value
+      })
+      return entries
+    }
+
+    function canonicalPreferenceEntries(value) {
+      var entries = Object.assign({}, value || {})
+      if (entries[CHIP_STYLE_KEY] === 'text') {
+        entries[CHIP_STYLE_KEY] = 'standard'
+        if (!Object.hasOwn(entries, CHIP_BALANCE_ONLY_KEY)) entries[CHIP_BALANCE_ONLY_KEY] = 'true'
+      }
+      return entries
+    }
+
+    function hydratePersistentPreferences() {
+      if (preferenceHydrationPromise !== null) return preferenceHydrationPromise
+      if (typeof fetch !== 'function') return Promise.resolve(null)
+      preferenceHydrationPromise = fetch('/api/wallet/preferences').then(function (response) {
+        if (!response || response.ok === false || typeof response.json !== 'function') throw new Error('preference-read-failed')
+        return response.json()
+      }).then(function (payload) {
+        var serverEntries = canonicalPreferenceEntries(payload && payload.ok && payload.entries && typeof payload.entries === 'object' ? payload.entries : {})
+        var rawLocalEntries = localPreferenceEntries()
+        var localEntries = canonicalPreferenceEntries(rawLocalEntries)
+        var merged = {}
+        Object.keys(serverEntries).forEach(function (key) {
+          if (BACKED_PREFERENCE_KEYS.has(key) && typeof serverEntries[key] === 'string') merged[key] = serverEntries[key]
+        })
+        Object.keys(localEntries).forEach(function (key) {
+          if (!Object.hasOwn(merged, key) || preferenceTouchedKeys.has(key)) merged[key] = localEntries[key]
+        })
+        Object.keys(merged).forEach(function (key) {
+          if (!Object.hasOwn(rawLocalEntries, key) || rawLocalEntries[key] !== merged[key]) compatibility.storage.setItem(key, merged[key])
+          else queuePersistentPreference(key, merged[key])
+        })
+        compatibility.dispatch(SETTINGS_EVENT)
+        compatibility.dispatch(NOTIFY_CONFIG_EVENT)
+        compatibility.dispatch(PEAK_RING_EVENT)
+        compatibility.dispatch(PERMANENT_DELETE_EVENT)
+        return merged
+      }).catch(function () {
+        preferenceHydrationPromise = null
+        return null
+      })
+      return preferenceHydrationPromise
+    }
+
+    function installPersistentPreferenceSync() {
+      hydratePersistentPreferences()
+      var retries = typeof window.setTimeout === 'function' ? [1000, 4000].map(function (delay) {
+        return window.setTimeout(function () { if (preferenceHydrationPromise === null) hydratePersistentPreferences() }, delay)
+      }) : []
+      function flushOnHide() { void flushPersistentPreferences() }
+      if (typeof window.addEventListener === 'function') window.addEventListener('pagehide', flushOnHide)
+      return function () {
+        if (typeof window.clearTimeout === 'function') retries.forEach(function (timer) { window.clearTimeout(timer) })
+        if (typeof window.removeEventListener === 'function') window.removeEventListener('pagehide', flushOnHide)
+        void flushPersistentPreferences()
+      }
+    }
 
     function openOfficialRecharge() {
       var url = 'https://platform.deepseek.com/top_up'
@@ -1791,6 +1909,36 @@ window.__ModuleLoader__.load({
         try { return compatibility.storage.getItem(PEAK_DOCK_KEY) || 'sidebar' } catch (e) { return 'sidebar' }
       })
       var settingsModelSelection = useCurrentModelSelection(props.sessionsService, props.modelDirectories, props.modelAware === true)
+      React.useEffect(function () {
+        if (typeof window.addEventListener !== 'function') return
+        function syncPreferencesFromStorage() {
+          try {
+            var savedVisibility = compatibility.storage.getItem(DATA_VISIBILITY_KEY)
+            setVisibility(savedVisibility === null ? normalizeDataVisibility(null) : normalizeDataVisibility(JSON.parse(savedVisibility)))
+          } catch (e) { /* ignore */ }
+          try { setChipStyle(normalizeChipStyle(compatibility.storage.getItem(CHIP_STYLE_KEY))) } catch (e) { /* ignore */ }
+          try { setBalanceOnly(readBalanceOnly()) } catch (e) { /* ignore */ }
+          try { setScale(normalizeChipScale(compatibility.storage.getItem(CHIP_SCALE_KEY))) } catch (e) { /* ignore */ }
+          try {
+            var notify = readNotifyConfig()
+            setNotifyEnabled(notify.enabled)
+            setNotifyTimeout(notify.timeout === 0 ? 'keep' : String(notify.timeout))
+          } catch (e) { /* ignore */ }
+          try { setLowBlinkEnabled(compatibility.storage.getItem(LOW_BLINK_KEY) !== 'false') } catch (e) { /* ignore */ }
+          try { setPdEnabled(compatibility.storage.getItem(PERMANENT_DELETE_KEY) === 'true') } catch (e) { /* ignore */ }
+          try { setRingEnabled(compatibility.storage.getItem(PEAK_RING_KEY) !== 'false') } catch (e) { /* ignore */ }
+          try { setPeakNotifyEnabled(compatibility.storage.getItem(PEAK_NOTIFY_KEY) === 'true') } catch (e) { /* ignore */ }
+          try { setPeakOrient(compatibility.storage.getItem(PEAK_ORIENT_KEY) || 'horizontal') } catch (e) { /* ignore */ }
+          try { setPeakRecharge(compatibility.storage.getItem(PEAK_RECHARGE_KEY) !== 'false') } catch (e) { /* ignore */ }
+          try {
+            var savedPeakScale = Number.parseFloat(compatibility.storage.getItem(PEAK_SCALE_KEY))
+            setPeakScale(Number.isFinite(savedPeakScale) ? Math.min(1.2, Math.max(1, savedPeakScale)) : 1)
+          } catch (e) { /* ignore */ }
+          try { setPeakDock(compatibility.storage.getItem(PEAK_DOCK_KEY) || 'sidebar') } catch (e) { /* ignore */ }
+        }
+        window.addEventListener(SETTINGS_EVENT, syncPreferencesFromStorage)
+        return function () { window.removeEventListener(SETTINGS_EVENT, syncPreferencesFromStorage) }
+      }, [])
       useLayoutEffect(function () {
         var node = settingsSectionRef.current
         var dialog = node && typeof node.closest === 'function' ? node.closest('[role="dialog"]') : null
@@ -4968,6 +5116,7 @@ window.__ModuleLoader__.load({
       ctx.inject(['sessions'], function (scope) {
         scope.effect(function () { return installCompletionNotifier(scope) }, 'dsh-wallet: completion notifications')
         scope.effect(function () { return installMaidModelMenuGuard() }, 'dsh-wallet: maid model-menu repaint guard')
+        scope.effect(function () { return installPersistentPreferenceSync() }, 'dsh-wallet: durable preference sync')
       })
       ctx.inject(['slots', 'conversation', 'modelDirectories'], function (scope) {
         scope.effect(function () {
@@ -5039,6 +5188,8 @@ window.__ModuleLoader__.load({
       selectBalanceInfo: selectBalanceInfo,
       balanceErrorText: balanceErrorText,
       installCompletionNotifier: installCompletionNotifier,
+      hydratePersistentPreferences: hydratePersistentPreferences,
+      flushPersistentPreferences: flushPersistentPreferences,
       normalizeDataVisibility: normalizeDataVisibility,
       normalizeNotifyConfig: normalizeNotifyConfig,
       normalizeChipLayout: normalizeChipLayout,

package/lib/plans.js

@@ -8,8 +8,15 @@
 
 export const PLAN_CACHE_VERSION = 2
 
+const TOKEN_LIMIT = Object.freeze({ id: 'tokens-5h', kind: 'tokens', window: '5h', amounts: false, reset: false })
+const CREDIT_LIMIT = Object.freeze({ id: 'tokens-5h', kind: 'tokens', window: '5h', amounts: true, reset: true })
+
 const ZAI_LIMITS = Object.freeze({
-  TOKENS_LIMIT: Object.freeze({ id: 'tokens-5h', kind: 'tokens', window: '5h' }),
+  // BigModel renamed this response type to CREDIT_LIMIT without changing
+  // the 5-hour model-credit semantics. Keep both names for old snapshots and
+  // new China-region responses.
+  TOKENS_LIMIT: TOKEN_LIMIT,
+  CREDIT_LIMIT,
   TIME_LIMIT: Object.freeze({ id: 'tools-month', kind: 'tools', window: 'month' }),
 })
 
@@ -81,9 +88,9 @@ function normalizedLimit(adapter, value, atMs) {
   if (value === null || typeof value !== 'object' || Array.isArray(value)) return null
   const descriptor = adapter.limitTypes[value.type]
   if (descriptor === undefined) return null
-  const used = descriptor.kind === 'tools' ? finiteNonNegative(value.currentValue) : null
-  const total = descriptor.kind === 'tools' ? finiteNonNegative(value.usage) : null
-  const remaining = descriptor.kind === 'tools' ? finiteNonNegative(value.remaining) : null
+  const used = descriptor.amounts ? finiteNonNegative(value.currentValue) : descriptor.kind === 'tools' ? finiteNonNegative(value.currentValue) : null
+  const total = descriptor.amounts ? finiteNonNegative(value.usage) : descriptor.kind === 'tools' ? finiteNonNegative(value.usage) : null
+  const remaining = descriptor.amounts ? finiteNonNegative(value.remaining) : descriptor.kind === 'tools' ? finiteNonNegative(value.remaining) : null
   const percentages = percentagePair(value.percentage, used, total)
   return {
     id: descriptor.id,
@@ -93,18 +100,26 @@ function normalizedLimit(adapter, value, atMs) {
     used,
     total,
     remaining,
-    resetAt: descriptor.kind === 'tools' ? resetTimestamp(value.nextResetTime, atMs) : null,
+    resetAt: descriptor.reset || descriptor.kind === 'tools' ? resetTimestamp(value.nextResetTime, atMs) : null,
   }
 }
 
+function preferRicherLimit(next, current) {
+  if (current === undefined) return true
+  if (current.used === null && next.used !== null) return true
+  if (current.total === null && next.total !== null) return true
+  if (current.remaining === null && next.remaining !== null) return true
+  return current.resetAt === null && next.resetAt !== null
+}
+
 function normalizeCachedLimit(value, atMs) {
   if (value === null || typeof value !== 'object' || Array.isArray(value)) return null
   if (!['tokens-5h', 'tools-month'].includes(value.id)) return null
   const kind = value.id === 'tokens-5h' ? 'tokens' : 'tools'
   const window = value.id === 'tokens-5h' ? '5h' : 'month'
-  const used = kind === 'tools' ? finiteNonNegative(value.used) : null
-  const total = kind === 'tools' ? finiteNonNegative(value.total) : null
-  const remaining = kind === 'tools' ? finiteNonNegative(value.remaining) : null
+  const used = finiteNonNegative(value.used)
+  const total = finiteNonNegative(value.total)
+  const remaining = finiteNonNegative(value.remaining)
   const legacyUsedPercentage = value.usedPercentage ?? value.percentage
   const percentages = percentagePair(legacyUsedPercentage, used, total)
   return {
@@ -115,7 +130,7 @@ function normalizeCachedLimit(value, atMs) {
     used,
     total,
     remaining,
-    resetAt: kind === 'tools' ? resetTimestamp(value.resetAt, atMs) : null,
+    resetAt: resetTimestamp(value.resetAt, atMs),
   }
 }
 
@@ -127,14 +142,12 @@ export function normalizePlanPayload(adapter, payload, atMs = Date.now()) {
   }
   const data = payload.data !== null && typeof payload.data === 'object' && !Array.isArray(payload.data) ? payload.data : null
   if (data === null || !Array.isArray(data.limits)) throw new Error('invalid-plan-response')
-  const limits = []
-  const seen = new Set()
+  const limitsById = new Map()
   for (const item of data.limits) {
     const limit = normalizedLimit(adapter, item, atMs)
-    if (limit === null || seen.has(limit.id)) continue
-    seen.add(limit.id)
-    limits.push(limit)
+    if (limit !== null && preferRicherLimit(limit, limitsById.get(limit.id))) limitsById.set(limit.id, limit)
   }
+  const limits = [...limitsById.values()]
   limits.sort((left, right) => left.id === 'tokens-5h' ? -1 : right.id === 'tokens-5h' ? 1 : left.id.localeCompare(right.id))
   if (limits.length === 0) throw new Error('invalid-plan-response')
   return {
@@ -156,14 +169,12 @@ export function normalizePlanSnapshotCache(value, atMs = Date.now()) {
       ? Math.trunc(raw.fetchedAt)
       : null
     if (fetchedAt === null || !Array.isArray(raw.limits)) continue
-    const limits = []
-    const seen = new Set()
+    const limitsById = new Map()
     for (const item of raw.limits) {
       const limit = normalizeCachedLimit(item, atMs)
-      if (limit === null || seen.has(limit.id)) continue
-      seen.add(limit.id)
-      limits.push(limit)
+      if (limit !== null && preferRicherLimit(limit, limitsById.get(limit.id))) limitsById.set(limit.id, limit)
     }
+    const limits = [...limitsById.values()]
     if (limits.length === 0) continue
     limits.sort((left, right) => left.id === 'tokens-5h' ? -1 : right.id === 'tokens-5h' ? 1 : left.id.localeCompare(right.id))
     out[adapter.id] = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "deepseek-harness-wallet",
   "description": "Local-first DeepSeek Harness control center for balance monitoring, usage accounting, a 365-day local token ledger, Z.ai Coding Plan quota monitoring, official pricing sync, peak/off-peak status, encrypted multi-account switching, health checks, completion reminders, recharge, and host-gated session controls.",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "type": "module",
   "main": "index.js",
   "exports": {