dsh-balance-widget 0.4.1 → 0.4.3

package/README.en.md

@@ -164,7 +164,7 @@ Built-in DeepSeek official peak/off-peak pricing (CNY per 1M tokens), effective
 
 - Config tree: `dsh --profile web --dump-config` should show a `balance-widget` entry.
 - Balance route: after restarting dsh web, `curl -s http://127.0.0.1:3080/api/dsh-balance/balance` should return `{ ok, balance_infos, modelId }`.
-- Cost routes: `curl -s "http://127.0.0.1:3080/api/dsh-balance/last-cost?session=<sessionId>"` and `curl -s http://127.0.0.1:3080/api/dsh-balance/today-cost` should return `{ cost, inputTokens, outputTokens, modelId }`.
+- Cost routes: `curl -s "http://127.0.0.1:3080/api/dsh-balance/last-cost?session=SESSION_ID"` and `curl -s http://127.0.0.1:3080/api/dsh-balance/today-cost` should return `{ cost, inputTokens, outputTokens, modelId }`.
 
 ## License
 

package/README.md

@@ -162,7 +162,7 @@ DSH 的插件配置统一放在这个文件里：
 
 - 配置树：`dsh --profile web --dump-config` 应出现 `balance-widget` 条目
 - 余额路由：重启 dsh web 后 `curl -s http://127.0.0.1:3080/api/dsh-balance/balance` 应返回 `{ ok, balance_infos, modelId }`
-- 成本路由：`curl -s "http://127.0.0.1:3080/api/dsh-balance/last-cost?session=<会话id>"` 与 `curl -s http://127.0.0.1:3080/api/dsh-balance/today-cost` 应返回 `{ cost, inputTokens, outputTokens, modelId }`
+- 成本路由：`curl -s "http://127.0.0.1:3080/api/dsh-balance/last-cost?session=SESSION_ID"` 与 `curl -s http://127.0.0.1:3080/api/dsh-balance/today-cost` 应返回 `{ cost, inputTokens, outputTokens, modelId }`
 
 ## License
 

package/lib/client.js

@@ -132,9 +132,24 @@ window.__ModuleLoader__.load({
 		/** Same-origin cost routes. */
 		const LAST_COST_ROUTE = "/api/dsh-balance/last-cost";
 		const TODAY_COST_ROUTE = "/api/dsh-balance/today-cost";
+		const ACTIVE_COST_ROUTE = "/api/dsh-balance/active-cost";
 		/** Official DeepSeek platform top-up page (opens in a new tab). */
 		const TOP_UP_URL = "https://platform.deepseek.com/top_up";
 		/**
+		* Fetch the active session's costs (last prompt + session total).
+		* @returns { ok, lastPrompt?, sessionTotal?, error? }
+		*/
+		async function fetchActiveCost() {
+			try {
+				const response = await fetch(ACTIVE_COST_ROUTE, { headers: { accept: "application/json" } });
+				const payload = await response.json().catch(() => ({}));
+				if (!response.ok) return { ok: false, error: payload.error ?? `active-cost responded ${response.status}` };
+				return { ok: true, lastPrompt: payload.lastPrompt?.cost ?? 0, sessionTotal: payload.sessionTotal?.cost ?? 0 };
+			} catch (error) {
+				return { ok: false, error: error instanceof Error ? error.message : String(error) };
+			}
+		}
+		/**
 		* Fetch the account balance from the host proxy.
 		* @returns { ok, balanceInfos?, modelId?, error? }
 		*/
@@ -193,6 +208,28 @@ window.__ModuleLoader__.load({
 			return { symbol, total, currency: entry.currency };
 		}
 		//#endregion
+		//#region lib/types/client/ExplainIcon.js
+		/**
+		* A small ⓘ marker with a hover tooltip explaining a term. Wraps the
+		* official DSH Tooltip so the popover stays visually consistent.
+		* @param {Object} props - label (tooltip text), t (locale).
+		*/
+		function ExplainIcon({ label, t }) {
+			return (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
+				label: label,
+				side: "top",
+				delayMs: 300,
+				children: (0, react_jsx_runtime.jsx)("span", {
+					role: "img",
+					"aria-label": t("explain.aria"),
+					style: { cursor: "help", color: "var(--dsw-alias-label-tertiary)", marginLeft: 3, fontSize: 11, lineHeight: 1 },
+					children: (0, react_jsx_runtime.jsx)("span", {
+						children: "ⓘ"
+					})
+				})
+			});
+		}
+		//#endregion
 		//#region lib/types/client/SidebarBalanceCard.js
 		/**
 		* Sidebar footer card: balance + remaining-ratio bar + today cost.
@@ -204,17 +241,32 @@ window.__ModuleLoader__.load({
 		function SidebarBalanceCard({ wide, t }) {
 			const [open, setOpen] = (0, react.useState)(false);
 			const [balance, setBalance] = (0, react.useState)(null);
-			const [todayCost, setTodayCost] = (0, react.useState)(null);
+			const [lastPrompt, setLastPrompt] = (0, react.useState)(null);
+			const [sessionTotal, setSessionTotal] = (0, react.useState)(null);
+			const [todayWs, setTodayWs] = (0, react.useState)(null);
+			const [todayAll, setTodayAll] = (0, react.useState)(null);
 			const [lowThreshold, setLowThreshold] = (0, react.useState)(5);
 			const [criticalThreshold, setCriticalThreshold] = (0, react.useState)(1);
 			const [error, setError] = (0, react.useState)(null);
 			const [loading, setLoading] = (0, react.useState)(false);
+			/** Fetch today's costs (workspace + all) from the dual-value route. */
+			const fetchTodayCosts = async () => {
+				const response = await fetch(TODAY_COST_ROUTE, { headers: { accept: "application/json" } });
+				const payload = await response.json().catch(() => ({}));
+				if (!response.ok) return { ok: false, error: payload.error ?? `today-cost responded ${response.status}` };
+				return {
+					ok: true,
+					workspace: payload.workspace?.cost ?? 0,
+					all: payload.all?.cost ?? 0
+				};
+			};
 			const refresh = async (showLoading) => {
 				if (showLoading) setLoading(true);
 				setError(null);
-				const [bResult, tResult] = await Promise.all([
+				const [bResult, aResult, tResult] = await Promise.all([
 					fetchBalance(),
-					fetchCost(TODAY_COST_ROUTE)
+					fetchActiveCost(),
+					fetchTodayCosts()
 				]);
 				const failures = [];
 				if (bResult.ok) {
@@ -224,8 +276,18 @@ window.__ModuleLoader__.load({
 				} else {
 					failures.push(`余额: ${bResult.error}`);
 				}
-				if (tResult.ok) setTodayCost(tResult.cost);
-				else if (tResult.error) failures.push(`今日: ${tResult.error}`);
+				if (aResult.ok) {
+					setLastPrompt(aResult.lastPrompt);
+					setSessionTotal(aResult.sessionTotal);
+				} else {
+					failures.push(`会话: ${aResult.error}`);
+				}
+				if (tResult.ok) {
+					setTodayWs(tResult.workspace);
+					setTodayAll(tResult.all);
+				} else {
+					failures.push(`今日: ${tResult.error}`);
+				}
 				setError(failures.length > 0 ? failures.join("；") : null);
 				if (showLoading) setLoading(false);
 			};
@@ -291,7 +353,7 @@ window.__ModuleLoader__.load({
 									children: [(0, react_jsx_runtime.jsx)("span", {
 										children: t("todayCostShort")
 									}), (0, react_jsx_runtime.jsx)("span", {
-										children: todayCost !== null ? formatCny(todayCost) : "—"
+										children: todayAll !== null ? formatCny(todayAll) : "—"
 									})]
 								})
 							})]
@@ -318,7 +380,13 @@ window.__ModuleLoader__.load({
 								className: styles.row,
 								children: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, {
 									children: [(0, react_jsx_runtime.jsx)("span", {
-										children: t("balance")
+										className: styles.label,
+										children: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, {
+											children: [t("balance"), (0, react_jsx_runtime.jsx)(ExplainIcon, {
+												label: t("explain.balance"),
+												t
+											})]
+										})
 									}), (0, react_jsx_runtime.jsx)("span", {
 										className: styles.val,
 										"data-level": level > 0 ? level : undefined,
@@ -333,10 +401,64 @@ window.__ModuleLoader__.load({
 								className: styles.row,
 								children: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, {
 									children: [(0, react_jsx_runtime.jsx)("span", {
-										children: t("todayCost")
+										className: styles.label,
+										children: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, {
+											children: [t("lastPrompt"), (0, react_jsx_runtime.jsx)(ExplainIcon, {
+												label: t("explain.lastPrompt"),
+												t
+											})]
+										})
+									}), (0, react_jsx_runtime.jsx)("span", {
+										className: styles.val,
+										children: loading ? "…" : lastPrompt !== null ? formatCny(lastPrompt) : "—"
+									})]
+								})
+							}), (0, react_jsx_runtime.jsx)("div", {
+								className: styles.row,
+								children: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, {
+									children: [(0, react_jsx_runtime.jsx)("span", {
+										className: styles.label,
+										children: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, {
+											children: [t("sessionTotal"), (0, react_jsx_runtime.jsx)(ExplainIcon, {
+												label: t("explain.sessionTotal"),
+												t
+											})]
+										})
+									}), (0, react_jsx_runtime.jsx)("span", {
+										className: styles.val,
+										children: loading ? "…" : sessionTotal !== null ? formatCny(sessionTotal) : "—"
+									})]
+								})
+							}), (0, react_jsx_runtime.jsx)("div", {
+								className: styles.row,
+								children: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, {
+									children: [(0, react_jsx_runtime.jsx)("span", {
+										className: styles.label,
+										children: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, {
+											children: [t("todayWs"), (0, react_jsx_runtime.jsx)(ExplainIcon, {
+												label: t("explain.todayWs"),
+												t
+											})]
+										})
+									}), (0, react_jsx_runtime.jsx)("span", {
+										className: styles.val,
+										children: loading ? "…" : todayWs !== null ? formatCny(todayWs) : "—"
+									})]
+								})
+							}), (0, react_jsx_runtime.jsx)("div", {
+								className: styles.row,
+								children: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, {
+									children: [(0, react_jsx_runtime.jsx)("span", {
+										className: styles.label,
+										children: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, {
+											children: [t("todayAll"), (0, react_jsx_runtime.jsx)(ExplainIcon, {
+												label: t("explain.todayAll"),
+												t
+											})]
+										})
 									}), (0, react_jsx_runtime.jsx)("span", {
 										className: styles.val,
-										children: loading ? "…" : todayCost !== null ? formatCny(todayCost) : "—"
+										children: loading ? "…" : todayAll !== null ? formatCny(todayAll) : "—"
 									})]
 								})
 							}), error !== null && (0, react_jsx_runtime.jsx)("div", {
@@ -378,7 +500,16 @@ window.__ModuleLoader__.load({
 			"refresh.aria": "刷新数据",
 			"refresh.title": "刷新余额与成本",
 			"balance": "账户余额",
-			"todayCost": "今天总成本",
+			"lastPrompt": "最近一次提问",
+			"sessionTotal": "本会话成本",
+			"todayWs": "今日·本项目",
+			"todayAll": "今日·全部",
+			"explain.aria": "解释",
+			"explain.balance": "DeepSeek 账户可用余额，实时查询官方接口。",
+			"explain.lastPrompt": "最近活跃会话的最后一个问题（含 AI 回复）的费用估算。",
+			"explain.sessionTotal": "最近活跃会话从开始到现在的累计费用估算。",
+			"explain.todayWs": "当前工作区今天所有会话的费用合计估算。",
+			"explain.todayAll": "所有工作区今天所有会话的费用合计估算（含其他项目）。",
 			"warn.title.1": "余额不足 ¥5，建议及时充值",
 			"warn.title.2": "余额低于 ¥1，即将耗尽！",
 			"warn.text.1": "⚠️ 余额不足 ¥5，建议及时充值。",
@@ -396,7 +527,16 @@ window.__ModuleLoader__.load({
 			"refresh.aria": "Refresh data",
 			"refresh.title": "Refresh balance and costs",
 			"balance": "Account balance",
-			"todayCost": "Today total",
+			"lastPrompt": "Last prompt",
+			"sessionTotal": "This session",
+			"todayWs": "Today · this project",
+			"todayAll": "Today · all",
+			"explain.aria": "Explain",
+			"explain.balance": "DeepSeek account balance, fetched live from the official API.",
+			"explain.lastPrompt": "Estimated cost of the latest question (incl. the AI reply) in the most recent session.",
+			"explain.sessionTotal": "Estimated total cost of the most recent session since it started.",
+			"explain.todayWs": "Estimated total cost of today's sessions in the current workspace.",
+			"explain.todayAll": "Estimated total cost of today's sessions across all workspaces.",
 			"warn.title.1": "Balance below ¥5, consider topping up",
 			"warn.title.2": "Balance below ¥1, almost exhausted!",
 			"warn.text.1": "⚠️ Balance below ¥5, consider topping up.",

package/lib/index.js

@@ -24,7 +24,8 @@ export const API = {
 	balance: "/api/dsh-balance/balance",
 	cost: "/api/dsh-balance/cost",
 	lastCost: "/api/dsh-balance/last-cost",
-	todayCost: "/api/dsh-balance/today-cost"
+	todayCost: "/api/dsh-balance/today-cost",
+	activeCost: "/api/dsh-balance/active-cost"
 };
 
 /** Default DeepSeek API base (mirrors dsh-llm-deepseek's PUBLIC_BASE_URL). */
@@ -459,6 +460,7 @@ async function decompressSession(path) {
 function parseSessionUsages(text) {
 	const samples = [];
 	let currentModel = void 0;
+	let cwd = void 0;
 	for (const line of text.split("\n")) {
 		if (line === "") continue;
 		let event;
@@ -468,7 +470,9 @@ function parseSessionUsages(text) {
 			continue;
 		}
 		const type = event.type;
-		if (type === "request/header") {
+		if (type === "session") {
+			cwd = event.cwd;
+		} else if (type === "request/header") {
 			currentModel = event.data?.header?.config?.model ?? currentModel;
 		} else if (type === "assistant/message") {
 			const usage = event.data?.usage;
@@ -482,7 +486,7 @@ function parseSessionUsages(text) {
 			}
 		}
 	}
-	return samples;
+	return { samples, cwd };
 }
 
 /** Cost of the last turn (the most recent user prompt) in one session file. */
@@ -502,19 +506,71 @@ function lastTurnCost(samples) {
 	return { cost, inputTokens: input, outputTokens: output };
 }
 
+/** Total cost across every sample of one session (all turns). */
+function sessionTotalCost(samples) {
+	let cost = 0;
+	let input = 0;
+	let output = 0;
+	for (const s of samples) {
+		cost += priceUsage(s.usage, s.model, s.time);
+		input += (s.usage.inputTokens ?? s.usage.uncachedInputTokens ?? 0) + (s.usage.cacheReadTokens ?? 0);
+		output += s.usage.outputTokens ?? 0;
+	}
+	return { cost, inputTokens: input, outputTokens: output };
+}
+
 /**
- * Sum today's usage across every session file. "Today" = events whose time
+ * Find the session file modified most recently (the "active" session).
+ * Walks the sessions tree and picks by mtime; returns the path or undefined.
+ */
+async function findMostRecentSessionFile() {
+	const root = sessionsRoot();
+	try {
+		const fs = await awaitImportFs();
+		const { statSync } = fs;
+		let best = void 0;
+		let bestMtime = -1;
+		const walk = (dir) => {
+			for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+				const full = `${dir}/${entry.name}`;
+				if (entry.isDirectory()) {
+					walk(full);
+				} else if (entry.name === "session.jsonl.zstd") {
+					try {
+						const mtime = statSync(full).mtimeMs;
+						if (mtime > bestMtime) {
+							bestMtime = mtime;
+							best = full;
+						}
+					} catch {
+						/* ignore unreadable files */
+					}
+				}
+			}
+		};
+		walk(root);
+		return best;
+	} catch {
+		return void 0;
+	}
+}
+
+/**
+ * Sum today's usage across session files. "Today" = events whose time
  * falls on the same calendar day (local time) as now.
+ * @param {Array<{samples:Array,cwd?:string}>} sessionList - parsed sessions.
+ * @param {string} [cwdFilter] - if given, only sessions with this cwd count.
  */
-function todayCost(samplesBySession) {
+function todayCost(sessionList, cwdFilter) {
 	const now = new Date();
 	const dayStart = new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime();
 	const dayEnd = dayStart + 24 * 60 * 60 * 1000;
 	let cost = 0;
 	let input = 0;
 	let output = 0;
-	for (const samples of samplesBySession) {
-		for (const s of samples) {
+	for (const session of sessionList) {
+		if (cwdFilter !== void 0 && session.cwd !== cwdFilter) continue;
+		for (const s of session.samples) {
 			if (s.time < dayStart || s.time >= dayEnd) continue;
 			cost += priceUsage(s.usage, s.model, s.time);
 			input += (s.usage.inputTokens ?? s.usage.uncachedInputTokens ?? 0) + (s.usage.cacheReadTokens ?? 0);
@@ -545,7 +601,8 @@ async function collectAllSessionSamples() {
 	for (const file of files) {
 		const result = await decompressSession(file);
 		if (!result.ok) continue;
-		perSession.push(parseSessionUsages(result.text));
+		const parsed = parseSessionUsages(result.text);
+		perSession.push(parsed);
 	}
 	return perSession;
 }
@@ -622,8 +679,8 @@ function makeRoutes(ctx, config) {
 				const compute = async () => {
 					const result = await decompressSession(file);
 					if (!result.ok) return { error: result.error };
-					const samples = parseSessionUsages(result.text);
-					return { value: lastTurnCost(samples) };
+					const parsed = parseSessionUsages(result.text);
+					return { value: lastTurnCost(parsed.samples) };
 				};
 				const outcome = await dedupe(key, () => cachedOrCompute(key, compute));
 				if (outcome.error !== void 0) {
@@ -640,12 +697,63 @@ function makeRoutes(ctx, config) {
 				if (!guard(req, res, "GET")) return;
 				const key = "today";
 				const compute = async () => {
-					const perSession = await collectAllSessionSamples();
-					return { value: todayCost(perSession) };
+					const sessionList = await collectAllSessionSamples();
+					const all = todayCost(sessionList);
+					// "Current workspace": the cwd of the session with the most
+					// samples today (best proxy for where the user is working).
+					let activeCwd = void 0;
+					let activeCount = 0;
+					for (const session of sessionList) {
+						if (session.cwd === void 0) continue;
+						const todaySamples = session.samples.filter((s) => {
+							const now = new Date();
+							const dayStart = new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime();
+							return s.time >= dayStart && s.time < dayStart + 24 * 60 * 60 * 1000;
+						}).length;
+						if (todaySamples > activeCount) {
+							activeCount = todaySamples;
+							activeCwd = session.cwd;
+						}
+					}
+					const workspace = todayCost(sessionList, activeCwd);
+					return {
+						value: {
+							workspace: { ...workspace, cwd: activeCwd },
+							all
+						}
+					};
 				};
 				const outcome = await dedupe(key, () => cachedOrCompute(key, compute));
 				writeJson(res, 200, { ...outcome.value, modelId: config.modelId, pricingSource, pricingSyncedAt });
 			}
+		},
+		{
+			kind: "exact",
+			path: API.activeCost,
+			handler: async (req, res) => {
+				if (!guard(req, res, "GET")) return;
+				const file = await findMostRecentSessionFile();
+				if (file === void 0) {
+					writeJson(res, 404, { error: "no session files found", modelId: config.modelId });
+					return;
+				}
+				const result = await decompressSession(file);
+				if (!result.ok) {
+					writeJson(res, 502, { error: result.error, modelId: config.modelId });
+					return;
+				}
+				const parsed = parseSessionUsages(result.text);
+				const last = lastTurnCost(parsed.samples);
+				const total = sessionTotalCost(parsed.samples);
+				writeJson(res, 200, {
+					lastPrompt: last,
+					sessionTotal: total,
+					cwd: parsed.cwd,
+					modelId: config.modelId,
+					pricingSource,
+					pricingSyncedAt
+				});
+			}
 		}
 	];
 }
@@ -689,8 +797,8 @@ function buildBillingTool(ctx, config) {
 			}
 			if (query === "cost" || query === "both") {
 				try {
-					const perSession = await collectAllSessionSamples();
-					const today = todayCost(perSession);
+					const sessionList = await collectAllSessionSamples();
+					const today = todayCost(sessionList);
 					parts.push(`Today's estimated cost: CNY ${today.cost.toFixed(4)} (${today.inputTokens} input tokens, ${today.outputTokens} output tokens)`);
 				} catch (error) {
 					parts.push(`Cost query failed: ${error instanceof Error ? error.message : String(error)}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-balance-widget",
   "description": "Balance & cost widget for the dsh web GUI: a corner icon in the conversation session header that shows the DeepSeek account balance and the current session's estimated spend on click. Host half proxies the official /user/balance API over ctx.webServer (loopback-only); client half renders the icon and popover. Zero external dependencies — works on Node 24.",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "type": "module",
   "main": "lib/index.js",
   "files": [