balance-dsh 1.0.0 → 1.0.2

package/lib/client.js

@@ -17,10 +17,10 @@ window.__ModuleLoader__.load({
 /* 完全复刻设置按钮（.VOzbGW_trigger）：width calc(100%+4px)、height 42px、margin 4px -2px、
    padding 0 10px 0 8px、gap 8px、font 14px/22px、color label-primary；
    左缘与设置按钮严格对齐，高度/颜色一致（图标与"余额"文字也统一 label-primary，金额 600 加粗） */
-.balance-footer{box-sizing:border-box;display:flex;align-items:center;justify-content:flex-start;gap:8px;width:calc(100% + 4px);min-width:0;height:42px;margin:0 -2px;padding:0 10px 0 8px;color:var(--dsw-alias-label-primary);font-size:14px;line-height:22px;text-decoration:none;cursor:pointer;white-space:nowrap;overflow:hidden;-webkit-user-select:none;user-select:none}
+.balance-footer{box-sizing:border-box;display:flex;align-items:center;justify-content:flex-start;gap:8px;width:100%;min-width:0;height:42px;margin:0;padding:0 0 0 8px;color:var(--dsw-alias-label-primary);font-size:14px;line-height:22px;text-decoration:none;cursor:pointer;white-space:nowrap;overflow:visible;-webkit-user-select:none;user-select:none}
 .balance-footer__icon{display:inline-flex;flex:none;color:var(--dsw-alias-label-primary)}
 .balance-footer__label{white-space:nowrap;color:var(--dsw-alias-label-primary)}
-.balance-footer__value{font-variant-numeric:tabular-nums;font-weight:600;white-space:nowrap;padding:2px 8px;border-radius:999px;margin-left:auto;text-decoration:none;cursor:pointer;transition:transform .15s var(--ds-ease-in-out,.2s)}
+.balance-footer__value{font-variant-numeric:tabular-nums;font-weight:600;white-space:nowrap;padding:2px 8px;border-radius:999px;margin-left:auto;margin-right:6px;text-decoration:none;cursor:pointer;transition:transform .15s var(--ds-ease-in-out,.2s)}
 .balance-footer__value:hover{filter:brightness(.85);transform:scale(1.06)}
 .balance-footer__value--healthy{color:var(--dsw-alias-state-success-primary);background:rgba(34,197,94,.15)}
 .balance-footer__value--low{color:#d97706;background:rgba(217,119,6,.15)}
@@ -41,6 +41,7 @@ window.__ModuleLoader__.load({
 .balance-fab-dark:hover{background:#cf3a3f}
 .balance-usage-line{box-sizing:border-box;display:flex;justify-content:center;align-items:center;gap:10px;color:var(--dsw-alias-label-secondary);font-size:12px;line-height:18px}
 .balance-usage-line strong{color:var(--dsw-alias-label-primary);font-weight:600}
+/* ── 跨会话统计面板（单击余额弹出） ── */
 /* ── 展开态底部一行：[设置齿轮][余额胶囊]，余额在设置右边 ──
    全部使用稳定锚点，不依赖 CSS Modules hash 类名（DSH 升级后仍有效）：
    - wide 态特征：底部存在 .balance-footer / .balance-topup（收起态渲染 position:fixed 的 .balance-fab，不影响）
@@ -104,8 +105,19 @@ window.__ModuleLoader__.load({
       return input + output;
     }
 
-    /** 分时段金额：高峰桶按目录价 ×2、空闲桶按目录价（与服务端 estimateCost 口径一致）。 */
+    /** 分时段金额：优先按服务端已标注的各模型 cost 累加（byModel）；
+     *  无 byModel 时回退到旧的单模型逻辑：高峰桶按目录价 ×2、空闲桶按目录价（兼容子代理/旧数据）。 */
     function computeSplitCost(usage, p) {
+      if (Array.isArray(usage.byModel) && usage.byModel.length > 0) {
+        let total = 0;
+        for (const b of usage.byModel) {
+          total += typeof b.cost === "number" && Number.isFinite(b.cost) ? b.cost : computeSingleSplitCost(b, p);
+        }
+        return total;
+      }
+      return computeSingleSplitCost(usage, p);
+    }
+    function computeSingleSplitCost(usage, p) {
       const costOf = (u) =>
         ((u.inputTokens ?? 0) * p.inputCnyPerMillion +
           (u.cacheReadTokens ?? 0) * p.cacheReadCnyPerMillion +
@@ -114,7 +126,6 @@ window.__ModuleLoader__.load({
         ((u.outputTokens ?? 0) * p.outputCnyPerMillion) / 1_000_000;
       return costOf(usage.peak) * 2 + costOf(usage.offpeak);
     }
-
       function formatTokens(n) {
         if (n >= 1_000_000) return (n / 1_000_000).toFixed(1).replace(/\.0$/, "") + "M";
         if (n >= 1_000) return (n / 1_000).toFixed(1).replace(/\.0$/, "") + "K";
@@ -302,6 +313,7 @@ window.__ModuleLoader__.load({
     // ─── 余额显示：展开态侧栏底部文字（¥ 图标+金额）；收起态悬浮 FAB ──
     function BalanceFooter({ wide }) {
       const state = useBalance();
+      const openUsagePage = (e) => { e && e.preventDefault(); window.open("https://platform.deepseek.com/usage", "_blank", "noopener"); };
 
       if (!wide) {
         // 收起态：悬浮 FAB（原样保留）
@@ -427,13 +439,15 @@ window.__ModuleLoader__.load({
             ],
           }),
         }),
-        jsx.jsx("span", { className: "balance-footer__label", children: "余额" }),
-        jsx.jsx("a", {
+        jsx.jsx("span", {
+          className: "balance-footer__label",
+          children: "余额",
+        }),
+        jsx.jsx("span", {
           className: "balance-footer__value" + valueClass,
-          href: "https://platform.deepseek.com/usage",
-          target: "_blank",
-          rel: "noreferrer",
+          onClick: openUsagePage,
           onContextMenu: onBalanceContextMenu,
+          title: "打开 DeepSeek 用量页",
           children: valueChildren,
         }),
       ];
@@ -445,11 +459,6 @@ window.__ModuleLoader__.load({
     }
 
     // ─── 当前会话消耗：输入区 dock ──────────────────────────────────────────
-    // ─── 关闭按钮：侧边栏底部，设置上方 ───────────────────────────────────
-function ShutdownButton({ wide }) {
-  return null;
-}
-
 function UsageCostLine({ useProjection, sessionId }) {
       const p = usePricing();
       const model = useCurrentModel();
@@ -582,19 +591,6 @@ function UsageCostLine({ useProjection, sessionId }) {
         ),
       );
 
-
-        // 关闭按钮：显示在设置上方、余额右侧
-        ctx.slots.inject("sidebar.footer.action", () =>
-          ctx.slots.register(
-            {
-              name: "sidebar.footer.action",
-              id: "shutdown",
-              order: 10,
-            },
-            ShutdownButton,
-          ),
-        );
-
       // 对话统计区（对话框下方）的会话消耗行
       ctx.slots.inject("conversation.composer.dock", () =>
         ctx.slots.register(

package/lib/index.js

@@ -176,17 +176,47 @@ function formatBalance(balance) {
   return `余额（${balance.currency || "CNY"}）：${balance.total_balance}\n  充值余额：${balance.topped_up_balance}\n  赠送余额：${balance.granted_balance}`;
 }
 
-/** 从事件数组汇总 usage（跨时段分桶）。供 live 会话与持久化（子代理）会话复用。 */
-function sumEventsUsage(events, config) {
+/** 构建模型切换点列表（按时间升序）。request/header、request/context 都在模型或请求设置变化时写入，
+ *  故可用它们把会话切成若干"模型段"，每条 assistant/message 归属到"它之前最近一个切换点"的模型。
+ *  这样换不同价模型时（如 flash→pro）金额能按各段模型分别计价，而不是整会话用最后一个模型。 */
+function collectModelSwitches(events) {
+  const switches = [];
+  for (const event of events ?? []) {
+    if (event.type === "request/header") {
+      const m = event.data?.header?.config?.model;
+      if (typeof m === "string" && m !== "") switches.push({ time: event.time ?? 0, model: m });
+    } else if (event.type === "request/context") {
+      const m = event.data?.model;
+      if (typeof m === "string" && m !== "") switches.push({ time: event.time ?? 0, model: m });
+    }
+  }
+  switches.sort((a, b) => a.time - b.time);
+  return switches;
+}
+
+/** 找到 time 之前最近一次模型切换点的模型；无切换点（或早于第一个）返回 ""（调用方回退到后备模型）。 */
+function modelAtTime(switches, time) {
+  let model = "";
+  for (const sp of switches) {
+    if (sp.time <= time) model = sp.model;
+    else break;
+  }
+  return model;
+}
+
+/** 从事件数组汇总 usage（按模型分段 + 跨时段分桶）。
+ *  供 live 会话与持久化（子代理）会话复用。返回按模型拆分的 byModel，及跨模型聚合字段。 */
+function sumEventsUsage(events, config, fallbackModel = "") {
+  const switches = collectModelSwitches(events);
+  const fallback = fallbackModel !== "" ? fallbackModel : "deepseek-v4-flash";
   const latestByStep = new Map();
-  for (const event of events) {
+  for (const event of events ?? []) {
     if (event.type !== "assistant/message") continue;
     const usage = event.data?.usage;
     if (usage === void 0 || usage === null) continue;
     const turn = event.data?.turn;
     const step = event.data?.step;
     if (turn === void 0 || step === void 0) continue;
-    // 事件带毫秒时间戳（event.time），用于按高峰/空闲时段分桶
     latestByStep.set(`${turn}/${step}`, { usage, time: event.time ?? Date.now() });
   }
   const add = (bucket, usage) => {
@@ -196,10 +226,27 @@ function sumEventsUsage(events, config) {
     bucket.cacheWriteTokens += usage.cacheWriteTokens ?? 0;
   };
   const empty = () => ({ inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0 });
+  const byModel = new Map(); // model -> { model, peak, offpeak }
+  for (const { usage, time } of latestByStep.values()) {
+    const model = modelAtTime(switches, time) || fallback;
+    let e = byModel.get(model);
+    if (!e) { e = { model, peak: empty(), offpeak: empty() }; byModel.set(model, e); }
+    add(isPeakAt(time, config) ? e.peak : e.offpeak, usage);
+  }
+  // 聚合 + 转换 byModel（按金额未在前面算，这里只分桶 + 汇总字段）
   const peak = empty();
   const offpeak = empty();
-  for (const { usage, time } of latestByStep.values()) {
-    add(isPeakAt(time, config) ? peak : offpeak, usage);
+  const modelList = [];
+  for (const e of byModel.values()) {
+    modelList.push({ model: e.model, peak: e.peak, offpeak: e.offpeak });
+    peak.inputTokens += e.peak.inputTokens;
+    peak.outputTokens += e.peak.outputTokens;
+    peak.cacheReadTokens += e.peak.cacheReadTokens;
+    peak.cacheWriteTokens += e.peak.cacheWriteTokens;
+    offpeak.inputTokens += e.offpeak.inputTokens;
+    offpeak.outputTokens += e.offpeak.outputTokens;
+    offpeak.cacheReadTokens += e.offpeak.cacheReadTokens;
+    offpeak.cacheWriteTokens += e.offpeak.cacheWriteTokens;
   }
   const inputTokens = peak.inputTokens + offpeak.inputTokens;
   const outputTokens = peak.outputTokens + offpeak.outputTokens;
@@ -215,12 +262,14 @@ function sumEventsUsage(events, config) {
     totalTokens: billedInputTokens + outputTokens,
     peak,
     offpeak,
+    byModel: modelList,
   };
 }
 
 function sumSessionUsage(session, config) {
   if (session == null) return null;
-  return sumEventsUsage(session.events ?? [], config);
+  // fallbackModel = detectModel(session)：当 message 早于所有模型切换点时兜底，避免落到默认 flash 价。
+  return sumEventsUsage(session.events ?? [], config, detectModel(session));
 }
 
 function estimateCost(usage, pricing) {
@@ -244,8 +293,9 @@ function estimateCost(usage, pricing) {
  *  再对每个子代理用 inspectApiRemoteSession 读取持久化事件计算 usage。无子代理返回 {usage:null,debug}。 */
 async function sumSubagentUsage(ctx, sessionId, config) {
   if (ctx == null || sessionId === "") return { usage: null };
-  // subagents 需通过 ctx.inject(["subagents"]) 注入后才可访问（见 apply 里的 webServer 注入列表）。
-  const subagentsSvc = ctx.subagents != null ? ctx.subagents : (typeof ctx.get === "function" ? ctx.get("subagents") : void 0);
+  // 用 ctx.get("subagents") 安全获取（非注入，可空）；不要直接读 ctx.subagents 属性，
+  // 否则未声明注入时会抛 "cannot get property subagents without inject"。
+  const subagentsSvc = typeof ctx.get === "function" ? ctx.get("subagents") : void 0;
   const listDescendants = subagentsSvc != null && typeof subagentsSvc.listDescendants === "function" ? subagentsSvc.listDescendants.bind(subagentsSvc) : void 0;
   // 1) 用 subagents.listDescendants 一次取完整后代树（含编号/层级/已结束）
   let descendants = [];
@@ -268,6 +318,7 @@ async function sumSubagentUsage(ctx, sessionId, config) {
   const empty = () => ({ inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0 });
   const peak = empty();
   const offpeak = empty();
+  const byModelMap = new Map(); // model -> { model, peak, offpeak }
   let count = 0;
   for (const id of childIds) {
     try {
@@ -284,6 +335,19 @@ async function sumSubagentUsage(ctx, sessionId, config) {
       offpeak.outputTokens += u.offpeak.outputTokens;
       offpeak.cacheReadTokens += u.offpeak.cacheReadTokens;
       offpeak.cacheWriteTokens += u.offpeak.cacheWriteTokens;
+      // 子代理也可能换模型，按模型同样分桶聚合
+      for (const b of u.byModel ?? []) {
+        let be = byModelMap.get(b.model);
+        if (!be) { be = { model: b.model, peak: empty(), offpeak: empty() }; byModelMap.set(b.model, be); }
+        be.peak.inputTokens += b.peak.inputTokens;
+        be.peak.outputTokens += b.peak.outputTokens;
+        be.peak.cacheReadTokens += b.peak.cacheReadTokens;
+        be.peak.cacheWriteTokens += b.peak.cacheWriteTokens;
+        be.offpeak.inputTokens += b.offpeak.inputTokens;
+        be.offpeak.outputTokens += b.offpeak.outputTokens;
+        be.offpeak.cacheReadTokens += b.offpeak.cacheReadTokens;
+        be.offpeak.cacheWriteTokens += b.offpeak.cacheWriteTokens;
+      }
     } catch {
       // 该子代理读取失败则跳过
     }
@@ -303,6 +367,7 @@ async function sumSubagentUsage(ctx, sessionId, config) {
     totalTokens: billedInputTokens + outputTokens,
     peak,
     offpeak,
+    byModel: [...byModelMap.values()],
     sessions: count,
   };
   return { usage };
@@ -375,7 +440,11 @@ export function apply(ctx, config = {}) {
   });
 
   // 2) /balance-api HTTP 接口：供客户端插件直接渲染余额（不经过命令，不污染会话日志）
-  ctx.inject(["webServer", "subagents"], (httpCtx) => {
+  // 注意：不要在这里声 inject ["subagents"] —— 它依赖 dsh-subagent 服务；
+  //      若 balance-dsh 加载时该服务未就绪，Cordis 会跳过整个 callback，导致
+  //      /balance-api 不注册（404）。改为只声 inject ["webServer"]，子代理在
+  //      sumSubagentUsage 内部用可空 ctx.get("subagents") 获取。
+  ctx.inject(["webServer"], (httpCtx) => {
     httpCtx.webServer.register({
       kind: "exact",
       path: "/balance-api",
@@ -425,6 +494,13 @@ export function apply(ctx, config = {}) {
         }
         // 客户端优先用自己解析的 model；为空则回退到服务端 detectModel
         const effectiveModel = model || detectedModel;
+        // 逐模型标注 cost（高峰期×2、空闲期×1），客户端直接按各模型 cost 累加，无需自己定价。
+        if (usage && Array.isArray(usage.byModel)) {
+          usage.byModel = usage.byModel.map((b) => ({ ...b, cost: estimateCost(b, resolvePricing(config, b.model)) }));
+        }
+        if (subagentUsage && Array.isArray(subagentUsage.byModel)) {
+          subagentUsage.byModel = subagentUsage.byModel.map((b) => ({ ...b, cost: estimateCost(b, resolvePricing(config, b.model)) }));
+        }
         try {
           const data = await fetchBalance(apiKey);
           writeJson(res, 200, {
@@ -442,22 +518,5 @@ export function apply(ctx, config = {}) {
       },
     });
 
-
-      httpCtx.webServer.register({
-        kind: "exact",
-        path: "/shutdown-api",
-        handler: async (req, res) => {
-          if (req.method !== "POST") {
-            writeJson(res, 405, { ok: false, error: "method not allowed" });
-            return;
-          }
-          writeJson(res, 200, { ok: true });
-          const exit = ctx.get("appExit");
-          setTimeout(() => {
-            if (typeof exit === "function") exit(0);
-            else process.exit(0);
-          }, 150);
-        },
-      });
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balance-dsh",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "查询 DeepSeek 余额并显示当前会话 token 消耗。DeepSeek 账户余额 + 会话 token/费用显示，含高峰/空闲峰谷计费。",
   "author": "Rannist",
   "type": "module",