dsh-cost-meter 1.7.47 → 1.7.49

package/lib/index.js

@@ -37,6 +37,7 @@ import { readExternalUsageSnapshot, externalTodayCostForReconcile } from './exte
 import { queryQwenCli } from './qwen-cli.js'
 import { queryBailianCli } from './bailian-cli.js'
 import { getSessionCost as readSessionCost } from './session-tree.js'
+import { getTurnCost } from './turn-cost.js'
 
 export const name = 'cost-meter'
 
@@ -2391,6 +2392,9 @@ function createService(ctx, ledger, openRouterPrices) {
     async getSessionCost(sessionId) {
       return readSessionCost(ledger, ctx, sessionId)
     },
+    async getTurnCost(sessionId, startSeq, endSeq) {
+      return getTurnCost(ledger, ctx, sessionId, startSeq, endSeq)
+    },
     async getTopSessions(limit, sort = 'cost', dir = 'desc') {
       const n = Math.max(1, Math.min(500, Math.floor(Number(limit)) || 100))
       const sortKey = sort === 'time' || sort === 'recent' ? sort : 'cost'

package/lib/native-search-billing.js

@@ -72,6 +72,7 @@ function parseBody(request) {
  */
 export function createNativeSearchBilling({ account, record = () => {}, uncovered = () => {}, now = Date.now, targetRequest = officialRequest, diagnostics = channel }) {
   const scope = new AsyncLocalStorage()
+  const searchSignal = new AsyncLocalStorage()
   const requests = new WeakMap()
   const pending = new Set()
   const subscriptions = []
@@ -98,6 +99,7 @@ export function createNativeSearchBilling({ account, record = () => {}, uncovere
     item.chunks.push(Buffer.from(chunk))
   }
   const release = (request, item) => {
+    clearTimeout(item.timer)
     item.chunks = []
     try { item.restore?.() } catch {}
     item.restore = undefined
@@ -106,13 +108,23 @@ export function createNativeSearchBilling({ account, record = () => {}, uncovere
     requests.delete(request)
   }
   subscribe('create', ({ request }) => {
-    const current = scope.getStore()
-    if (!current || !targetRequest(request)) return
+    if (!targetRequest(request)) return
+    const signal = searchSignal.getStore()
+    const scoped = scope.getStore()
+    const current = scoped ?? (signal?.pending && now() - signal.at < 60_000 ? signal : null)
+    if (!current) return
+    if (signal) signal.pending = false
     const item = { session: current.session, startedAtMs: now(), requestId: randomUUID(), bytes: 0, chunks: [], encoding: '', status: 0, done: false }
     requests.set(request, item)
     current.requests.push(item)
     pending.add(item)
     item.release = () => release(request, item)
+    if (!scoped) {
+      item.timer = setTimeout(() => {
+        item.done = true; miss(item, 'response-incomplete'); release(request, item)
+      }, 60_000)
+      item.timer.unref?.()
+    }
     // Node 20/22 的 undici 6 尚无响应 body 诊断通道。只观察这一请求的
     // onData，不更换 dispatcher/fetch；保留 this/返回值，并在结束/卸载时恢复。
     // 这是有能力检测的旧运行时兼容层；宿主更换网络实现后退回缺口提示。
@@ -169,6 +181,18 @@ export function createNativeSearchBilling({ account, record = () => {}, uncovere
     release(request, item)
   })
   return {
+    // The host publishes this exact event immediately before native search
+    // dispatch. It gives the request its own session boundary even when another
+    // plugin replaces web.search or the tool invokes a previously saved method.
+    signal(session, event) {
+      if (!active) return
+      if (event?.type === 'web/deepseek-search-llm-request') {
+        searchSignal.enterWith({ session, at: now(), pending: event.data?.endpoint === 'https://api.deepseek.com/anthropic/v1/messages', requests: [] })
+      } else if (['tool/result', 'turn/end', 'step/end'].includes(event?.type)) {
+        const current = searchSignal.getStore()
+        if (current?.session?.id === session?.id) current.pending = false
+      }
+    },
     async run(operation, session) {
       if (!active || scope.getStore()) return operation()
       const current = { session, requests: [] }
@@ -189,6 +213,7 @@ export function createNativeSearchBilling({ account, record = () => {}, uncovere
       for (const item of pending) { item.done = true; item.release() }
       pending.clear()
       scope.disable()
+      searchSignal.disable()
     },
   }
 }
@@ -252,6 +277,7 @@ export function installNativeSearchBilling(ctx, ledger) {
     uncovered: (event) => coverage.add(event),
   })
   monitors.set(ledger, { coverage })
+  ctx.on?.('session/event', (session, event) => monitor.signal(session, event), { global: true })
   const observations = new Map()
   const observe = (service, webCtx = ctx) => {
     if (!service) return

package/lib/store.js

@@ -143,6 +143,7 @@ export function defaultConfig() {
     showTotalWithPlan: false, // 「含 Plan 总额」全局开关(v1.6.0):开启后全部金额展示按总等值(cost)计;默认按真金白银(apiCost)
     includeSubagentCost: false, // 本会话展示可合并连续子代理后代;不重复写入每日账本。
     codexQuotaEnabled: false, // Codex 额度按需开启,避免未使用 Codex 时显示卡片或查询。
+    codexQuotaSidebar: true, // 独立控制侧栏卡片，保留会话额度条。
     sidebarSimple: false,
     sidebarSimplePromptSeen: false,
     sidebarModels: { enabled: false, period: 'today', topN: 5, summary: 'total', position: 'last', defaultOpen: false, remember: true, tokens: false, shares: true, refreshSeconds: 60, dock: false },
@@ -740,6 +741,7 @@ const VALIDATION_MESSAGES = {
     showTotalWithPlan: 'showTotalWithPlan 必须是布尔值',
     includeSubagentCost: 'includeSubagentCost 必须是布尔值',
     codexQuotaEnabled: 'codexQuotaEnabled 必须是布尔值',
+    codexQuotaSidebar: 'codexQuotaSidebar 必须是布尔值',
     sidebarSimple: '简化显示设置必须是布尔值',
     sidebarModels: '模型花费卡片设置无效：Top-N 为 1–10，刷新间隔为 10–60 秒',
     sidebarStyle: 'sidebarStyle 必须是 standard / compact',
@@ -844,6 +846,7 @@ const VALIDATION_MESSAGES = {
     showTotalWithPlan: 'showTotalWithPlan must be a boolean',
     includeSubagentCost: 'includeSubagentCost must be a boolean',
     codexQuotaEnabled: 'codexQuotaEnabled must be a boolean',
+    codexQuotaSidebar: 'codexQuotaSidebar must be a boolean',
     sidebarSimple: 'Simple display settings must be boolean',
     sidebarModels: 'Invalid model cost card settings: Top-N must be 1–10 and refresh interval 10–60 seconds',
     sidebarStyle: 'sidebarStyle must be standard / compact',
@@ -1142,7 +1145,7 @@ export function applyConfigPatch(current, rawPatch) {
   if (candidate.sidebarTodayMetric !== undefined && !['cost', 'tokens'].includes(candidate.sidebarTodayMetric)) errors.push('sidebarTodayMetric must be cost or tokens')
   // 「含 Plan 总额」全局开关(v1.6.0):布尔,可缺省(默认关)。
   if (candidate.showTotalWithPlan !== undefined && typeof candidate.showTotalWithPlan !== 'boolean') errors.push(vmsg(locale, 'showTotalWithPlan'))
-  for (const field of ['includeSubagentCost', 'codexQuotaEnabled']) {
+  for (const field of ['includeSubagentCost', 'codexQuotaEnabled', 'codexQuotaSidebar']) {
     if (candidate[field] !== undefined && typeof candidate[field] !== 'boolean') errors.push(vmsg(locale, field))
   }
   // 侧边栏进度条样式:standard(默认,纵向单列) | compact(额度卡两列网格)。
@@ -1480,6 +1483,7 @@ export function sanitizeConfig(raw) {
   out.showTotalWithPlan = out.showTotalWithPlan === true
   out.includeSubagentCost = out.includeSubagentCost === true
   out.codexQuotaEnabled = out.codexQuotaEnabled === true
+  out.codexQuotaSidebar = out.codexQuotaSidebar !== false
   out.sidebarSimple = out.sidebarSimple === true
   out.sidebarSimplePromptSeen = out.sidebarSimplePromptSeen === true
   out.sidebarModels = Object.fromEntries(Object.entries(base.sidebarModels).map(([k, fallback]) => {

package/lib/turn-cost.js

@@ -0,0 +1,71 @@
+import { statSync } from 'node:fs'
+import { join } from 'node:path'
+import { resolveDshHome } from '@deepseek-ai/dsh-home-paths'
+import { listSessionLogs, iterateSessionRecords, replaySessionRecords } from './backfill.js'
+import { nativeSearchRecordsFor } from './native-search-history.js'
+import { tierFor, usdFromCost } from './pricing.js'
+
+const cache = new Map()
+const fields = { input: 'cacheMiss', output: 'output', cacheRead: 'cacheHit', cacheWrite: 'cacheWrite', reasoning: 'reasoning' }
+const emptyTurn = () => ({ found: false, cost: 0, apiCost: 0, rows: [], calls: [] })
+export function turnCostFromRecords(records, config, startSeq, endSeq, native = []) {
+  const start = records.find(row => row.seq === startSeq && row.type === 'turn/start')
+  const end = records.find(row => row.seq === endSeq && row.type === 'turn/end')
+  if (!start || !end || endSeq < startSeq || start.data?.turn !== end.data?.turn) return emptyTurn()
+  const headers = records.filter(row => row.type === 'request/header' && row.seq < startSeq).slice(-1)
+  const selected = [...headers, ...records.filter(row => row.seq >= startSeq && row.seq <= endSeq),
+    ...native.filter(row => row.data.startedAtMs >= start.time && row.data.startedAtMs <= end.time)]
+  const { samples } = replaySessionRecords(selected, config, null, true)
+  const parts = new Map()
+  const calls = []
+  for (const sample of samples) {
+    let tier = tierFor(sample.resolved.entry, sample.atMs, sample.peak)
+    const longContext = !!tier.longContext && sample.buckets.input + sample.buckets.cacheRead + sample.buckets.cacheWrite > tier.longContext.aboveInputTokens
+    if (longContext) tier = tier.longContext
+    const call = { kind: sample.kind, provider: sample.provider, model: sample.model, atMs: sample.atMs, cost: sample.cost, apiCost: sample.apiCost, plan: sample.plan, priced: sample.resolved.priced, longContext, rows: [] }
+    for (const [bucket, priceKey] of Object.entries(fields)) {
+      const tokens = sample.buckets[bucket]
+      if (!tokens) continue
+      const rate = sample.resolved.priced ? usdFromCost(tier[priceKey] ?? (bucket === 'cacheWrite' ? tier.cacheHit : 0), sample.resolved.currency, config.exchangeRate) : 0
+      const plan = sample.plan
+      call.rows.push({ provider: sample.provider, model: sample.model, bucket, tokens, rate, cost: tokens * rate / 1e6, priced: sample.resolved.priced, plan })
+      const key = JSON.stringify([sample.provider, sample.model, bucket, rate, plan, sample.resolved.priced])
+      const row = parts.get(key) ?? { provider: sample.provider, model: sample.model, bucket, tokens: 0, rate, cost: 0, priced: sample.resolved.priced, plan }
+      row.tokens += tokens; row.cost += tokens * rate / 1e6
+      parts.set(key, row)
+    }
+    calls.push(call)
+  }
+  calls.sort((a, b) => a.atMs - b.atMs)
+  return { found: samples.length > 0, cost: samples.reduce((n, row) => n + row.cost, 0), apiCost: samples.reduce((n, row) => n + row.apiCost, 0), rows: [...parts.values()], calls }
+}
+
+export async function getTurnCost(ledger, ctx, sessionId, startSeq, endSeq) {
+  if (typeof sessionId !== 'string' || !sessionId || sessionId.length > 512 || ![startSeq, endSeq].every(n => Number.isSafeInteger(n) && n >= 0) || endSeq < startSeq) throw new Error('invalid turn identity')
+  const live = ctx?.get?.('sessions')?.get?.(sessionId)?.snapshotEvents?.()
+  if (Array.isArray(live)) return turnCostFromRecords(live, ledger.config, startSeq, endSeq, await nativeSearchRecordsFor(ledger.path, sessionId))
+  const paths = listSessionLogs(join(resolveDshHome(), 'sessions'), new Set([sessionId]))
+  if (!paths.length) return emptyTurn()
+  const path = paths[0], info = statSync(path)
+  const key = `${path}:${info.size}:${info.mtimeMs}`
+  let pending = cache.get(key)
+  if (!pending) {
+    pending = (async () => {
+      const rows = []
+      for await (const row of iterateSessionRecords(path)) {
+        if (row.type === 'request/header') rows.push({ type: row.type, seq: row.seq, time: row.time, data: { header: { config: { model: row.data?.header?.config?.model, provider: row.data?.header?.config?.provider } } } })
+        else if (['turn/start', 'turn/end', 'compaction/summary', 'assistant/message'].includes(row.type) || row.type === 'assistant/chunk' && row.data?.chunk?.type === 'usage') {
+          rows.push({ type: row.type, seq: row.seq, time: row.time, data: { turn: row.data?.turn, step: row.data?.step, provider: row.data?.provider, model: row.data?.model,
+            usage: row.data?.usage, message: { source: row.data?.message?.source }, chunk: row.data?.chunk?.type === 'usage' ? row.data.chunk : undefined } })
+        }
+        if (rows.length > 200_000) throw new Error('Session usage history exceeds the turn detail limit')
+      }
+      return rows
+    })()
+    cache.set(key, pending)
+    if (cache.size > 16) cache.delete(cache.keys().next().value)
+    pending.catch(() => cache.delete(key))
+  }
+  const records = await pending
+  return turnCostFromRecords(records, ledger.config, startSeq, endSeq, await nativeSearchRecordsFor(ledger.path, sessionId))
+}

package/lib/typert.host.js

@@ -59,6 +59,12 @@ export const sessionCostSchema = z.object({
   subagentCount: num,
   found: z.boolean(),
 })
+const turnCostRowSchema = z.object({ provider: z.string(), model: z.string(), bucket: z.string(), tokens: num, rate: num, cost: num, priced: z.boolean(), plan: z.boolean() })
+export const turnCostSchema = z.object({
+  found: z.boolean(), cost: num, apiCost: num,
+  rows: z.array(turnCostRowSchema),
+  calls: z.array(z.object({ kind: z.string(), provider: z.string(), model: z.string(), atMs: num, cost: num, apiCost: num, plan: z.boolean(), priced: z.boolean(), longContext: z.boolean(), rows: z.array(turnCostRowSchema) })),
+})
 
 const longContextSchema = z.object({
   aboveInputTokens: z.number().positive(),
@@ -160,6 +166,7 @@ const configSchema = z.object({
   showTotalWithPlan: z.boolean().optional(),
   includeSubagentCost: z.boolean().optional(),
   codexQuotaEnabled: z.boolean().optional(),
+  codexQuotaSidebar: z.boolean().optional(),
   sidebarSimple: z.boolean().optional(),
   sidebarSimplePromptSeen: z.boolean().optional(),
   sidebarModels: z.object({ enabled: z.boolean(), period: z.enum(['today', 'history']), topN: z.number().int().min(1).max(10), summary: z.enum(['total', 'top']), position: z.enum(['first', 'afterBalance', 'last']), defaultOpen: z.boolean(), remember: z.boolean(), tokens: z.boolean(), shares: z.boolean(), refreshSeconds: z.number().int().min(10).max(60), dock: z.boolean() }).strict().optional(),
@@ -523,6 +530,8 @@ const _sort$codec = strictCodec('SessionSort', z.string())
 const _dir$codec = strictCodec('SessionSortDir', z.string())
 const _sessionId$codec = strictCodec('SessionId', z.string().min(1).max(512))
 const _sessionCost$codec = strictCodec('SessionCost', sessionCostSchema)
+const _turnCost$codec = strictCodec('TurnCost', turnCostSchema)
+const _turnSeq$codec = strictCodec('TurnSeq', z.number().int().nonnegative())
 
 export const TYPERT = {
   package: 'dsh-cost-meter',
@@ -673,6 +682,12 @@ export const TYPERT = {
       parameters: [{ name: 'sessionId', wire: 'sessionId', source: 'json', codec: _sessionId$codec }],
       result: _sessionCost$codec,
     },
+    {
+      id: 'dsh-cost-meter#costMeter/getTurnCost', service: 'costMeter', namespace: 'costMeter', method: 'getTurnCost',
+      invocation: { kind: 'direct' },
+      parameters: [{ name: 'sessionId', wire: 'sessionId', source: 'json', codec: _sessionId$codec }, { name: 'startSeq', wire: 'startSeq', source: 'json', codec: _turnSeq$codec }, { name: 'endSeq', wire: 'endSeq', source: 'json', codec: _turnSeq$codec }],
+      result: _turnCost$codec,
+    },
     {
       // 写入一枚密钥到 DSH 凭据库(v1.6.8):密钥不再经 updateConfig 传递,值只进凭据库。
       id: 'dsh-cost-meter#costMeter/setCredential',
@@ -786,6 +801,12 @@ 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: 'getTurnCost',
+            signature: 'getTurnCost(sessionId: string, startSeq: number, endSeq: number): TurnCost',
+            summary: '读取已完成轮次的分项用量与估算费用。Read recorded usage and estimated costs for a completed turn.',
+          },
           {
             kind: 'method',
             name: 'getSessionCost',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cost-meter",
-  "version": "1.7.47",
+  "version": "1.7.49",
   "description": "DeepSeek Harness 会话费用统计插件:本会话成本、当日费用、历史记录与官方价格同步,支持多厂商多模型价格计费(内置 90+ 模型价格目录与自动匹配)、主流 Coding Plan 订阅额度查询与显示(11 家,含小米 MiMo Token Plan 控制台 Cookie 查询、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 11 vendors (incl. Xiaomi MiMo Token Plan via console cookie, 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",
@@ -37,7 +37,8 @@
         "0.1.3-alpha.1": "unknown",
         "0.1.3-alpha.2": "compatible",
         "0.1.5-alpha.1": "compatible",
-        "0.2.0-rc.1": "compatible"
+        "0.2.0-rc.1": "compatible",
+        "0.2.0-rc.2": "compatible"
       }
     }
   },