dsh-cost-meter 1.7.13 → 1.7.15

package/lib/coding-plans.js

@@ -893,17 +893,27 @@ const QWEN_CREDIT_RATES_BY_CANON = Object.fromEntries(
   Object.entries(QWEN_CREDIT_RATES).map(([id, rate]) => [scnetCanonModelId(id), rate]),
 )
 
+// 只识别明确的订阅渠道；qianwen/dashscope 等按量渠道不能仅凭同名模型归入。
+export const QWEN_TOKEN_PLAN_PROVIDER_IDS = ['qwen', 'qwen-tokenplan', 'qianwen-tokenplan', 'qwen-token-plan', 'qianwen-token-plan']
+
+export function isQwenTokenPlanProvider(provider) {
+  const name = String(provider ?? '').trim().toLowerCase().replace(/^llm-/, '')
+  return QWEN_TOKEN_PLAN_PROVIDER_IDS.includes(name)
+}
+
 /**
  * 汇总本地账本当前计费周期(自然月,与 SCNet 同款 scnetPlanPeriod)的千问
  * Credits 用量。entry 为 codingPlans.qwen 配置:{ planCredits(必填,月度总额),
  * planStart(可选,计费周期锚日), rates(可选,模型名 → 抵扣率覆盖,键为归一模型名) }。
+ * 仅汇总千问订阅 provider；includeCall 可进一步按 Plan/API 显式配置排除调用。
  * 返回 null(planCredits 非法)或 { used, total, percent, resetsAt, byModel, windows }。
  */
-export function qwenTokenPlanWindows(days, entry, nowMs) {
+export function qwenTokenPlanWindows(days, entry, nowMs, includeCall) {
   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]
@@ -914,7 +924,10 @@ export function qwenTokenPlanWindows(days, entry, nowMs) {
   for (const [date, day] of Object.entries(days ?? {})) {
     if (typeof date !== 'string' || date < period.fromKey || date > period.toKeyInclusive) continue
     for (const [pmKey, buckets] of Object.entries(day?.byProviderModel ?? {})) {
-      const model = pmKey.includes(':') ? pmKey.slice(pmKey.indexOf(':') + 1) : pmKey
+      const sep = pmKey.indexOf(':')
+      const provider = sep > 0 ? pmKey.slice(0, sep) : ''
+      const model = sep > 0 ? pmKey.slice(sep + 1) : pmKey
+      if (!isQwenTokenPlanProvider(provider) || (includeCall && !includeCall(provider, model))) continue
       const canon = scnetCanonModelId(model)
       const rate = rateOf(canon)
       if (rate === undefined || buckets === null || typeof buckets !== 'object') continue

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

@@ -22,10 +22,10 @@ import { resolveDshHome } from '@deepseek-ai/dsh-home-paths'
 import { Ledger, applyConfigPatch, localDayKey, pickBalanceInfo, reconcileBalanceDelta, zeroDay, splitLedgerApiCost, repairLedgerPricing, dedupeWrapperProviderDays, unpriceLocalOriginModels, stripSecrets, stripSecretPatch, secretRefOf, readSecret, writeSecret, SECRET_TARGETS, looksLikeSecretHeaderValue } from './store.js'
 import { backfillLegacyLedger, importLegacyHistory, repairForkSeed, repairProviderDupes, recomputeLedgerPricingBasis } from './backfill.js'
 import { createLlmStreamBilling } from './billing-stream.js'
-import { OFFICIAL_PRICING_URL, OFFICIAL_PRICING_URL_ZH, LEGACY_BASE_BOUNDARY, normalizePrice, parsePricingHtml, costOf, providerPriceEntryFor, buildPriceCatalog, usdFromCost, isWrapperProviderId, wrapperUpstreamProvider } from './pricing.js'
+import { OFFICIAL_PRICING_URL, OFFICIAL_PRICING_URL_ZH, LEGACY_BASE_BOUNDARY, normalizePrice, parsePricingHtml, repairDefaultPeakPrice, costOf, providerPriceEntryFor, buildPriceCatalog, usdFromCost, isWrapperProviderId, wrapperUpstreamProvider } from './pricing.js'
 import { createUsageDeduper, USAGE_DEDUP_WINDOW_MS, usageFingerprint } from './usage-dedup.js'
 import { CODING_PLAN_PROVIDERS, CODING_PLAN_PROVIDER_IDS, queryCodingPlan, scnetTokenPlanWindows, qwenTokenPlanWindows, emptyCustomBalance, queryCustomBalance, normalizeVolcengineKey } from './coding-plans.js'
-import { recordSamples, buildPlanStats, canonicalWindowKey, periodStartOf, aggregateUsageSince, enabledPlanSetOf, pruneHourBuckets, suggestPlanAutoClasses } from './plan-billing.js'
+import { recordSamples, buildPlanStats, canonicalWindowKey, periodStartOf, aggregateUsageSince, enabledPlanSetOf, billingClassOf, pruneHourBuckets, suggestPlanAutoClasses } from './plan-billing.js'
 import { fetchWithRetry } from './net.js'
 import { queryGatewayQuota, emptyGatewayQuota, managementKeyVarOf, gatewaySourceFingerprint } from './gateway-quotas.js'
 import { stateSchema } from './typert.host.js'
@@ -375,7 +375,8 @@ function makeCostUsageProjection(ledger) {
     // v6→v7(issue #63):seedLength 仅显式取值,普通会话的 length 不再误作种子边界,避免非 fork 会话代币漏计。
     // v7→v8(issue #77):折叠计入 compaction/summary(压缩摘要调用,此前漏计);
     // 升版本触发宿主对旧 checkpoint 全量重放,历史摘要调用量随之补齐。
-    stateVersion: 8,
+    // v8→v9(issue #109):默认回退补齐峰谷档位，旧金额 checkpoint 需按事件重放。
+    stateVersion: 9,
     init: () => ({ provider: 'deepseek', model: 'default', totals: zeroBuckets(), byModel: {}, byProviderModel: {}, last: null, createdAt: 0, seedEndSeq: -1, shadow: emptyShadow(), seedLength: -1, seedDeducted: false, recent: [] }),
     apply(state, event) {
       // 兼容旧 checkpoint 的缺字段(版本升级前持久化的 v5 状态):缺省回落。
@@ -1593,7 +1594,9 @@ function createService(ctx, ledger) {
     // 千问 Token Plan(issue #78)与 SCNet 同型:平台无 API-Key 化额度端点(额度仅
     // 控制台可见,网关需 cookie+sec_token),按官方 Credits 抵扣率本地估算,跳过缓存间隔。
     if (id === 'qwen') {
-      const result = qwenTokenPlanWindows(ledger.days ?? {}, config, Date.now())
+      const enabledPlans = enabledPlanSetOf(ledger.config)
+      const result = qwenTokenPlanWindows(ledger.days ?? {}, config, Date.now(),
+        (provider, model) => billingClassOf(provider, model, ledger.config.planBilling, enabledPlans, ledger.config.prices) === 'plan')
       codingPlanCaches[id] = {
         fetchedAt: Date.now(),
         value: result === null
@@ -2461,6 +2464,18 @@ export async function migrateCustomBalanceHeaderSecrets(ctx, ledger) {
   return { imported, pending }
 }
 
+const DEFAULT_PRICE_MIGRATION = 'default-peak-price-v1'
+const DEFAULT_PRICE_MIGRATION_PENDING = 'default-peak-price-pending-v1'
+
+function prepareDefaultPeakPrice(ledger) {
+  if (ledger.migrations.includes(DEFAULT_PRICE_MIGRATION) || ledger.migrations.includes(DEFAULT_PRICE_MIGRATION_PENDING)) return
+  if (repairDefaultPeakPrice(ledger.config.prices)) {
+    if (!ledger.migrations.includes(DEFAULT_PRICE_MIGRATION_PENDING)) ledger.migrations.push(DEFAULT_PRICE_MIGRATION_PENDING)
+    // 同步修正新调用和投影使用的价格；重放若被退出打断，pending 随账本保存后可重试。
+    ledger.scheduleWrite()
+  }
+}
+
 /**
  * 启动期历史导入(issue #27):先做按模型回填,再在**本插件首次启动**(config
  * 标记 legacyAutoImportedAt 为 0)时自动导入一次安装前历史——用户无需手动触
@@ -2469,6 +2484,14 @@ export async function migrateCustomBalanceHeaderSecrets(ctx, ledger) {
  * @param sessionsRoot - 宿主会话根目录($DSH_HOME/sessions)。
  */
 export async function runStartupImports(ledger, sessionsRoot) {
+  prepareDefaultPeakPrice(ledger)
+  const needsDefaultPriceMigration = !ledger.migrations.includes(DEFAULT_PRICE_MIGRATION)
+  const defaultPriceRepaired = ledger.migrations.includes(DEFAULT_PRICE_MIGRATION_PENDING)
+  const oldPrices = defaultPriceRepaired ? structuredClone(ledger.config.prices) : null
+  if (oldPrices) {
+    const { cacheHit, cacheMiss, output } = oldPrices.default
+    oldPrices.default = { cacheHit, cacheMiss, output }
+  }
   const filled = await backfillLegacyLedger(ledger, sessionsRoot)
   if (filled.days > 0 || filled.sessions > 0 || filled.titles > 0) {
     const extras = [
@@ -2617,6 +2640,31 @@ export async function runStartupImports(ledger, sessionsRoot) {
     ledger.config.legacyAutoImportedAt = Date.now()
     ledger.scheduleWrite()
   }
+  if (needsDefaultPriceMigration) {
+    if (defaultPriceRepaired) {
+      const options = { mode: ledger.config.priceMatch, overrides: ledger.config.priceOverrides }
+      const stats = await recomputeLedgerPricingBasis(ledger, sessionsRoot, key => {
+        const sep = key.indexOf(':')
+        const provider = sep > 0 ? key.slice(0, sep) : 'deepseek'
+        const model = sep > 0 ? key.slice(sep + 1) : key
+        // 唯一发生变化的是 default；明确命中的模型及自定义映射不受重算影响。
+        const before = providerPriceEntryFor(provider, model, oldPrices, options)
+        const after = providerPriceEntryFor(provider, model, ledger.config.prices, options)
+        return JSON.stringify(before) !== JSON.stringify(after)
+      })
+      splitLedgerApiCost(ledger)
+      console.log(`[dsh-cost-meter] 已补齐默认价格峰谷档位，按日志重算 ${stats.recostedSessions} 个会话；跳过 ${stats.skippedSessions} 个覆盖不全的会话`)
+    }
+    ledger.migrations = ledger.migrations.filter(marker => marker !== DEFAULT_PRICE_MIGRATION_PENDING)
+    ledger.migrations.push(DEFAULT_PRICE_MIGRATION)
+    ledger.scheduleWrite()
+  }
+  // 新识别的千问订阅别名同步更新历史 API/订阅金额，token 与原始 provider 键保留。
+  if (!ledger.migrations.includes('qwen-provider-split-v1')) {
+    splitLedgerApiCost(ledger)
+    ledger.migrations.push('qwen-provider-split-v1')
+    ledger.scheduleWrite()
+  }
 }
 
 /**
@@ -2625,6 +2673,8 @@ export async function runStartupImports(ledger, sessionsRoot) {
  */
 export function apply(ctx) {
   const ledger = Ledger.open()
+  // 必须先于监听器/投影注册，避免延迟历史修复期间的新调用仍使用旧默认谷价。
+  prepareDefaultPeakPrice(ledger)
   console.log(`[dsh-cost-meter] 已加载,账本:${ledger.path}`)
 
   // 卸载/退出前最终落盘。
@@ -2668,6 +2718,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 +2735,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/plan-billing.js

@@ -20,7 +20,7 @@
  * 全部为纯函数(可单测);持久化与网络在宿主侧(store.js / index.js)。
  */
 
-import { CODING_PLAN_PROVIDER_IDS } from './coding-plans.js'
+import { CODING_PLAN_PROVIDER_IDS, QWEN_TOKEN_PLAN_PROVIDER_IDS } from './coding-plans.js'
 import { canonModelId } from './pricing.js'
 
 /** Plan 统计支持的提供商 id:9 家 Coding Plan + OpenCode Go。 */
@@ -29,6 +29,7 @@ export const PLAN_PROVIDER_IDS = [...CODING_PLAN_PROVIDER_IDS, 'go']
 /** 请求 provider 名 → Plan 提供商 id 的别名归并(路由渠道 zen/opencode 都是 Go)。 */
 export const PLAN_PROVIDER_ALIASES = {
   go: ['go', 'zen', 'opencode', 'opencode-go'],
+  qwen: QWEN_TOKEN_PLAN_PROVIDER_IDS,
 }
 
 /** 各 Plan 提供商的默认计费类别(auto = 跟随该家启用开关)。 */
@@ -558,4 +559,3 @@ export function buildPlanStats({ days, hourBuckets, samples, codingPlans, goQuot
   collect('go', goQuota?.status, goQuota ?? undefined)
   return { generatedAt: now, providers }
 }
-

package/lib/pricing.js

@@ -372,7 +372,12 @@ export const DEFAULT_PRICE_TABLE = {
       peak: { cacheHit: 0.014, cacheMiss: 0.44, output: 1.32 },
     },
   },
-  default: { cacheHit: 0.007, cacheMiss: 0.22, output: 0.66 },
+  default: {
+    cacheHit: 0.007, cacheMiss: 0.22, output: 0.66,
+    offPeak: { cacheHit: 0.007, cacheMiss: 0.22, output: 0.66 },
+    peak: { cacheHit: 0.014, cacheMiss: 0.44, output: 1.32 },
+    legacyBase: { cacheHit: 0.0028, cacheMiss: 0.14, output: 0.28 },
+  },
 }
 
 /**
@@ -409,7 +414,23 @@ export const DEFAULT_PRICE_TABLE_CNY = {
       peak: { cacheHit: 0.10, cacheMiss: 3, output: 9 },
     },
   },
-  default: { cacheHit: 0.05, cacheMiss: 1.5, output: 4.5 },
+  default: {
+    cacheHit: 0.05, cacheMiss: 1.5, output: 4.5,
+    offPeak: { cacheHit: 0.05, cacheMiss: 1.5, output: 4.5 },
+    peak: { cacheHit: 0.10, cacheMiss: 3, output: 9 },
+    legacyBase: { cacheHit: 0.02, cacheMiss: 1, output: 2 },
+  },
+}
+
+/** 仅补齐旧内置/官方三桶默认价；自定义单价、已有档位和显式 flat 价保持原样。 */
+export function repairDefaultPeakPrice(prices) {
+  const current = prices?.default
+  const expected = (prices?.currency === 'CNY' ? DEFAULT_PRICE_TABLE_CNY : DEFAULT_PRICE_TABLE).default
+  const fields = ['cacheHit', 'cacheMiss', 'output']
+  if (!current || Object.keys(current).some(key => !fields.includes(key))
+    || !fields.every(key => current[key] === expected[key])) return false
+  prices.default = structuredClone(expected)
+  return true
 }
 
 /**
@@ -1106,7 +1127,6 @@ export function parsePricingHtml(html) {
 
   const currency = sawCny ? 'CNY' : 'USD'
   const models = {}
-  let firstOffPeak = null
   for (let k = 0; k < modelIds.length; k += 1) {
     const id = modelIds[k].toLowerCase()
     const off = {
@@ -1131,7 +1151,6 @@ export function parsePricingHtml(html) {
         output: pk.output ?? off.output,
       },
     }
-    if (firstOffPeak === null) firstOffPeak = off
     // 峰谷时代前的历史基础价(官方页面已不再列出,按历史公告数字附带;
     // 人民币页附带人民币基础价,与价表币种一致)。
     const legacy = (currency === 'CNY' ? LEGACY_BASE_PRICES_CNY : LEGACY_BASE_PRICES)[id]
@@ -1146,9 +1165,8 @@ export function parsePricingHtml(html) {
   }
   // 生效时间:页面已不再给出(两档方案即时生效)→ null。
   const effectiveAt = null
-  // 兜底价:取首个解析成功模型的空闲档三桶(与内置默认表的「default = flash
-  // 空闲档」语义一致;随价表币种同步,避免切换币种后 default 残留旧币种数字)。
-  const fallback = firstOffPeak === null ? undefined : { cacheHit: firstOffPeak.cacheHit, cacheMiss: firstOffPeak.cacheMiss, output: firstOffPeak.output }
+  // 默认回退沿用首个成功模型的完整档位；只复制谷价会让峰时费用少算一半。
+  const fallback = structuredClone(Object.values(models)[0])
   // 峰时段窗口。
   let peakWindows = null
   const plain = stripTags(html)

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,9 +996,20 @@ 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)) {
+    // 默认价卡片也是完整记录，清空某档位时不能被深合并复活。
+    const defaultPatch = patch.prices.default
+    if (defaultPatch && ['cacheHit', 'cacheMiss', 'output'].every(key => Object.hasOwn(defaultPatch, key))) {
+      candidate.prices.default = structuredClone(defaultPatch)
+    }
     if (patch.prices.models !== null && typeof patch.prices.models === 'object' && !Array.isArray(patch.prices.models)) {
       candidate.prices.models = patch.prices.models
     }
@@ -1092,9 +1109,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'))
@@ -1361,6 +1385,13 @@ export function sanitizeConfig(raw) {
   const base = defaultConfig()
   const cfg = raw !== null && typeof raw === 'object' && !Array.isArray(raw) ? raw : {}
   const out = mergeDeep(base, cfg)
+  // 新版默认价带峰谷档位；加载已有完整记录时保留用户省略/清空的档位。
+  // 旧官方默认价的补齐由带迁移标记的启动流程负责，避免每次加载覆盖自定义。
+  const storedDefault = cfg.prices?.default
+  if (storedDefault && typeof storedDefault === 'object' && !Array.isArray(storedDefault)) {
+    const { cacheHit, cacheMiss, output } = base.prices.default
+    out.prices.default = mergeDeep({ cacheHit, cacheMiss, output }, storedDefault)
+  }
   const isNum = v => typeof v === 'number' && Number.isFinite(v)
   const oneOf = (v, list, fallback) => (typeof v === 'string' && list.includes(v) ? v : fallback)
   // 顶层标量:类型不符回落默认。
@@ -1392,6 +1423,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.15",
   "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"
   }
 }