dsh-api-dashboard 1.4.2 → 1.4.4

package/README.md

@@ -125,7 +125,7 @@ dsh plugin --profile web add link:/root/dsha-api-dashboard
 
 ## 更新日志
 
-最近一版 **v1.4.1** —— 安全与稳定性审计修复。一版一行的完整历史见 [`CHANGELOG.md`](CHANGELOG.md)。
+最近一版 **v1.4.4** —— 子代理胶囊只显示**它自己新产生**的消耗（不再把父会话继承来的历史、兄弟或后代子代理的消耗算进去）；并恢复 v1.4.3 升级后误显示为 `~—` 的历史子代理行。一版一行的完整历史见 [`CHANGELOG.md`](CHANGELOG.md)。
 
 ## License
 

package/client/client.js

@@ -858,13 +858,15 @@ window.__ModuleLoader__.load({
         ref: (n) => { if (n) requestAnimationFrame(() => syncSubsOverflow(n)); },
         onScroll: (e) => syncSubsOverflow(e.currentTarget) },
         list.map((s, i) => {
-          const f = formatSessionCost({ cost: s.cost, currency: mainCur, costByCurrency: s.costByCurrency, waiting: false });
+          const f = formatSessionCost({ cost: s.cost, currency: mainCur, costByCurrency: s.costByCurrency, waiting: s.waiting === true });
+          // waiting(等自身数据) 时 formatSessionCost 直接返回 null → "~—";
+          // 真实零消耗时 f 非 null 但 hasValue=false, 也必须回落 "~—"(与 v1.4.x 一致), 不能显示 ~¥0.00
           const amt = f !== null && f.hasValue ? "~" + f.text : "~—";
           const kind = s.mode === "continuable" ? "可续聊子代理" : "一次性子代理";
           const models = (s.models || []).join(", ");
           const tip = [
             kind + " " + (s.label || "子代理"),
-            "消耗 " + (f !== null ? f.title : "—"),
+            "自身消耗 " + (f !== null ? f.title : "等待自身用量数据"),
             models ? "模型 " + models : "",
             s.id ? "ID " + String(s.id).slice(0, 8) : "",
           ].filter(Boolean).join("\n");
@@ -2645,7 +2647,7 @@ window.__ModuleLoader__.load({
 
           // v1.4.0: 子代理消耗行 —— 有子代理时在状态条**下面换行**追加一行,
           // 按父会话里的创建顺序从左到右排列 (顺序由服务端 subagentCatalog 决定, 这里不排序)。
-          // 金额是「该子代理及其后代」的汇总, 与主板数字同一套计价口径。
+          // 只计该子代理自身新用量，不含继承历史、兄弟或后代。
           const subRow = buildSubagentRow(cost);
 
           return react.createElement("span", { className: "dshadb_barwrap" }, [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-api-dashboard",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "DeepSeek Harness 多平台 API 余额 / 用量看板：输入框下方实时显示各平台余额与本会话估算消耗",
   "keywords": [
     "dsh",

package/src/index.js

@@ -1703,31 +1703,64 @@ let subagentCostSummarize = null
 
 const safeSessionId = (id) => typeof id === 'string' && /^[A-Za-z0-9._-]{1,128}$/.test(id) ? id : null
 
-/** 读某会话的投影缓存记录(带 TTL 内存缓存)。任何异常 → null。 */
-const readSessionCacheRecord = (sessionId) => {
+/**
+ * 读某会话的投影缓存记录(带 TTL 内存缓存)。任何异常 → null。
+ * v1.4.4: 同时把 `identity` 带出来 —— 里面记着 `isSeeded` / `inheritedEventCount`（fork 边界），
+ * 旧版本的缓存行（状态里没有 own）要靠它判断「自身用量」能不能精确还原。
+ */
+const loadCacheEntry = (sessionId) => {
   const id = safeSessionId(sessionId)
   if (id === null) return null
   const now = Date.now()
   const hit = sessionCacheFiles.get(id)
-  if (hit !== undefined && now - hit.at < SUBAGENT_FILE_TTL_MS) return hit.rows
-  let rows = null
+  if (hit !== undefined && now - hit.at < SUBAGENT_FILE_TTL_MS) return hit
+  let entry = null
   try {
     const home = process.env.DSH_HOME || join(homedir(), '.dsh')
     const file = join(home, 'storages', 'session_projcache', 'sessions', `${id}.json`)
     const parsed = JSON.parse(readFileSync(file, 'utf8'))
     const r = parsed?.record?.rows
-    if (r !== null && typeof r === 'object') rows = r
-  } catch { rows = null }
+    if (r !== null && typeof r === 'object') {
+      const identity = parsed?.record?.identity
+      entry = { at: now, rows: r, identity: (identity !== null && typeof identity === 'object') ? identity : null }
+    }
+  } catch { entry = null }
   // 只缓存成功结果, 避免一次读失败被 TTL 钉住 3 秒
-  if (rows !== null) sessionCacheFiles.set(id, { at: now, rows })
+  if (entry !== null) sessionCacheFiles.set(id, entry)
   if (sessionCacheFiles.size > 256) sessionCacheFiles.clear()
-  return rows
+  return entry
 }
 
-/** 冷路径: 从缓存文件里取该会话的 queryBalanceCost **状态**(不是 wire 视图)。 */
+/** 读某会话的投影缓存 rows。任何异常 → null。 */
+const readSessionCacheRecord = (sessionId) => loadCacheEntry(sessionId)?.rows ?? null
+
+/**
+ * 冷路径: 从缓存文件里取该会话的 queryBalanceCost **状态**(不是 wire 视图)。
+ *
+ * ⚠️ v1.4.4 修正 v1.4.3 的一个过严判断：v1.4.3 只认 `ver === 3`，于是**升级后所有旧缓存行
+ * 一律显示 `~—`**（老框架不会再给已结束的子会话重写缓存，那些行永远好不了）。
+ * 实际上旧缓存也能精确还原**非分叉**子会话的自身用量：
+ *   · `inheritedEventCount === 0`（没有继承任何事件）→ 自身 == 全量，`byModel` 就是精确值；
+ *   · 分叉过的子会话 → 旧缓存分不出继承段，**仍然返回 null**（上层显示「等待」），
+ *     绝不退化成把父会话历史算进去的错数字。
+ */
 const cachedCostState = (sessionId) => {
-  const val = readSessionCacheRecord(sessionId)?.queryBalanceCost?.val
-  return (val !== null && typeof val === 'object' && Array.isArray(val.modelOrder) && val.byModel !== null && typeof val.byModel === 'object') ? val : null
+  const entry = loadCacheEntry(sessionId)
+  const row = entry?.rows?.queryBalanceCost
+  const val = row?.val
+  if (val === null || typeof val !== 'object' || !Array.isArray(val.modelOrder) || val.byModel === null || typeof val.byModel !== 'object') return null
+  if (row.ver === 3 && val.own !== undefined) return val
+  const inherited = entry?.identity?.inheritedEventCount
+  if (inherited === 0) {
+    return {
+      ...val, ownBoundaryKnown: true, inheritedEventCount: 0,
+      own: {
+        currentModel: val.currentModel ?? null, currentProvider: val.currentProvider ?? null,
+        last: val.last ?? null, byModel: val.byModel, modelOrder: val.modelOrder,
+      },
+    }
+  }
+  return null
 }
 
 /** 冷路径: 从缓存文件里取该会话的 subagentCatalog 条目。 */
@@ -1745,7 +1778,7 @@ const cachedCatalog = (sessionId) => {
     }))
 }
 
-export function collectSubagentCosts(services, rootSessionId, summarize) {
+export function collectSubagentCosts(services, rootSessionId, summarize, ownChildIds) {
   const out = []
   if (typeof rootSessionId !== 'string' || rootSessionId === '') return out
   let sessions = null, projections = null
@@ -1779,32 +1812,26 @@ export function collectSubagentCosts(services, rootSessionId, summarize) {
     if (s !== null && projections !== null) {
       try {
         const st = projections.stateOf(s, 'queryBalanceCost')
-        if (st !== null && st !== undefined && Array.isArray(st.modelOrder) && st.modelOrder.length > 0) return st
+        if (st !== null && st !== undefined) return st
       } catch { /* 落到冷路径 */ }
     }
     return cachedCostState(sessionId)
   }
 
-  /** 递归汇总: 自身 + 后代, 返回与 summarize 同形的汇总。 */
-  const rollup = (sessionId, depth) => {
-    const st = costStateOf(sessionId)
-    let acc = (st !== null && subagentCostSummarize !== null) ? subagentCostSummarize(st) : null
-    if (depth >= SUBAGENT_MAX_DEPTH) return acc
-    for (const entry of childrenOf(sessionId)) {
-      acc = mergeSummary(acc, rollup(entry.id, depth + 1))
-    }
-    return acc
-  }
-
   for (const entry of childrenOf(rootSessionId)) {
     if (out.length >= SUBAGENT_MAX_ROWS) break
-    const s = rollup(entry.id, 1) ?? emptySummary()
+    if (Array.isArray(ownChildIds) && !ownChildIds.includes(entry.id)) continue
+    const st = costStateOf(entry.id)
+    const ready = st?.ownBoundaryKnown === true && st?.own && Array.isArray(st.own.modelOrder)
+    const waiting = !ready || st.own.modelOrder.length === 0
+    const s = ready ? summarize(st.own) : emptySummary()
     out.push({
       id: String(entry.id),
       label: typeof entry.label === 'string' && entry.label !== '' ? entry.label : String(entry.id).slice(0, 12),
       mode: entry.mode === 'continuable' ? 'continuable' : 'one-shot',
       createdAt: typeof entry.createdAt === 'number' ? entry.createdAt : 0,
-      cost: s.cost,
+      cost: waiting ? -1 : s.cost,
+      waiting,
       costByCurrency: s.costByCurrency,
       currencyByModel: s.currencyByModel,
       mixedCurrency: s.mixedCurrency,
@@ -1952,39 +1979,7 @@ export function makeCostProjection(configOrGetter, services) {
     }
   }
 
-  return {
-    key: 'queryBalanceCost',
-    // 框架要求的投影定义 API: stateSchema(内部状态) + wire.{viewSchema,view}(客户端可见视图)。
-    // 旧版误用顶层 schema+view, 导致 wire 缺失, 服务端 drive 永不通知、客户端永远拿不到值。
-    stateSchema: z.object({
-      currentModel: z.string().nullable(),
-      currentProvider: z.string().nullable(),
-      last: z.object({
-        turn: z.number(),
-        step: z.number(),
-        model: z.string(),
-        buckets: z.object({
-          uncachedInputTokens: z.number(),
-          cacheReadTokens: z.number(),
-          cacheWriteTokens: z.number(),
-          outputTokens: z.number(),
-        }),
-      }).nullable(),
-      byModel: z.record(z.string(), z.object({
-        uncachedInputTokens: z.number(),
-        cacheReadTokens: z.number(),
-        cacheWriteTokens: z.number(),
-        outputTokens: z.number(),
-      })),
-      modelOrder: z.array(z.string()),
-      /** v1.4.0: 本投影所属会话 id —— 子代理汇总要拿它去查 `subagentCatalog`。空串表示未知。 */
-      sessionId: z.string(),
-    }),
-    init: (header) => ({
-      currentModel: null, currentProvider: null, last: null, byModel: {}, modelOrder: [],
-      sessionId: typeof header?.id === 'string' ? header.id : '',
-    }),
-    apply: (state, event) => {
+  const foldUsage = (state, event) => {
       // v1.4.0: `llm/retry-started` 关闭「替换槽位」—— 被重试的那次 attempt 的用量要**留在总量里**,
       // 下一次 attempt 是**新增**而不是替换。与 dsh-token-meter 的 usage-projection 对齐。
       if (event.type === 'llm/retry-started') {
@@ -2027,6 +2022,56 @@ export function makeCostProjection(configOrGetter, services) {
       if (prev !== null) byModel = { ...byModel, [prev.model]: subBuckets(byModel[prev.model] ?? zero(), prev.buckets) }
       byModel = { ...byModel, [model]: addBuckets(byModel[model] ?? zero(), buckets) }
       return { ...state, currentModel: nextModel, currentProvider: nextProvider, last: { turn, step, model, buckets }, byModel, modelOrder: isNewModel ? [...state.modelOrder, model] : state.modelOrder }
+  }
+
+  return {
+    key: 'queryBalanceCost',
+    // 框架要求的投影定义 API: stateSchema(内部状态) + wire.{viewSchema,view}(客户端可见视图)。
+    // 旧版误用顶层 schema+view, 导致 wire 缺失, 服务端 drive 永不通知、客户端永远拿不到值。
+    stateSchema: z.object({
+      currentModel: z.string().nullable(),
+      currentProvider: z.string().nullable(),
+      last: z.object({
+        turn: z.number(),
+        step: z.number(),
+        model: z.string(),
+        buckets: z.object({
+          uncachedInputTokens: z.number(),
+          cacheReadTokens: z.number(),
+          cacheWriteTokens: z.number(),
+          outputTokens: z.number(),
+        }),
+      }).nullable(),
+      byModel: z.record(z.string(), z.object({
+        uncachedInputTokens: z.number(),
+        cacheReadTokens: z.number(),
+        cacheWriteTokens: z.number(),
+        outputTokens: z.number(),
+      })),
+      modelOrder: z.array(z.string()),
+      /** v1.4.0: 本投影所属会话 id —— 子代理汇总要拿它去查 `subagentCatalog`。空串表示未知。 */
+      sessionId: z.string(),
+      inheritedEventCount: z.number().int().nonnegative(),
+      ownBoundaryKnown: z.boolean(),
+      ownChildIds: z.array(z.string()),
+      own: z.object({ currentModel: z.string().nullable(), currentProvider: z.string().nullable(), last: z.any().nullable(), byModel: z.record(z.string(), z.object({ uncachedInputTokens: z.number().nonnegative(), cacheReadTokens: z.number().nonnegative(), cacheWriteTokens: z.number().nonnegative(), outputTokens: z.number().nonnegative() })), modelOrder: z.array(z.string()) }),
+    }),
+    init: (header, inheritedEventCount) => ({
+      currentModel: null, currentProvider: null, last: null, byModel: {}, modelOrder: [],
+      sessionId: typeof header?.id === 'string' ? header.id : '',
+      inheritedEventCount: Number.isSafeInteger(inheritedEventCount) && inheritedEventCount >= 0 ? inheritedEventCount : 0,
+      ownBoundaryKnown: (Number.isSafeInteger(inheritedEventCount) && inheritedEventCount >= 0) || !header?.isSeeded,
+      ownChildIds: [],
+      own: { currentModel: null, currentProvider: null, last: null, byModel: {}, modelOrder: [] },
+    }),
+    apply: (state, event) => {
+      const full = foldUsage(state, event)
+      const isOwn = state.ownBoundaryKnown && (state.inheritedEventCount === 0 || (Number.isSafeInteger(event.seq) && event.seq >= state.inheritedEventCount))
+      // Inherited model context is useful; inherited usage and retry slots are not.
+      const own = isOwn ? foldUsage(state.own, event) : { ...state.own, currentModel: full.currentModel, currentProvider: full.currentProvider }
+      const childId = isOwn && event.type === 'subagent/catalog' ? event.data?.childId : null
+      const ownChildIds = typeof childId === 'string' && !state.ownChildIds.includes(childId) ? [...state.ownChildIds, childId] : state.ownChildIds
+      return { ...full, own, ownChildIds }
     },
     wire: {
       viewSchema: z.object({
@@ -2055,6 +2100,7 @@ export function makeCostProjection(configOrGetter, services) {
           mode: z.enum(['one-shot', 'continuable']),
           createdAt: z.number(),
           cost: z.number(),
+          waiting: z.boolean().optional(),
           costByCurrency: z.record(z.string(), z.number().nonnegative()),
           currencyByModel: z.record(z.string(), z.string()),
           mixedCurrency: z.boolean(),
@@ -2071,7 +2117,7 @@ export function makeCostProjection(configOrGetter, services) {
       const cfg = getConfig()
       const mainCurrency = (cfg.currency ?? 'CNY').toUpperCase()
       // v1.4.0: 子代理消耗 (换行单独展示)。取不到服务/没有子代理 → 空数组。
-      const subagents = collectSubagentCosts(services, state.sessionId, summarize)
+      const subagents = collectSubagentCosts(services, state.sessionId, summarize, state.ownChildIds)
       // 无事件时返回 waiting 标记, 客户端据此显示 "~—" 而非 "~¥0"
       if (state.modelOrder.length === 0) {
         return { models: [], currentModel: state.currentModel ?? null, currentProvider: state.currentProvider ?? null, cost: -1, costByModel: {}, costByCurrency: {}, currencyByModel: {}, mixedCurrency: false, tokens: { uncachedInput: 0, cacheRead: 0, cacheWrite: 0, output: 0 }, tokensByModel: {}, currency: mainCurrency, isPeak: isPeakTime(), waiting: true, subagents }
@@ -2085,7 +2131,7 @@ export function makeCostProjection(configOrGetter, services) {
       }
       },
     },
-    stateVersion: 2,
+    stateVersion: 3,
   }
 }