dsh-cost-meter 1.7.13 → 1.7.14

package/lib/coding-plans.js

@@ -903,7 +903,8 @@ export function qwenTokenPlanWindows(days, entry, nowMs) {
   const total = Number(entry?.planCredits)
   if (!Number.isFinite(total) || total <= 0) return null
   // 用户覆盖的抵扣率优先,内置表兜底;键与模型名均做字母数字归一比较。
-  const overrides = entry?.rates !== null && typeof entry?.rates === 'object' && !Array.isArray(entry?.rates) ? entry.rates : {}
+  const rawOverrides = entry?.rates !== null && typeof entry?.rates === 'object' && !Array.isArray(entry?.rates) ? entry.rates : {}
+  const overrides = Object.fromEntries(Object.entries(rawOverrides).map(([model, rate]) => [scnetCanonModelId(model), rate]))
   const rateOf = canon => {
     if (overrides[canon] !== undefined && overrides[canon] !== null && typeof overrides[canon] === 'object') return overrides[canon]
     return QWEN_CREDIT_RATES_BY_CANON[canon]

package/lib/gateway-quota-adapters.js

@@ -270,7 +270,11 @@ export function parseAntigravityQuota(payload, ctx = {}) {
   for (let gi = 0; gi < groups.length; gi++) {
     const group = groups[gi]
     if (group === null || typeof group !== 'object' || Array.isArray(group)) continue
-    const groupId = slug(pickField(group, 'groupId', 'group_id', 'id', 'name') ?? `group-${gi}`)
+    const explicitId = pickField(group, 'groupId', 'group_id', 'id')
+    const rawGroupTitle = pickField(group, 'displayName', 'display_name', 'name') ?? explicitId
+    let groupTitle = rawGroupTitle ? String(rawGroupTitle).replace(/\s+models$/i, '').trim() : `group-${gi}`
+    if (groupTitle.toLowerCase().includes('claude') && groupTitle.toLowerCase().includes('gpt')) groupTitle = 'Claude / GPT'
+    const groupId = slug(explicitId ?? groupTitle)
     const buckets = Array.isArray(group.buckets) ? group.buckets : []
     let added = 0
     for (const bucket of buckets) {
@@ -288,7 +292,7 @@ export function parseAntigravityQuota(payload, ctx = {}) {
       const percent = clampPct((1 - fraction) * 100)
       windows.push(makeWindow(
         id,
-        `${groupId} · ${meta.label}`,
+        `${groupTitle} · ${meta.label}`,
         percent,
         absoluteResetAt(pickField(bucket, 'resetTime', 'reset_time', 'resetTime')),
         meta.periodHours,

package/lib/index.js

@@ -2668,6 +2668,8 @@ export function apply(ctx) {
   // 指纹窗口去重:包装层样本改挂上游 id 后,与上游真实流按 (model, 五桶指纹)
   // 10s 窗互斥入账,无论到达顺序只记一次;包装层单链照常入账(不再漏计)。
   const usageDeduper = createUsageDeduper()
+  // 记忆插件等可创建隔离的 llm 服务；账本是全局观察者，须跨服务作用域接收用量。
+  // 子会话仍按自己的 sessionId 入账；无 sessionId 的后台调用只进入日/月总计。
   ctx.on('llm/stream', createLlmStreamBilling({
     account: (usage, model, sessionId, atMs, provider) => {
       const buckets = {
@@ -2683,7 +2685,7 @@ export function apply(ctx) {
       if (effective === null) return
       ledger.account(buckets, model, sessionId, atMs, effective)
     },
-  }))
+  }), { global: true })
 
   // costUsage 投影:向会话历史页/推送帧提供 token 桶(客户端计价)。
   ctx.inject(['sessionProjections'], (projectionCtx) => {

package/lib/store.js

@@ -135,9 +135,11 @@ export function defaultConfig() {
     hideOfficialBalance: false, // 隐藏官方账户余额(issue #45):开启后侧边栏/会话页/设置页的官方余额 UI 整体不渲染
     hideTodayCost: false, // 隐藏今日消耗金额(issue #46):开启后侧栏今日费用行/预算明细今日行/概览今日卡片不渲染
     showTotalWithPlan: false, // 「含 Plan 总额」全局开关(v1.6.0):开启后全部金额展示按总等值(cost)计;默认按真金白银(apiCost)
+    sidebarStyle: 'standard', // 侧边栏进度条样式:standard(标准,纵向单列) | compact(紧凑,额度卡两列网格)
     legacyAutoImportedAt: 0, // 安装前历史自动导入标记(issue #27):完成时刻 ms;0 = 尚未跑过
     peakStyle: 'compact', // 峰谷时段条样式:compact(简洁单行/竖向同构) | classic(经典分段/胶囊芯片)
     priceMatch: 'auto', // 未知模型名自动匹配价格表:auto(去后缀/前缀/家族相似) | exact(仅精确)
+    priceMatchDismissed: [], // 从匹配设置中移除的 provider:model 行；不删除用量或改变计价规则。
     priceOverrides: {}, // 手动匹配覆盖:{ 'provider:modelId': 'provider:模型 | deepseek:__default__' };裸模型名 = 同渠道换名(旧版遗留,跨渠道裸 DeepSeek 名由查价兜底自愈,issue #56)
     priceTableDisplay: {}, // 费用设置直接显示(按模型):键 'provider:modelId' → 布尔;缺省 = DeepSeek 模型直接显示、第三方收入拓展价格表(含 DeepSeek 模型也可逐模型收入)
     prices: {
@@ -722,9 +724,11 @@ const VALIDATION_MESSAGES = {
     hideOfficialBalance: 'hideOfficialBalance 必须是布尔值',
     hideTodayCost: 'hideTodayCost 必须是布尔值',
     showTotalWithPlan: 'showTotalWithPlan 必须是布尔值',
+    sidebarStyle: 'sidebarStyle 必须是 standard / compact',
     peakStyle: 'peakStyle 必须是 compact / classic',
     priceMatch: 'priceMatch 必须是 auto / exact',
     priceOverrides: 'priceOverrides 必须是字符串→字符串映射',
+    priceMatchDismissed: 'priceMatchDismissed 必须是模型键字符串数组（最多 1000 项，每项 1–512 字符）',
     historyDays: 'historyDays 必须是 7-3650 的整数',
     locale: 'locale 必须是 auto / zh / en',
     budget: 'budget 非法',
@@ -818,9 +822,11 @@ const VALIDATION_MESSAGES = {
     hideOfficialBalance: 'hideOfficialBalance must be a boolean',
     hideTodayCost: 'hideTodayCost must be a boolean',
     showTotalWithPlan: 'showTotalWithPlan must be a boolean',
+    sidebarStyle: 'sidebarStyle must be standard / compact',
     peakStyle: 'peakStyle must be compact / classic',
     priceMatch: 'priceMatch must be auto / exact',
     priceOverrides: 'priceOverrides must be a string→string map',
+    priceMatchDismissed: 'priceMatchDismissed must contain at most 1000 model keys of 1–512 characters',
     historyDays: 'historyDays must be an integer from 7 to 3650',
     locale: 'locale must be auto / zh / en',
     budget: 'Invalid budget',
@@ -990,6 +996,12 @@ export function applyConfigPatch(current, rawPatch) {
   if (errors.length > 0) return { config: current, errors }
   // 结构化克隆,拒绝补丁时不得污染活配置(mergeDeep 共享未触及子树,校验期的就地收敛会泄漏进活配置)。
   const candidate = mergeDeep(structuredClone(current), patch)
+  // 这两张编辑表随对应设置整表提交；逐键深合并会把用户移除的键补回来。
+  if (Object.hasOwn(patch, 'priceOverrides')) candidate.priceOverrides = structuredClone(patch.priceOverrides)
+  const qwenPatch = patch.codingPlans?.qwen
+  if (qwenPatch !== null && typeof qwenPatch === 'object' && !Array.isArray(qwenPatch) && Object.hasOwn(qwenPatch, 'rates')) {
+    candidate.codingPlans.qwen.rates = structuredClone(qwenPatch.rates)
+  }
   // prices.models 是可编辑列表:客户端提交完整列表时必须按替换语义处理，
   // 否则 mergeDeep 会把已删除的旧模型重新合并回来。
   if (patch.prices !== null && typeof patch.prices === 'object' && !Array.isArray(patch.prices)) {
@@ -1092,9 +1104,16 @@ export function applyConfigPatch(current, rawPatch) {
   if (candidate.hideTodayCost !== undefined && typeof candidate.hideTodayCost !== 'boolean') errors.push(vmsg(locale, 'hideTodayCost'))
   // 「含 Plan 总额」全局开关(v1.6.0):布尔,可缺省(默认关)。
   if (candidate.showTotalWithPlan !== undefined && typeof candidate.showTotalWithPlan !== 'boolean') errors.push(vmsg(locale, 'showTotalWithPlan'))
+  // 侧边栏进度条样式:standard(默认,纵向单列) | compact(额度卡两列网格)。
+  if (candidate.sidebarStyle !== undefined && candidate.sidebarStyle !== 'standard' && candidate.sidebarStyle !== 'compact') errors.push(vmsg(locale, 'sidebarStyle'))
   if (candidate.peakStyle !== 'compact' && candidate.peakStyle !== 'classic') errors.push(vmsg(locale, 'peakStyle'))
   if (candidate.priceMatch !== 'auto' && candidate.priceMatch !== 'exact') errors.push(vmsg(locale, 'priceMatch'))
   const overrides = candidate.priceOverrides
+  if (candidate.priceMatchDismissed !== undefined && (!Array.isArray(candidate.priceMatchDismissed)
+    || candidate.priceMatchDismissed.length > 1000
+    || candidate.priceMatchDismissed.some(key => typeof key !== 'string' || key.length === 0 || key.length > 512))) {
+    errors.push(vmsg(locale, 'priceMatchDismissed'))
+  }
   if (overrides === null || typeof overrides !== 'object' || Array.isArray(overrides)
     || Object.entries(overrides).some(([k, v]) => typeof k !== 'string' || typeof v !== 'string')) {
     errors.push(vmsg(locale, 'priceOverrides'))
@@ -1392,6 +1411,10 @@ export function sanitizeConfig(raw) {
   out.hideOfficialBalance = out.hideOfficialBalance === true
   out.hideTodayCost = out.hideTodayCost === true
   out.showTotalWithPlan = out.showTotalWithPlan === true
+  out.sidebarStyle = oneOf(out.sidebarStyle, ['standard', 'compact'], 'standard')
+  out.priceMatchDismissed = Array.isArray(out.priceMatchDismissed)
+    ? [...new Set(out.priceMatchDismissed.filter(key => typeof key === 'string' && key.length > 0 && key.length <= 512))].slice(0, 1000)
+    : []
   // v1.5.38 的隐私模式字段已废弃(改为 UI 隐藏开关):清洗旧账本残留,避免僵尸配置长期留存。
   delete out.hideAmounts
   // 峰/谷切换弹窗提醒:非法值定向收敛(开关默认开、提前量回 2、类型回 both)。

package/lib/typert.host.js

@@ -119,6 +119,8 @@ const configSchema = z.object({
   hideTodayCost: z.boolean().optional(),
   // 「含 Plan 总额」全局开关(v1.6.0):开启后全部金额展示按总等值(cost)计。
   showTotalWithPlan: z.boolean().optional(),
+  sidebarStyle: z.enum(['standard', 'compact']).optional(),
+  priceMatchDismissed: z.array(z.string()).optional(),
   // 安装前历史自动导入完成时刻(issue #27,内部标记;0/缺席 = 尚未跑过)。
   legacyAutoImportedAt: num.optional(),
   peakStyle: z.enum(['compact', 'classic']).optional(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cost-meter",
-  "version": "1.7.13",
+  "version": "1.7.14",
   "description": "DeepSeek Harness 会话费用统计插件:本会话成本、当日费用、历史记录与官方价格同步,支持多厂商多模型价格计费(内置 90+ 模型价格目录与自动匹配)、主流 Coding Plan 订阅额度查询与显示(9 家,含 SCNet Token Plan 本地 Credits 计量与火山方舟 Volcano Ark Coding Plan AK/SK 签名查询)、自定义 Provider 余额查询(可配任意 HTTP 端点)与余额进度条、峰谷计价时段显示与切换前弹窗/系统通知提醒(位置/提前量/类型可配),界面中英双语。Session cost tracking plugin for DeepSeek Harness: per-conversation cost, daily totals, history and official price sync, with multi-vendor model pricing (built-in 90+ model catalog with auto-matching), Coding Plan quota queries & display for 9 vendors (incl. local credits metering for the SCNet Token Plan and Volcano Ark Coding Plan via AK/SK signature), plan/API dual-track billing with per-1% & full-window Token Plan usage estimates, custom provider balance lookup (configurable HTTP endpoint) and balance progress bar, plus peak/off-peak pricing display with pre-switch popup & system-notification alerts (position / lead time / type configurable), in a bilingual (Chinese/English) UI.",
   "type": "module",
   "main": "lib/index.js",
@@ -24,7 +24,10 @@
       "dshReleases": {
         "0.1.2-alpha.3": "compatible",
         "0.1.2-alpha.4": "compatible",
-        "0.1.2-alpha.5": "compatible"
+        "0.1.2-alpha.5": "compatible",
+        "0.1.2-rc.1": "compatible",
+        "0.1.3-alpha.1": "unknown",
+        "0.1.3-alpha.2": "compatible"
       }
     }
   },
@@ -80,10 +83,12 @@
     "docs/provider-pricing.json"
   ],
   "dependencies": {
-    "@deepseek-ai/dsh-credentials": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-home-paths": "0.1.0-rc.8",
     "zod": "4.5.1"
   },
+  "peerDependencies": {
+    "@deepseek-ai/dsh-credentials": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.3-0",
+    "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.3-0"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Han-1413141/dsh-cost-meter.git"
@@ -115,6 +120,8 @@
     "test": "node test/verify.mjs"
   },
   "devDependencies": {
+    "@deepseek-ai/dsh-credentials": "0.1.0-rc.8",
+    "@deepseek-ai/dsh-home-paths": "0.1.0-rc.8",
     "esbuild": "^0.28.2"
   }
 }