balance-dsh 1.3.0 → 1.3.1

package/lib/client.js

@@ -254,14 +254,18 @@ window.__ModuleLoader__.load({
      *  ⚠️ p 必须是**目录价**（服务端 pricing 字段即目录价），倍率由 peakMultiplier 单独给，
      *  否则会与这里的乘法重复翻倍（高峰变 ×4）。 */
     function computeSplitCost(usage, p, multiplier = 2) {
+      let total = 0;
       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, multiplier);
         }
-        return total;
+      } else {
+        total = computeSingleSplitCost(usage, p, multiplier);
       }
-      return computeSingleSplitCost(usage, p, multiplier);
+      // 网页搜索 / 抓取按次费用：服务端已按官方「每千次 ¥5」、且只对 2026-11-01 00:00
+      // （北京）之后的成功调用计价，这里直接累加，不再乘峰谷倍率。
+      total += typeof usage.webToolCost === "number" && Number.isFinite(usage.webToolCost) ? usage.webToolCost : 0;
+      return total;
     }
     function computeSingleSplitCost(usage, p, multiplier = 2) {
       const costOf = (u, factor) =>
@@ -1534,6 +1538,23 @@ function UsageCostLine({ useProjection, sessionId }) {
           ["子代理 tokens", "+" + formatTokens(subNewTokens) + " / 计费 " + formatTokens(subagentUsage.totalTokens)],
         );
       }
+      // 网页搜索 / 抓取：官方按次计费（每千次 ¥5），2026-11-01 00:00（北京）起收费。
+      // 次数来自 tool/call 与 tool/result 配对，金额由服务端算好放在 webToolCost。
+      const webSearch = splitUsable ? (split.webSearchCalls ?? 0) : 0;
+      const webFetch = splitUsable ? (split.webFetchCalls ?? 0) : 0;
+      const webCost = splitUsable && Number.isFinite(split.webToolCost) ? split.webToolCost : 0;
+      if (webSearch > 0 || webFetch > 0) {
+        const parts = [];
+        if (webSearch > 0) parts.push("搜索 " + webSearch + " 次");
+        if (webFetch > 0) parts.push("抓取 " + webFetch + " 次");
+        costDetails.push(
+          ["网页工具", parts.join(" · ")],
+          [
+            "网页工具费用",
+            webCost > 0 ? "¥" + webCost.toFixed(4) : "免费期内",
+          ],
+        );
+      }
 
       const detailRows = (prefix, rows) =>
         rows.flatMap(([label, value], index) => [

package/lib/index.js

@@ -343,7 +343,7 @@ function formatBalance(balance) {
 //                          | { status:"failed" }  （网络失败；官方明确“失败绝不变成 0 余额”）
 // client 是 AccountClientMetadata（version / locale / timezoneOffsetSeconds），
 // 缺字段会在平台侧组装请求头时抛错，所以三个字段都要给。
-const PLUGIN_VERSION = "1.3.0";
+const PLUGIN_VERSION = "1.3.1";
 
 /**
  * 读取官方账号余额并归一化成与 normalizeBalance 相同的形状。
@@ -453,12 +453,75 @@ function modelAtTime(switches, time) {
   return model;
 }
 
+/** 网页搜索 / 抓取工具按次计费（官方 2026-10-17 上线 Search/Fetch API 公告）：
+ *  · Search 与 Fetch 同价：**每千次 ¥5**（= ¥0.005 / 次），结果条数不影响价格；
+ *  · 只有 Search 返回非空结果、Fetch 返回正文且 HTTP 200 才计费，失败/空结果/超时不计费；
+ *  · **北京时间 2026-11-01 00:00 起开始收费**，此前的调用免费。
+ *  会话事件里 tool/call 带 { callId, name, arguments }（name = web_search / web_fetch），
+ *  tool/result 带 { toolCallId, message: { isError, content } }，按 callId 配对就能算钱。 */
+const WEB_TOOL_BILLING_START = Date.parse("2026-11-01T00:00:00+08:00");
+const WEB_TOOL_PRICE_PER_CALL = 5 / 1000;
+
+/** 统计网页工具调用：次数、可计费次数与金额。
+ *  只认 tool/call 与 tool/result 配对成功、且 isError !== true 的调用（官方口径：失败不计费）。 */
+function webToolUsage(events) {
+  const calls = new Map(); // callId -> { name, time }
+  for (const event of events ?? []) {
+    if (event.type !== "tool/call") continue;
+    const name = event.data?.name;
+    if (name !== "web_search" && name !== "web_fetch") continue;
+    const time = Number(event.time ?? 0);
+    if (!Number.isFinite(time)) continue;
+    const id = event.data?.callId;
+    if (id === void 0 || id === null) continue;
+    calls.set(String(id), { name, time });
+  }
+  let webSearchCalls = 0;
+  let webFetchCalls = 0;
+  let webSearchBillable = 0;
+  let webFetchBillable = 0;
+  let webSearchCost = 0;
+  let webFetchCost = 0;
+  const done = new Set();
+  for (const event of events ?? []) {
+    if (event.type !== "tool/result") continue;
+    const id = event.data?.toolCallId ?? event.data?.message?.toolCallId;
+    const key = id === void 0 || id === null ? "" : String(id);
+    const call = calls.get(key);
+    if (call === void 0 || done.has(key)) continue;
+    done.add(key);
+    if (event.data?.message?.isError === true) continue; // 失败不计费
+    if (call.name === "web_search") webSearchCalls += 1;
+    else webFetchCalls += 1;
+    if (call.time >= WEB_TOOL_BILLING_START) {
+      if (call.name === "web_search") {
+        webSearchBillable += 1;
+        webSearchCost += WEB_TOOL_PRICE_PER_CALL;
+      } else {
+        webFetchBillable += 1;
+        webFetchCost += WEB_TOOL_PRICE_PER_CALL;
+      }
+    }
+  }
+  return {
+    webSearchCalls,
+    webFetchCalls,
+    webSearchBillable,
+    webFetchBillable,
+    webSearchCost,
+    webFetchCost,
+    webToolCost: webSearchCost + webFetchCost,
+  };
+}
+
 /** 从事件数组汇总 usage（按模型分段 + 跨时段分桶）。
  *  供 live 会话与持久化（子代理）会话复用。返回按模型拆分的 byModel，及跨模型聚合字段。 */
 function sumEventsUsage(events, config, fallbackModel = "") {
   const switches = collectModelSwitches(events);
   const starts = stepStartTimes(events);
   const fallback = fallbackModel !== "" ? fallbackModel : "deepseek-v4-flash";
+  // 网页搜索 / 抓取：次数 + 按次计费金额（2026-11-01 起才收费）
+  const webTools = webToolUsage(events);
   const latestByStep = new Map();
   for (const event of events ?? []) {
     if (event.type !== "assistant/message") continue;
@@ -518,6 +581,7 @@ function sumEventsUsage(events, config, fallbackModel = "") {
     peak,
     offpeak,
     byModel: modelList,
+    ...webTools,
   };
 }
 
@@ -728,6 +792,35 @@ function tokenTotal(usage) {
   return usage.inputTokens + usage.outputTokens + usage.cacheReadTokens + usage.cacheWriteTokens;
 }
 
+/** 取（或建）某天的统计桶。 */
+function ensureDay(days, key) {
+  let day = days.get(key);
+  if (day == null) {
+    day = {
+      date: key,
+      ...emptyTokenBucket(),
+      totalTokens: 0,
+      cost: 0,
+      sessionIds: new Set(),
+      // —— 以下为细分维度，供统计面板展示；不改动上方总额口径 ——
+      byModel: new Map(), // modelKey -> { model, tokens..., totalTokens, cost }
+      peak: emptyTokenBucket(),
+      offpeak: emptyTokenBucket(),
+      peakCost: 0,
+      offpeakCost: 0,
+      // 网页搜索 / 抓取的工具调用次数与按次费用（官方 ¥5/千次，2026-11-01 起计费）
+      webSearchCalls: 0,
+      webFetchCalls: 0,
+      webSearchBillable: 0,
+      webFetchBillable: 0,
+      webSearchCost: 0,
+      webFetchCost: 0,
+    };
+    days.set(key, day);
+  }
+  return day;
+}
+
 /** 按北京时间把一个会话的最终 assistant/message usage 聚合到每日统计。 */
 function collectDailyUsage(events, config, fallbackModel, cutoffMs, days, sessionId) {
   const switches = collectModelSwitches(events);
@@ -743,26 +836,52 @@ function collectDailyUsage(events, config, fallbackModel, cutoffMs, days, sessio
     // 与 sumEventsUsage 同口径：按"请求发起时刻"归属日期与峰谷，拿不到才回退完成时刻
     latestByStep.set(`${turn}/${step}`, { usage, time: starts.get(`${turn}/${step}`) ?? Number(event.time ?? 0) });
   }
-  for (const { usage, time } of latestByStep.values()) {
+  // 网页搜索 / 抓取：按调用发生的北京日期归日，金额按官方「每千次 ¥5」、且只在
+  // 2026-11-01 00:00（北京）之后计费。tool/call 与 tool/result 配对 + isError 过滤同 webToolUsage。
+  const webCalls = new Map(); // callId -> { name, time }
+  for (const event of events ?? []) {
+    if (event.type !== "tool/call") continue;
+    const name = event.data?.name;
+    if (name !== "web_search" && name !== "web_fetch") continue;
+    const time = Number(event.time ?? 0);
+    const id = event.data?.callId;
     if (!Number.isFinite(time) || time < cutoffMs) continue;
-    const key = beijingDayKey(time);
-    let day = days.get(key);
-    if (day == null) {
-      day = {
-        date: key,
-        ...emptyTokenBucket(),
-        totalTokens: 0,
-        cost: 0,
-        sessionIds: new Set(),
-        // —— 以下为细分维度，供统计面板展示；不改动上方总额口径 ——
-        byModel: new Map(), // modelKey -> { model, tokens..., totalTokens, cost }
-        peak: emptyTokenBucket(),
-        offpeak: emptyTokenBucket(),
-        peakCost: 0,
-        offpeakCost: 0,
-      };
-      days.set(key, day);
+    if (id === void 0 || id === null) continue;
+    webCalls.set(String(id), { name, time });
+  }
+  if (webCalls.size > 0) {
+    const seen = new Set();
+    for (const event of events ?? []) {
+      if (event.type !== "tool/result") continue;
+      const id = event.data?.toolCallId ?? event.data?.message?.toolCallId;
+      const key = id === void 0 || id === null ? "" : String(id);
+      const call = webCalls.get(key);
+      if (call === void 0 || seen.has(key)) continue;
+      seen.add(key);
+      if (event.data?.message?.isError === true) continue;
+      const day = ensureDay(days, beijingDayKey(call.time));
+      const billable = call.time >= WEB_TOOL_BILLING_START;
+      if (call.name === "web_search") {
+        day.webSearchCalls += 1;
+        if (billable) {
+          day.webSearchBillable += 1;
+          day.webSearchCost += WEB_TOOL_PRICE_PER_CALL;
+          day.cost += WEB_TOOL_PRICE_PER_CALL;
+        }
+      } else {
+        day.webFetchCalls += 1;
+        if (billable) {
+          day.webFetchBillable += 1;
+          day.webFetchCost += WEB_TOOL_PRICE_PER_CALL;
+          day.cost += WEB_TOOL_PRICE_PER_CALL;
+        }
+      }
+      day.sessionIds.add(sessionId);
     }
+  }
+  for (const { usage, time } of latestByStep.values()) {
+    if (!Number.isFinite(time) || time < cutoffMs) continue;
+    const day = ensureDay(days, beijingDayKey(time));
     const model = modelAtTime(switches, time) || fallback;
     const isPeak = isPeakAt(time, config);
     // 分时段精确计费：高峰桶按高峰价（= 目录价 ×2）、空闲桶按目录价
@@ -896,6 +1015,13 @@ async function buildUsageStats(ctx, config) {
       offpeak: day.offpeak,
       peakCost: day.peakCost,
       offpeakCost: day.offpeakCost,
+      webSearchCalls: day.webSearchCalls,
+      webFetchCalls: day.webFetchCalls,
+      webSearchBillable: day.webSearchBillable,
+      webFetchBillable: day.webFetchBillable,
+      webSearchCost: day.webSearchCost,
+      webFetchCost: day.webFetchCost,
+      webToolCost: day.webSearchCost + day.webFetchCost,
     };
   });
   const total = rows.reduce((acc, day) => {
@@ -910,6 +1036,13 @@ async function buildUsageStats(ctx, config) {
     addTokenUsage(acc.offpeak, day.offpeak);
     acc.peakCost += day.peakCost;
     acc.offpeakCost += day.offpeakCost;
+    acc.webSearchCalls += day.webSearchCalls;
+    acc.webFetchCalls += day.webFetchCalls;
+    acc.webSearchBillable += day.webSearchBillable;
+    acc.webFetchBillable += day.webFetchBillable;
+    acc.webSearchCost += day.webSearchCost;
+    acc.webFetchCost += day.webFetchCost;
+    acc.webToolCost += day.webToolCost;
     for (const item of day.byModel ?? []) {
       let entry = acc.byModel.get(item.model);
       if (entry == null) {
@@ -930,6 +1063,13 @@ async function buildUsageStats(ctx, config) {
     offpeak: emptyTokenBucket(),
     peakCost: 0,
     offpeakCost: 0,
+    webSearchCalls: 0,
+    webFetchCalls: 0,
+    webSearchBillable: 0,
+    webFetchBillable: 0,
+    webSearchCost: 0,
+    webFetchCost: 0,
+    webToolCost: 0,
   });
   return {
     days: rows,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balance-dsh",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "在 DSH 中显示 DeepSeek 账户余额和当前会话 token/费用消耗（含高峰/空闲峰谷计费）。仅支持 DeepSeek 官方模型与账号，暂不支持其他大模型。",
   "author": "Rannist",
   "type": "module",