@feiyang666/dsh-usage-plugin 1.14.0 → 1.16.5

package/lib/index.js

@@ -186,6 +186,7 @@ export default {
           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'),
@@ -254,7 +255,7 @@ export default {
       function buildDays() {
         const map = {}
         for (const r of records) {
-          if (!isRealCall(r)) continue;
+          if (!isRealCall(r)) continue;
           const key = bjKey(r.time)
           let d = map[key]
           if (!d) {
@@ -302,6 +303,8 @@ export default {
       let root = ''
       let dataPath = ''
       let pricingPath = ''
+      let budgetPath = ''
+      let budget = null // { monthly: number|null } — 月度预算（元），null 表示未设置
       let persistOk = false
       let persistError = ''
       let initPromise = null
@@ -362,6 +365,21 @@ export default {
         return nfsWriteText(pricingPath, JSON.stringify(PRICING)).catch(() => {})
       }
 
+      function persistBudget() {
+        if (!budgetPath || !persistOk) return Promise.resolve()
+        return nfsWriteText(budgetPath, JSON.stringify(budget)).catch(() => {})
+      }
+
+      async function loadBudget() {
+        if (!budgetPath) return
+        try {
+          const data = JSON.parse(await nfsReadText(budgetPath))
+          if (!data || typeof data !== 'object') return
+          const m = Number(data.monthly)
+          budget = { monthly: Number.isFinite(m) && m >= 0 ? m : null }
+        } catch (e) {}
+      }
+
       async function loadPricing() {
         if (!pricingPath) return
         try {
@@ -400,6 +418,7 @@ export default {
           cacheWriteTokens: toNum(raw.cacheWriteTokens),
           reasoningTokens: toNum(raw.reasoningTokens),
           finishReason: String(raw.finishReason || ''),
+          interrupted: !!raw.interrupted,
           usdCnyRate: toNum(raw.usdCnyRate),
           fxDate: String(raw.fxDate || '')
         }
@@ -431,7 +450,9 @@ export default {
           root = normPath(candidate)
           dataPath = tryPath
           pricingPath = joinPath(path.dirname(dataPath), 'pricing.json')
+          budgetPath = joinPath(path.dirname(dataPath), 'budget.json')
           await loadPricing()
+          await loadBudget()
           persistOk = true
           persistError = ''
           return { ok: true }
@@ -559,13 +580,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 (!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) {}
-                }
                 // 兼容性：DeepSeek 系 provider 的 usage 不单独上报 cacheWriteTokens
                 // （缓存写入发生在未命中时，即 cacheWriteTokens == inputTokens）。
                 // 当上游未提供该字段时，用未命中 token 数（inputTokens）兜底，避免
@@ -583,20 +605,42 @@ export default {
                   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(() => {})
             }
           }
 
@@ -1189,7 +1233,7 @@ export default {
             try { await refreshFxRate(false) } catch (e) {}
             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 }
+            return { ok: true, records: items, count: items.length, toolCalls: toolItems, dataPath, persistOk, persistError, pricing: PRICING, effectiveAt: EFFECTIVE_AT, days: buildDays(), fx: FX, budget }
           }
           case 'tokenForMessage': {
             // 消息底部弹窗：分两层统计——整场对话累计（conversation）+ 本轮明细（aggregate/records）。
@@ -1247,6 +1291,14 @@ export default {
             persistPricing()
             return { ok: true }
           }
+          case 'setBudget': {
+            // 设置月度预算（元）；传入非负数字生效，null/NaN/负数视为清除预算。
+            const raw = Number(body && body.monthly)
+            if (Number.isFinite(raw) && raw >= 0) budget = { monthly: raw }
+            else budget = null
+            persistBudget()
+            return { ok: true, budget }
+          }
           case 'fxRefresh': {
             const fx = await refreshFxRate(true)
             return { ok: fx.rate > 0, fx, error: fx.rate > 0 ? '' : (fx.error || '无法获取汇率') }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feiyang666/dsh-usage-plugin",
-  "version": "1.14.0",
+  "version": "1.16.5",
   "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",
@@ -71,8 +71,7 @@
     "cordis.patch.yml",
     "README.md",
     "README.zh.md",
-    "CHANGELOG.md",
-    "RELEASE_NOTES.md"
+    "CHANGELOG.md"
   ],
   "scripts": {
     "wire": "node scripts/wire.js",

package/RELEASE_NOTES.md

@@ -1,46 +0,0 @@
-# Release Notes (English)
-
-The authoritative **English** release notes for `@feiyang666/dsh-usage-plugin`.
-
-Each new version's notes are added at the **top** of this file; the **[Version index](#version-index)** at the **bottom** is the default entry point for jumping to any release.
-
----
-
-## v1.14.0 (2026-08-27)
-
-This release focuses on **per-message token insights**, cleaner cost breakdowns, **system-level language sync**, and **mobile adaptation**.
-
-### Per-message "Turn tokens" popup
-
-After a turn finishes, the assistant message's footer action row gains a **"Turn tokens"** button. Clicking it opens a `Token Details` popup with two layers:
-
-- **Conversation total** — the whole session's total tokens, total cost, run time and cache-hit rate;
-- **This turn** — this output's tokens, turn tokens, turn cost, turn duration, turn cache-hit rate, a cache-hit bar, and per-model cards (each model's input·miss / cache hit / output (+ reasoning) plus its peak/off-peak cost split).
-
-Durations are shown as `Xm Ys`. Every usage record is tagged with the conversation (`sessionId`), so per-turn and per-conversation stats are computed independently.
-
-### Internal/tool calls grouped separately
-
-Internal/placeholder calls (e.g. `dsh2shell-*` with model `fake`) no longer clutter the model cost tables; they are collected in a collapsible **"Tool calls (internal)"** group below the cost breakdown, so only real model calls count in the cost tables.
-
-### Language follows the harness setting
-
-The in-panel language toggle is removed; the plugin now follows the harness's own language setting (General Settings → Language) instantly, with no `localStorage` override — this also fixes the "still English after switching back" bug.
-
-### Mobile adaptation
-
-Tables fit the screen width on ≤900px (no horizontal scrollbar), wide tables collapse the middle columns, and the popup adapts to the viewport.
-
-### Also fixed
-
-- The popup previously rendered off-screen inside transformed ancestors — now portaled to `document.body`;
-- Per-message windowing now reads the message's real step boundaries, so "this turn" and "conversation total" stats are truly independent;
-- Wide tables no longer wrap numbers into unreadable lines.
-
----
-
-## Version index
-
-| Version | Date | English notes |
-| --- | --- | --- |
-| v1.14.0 | 2026-08-27 | [What's New in v1.14.0](#v1140-2026-08-27) |