dsh-cost-meter 1.7.19 → 1.7.21

package/lib/store.js

@@ -136,6 +136,8 @@ export function defaultConfig() {
     hideOfficialBalance: false, // 隐藏官方账户余额(issue #45):开启后侧边栏/会话页/设置页的官方余额 UI 整体不渲染
     hideTodayCost: false, // 隐藏今日消耗金额(issue #46):开启后侧栏今日费用行/预算明细今日行/概览今日卡片不渲染
     showTotalWithPlan: false, // 「含 Plan 总额」全局开关(v1.6.0):开启后全部金额展示按总等值(cost)计;默认按真金白银(apiCost)
+    includeSubagentCost: false, // 本会话展示可合并连续子代理后代;不重复写入每日账本。
+    codexQuotaEnabled: false, // Codex 额度按需开启,避免未使用 Codex 时显示卡片或查询。
     sidebarSimple: false,
     sidebarSimplePromptSeen: false,
     sidebarStyle: 'standard', // 侧边栏进度条样式:standard(标准,纵向单列) | compact(紧凑,额度卡两列网格)
@@ -406,7 +408,9 @@ export function repairLedgerPricing(ledger) {
       const resolved = providerPriceEntryFor(provider, model, ledger.config.prices, priceOpts)
       if (!resolved.priced || resolved.entry === null) continue
       // 仅修复 flat 模型的误配，deepseek-peak 依赖峰时判定，近似 noon 易误伤
-      if (resolved.billingMode === 'deepseek-peak') continue
+      // 按单次请求上下文分档的模型不能用日聚合 token 猜档位;保留已记成本,
+      // 只允许完整请求日志回放重算,否则多次短请求合计会误套长上下文价格。
+      if (resolved.billingMode === 'deepseek-peak' || resolved.entry.longContext) continue
       const priced = costOf(tokens, resolved.entry, atMsSafe, { enabled: false })
       const newCost = usdFromCost(priced, 'USD', ledger.config.exchangeRate)
       const oldCost = Number(bucket.cost) || 0
@@ -446,7 +450,7 @@ export function repairLedgerPricing(ledger) {
           if ((tokens.input + tokens.output + tokens.cacheRead + tokens.cacheWrite + tokens.reasoning) === 0) continue
           const resolved = providerPriceEntryFor(provider, model, ledger.config.prices, priceOpts)
           if (!resolved.priced || resolved.entry === null) continue
-          if (resolved.billingMode === 'deepseek-peak') continue
+          if (resolved.billingMode === 'deepseek-peak' || resolved.entry.longContext) continue
           const priced = costOf(tokens, resolved.entry, sessAtMs, { enabled: false })
           const newCost = usdFromCost(priced, 'USD', ledger.config.exchangeRate)
           const oldCost = Number(bucket.cost) || 0
@@ -727,6 +731,8 @@ const VALIDATION_MESSAGES = {
     hideOfficialBalance: 'hideOfficialBalance 必须是布尔值',
     hideTodayCost: 'hideTodayCost 必须是布尔值',
     showTotalWithPlan: 'showTotalWithPlan 必须是布尔值',
+    includeSubagentCost: 'includeSubagentCost 必须是布尔值',
+    codexQuotaEnabled: 'codexQuotaEnabled 必须是布尔值',
     sidebarSimple: '简化显示设置必须是布尔值',
     sidebarStyle: 'sidebarStyle 必须是 standard / compact',
     peakStyle: 'peakStyle 必须是 compact / classic',
@@ -826,6 +832,8 @@ const VALIDATION_MESSAGES = {
     hideOfficialBalance: 'hideOfficialBalance must be a boolean',
     hideTodayCost: 'hideTodayCost must be a boolean',
     showTotalWithPlan: 'showTotalWithPlan must be a boolean',
+    includeSubagentCost: 'includeSubagentCost must be a boolean',
+    codexQuotaEnabled: 'codexQuotaEnabled must be a boolean',
     sidebarSimple: 'Simple display settings must be boolean',
     sidebarStyle: 'sidebarStyle must be standard / compact',
     peakStyle: 'peakStyle must be compact / classic',
@@ -1114,6 +1122,9 @@ 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'))
+  for (const field of ['includeSubagentCost', 'codexQuotaEnabled']) {
+    if (candidate[field] !== undefined && typeof candidate[field] !== 'boolean') errors.push(vmsg(locale, field))
+  }
   // 侧边栏进度条样式:standard(默认,纵向单列) | compact(额度卡两列网格)。
   for (const field of ['sidebarSimple', 'sidebarSimplePromptSeen']) {
     if (candidate[field] !== undefined && typeof candidate[field] !== 'boolean') errors.push(vmsg(locale, 'sidebarSimple'))
@@ -1440,6 +1451,8 @@ export function sanitizeConfig(raw) {
   out.hideOfficialBalance = out.hideOfficialBalance === true
   out.hideTodayCost = out.hideTodayCost === true
   out.showTotalWithPlan = out.showTotalWithPlan === true
+  out.includeSubagentCost = out.includeSubagentCost === true
+  out.codexQuotaEnabled = out.codexQuotaEnabled === true
   out.sidebarSimple = out.sidebarSimple === true
   out.sidebarSimplePromptSeen = out.sidebarSimplePromptSeen === true
   out.sidebarStyle = oneOf(out.sidebarStyle, ['standard', 'compact'], 'standard')

package/lib/typert.host.js

@@ -45,9 +45,26 @@ const topSessionsSchema = z.object({
   sessions: z.array(datedSessionSchema),
 })
 
+export const sessionCostSchema = z.object({
+  own: sessionSchema,
+  subagents: sessionSchema,
+  subagentCount: num,
+  found: z.boolean(),
+})
+
+const longContextSchema = z.object({
+  aboveInputTokens: z.number().positive(),
+  cacheHit: z.number().nonnegative(),
+  cacheMiss: z.number().nonnegative(),
+  cacheWrite: z.number().nonnegative().optional(),
+  output: z.number().nonnegative(),
+  reasoning: z.number().nonnegative().optional(),
+})
+
 const priceTierSchema = z.object({
   cacheHit: num,
   cacheMiss: num,
+  cacheWrite: z.number().nonnegative().optional(),
   output: num,
   reasoning: num.optional(),
 })
@@ -62,7 +79,8 @@ const providerPriceSchema = z.object({
   input: num.optional(),
   cachedInput: num.optional(),
   cacheRead: num.optional(),
-  cacheWrite: num.optional(),
+  cacheWrite: z.number().nonnegative().optional(),
+  longContext: longContextSchema.optional(),
   cacheCreation5m: num.optional(),
   cacheCreation1h: num.optional(),
   output: num.optional(),
@@ -88,6 +106,8 @@ const catalogEntrySchema = providerPriceSchema.extend({
 const priceSchema = z.object({
   cacheHit: num,
   cacheMiss: num,
+  cacheWrite: z.number().nonnegative().optional(),
+  longContext: longContextSchema.optional(),
   output: num,
   reasoning: num.optional(),
   billingMode: z.enum(['flat', 'deepseek-peak', 'batch']).optional(),
@@ -127,6 +147,8 @@ const configSchema = z.object({
   hideTodayCost: z.boolean().optional(),
   // 「含 Plan 总额」全局开关(v1.6.0):开启后全部金额展示按总等值(cost)计。
   showTotalWithPlan: z.boolean().optional(),
+  includeSubagentCost: z.boolean().optional(),
+  codexQuotaEnabled: z.boolean().optional(),
   sidebarSimple: z.boolean().optional(),
   sidebarSimplePromptSeen: z.boolean().optional(),
   sidebarStyle: z.enum(['standard', 'compact']).optional(),
@@ -475,6 +497,8 @@ const _topSessions$codec = { mode: 'strict', typeSymbol: 'dsh-cost-meter#TopSess
 const _limit$codec = { mode: 'strict', typeSymbol: 'dsh-cost-meter#SessionLimit', schema: num }
 const _sort$codec = { mode: 'strict', typeSymbol: 'dsh-cost-meter#SessionSort', schema: z.string() }
 const _dir$codec = { mode: 'strict', typeSymbol: 'dsh-cost-meter#SessionSortDir', schema: z.string() }
+const _sessionId$codec = { mode: 'strict', typeSymbol: 'dsh-cost-meter#SessionId', schema: z.string().min(1).max(512) }
+const _sessionCost$codec = { mode: 'strict', typeSymbol: 'dsh-cost-meter#SessionCost', schema: sessionCostSchema }
 
 export const TYPERT = {
   package: 'dsh-cost-meter',
@@ -616,6 +640,15 @@ export const TYPERT = {
       ],
       result: _topSessions$codec,
     },
+    {
+      id: 'dsh-cost-meter#costMeter/getSessionCost',
+      service: 'costMeter',
+      namespace: 'costMeter',
+      method: 'getSessionCost',
+      invocation: { kind: 'direct' },
+      parameters: [{ name: 'sessionId', wire: 'sessionId', source: 'json', codec: _sessionId$codec }],
+      result: _sessionCost$codec,
+    },
     {
       // 写入一枚密钥到 DSH 凭据库(v1.6.8):密钥不再经 updateConfig 传递,值只进凭据库。
       id: 'dsh-cost-meter#costMeter/setCredential',
@@ -729,6 +762,13 @@ export const TYPERT = {
             summary: '跨全部日期按指定排序返回前 N 个会话(不分日期视角)。Return the top N sessions across all days with the given sort.',
             jsDoc: '/**\n * 跨全部日期返回前 N 个会话(每条带所属日期/标题/创建时刻)。\n * @param limit - 返回条数上限(服务端限制 1-500)。\n * @param sort - cost(费用) | time(创建时间) | recent(实时顺序)。\n * @param dir - asc | desc(默认 desc)。\n * @returns 会话列表(含 date/title/at 字段)。\n * Return the top N sessions across all days (each tagged with date/title/createdAt).\n * @param limit - Max rows to return (server clamps to 1-500).\n * @param sort - cost | time | recent (ledger/sidebar order).\n * @param dir - asc | desc (defaults to desc).\n * @returns Session list with date/title/at fields.\n */',
           },
+          {
+            kind: 'method',
+            name: 'getSessionCost',
+            signature: 'getSessionCost(sessionId: string): SessionCost',
+            summary: '读取本会话跨日期账本及可选的子代理费用汇总。Read a session ledger and optional descendant costs.',
+            jsDoc: '/** 只读会话费用;后代合计不改变每日账本。Read-only cost summary; descendant costs never rewrite daily totals. */',
+          },
           {
             kind: 'method',
             name: 'setCredential',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cost-meter",
-  "version": "1.7.19",
+  "version": "1.7.21",
   "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",