@feiyang666/dsh-usage-plugin 1.13.1 → 1.14.1

package/lib/index.js

@@ -26,6 +26,22 @@ import {
   resolveBalanceEndpoint
 } from './balance.js'
 
+// 周末统一按空闲价计费规则生效时间：北京时间 2026-08-23 00:00（周日）。
+// 生效前（含周末）仍按原峰谷分段计费；生效后周末（周六、周日）全天统一按空闲价，工作日仍按峰谷分段。
+export const WEEKEND_FLAT_AT = Date.parse('2026-08-23T00:00:00+08:00')
+
+// 高峰时段判定：新规则（2026-08-23 起）周末（周六、周日）全天不再区分峰谷，统一按空闲价；
+// 工作日仍按北京时间 9:00–12:00、14:00–18:00 为高峰；新规则生效前的调用仍按原规则判定。
+// 星期取自平移后的北京时间（ts + 8h），避免 UTC 日历与北京日历在 16:00–24:00 UTC 段错位。
+// 导出为独立函数，供 test/period.test.js 做回归测试（issue #9）。
+export function isPeakAt(ts) {
+  const d = new Date(ts + 8 * 3600 * 1000)
+  const wd = d.getUTCDay() // 0=周日 1=周一 … 6=周六
+  if (ts >= WEEKEND_FLAT_AT && (wd === 0 || wd === 6)) return false
+  const t = d.getUTCHours() * 60 + d.getUTCMinutes()
+  return (t >= 9 * 60 && t < 12 * 60) || (t >= 14 * 60 && t < 18 * 60)
+}
+
 export default {
   inject: ['fs', 'webServer', 'subprocess', 'credentials', 'settings', 'sandboxPolicy', 'agents'],
   apply(ctx) {
@@ -86,9 +102,9 @@ export default {
       // 新价格表（峰谷价）生效时间：北京时间 2026-08-17 00:00。
       // 在此之前的调用按旧价格表（基础价 base）计费；之后按新价格表（峰谷价）计费。
       const EFFECTIVE_AT = Date.parse('2026-08-17T00:00:00+08:00')
-      // 周末统一按低谷（空闲）价计费规则生效时间：北京时间 2026-08-23 00:00（周日）。
-      // 生效前（含周末）仍按原峰谷分段计费；生效后周末（周六、周日）全天统一按空闲价，工作日仍按峰谷分段。
-      const WEEKEND_FLAT_AT = Date.parse('2026-08-23T00:00:00+08:00')
+
+      // 高峰/空闲判定使用模块级 isPeakAt（含周末规则与生效时间保护；实现见文件顶部导出，供回归测试）
+      const isPeak = isPeakAt
 
       function modelKey(model) {
         const m = String(model || '').toLowerCase()
@@ -98,16 +114,6 @@ export default {
         return 'unknown'
       }
 
-      // 高峰时段判定：新规则（2026-08-23 起）周末（周六、周日）全天不再区分峰谷，统一按空闲价；
-      // 工作日仍按北京时间 9:00–12:00、14:00–18:00 为高峰；新规则生效前的调用仍按原规则判定。
-      function isPeak(ts) {
-        const d = new Date(ts + 8 * 3600 * 1000)
-        const wd = d.getUTCDay() // 0=周日 1=周一 … 6=周六
-        if (ts >= WEEKEND_FLAT_AT && (wd === 0 || wd === 6)) return false
-        const t = d.getUTCHours() * 60 + d.getUTCMinutes()
-        return (t >= 9 * 60 && t < 12 * 60) || (t >= 14 * 60 && t < 18 * 60)
-      }
-
       // Third-party providers are priced only when a verified provider/model
       // mapping exists. Unknown mappings deliberately remain zero rather than
       // inheriting DeepSeek prices from a similar model name.
@@ -161,6 +167,52 @@ export default {
         return (hit * p.cacheHit + miss * p.cacheMiss + out * p.output) / 1e6
       }
 
+      // 过滤内部/占位调用（如 harness 内部 dsh2shell-* + model "fake"）：
+      // 这些不是用户调用的 API 服务商，不出现在用量明细 / 消耗明细 / 日历统计里。
+      function isRealCall(rec) {
+        const model = String(rec.model || '').trim().toLowerCase()
+        const provider = String(rec.provider || '').trim().toLowerCase()
+        if (!model || model === 'fake' || model === 'unknown') return false
+        if (!provider || provider === 'unknown') return false
+        // 内部 agent/工具路由（dsh2shell-* 等）不计入用户可见明细
+        if (provider.indexOf('dsh') === 0) return false
+        return true
+      }
+
+      // 把一条记录投影为 API 响应形状（供 list / tokenForMessage 共用，含成本与峰谷判定）。
+      function projectRecord(r) {
+        return {
+          time: r.time, model: r.model, provider: r.provider, purpose: r.purpose, sessionId: r.sessionId || '',
+          inputTokens: r.inputTokens, outputTokens: r.outputTokens,
+          cacheReadTokens: r.cacheReadTokens, cacheWriteTokens: r.cacheWriteTokens,
+          reasoningTokens: r.reasoningTokens, finishReason: r.finishReason,
+          interrupted: !!r.interrupted,
+          usdCnyRate: r.usdCnyRate || 0, fxDate: r.fxDate || '',
+          modelKey: modelKey(r.model),
+          baseCost: costFor(r, 'base'), peakValleyCost: costFor(r, 'peakValley'), autoCost: costFor(r, 'auto'),
+          peak: isPeak(r.time)
+        }
+      }
+
+      // 对已投影的记录做聚合（对话累计 / 本轮明细共用）。
+      function computeAgg(items) {
+        const agg = { calls: items.length, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, reasoning: 0, peakCost: 0, offCost: 0, baseCost: 0, totalCost: 0, hitRate: 0 }
+        let firstTime = 0, lastTime = 0
+        for (const it of items) {
+          agg.input += it.inputTokens; agg.output += it.outputTokens
+          agg.cacheRead += it.cacheReadTokens; agg.cacheWrite += it.cacheWriteTokens
+          agg.reasoning += it.reasoningTokens
+          if (it.peak) agg.peakCost += it.peakValleyCost; else agg.offCost += it.peakValleyCost
+          agg.baseCost += it.baseCost; agg.totalCost += it.autoCost
+          if (!firstTime || it.time < firstTime) firstTime = it.time
+          if (it.time > lastTime) lastTime = it.time
+        }
+        const denom = agg.cacheRead + agg.input
+        agg.hitRate = denom > 0 ? (agg.cacheRead / denom * 100) : 0
+        agg.time = { start: firstTime, end: lastTime }
+        return agg
+      }
+
       const msg = (e) => String((e && e.message) || e)
       const fail = (message) => ({ ok: false, error: message })
       const pad2 = (n) => (n < 10 ? '0' : '') + n
@@ -203,6 +255,7 @@ export default {
       function buildDays() {
         const map = {}
         for (const r of records) {
+          if (!isRealCall(r)) continue;
           const key = bjKey(r.time)
           let d = map[key]
           if (!d) {
@@ -341,12 +394,14 @@ export default {
           model: String(raw.model || ''),
           provider: String(raw.provider || ''),
           purpose: String(raw.purpose || ''),
+          sessionId: String(raw.sessionId || ''),
           inputTokens: toNum(raw.inputTokens),
           outputTokens: toNum(raw.outputTokens),
           cacheReadTokens: toNum(raw.cacheReadTokens),
           cacheWriteTokens: toNum(raw.cacheWriteTokens),
           reasoningTokens: toNum(raw.reasoningTokens),
           finishReason: String(raw.finishReason || ''),
+          interrupted: !!raw.interrupted,
           usdCnyRate: toNum(raw.usdCnyRate),
           fxDate: String(raw.fxDate || '')
         }
@@ -489,6 +544,7 @@ export default {
           const model = (options && options.model) || ''
           const provider = (options && options.provider) || ''
           const purpose = options && options.purpose ? String(options.purpose) : ''
+          let sessionId = options && options.sessionId ? String(options.sessionId) : ''
           const startedAt = Date.now()
           let usage = null
           let finishReason = ''
@@ -505,10 +561,14 @@ export default {
                 yield chunk
               }
             } finally {
+              if (!sessionId) {
+                try { const ag = currentAgent(); if (ag && ag.session && ag.session.id) sessionId = String(ag.session.id) } catch (e) {}
+              }
+              if (provider === 'digital-ocean' || provider === 'digitalocean') {
+                try { await refreshFxRate(false) } catch (e) {}
+              }
+              const isDO = provider === 'digital-ocean' || provider === 'digitalocean'
               if (usage) {
-                if (provider === 'digital-ocean' || provider === 'digitalocean') {
-                  try { await refreshFxRate(false) } catch (e) {}
-                }
                 // 兼容性：DeepSeek 系 provider 的 usage 不单独上报 cacheWriteTokens
                 // （缓存写入发生在未命中时，即 cacheWriteTokens == inputTokens）。
                 // 当上游未提供该字段时，用未命中 token 数（inputTokens）兜底，避免
@@ -519,26 +579,49 @@ export default {
                   model,
                   provider,
                   purpose,
+                  sessionId,
                   inputTokens: usage.inputTokens || 0,
                   outputTokens: usage.outputTokens || 0,
                   cacheReadTokens: usage.cacheReadTokens || 0,
                   cacheWriteTokens: cacheWrite,
                   reasoningTokens: usage.reasoningTokens || 0,
                   finishReason,
-                  usdCnyRate: (provider === 'digital-ocean' || provider === 'digitalocean') ? (FX.rate || 0) : 0,
-                  fxDate: (provider === 'digital-ocean' || provider === 'digitalocean') ? (FX.date || '') : ''
+                  usdCnyRate: isDO ? (FX.rate || 0) : 0,
+                  fxDate: isDO ? (FX.date || '') : ''
+                })
+              } else if (isRealCall({ model, provider, time: startedAt })) {
+                // 兜底：harness 在流被中断（aborted / error / timeout）时不会产出
+                // usage chunk（usage 只在收到 [DONE] 哨兵后才由 adapter yield），
+                // 但官方后台仍会按该次请求的实际 token 计费。这里补记一条 0-token
+                // 的「中断调用」，使调用次数与官方口径对齐；token 与费用均为 0，
+                // 不会虚增消耗。interrupted 标记供客户端 UI 区分展示。
+                records.push({
+                  time: startedAt,
+                  model,
+                  provider,
+                  purpose,
+                  sessionId,
+                  inputTokens: 0,
+                  outputTokens: 0,
+                  cacheReadTokens: 0,
+                  cacheWriteTokens: 0,
+                  reasoningTokens: 0,
+                  finishReason: finishReason || 'aborted',
+                  interrupted: true,
+                  usdCnyRate: 0,
+                  fxDate: ''
                 })
-                if (records.length > MAX_RECORDS) records.splice(0, records.length - MAX_RECORDS)
-                try {
-                  const agent = currentAgent()
-                  const sp = ctx.get('sandboxPolicy')
-                  if (sp && typeof sp.resolve === 'function' && agent && agent.session) {
-                    const policy = sp.resolve({ session: agent.session })
-                    if (policy && policy.workspaceRoot) cachedPolicy = policy
-                  }
-                } catch (e) {}
-                ensureSessionRoot().then(persistNow).catch(() => {})
               }
+              if (records.length > MAX_RECORDS) records.splice(0, records.length - MAX_RECORDS)
+              try {
+                const agent = currentAgent()
+                const sp = ctx.get('sandboxPolicy')
+                if (sp && typeof sp.resolve === 'function' && agent && agent.session) {
+                  const policy = sp.resolve({ session: agent.session })
+                  if (policy && policy.workspaceRoot) cachedPolicy = policy
+                }
+              } catch (e) {}
+              ensureSessionRoot().then(persistNow).catch(() => {})
             }
           }
 
@@ -1129,17 +1212,23 @@ export default {
         switch (action) {
           case 'list': {
             try { await refreshFxRate(false) } catch (e) {}
-            const items = records.map((r) => ({
-              time: r.time, model: r.model, provider: r.provider, purpose: r.purpose,
-              inputTokens: r.inputTokens, outputTokens: r.outputTokens,
-              cacheReadTokens: r.cacheReadTokens, cacheWriteTokens: r.cacheWriteTokens,
-              reasoningTokens: r.reasoningTokens, finishReason: r.finishReason,
-              usdCnyRate: r.usdCnyRate || 0, fxDate: r.fxDate || '',
-              modelKey: modelKey(r.model),
-              baseCost: costFor(r, 'base'), peakValleyCost: costFor(r, 'peakValley'), autoCost: costFor(r, 'auto'),
-              peak: isPeak(r.time)
-            }))
-            return { ok: true, records: items, count: items.length, dataPath, persistOk, persistError, pricing: PRICING, effectiveAt: EFFECTIVE_AT, days: buildDays(), fx: FX }
+            const items = records.filter(isRealCall).map(projectRecord)
+            const toolItems = records.filter((r) => !isRealCall(r)).map(projectRecord)
+            return { ok: true, records: items, count: items.length, toolCalls: toolItems, dataPath, persistOk, persistError, pricing: PRICING, effectiveAt: EFFECTIVE_AT, days: buildDays(), fx: FX }
+          }
+          case 'tokenForMessage': {
+            // 消息底部弹窗：分两层统计——整场对话累计（conversation）+ 本轮明细（aggregate/records）。
+            const sid = body && body.sessionId ? String(body.sessionId) : ''
+            const from = Number(body && body.from) || 0
+            const to = Number(body && body.to) || 0
+            let sessionRecs = records.filter(isRealCall)
+            if (sid) sessionRecs = sessionRecs.filter((r) => String(r.sessionId || '') === sid)
+            let turnRecs = sessionRecs
+            if (from > 0) turnRecs = turnRecs.filter((r) => r.time >= from)
+            if (to > 0) turnRecs = turnRecs.filter((r) => r.time <= to)
+            const convoAgg = computeAgg(sessionRecs.map(projectRecord))
+            const turnAgg = computeAgg(turnRecs.map(projectRecord))
+            return { ok: true, records: turnRecs.map(projectRecord), aggregate: turnAgg, conversation: convoAgg, count: turnRecs.length, from, to }
           }
           case 'clear': {
             const n = records.length

package/package.json

@@ -1,88 +1,88 @@
-{
-  "name": "@feiyang666/dsh-usage-plugin",
-  "version": "1.13.1",
-  "description": "DeepSeek Harness usage & cost tracker plugin: per-call token/cache-hit stats, peak/off-peak billing, DeepSeek balance query, CSV/JSON/PNG export with custom destination, and persistent local storage. Ships a host half plus a web client half in one npm package; installs into a DSH profile as a dsh.bundle with one command (dsh plugin --profile web add @feiyang666/dsh-usage-plugin).",
-  "keywords": [
-    "deepseek",
-    "harness",
-    "dsh",
-    "plugin",
-    "usage",
-    "cost",
-    "tokens",
-    "cache",
-    "balance"
-  ],
-  "license": "MIT",
-  "type": "module",
-  "main": "lib/index.js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/feiyang-dev/dsh-usage-plugin.git"
-  },
-  "contributors": [
-    {
-      "name": "ayleen",
-      "url": "https://github.com/ayleen"
-    },
-    {
-      "name": "wuhuqif176",
-      "url": "https://github.com/wuhuqif176"
-    },
-    {
-      "name": "Martin-soaring-dev",
-      "url": "https://github.com/Martin-soaring-dev"
-    },
-    {
-      "name": "liu3734",
-      "url": "https://github.com/liu3734"
-    },
-    {
-      "name": "mumuer1024",
-      "url": "https://github.com/mumuer1024"
-    }
-  ],
-  "homepage": "https://github.com/feiyang-dev/dsh-usage-plugin#readme",
-  "bugs": {
-    "url": "https://github.com/feiyang-dev/dsh-usage-plugin/issues"
-  },
-  "exports": {
-    ".": "./lib/index.js",
-    "./client": "./lib/client.js",
-    "./package.json": "./package.json"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "platform": "web",
-      "inject": [
-        "@deepseek-ai/dsh-client-ui-conversation"
-      ]
-    }
-  },
-  "files": [
-    "lib",
-    "scripts",
-    "cordis.patch.yml",
-    "README.md",
-    "README.zh.md",
-    "CHANGELOG.md"
-  ],
-  "scripts": {
-    "wire": "node scripts/wire.js",
-    "check": "node scripts/check-package.js",
-    "prepublishOnly": "node scripts/check-package.js",
-    "pack": "npm pack"
-  },
-  "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1"
-  },
-  "dependencies": {
-    "undici": "^7.0.0"
-  }
-}
+{
+  "name": "@feiyang666/dsh-usage-plugin",
+  "version": "1.14.1",
+  "description": "DeepSeek Harness usage & cost tracker plugin: per-call token/cache-hit stats, peak/off-peak billing, DeepSeek balance query, CSV/JSON/PNG export with custom destination, and persistent local storage. Ships a host half plus a web client half in one npm package; installs into a DSH profile as a dsh.bundle with one command (dsh plugin --profile web add @feiyang666/dsh-usage-plugin).",
+  "keywords": [
+    "deepseek",
+    "harness",
+    "dsh",
+    "plugin",
+    "usage",
+    "cost",
+    "tokens",
+    "cache",
+    "balance"
+  ],
+  "license": "MIT",
+  "type": "module",
+  "main": "lib/index.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/feiyang-dev/dsh-usage-plugin.git"
+  },
+  "contributors": [
+    {
+      "name": "ayleen",
+      "url": "https://github.com/ayleen"
+    },
+    {
+      "name": "wuhuqif176",
+      "url": "https://github.com/wuhuqif176"
+    },
+    {
+      "name": "Martin-soaring-dev",
+      "url": "https://github.com/Martin-soaring-dev"
+    },
+    {
+      "name": "liu3734",
+      "url": "https://github.com/liu3734"
+    },
+    {
+      "name": "mumuer1024",
+      "url": "https://github.com/mumuer1024"
+    }
+  ],
+  "homepage": "https://github.com/feiyang-dev/dsh-usage-plugin#readme",
+  "bugs": {
+    "url": "https://github.com/feiyang-dev/dsh-usage-plugin/issues"
+  },
+  "exports": {
+    ".": "./lib/index.js",
+    "./client": "./lib/client.js",
+    "./package.json": "./package.json"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "inject": [
+        "@deepseek-ai/dsh-client-ui-conversation"
+      ]
+    }
+  },
+  "files": [
+    "lib",
+    "scripts",
+    "cordis.patch.yml",
+    "README.md",
+    "README.zh.md",
+    "CHANGELOG.md"
+  ],
+  "scripts": {
+    "wire": "node scripts/wire.js",
+    "check": "node scripts/check-package.js",
+    "prepublishOnly": "node scripts/check-package.js",
+    "pack": "npm pack"
+  },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "^4.0.1"
+  },
+  "dependencies": {
+    "undici": "^7.0.0"
+  }
+}