@feiyang666/dsh-usage-plugin 1.9.1 → 1.9.2

package/CHANGELOG.md

@@ -8,6 +8,21 @@
 
 ---
 
+## v1.9.2 (2026-08-20)
+
+> 修复 issue #4：持久化路径随会话工作区漂移，导致历史用量数据"消失/统计为 0"，且 UI 显示路径与实际落盘路径不一致。
+
+### 修复
+- **固定专用数据目录**：持久化根不再跟随 `agent.session.cwd` / `sandboxPolicy.workspaceRoot` 漂移。解析顺序为：环境变量 `DSH_USAGE_DATA_DIR` > 系统应用数据目录 `%LOCALAPPDATA%\dsh-usage-plugin`（仅 Windows；macOS/Linux 下该分支不生效，因 `LOCALAPPDATA`/`APPDATA` 未定义）> 用户主目录下专用文件夹 `~/dsh-usage-data`（Windows 为 `%USERPROFILE%\dsh-usage-data`，macOS/Linux 为 `~/dsh-usage-data`）。该目录独立于桌面端安装目录、`~/.dsh` 主目录与任何会话工作区，删除工作区或卸载 APP 都不会丢失数据。
+- **启动时合并去重**：首次初始化与会话激活时，自动把散落在用户主目录、`.dsh`、各工作区旧路径里的 `usage-records.json` 按 `time` 去重合并进固定根（复用现有 `normalizeRecord`），不再只读当前根的那一份。
+- **UI 路径一致**：统计页顶部显示的「数据持久化」路径恒等于真实落盘路径；写入不再绑定工作区沙箱策略，固定目录可正常写入。
+- **数据迁移**：切换根目录时对旧根记录做真正合并（非复制/分裂），重启后自动恢复全部历史。
+
+### 影响
+- 旧版本落在 `%USERPROFILE%\dsh-usage`、`.dsh\dsh-usage`、各工作区 `dsh-usage` 下的历史记录，会在首次启动本版本时自动合并到固定目录，无需手动迁移。
+
+---
+
 ## v1.9.1 (2026-08-16)
 
 - **文档**: README 改为英文优先（`README.md` 英文 + 新增 `README.zh.md` 中文）；补充「npm 包名已更换」醒目通知（旧包名 `@feiyang666/deepseekharnessdesktop` → 新包名 `@feiyang666/dsh-usage-plugin`），并移除发布教程等无关内容；修正 tarball 测试命令为新包名文件名。

package/README.md

@@ -195,11 +195,19 @@ For manual installs (Method B), do it in reverse: remove the `usage-plugin` row
 
 ## Data & locations
 
-- Records: `<session workspace>/dsh-usage/usage-records.json`
-- Price config (edited & saved in the panel): `<session workspace>/dsh-usage/pricing.json`
-- Default export dir: `<session workspace>/dsh-usage/{csv,json,images}/`
+> **Since v1.9.2**, records are stored in a **fixed, dedicated data directory** (fixes [#4](https://github.com/feiyang-dev/dsh-usage-plugin/issues/4)). The path no longer follows the session workspace / `~/.dsh` / desktop-app install dir, so your history never "disappears" (counted as 0) when the workspace changes, and the path shown in the UI equals the on-disk path.
+
+- **Records**: `<data root>/dsh-usage/usage-records.json`
+  - Resolution order for the **data root**:
+    1. env var `DSH_USAGE_DATA_DIR` (if set) — overrides everything;
+    2. Windows: `%LOCALAPPDATA%\dsh-usage-plugin` (falls back to `%APPDATA%` if `LOCALAPPDATA` is unset);
+    3. user home dir: `~/dsh-usage-data` (Windows `%USERPROFILE%\dsh-usage-data`, macOS/Linux `~/dsh-usage-data`).
+  - Default on Windows: `%LOCALAPPDATA%\dsh-usage-plugin\dsh-usage\usage-records.json`
+- **Legacy data auto-merge**: on first start, records previously scattered in `%USERPROFILE%\dsh-usage`, `~/.dsh/dsh-usage`, and each workspace's `dsh-usage` (or `.dsh-usage-records.json`) are merged into the fixed root, deduplicated by `time` — no manual migration needed.
+- Price config (edited & saved in the panel): `<data root>/dsh-usage/pricing.json`
+- Default export dir: `<data root>/dsh-usage/{csv,json,images}/`
 - Custom export dir: set in the panel's "Export target directory" or click "Choose directory…"
-- Startup diagnostics (if the plugin fails to activate): `dsh-usage-boot.log` in the session workspace
+- Startup diagnostics (if the plugin fails to activate): `dsh-usage-boot.log` next to the data root
 
 ---
 
@@ -251,6 +259,7 @@ pnpm dsh web
 
 ## Acknowledgements
 
+- **[@mumuer1024](https://github.com/mumuer1024)**: reported and diagnosed the persistence-path drift across workspaces (history "disappearing" / counted as 0) and proposed storing data in a fixed, dedicated directory ([#4](https://github.com/feiyang-dev/dsh-usage-plugin/issues/4)).
 - **[@liu3734](https://github.com/liu3734)**: reported and diagnosed the Windows-only path handling / spawn issues on macOS (POSIX) and proposed the cross-platform fix ([#1](https://github.com/feiyang-dev/dsh-usage-plugin/issues/1)).
 
 ## License

package/README.zh.md

@@ -195,11 +195,19 @@ dsh plugin --profile web remove @feiyang666/dsh-usage-plugin
 
 ## 数据与位置
 
-- 数据文件：`<会话工作区>/dsh-usage/usage-records.json`
-- 价格配置（面板内编辑后保存）：`<会话工作区>/dsh-usage/pricing.json`
-- 导出目录（默认）：`<会话工作区>/dsh-usage/{csv,json,images}/`
+> **自 v1.9.2 起**，记录存储在**固定专用数据目录**中（修复 [#4](https://github.com/feiyang-dev/dsh-usage-plugin/issues/4)）。路径不再跟随会话工作区 / `~/.dsh` / 桌面端安装目录漂移，因此切换工作区时历史数据不会再"消失"（被统计为 0），且 UI 中显示的路径与真实落盘路径始终一致。
+
+- 数据文件：`<数据根>/dsh-usage/usage-records.json`
+  - **数据根**的解析顺序：
+    1. 环境变量 `DSH_USAGE_DATA_DIR`（若已设置）——优先级最高，覆盖其它；
+    2. Windows：`%LOCALAPPDATA%\dsh-usage-plugin`（若 `LOCALAPPDATA` 未设置则回退到 `%APPDATA%`）；
+    3. 用户主目录：`~/dsh-usage-data`（Windows 为 `%USERPROFILE%\dsh-usage-data`，macOS/Linux 为 `~/dsh-usage-data`）。
+  - Windows 下默认位置：`%LOCALAPPDATA%\dsh-usage-plugin\dsh-usage\usage-records.json`
+- 旧数据自动合并：首次启动时，落在 `%USERPROFILE%\dsh-usage`、`~/.dsh/dsh-usage` 以及各工作区 `dsh-usage`（或 `.dsh-usage-records.json`）下的旧记录会按 `time` 去重合并进固定数据根，无需手动迁移。
+- 价格配置（面板内编辑后保存）：`<数据根>/dsh-usage/pricing.json`
+- 导出目录（默认）：`<数据根>/dsh-usage/{csv,json,images}/`
 - 自定义导出目录：在面板「导出目标目录」里填写或点「选择目录…」
-- 启动诊断日志（若插件激活失败）：会话工作区下的 `dsh-usage-boot.log`
+- 启动诊断日志（若插件激活失败）：数据根旁的 `dsh-usage-boot.log`
 
 ---
 
@@ -251,6 +259,7 @@ pnpm dsh web
 
 ## 致谢
 
+- **[@mumuer1024](https://github.com/mumuer1024)**：报告并定位了持久化路径随会话工作区漂移导致历史数据"消失/统计为 0"的问题，提出把数据写到固定专用目录的方案（[#4](https://github.com/feiyang-dev/dsh-usage-plugin/issues/4)）。
 - **[@liu3734](https://github.com/liu3734)**：报告并定位 macOS（POSIX）下路径处理与 spawn 的 Windows 专用问题，提出跨平台修复方案（[#1](https://github.com/feiyang-dev/dsh-usage-plugin/issues/1)）。
 
 ## 许可

package/cordis.patch.yml

@@ -1,22 +1,23 @@
-# dsh-usage-plugin — bundle patch layer.
-#
-# This file is the package's `dsh.bundle.patch` layer. When the package is
-# installed into a DSH profile (via `dsh plugin --profile <name> add
-# @feiyang666/dsh-usage-plugin`, or manually), the loader applies this
-# patch over the profile's empty root entry list, mounting the plugin row.
-#
-# The `inject` list is REQUIRED: it tells the Cordis loader to wait until the
-# fs / webServer / subprocess / credentials / sandboxPolicy / agents services
-# are ready before activating the plugin. Without it the plugin's `apply` may
-# run before those services exist, the `/usage/api` route never registers, and
-# the client panel fails with `Unexpected end of JSON input`.
-- insert:
-    - id: usage-plugin
-      name: '@feiyang666/dsh-usage-plugin'
-      inject:
-        - fs
-        - webServer
-        - subprocess
-        - credentials
-        - sandboxPolicy
-        - agents
+# dsh-usage-plugin — bundle patch layer.
+#
+# This file is the package's `dsh.bundle.patch` layer. When the package is
+# installed into a DSH profile (via `dsh plugin --profile <name> add
+# @feiyang666/dsh-usage-plugin`, or manually), the loader applies this
+# patch over the profile's empty root entry list, mounting the plugin row.
+#
+# The `inject` list is REQUIRED: it tells the Cordis loader to wait until the
+# fs / webServer / subprocess / credentials / settings / sandboxPolicy / agents
+# services are ready before activating the plugin. Without it the plugin's `apply`
+# may run before those services exist, the `/usage/api` route never registers,
+# and the client panel fails with `Unexpected end of JSON input`.
+- insert:
+    - id: usage-plugin
+      name: '@feiyang666/dsh-usage-plugin'
+      inject:
+        - fs
+        - webServer
+        - subprocess
+        - credentials
+        - settings
+        - sandboxPolicy
+        - agents

package/lib/balance.js

@@ -0,0 +1,205 @@
+const PROVIDERS = {
+  deepseek: {
+    id: 'deepseek',
+    name: 'DeepSeek',
+    credentialNames: ['DEEPSEEK_API_KEY'],
+    endpoint: 'https://api.deepseek.com/user/balance',
+    credentialHint: 'DEEPSEEK_API_KEY（推理 Key）',
+    queryMode: 'direct',
+    modelProviderAliases: ['deepseek']
+  },
+  siliconflow: {
+    id: 'siliconflow',
+    name: 'SiliconFlow',
+    credentialNames: [],
+    endpoint: 'https://api.siliconflow.cn/v1/user/info',
+    credentialHint: '模型设置中名为 siliconflow 的提供商所引用的 API Key',
+    queryMode: 'direct',
+    modelProviderAliases: ['siliconflow', 'silicon-flow'],
+    credentialHelpUrl: 'https://cloud.siliconflow.cn/account/ak'
+  },
+  digitalocean: {
+    id: 'digitalocean',
+    name: 'DigitalOcean',
+    credentialNames: ['DIGITALOCEAN_TOKEN', 'DIGITALOCEAN_ACCESS_TOKEN'],
+    endpoint: 'https://api.digitalocean.com/v2/customers/my/balance',
+    credentialHint: 'DIGITALOCEAN_TOKEN（账户级 Personal Access Token，不是 DO AI 推理 Key）',
+    queryMode: 'account',
+    modelProviderAliases: ['digitalocean', 'digital-ocean'],
+    credentialHelpUrl: 'https://cloud.digitalocean.com/account/api/tokens'
+  },
+  'amd-gpu-cloud': {
+    id: 'amd-gpu-cloud',
+    name: 'AMD GPU Cloud',
+    credentialNames: [],
+    endpoint: '',
+    credentialHint: 'AMD GPU Cloud 当前未公开余额查询端点',
+    queryMode: 'unsupported',
+    modelProviderAliases: ['amd', 'amd-gpu-cloud'],
+    credentialHelpUrl: 'https://www.amd.com/en/developer/resources/cloud-access/amd-developer-cloud.html'
+  }
+}
+
+export const BALANCE_PROVIDERS = Object.freeze(PROVIDERS)
+
+export function providerList() {
+  return Object.values(PROVIDERS).map((p) => ({
+    id: p.id,
+    name: p.name,
+    credentialHint: p.credentialHint,
+    queryMode: p.queryMode,
+    credentialHelpUrl: p.credentialHelpUrl || ''
+  }))
+}
+
+export function getBalanceProvider(id) {
+  return PROVIDERS[String(id || 'deepseek').toLowerCase()] || null
+}
+
+function normalizedRoute(value) {
+  return String(value || '').toLowerCase().replace(/[^a-z0-9]/g, '')
+}
+
+export function matchesModelProvider(providerId, routeId, displayName) {
+  const provider = getBalanceProvider(providerId)
+  if (!provider) return false
+  const candidates = [routeId, displayName].map(normalizedRoute).filter(Boolean)
+  const aliases = (provider.modelProviderAliases || []).map(normalizedRoute)
+  return candidates.some((candidate) => aliases.includes(candidate))
+}
+
+export function resolveBalanceEndpoint(providerId, modelBaseURL) {
+  const provider = getBalanceProvider(providerId)
+  if (!provider) return ''
+  if (provider.id !== 'siliconflow' || !modelBaseURL) return provider.endpoint
+  try {
+    const url = new URL(String(modelBaseURL))
+    const allowed = url.protocol === 'https:'
+      && !url.username
+      && !url.password
+      && !url.port
+      && (url.hostname === 'api.siliconflow.cn' || url.hostname === 'api.siliconflow.com')
+    if (allowed) return url.origin + '/v1/user/info'
+  } catch (e) {}
+  return provider.endpoint
+}
+
+function fail(message) {
+  return { ok: false, error: message }
+}
+
+function json(text) {
+  try { return JSON.parse(text) } catch (e) { return null }
+}
+
+function value(source, names) {
+  if (!source || typeof source !== 'object') return undefined
+  for (const name of names) {
+    if (source[name] !== undefined && source[name] !== null && source[name] !== '') return source[name]
+  }
+  return undefined
+}
+
+function money(v, fallback = '0') {
+  return String(v === undefined || v === null || v === '' ? fallback : v)
+}
+
+function result(provider, fields) {
+  return {
+    ok: true,
+    provider: provider.id,
+    providerName: provider.name,
+    queriedAt: Date.now(),
+    ...fields
+  }
+}
+
+function parseDeepSeek(provider, data) {
+  const infos = data && Array.isArray(data.balance_infos) ? data.balance_infos : []
+  if (!infos.length) return fail('DeepSeek 响应中没有余额信息')
+  const b = infos[0] || {}
+  const legacyInfo = {
+    currency: String(b.currency || 'CNY'),
+    totalBalance: money(b.total_balance),
+    grantedBalance: money(b.granted_balance),
+    toppedUpBalance: money(b.topped_up_balance)
+  }
+  return result(provider, {
+    currency: legacyInfo.currency,
+    isAvailable: data.is_available == null ? null : data.is_available === true,
+    totalBalance: legacyInfo.totalBalance,
+    infos: [legacyInfo],
+    details: [
+      { label: '充值余额', value: legacyInfo.toppedUpBalance, hint: '实际充值' },
+      { label: '赠送余额', value: legacyInfo.grantedBalance, hint: '平台赠送' }
+    ],
+    sourceNote: '数据来自 DeepSeek 官方 /user/balance 接口。'
+  })
+}
+
+function parseSiliconFlow(provider, data) {
+  if (data && data.code !== undefined && Number(data.code) !== 20000) {
+    return fail('SiliconFlow 接口返回错误：' + String(data.message || data.code))
+  }
+  const d = data && data.data && typeof data.data === 'object' ? data.data : data
+  const total = value(d, ['totalBalance', 'total_balance'])
+  const granted = value(d, ['balance', 'grantedBalance', 'granted_balance'])
+  const charged = value(d, ['chargeBalance', 'charge_balance', 'toppedUpBalance', 'topped_up_balance'])
+  if (total === undefined && granted === undefined && charged === undefined) {
+    return fail('SiliconFlow 响应中没有可识别的余额字段')
+  }
+  const computed = total !== undefined ? total : (Number(granted || 0) + Number(charged || 0))
+  const numeric = [computed, granted || 0, charged || 0].map((entry) => Number(entry))
+  return result(provider, {
+    currency: String(value(d, ['currency']) || 'CNY'),
+    isAvailable: null,
+    totalBalance: money(computed),
+    zeroBalance: numeric.every((entry) => Number.isFinite(entry) && entry === 0),
+    details: [
+      { label: '充值余额', value: money(charged), hint: 'chargeBalance · 用户充值余额' },
+      { label: '赠送/旧免费余额', value: money(granted), hint: 'balance · 旧版赠送余额字段' }
+    ],
+    fieldDefinitions: [
+      { name: 'totalBalance', meaning: '公开 API 返回的总余额，通常为 balance 与 chargeBalance 的合计' },
+      { name: 'chargeBalance', meaning: '用户充值形成的余额' },
+      { name: 'balance', meaning: '赠送或旧版免费余额字段' }
+    ],
+    sourceNote: '数据来自 SiliconFlow 官方 /v1/user/info 接口；该接口未公开代金券或历史用量字段，数值可能与控制台可用总额不同。'
+  })
+}
+
+function parseDigitalOcean(provider, data) {
+  const account = value(data, ['account_balance'])
+  if (account === undefined) return fail('DigitalOcean 响应中没有 account_balance 字段')
+  const accountNumber = Number(account)
+  if (!Number.isFinite(accountNumber)) return fail('DigitalOcean account_balance 不是有效数字')
+  const credit = accountNumber < 0 ? Math.abs(accountNumber) : 0
+  const due = accountNumber > 0 ? accountNumber : 0
+  const balanceKind = credit > 0 ? 'credit' : (due > 0 ? 'due' : 'settled')
+  return result(provider, {
+    currency: 'USD',
+    isAvailable: null,
+    totalBalance: money(credit > 0 ? credit : due),
+    balanceKind,
+    balanceLabel: balanceKind === 'credit' ? '可用信用余额' : (balanceKind === 'due' ? '待结算账户余额' : '账户余额'),
+    rawAccountBalance: money(account),
+    monthToDateUsage: money(value(data, ['month_to_date_usage'])),
+    monthToDateBalance: money(value(data, ['month_to_date_balance'])),
+    details: [
+      { label: '本月至今使用', value: money(value(data, ['month_to_date_usage'])), hint: 'month_to_date_usage · 当前账期使用金额' }
+    ],
+    generatedAt: String(value(data, ['generated_at']) || ''),
+    sourceNote: '数据来自 DigitalOcean 账户级 Billing API；负数账户余额按可用信用额取绝对值展示，DO AI 推理 Key 不能用于此查询。'
+  })
+}
+
+export function parseBalanceResponse(providerId, text) {
+  const provider = getBalanceProvider(providerId)
+  if (!provider) return fail('不支持的余额服务商：' + String(providerId || ''))
+  const data = json(text)
+  if (data === null) return fail('无法解析 ' + provider.name + ' 余额响应')
+  if (provider.id === 'deepseek') return parseDeepSeek(provider, data)
+  if (provider.id === 'siliconflow') return parseSiliconFlow(provider, data)
+  if (provider.id === 'digitalocean') return parseDigitalOcean(provider, data)
+  return fail(provider.name + ' 当前没有可用的公开余额查询接口')
+}