dsh-desktop-statusbar 2.0.0 → 2.0.1

package/README.en.md

@@ -27,9 +27,9 @@ Replaces the stats line under the message input in the DSH desktop app with a co
   | Field | Content |
   | --- | --- |
   | Session status | Context occupancy: system prompt / tool definitions / messages |
-  | Combined hit | Highest / lowest cache hit rate |
-  | TTFT | Fastest / slowest first-token delay |
-  | TPS | Fastest / slowest output speed |
+  | Combined hit | This turn / highest / lowest cache hit rate |
+  | TTFT | This turn / fastest / slowest first-token delay |
+  | TPS | This turn / fastest / slowest output speed |
   | Run time | Model time / tool calls |
   | This turn cost | Token breakdown for this turn |
   | Session cost | Cumulative token breakdown for the whole session |

package/README.md

@@ -27,9 +27,9 @@
   | 字段 | 内容 |
   | --- | --- |
   | 会话状态 | 上下文占用：系统提示词 / 工具定义 / 对话消息 |
-  | 综合命中 | 最高 / 最低缓存命中率 |
-  | 首字平均 | 最快 / 最慢首字延迟 |
-  | 输出速度 | 最快 / 最慢输出速度 |
+  | 综合命中 | 本轮 / 最高 / 最低缓存命中率 |
+  | 首字平均 | 本轮 / 最快 / 最慢首字延迟 |
+  | 输出速度 | 本轮 / 最快 / 最慢输出速度 |
   | 运行用时 | 模型用时 / 工具调用 |
   | 本轮费用 | 本轮会话的 token 明细 |
   | 总计费用 | 整个会话累计的 token 明细 |

package/lib/client.js

@@ -40,6 +40,8 @@ window.__ModuleLoader__.load({
 		 * v6 起：`segments` 存全部段的有序列表（顺序对整份列表生效），`hidden` 存未勾选的段。
 		 */
 		const CONFIG_VERSION = 6;
+		/** 插件版本：显示在设置页底部，用来确认页面加载的是哪一版客户端代码。 */
+		const VERSION = "2.0.1";
 		/** 官方参考价的版本：官方调价时改这个数字，老价格库会自动并入新参考价。 */
 		const PRICE_VERSION = 2;
 
@@ -447,12 +449,15 @@ window.__ModuleLoader__.load({
 			f_tokensTurn: "本轮用量",
 			tipModelTime: "模型用时",
 			tipToolTime: "工具调用",
+			tipTtftTurn: "本轮平均首字",
 			tipTtftFast: "最快首字延迟",
 			tipTtftSlow: "最慢首字延迟",
+			tipTpsTurn: "本轮平均速度",
 			tipTpsFast: "最快输出速度",
 			tipTpsSlow: "最慢输出速度",
 			tipTopUp: "充值余额",
 			tipGranted: "赠金余额",
+			tipHitTurn: "本轮缓存命中率",
 			tipHitHigh: "最高缓存命中率",
 			tipHitLow: "最低缓存命中率",
 			contextAria: "上下文已用 {percent}",
@@ -533,12 +538,15 @@ window.__ModuleLoader__.load({
 			f_tokensTurn: "This turn usage",
 			tipModelTime: "Model time",
 			tipToolTime: "Tool calls",
+			tipTtftTurn: "Average TTFT this turn",
 			tipTtftFast: "Fastest TTFT",
 			tipTtftSlow: "Slowest TTFT",
+			tipTpsTurn: "Average TPS this turn",
 			tipTpsFast: "Fastest TPS",
 			tipTpsSlow: "Slowest TPS",
 			tipTopUp: "Top-up balance",
 			tipGranted: "Granted balance",
+			tipHitTurn: "Cache hit rate this turn",
 			tipHitHigh: "Highest cache hit rate",
 			tipHitLow: "Lowest cache hit rate",
 			contextAria: "{percent} of context used",
@@ -999,12 +1007,52 @@ window.__ModuleLoader__.load({
 			return panel === null ? null : { kind: "tokens", title: title, panel: panel };
 		}
 
-		/** 毫秒 → 面板里的时长文本；0 或缺数据给横杠。 */
+		/** 毫秒 → 面板里的时长文本（精确到秒）；0 或缺数据给横杠。 */
 		function tipDuration(ms) {
-			const text = formatDuration(ms);
+			const text = formatDurationFine(ms);
 			return text === null ? "-" : text;
 		}
 
+		/** 时长精确到秒：1h23m45s / 23m45s / 45s。底栏那条用 formatDuration（省掉秒，宽度有限）。 */
+		function formatDurationFine(ms) {
+			const n = Number(ms) || 0;
+			if (n <= 0) return null;
+			const whole = Math.round(n / 1000);
+			if (whole < 60) return whole + "s";
+			const minutes = Math.floor(whole / 60);
+			if (minutes < 60) return minutes + "m" + (whole % 60) + "s";
+			return Math.floor(minutes / 60) + "h" + (minutes % 60) + "m" + (whole % 60) + "s";
+		}
+
+		/** 本轮缓存命中率：这一轮的输入 token 里命中缓存的比例；本轮还没有调用给横杠。
+		    读插件自己的 desktopStatusbarUsage 投影 —— 官方 tokenUsage 只有会话累计值。
+		    注意字段是短名（input / cacheRead / cacheWrite），与官方投影的 *Tokens 不同名。 */
+		function turnHitRate(sessionUsage) {
+			const current = sessionUsage === undefined || sessionUsage === null ? null : sessionUsage.current;
+			if (current === null || current === undefined) return "-";
+			const denominator = (current.input || 0) + (current.cacheRead || 0) + (current.cacheWrite || 0);
+			if (denominator <= 0) return "-";
+			return hitRateText(((current.cacheRead || 0) / denominator) * 100);
+		}
+
+		/** 本轮平均首字；本轮还没有样本给横杠。 */
+		function turnAverageTtft(timing) {
+			if (timing === null || timing === undefined) return "-";
+			const samples = timing.turnTtftSamples || 0;
+			if (samples <= 0) return "-";
+			const text = formatSeconds(timing.turnTtftMs / samples);
+			return text === null ? "-" : text + "s";
+		}
+
+		/** 本轮平均输出速度；本轮还没有可测样本给横杠。 */
+		function turnAverageTps(timing, t) {
+			if (timing === null || timing === undefined) return "-";
+			const decodeMs = timing.turnDecodeMs || 0;
+			const tokens = timing.turnDecodeTokens || 0;
+			if (decodeMs <= 0 || tokens <= 0) return "-";
+			return formatThroughput(tokens / (decodeMs / 1000)) + t("unitSpeed");
+		}
+
 		/** 首字极值（毫秒）→ "9.3s"；没有样本给横杠。 */
 		function tipSeconds(mark) {
 			if (mark === null || mark === undefined) return "-";
@@ -1126,6 +1174,7 @@ window.__ModuleLoader__.load({
 						kind: "rows",
 						title: t("segTtft"),
 						rows: [
+							{ label: t("tipTtftTurn"), value: turnAverageTtft(timing) },
 							{ label: t("tipTtftFast"), value: tipSeconds(timing === null ? null : timing.fastestTtft) },
 							{ label: t("tipTtftSlow"), value: tipSeconds(timing === null ? null : timing.slowestTtft) }
 						]
@@ -1147,6 +1196,7 @@ window.__ModuleLoader__.load({
 						kind: "rows",
 						title: t("segCacheHit"),
 						rows: [
+							{ label: t("tipHitTurn"), value: turnHitRate(src.sessionUsage) },
 							{ label: t("tipHitHigh"), value: extremes === null ? "-" : extremes.high },
 							{ label: t("tipHitLow"), value: extremes === null ? "-" : extremes.low }
 						]
@@ -1165,6 +1215,7 @@ window.__ModuleLoader__.load({
 						kind: "rows",
 						title: t("segTps"),
 						rows: [
+							{ label: t("tipTpsTurn"), value: turnAverageTps(timing, t) },
 							{ label: t("tipTpsFast"), value: tipSpeed(timing === null ? null : timing.fastestTps, t) },
 							{ label: t("tipTpsSlow"), value: tipSpeed(timing === null ? null : timing.slowestTps, t) }
 						]
@@ -1475,6 +1526,8 @@ window.__ModuleLoader__.load({
 			".dsb-settings .dsb-action:hover{background:var(--dsw-alias-interactive-bg-hover,rgba(127,127,127,.1))}",
 			".dsb-settings .dsb-action-sm{height:24px;padding:0 8px;font-size:12px}",
 			".dsb-settings .dsb-foot{display:flex;align-items:center;gap:12px;flex-wrap:wrap}",
+			/* 版本号贴右侧、与按钮底边对齐 */
+			".dsb-settings .dsb-version{margin-left:auto;align-self:flex-end;font-size:11px;line-height:1;color:var(--dsw-alias-label-tertiary);opacity:.75}",
 			".dsb-settings .dsb-actions{display:flex;align-items:center;gap:8px;flex-wrap:wrap}"
 		].join("");
 
@@ -1878,21 +1931,38 @@ window.__ModuleLoader__.load({
 			const currencyRef = react.useRef(null);
 			const editPopRef = react.useRef(null);
 
-			/* 编辑浮层比卡片本身高，会被设置页的滚动容器裁掉下半截 —— 打开后滚一下，
-			   把它的底边对齐到可视区底部，整块就都看得见了。 */
+			/* 编辑浮层打开后按需滚动：block:"nearest" 只补上被遮住的那一段，
+			   本来就在视野里就一动不动（旧版用 "end" 会平白往上滚，明明下面有地方）。 */
 			react.useEffect(() => {
 				if (editing === null) return;
 				const node = editPopRef.current;
 				if (node === null || node === undefined || typeof node.scrollIntoView !== "function") return;
-				node.scrollIntoView({ block: "end", behavior: "smooth" });
+				node.scrollIntoView({ block: "nearest", behavior: "smooth" });
 			}, [editing]);
 
-			/* 编辑浮层：点别处就收起，草稿一律丢弃 —— 改了一半的数字、新模型里填的空值都不留下 */
+			/* 编辑浮层：点别处收起并丢弃草稿。判断"里面"上三重保险 —— 浮层节点、价格卡节点，
+			   以及鼠标坐标是否落在卡片或币种下拉的矩形内。切币种时点在卡片内的控件上，
+			   无论 DOM 结构怎么变都不该把编辑区收掉。 */
 			react.useEffect(() => {
 				if (editing === null) return undefined;
-				const onDocClick = (event) => {
+				const inside = (event) => {
+					const target = event.target;
+					if (target !== null && target !== undefined && typeof target.closest === "function"
+						&& target.closest(".dsb-model") !== null) return true;
 					const node = editPopRef.current;
-					if (node !== null && node !== undefined && typeof node.contains === "function" && node.contains(event.target)) return;
+					if (node !== null && node !== undefined && typeof node.contains === "function" && node.contains(target)) return true;
+					const x = event.clientX;
+					const y = event.clientY;
+					if (typeof x !== "number" || typeof y !== "number") return false;
+					return [node, currencyRef.current].some((one) => {
+						if (one === null || one === undefined || typeof one.getBoundingClientRect !== "function") return false;
+						const box = one.getBoundingClientRect();
+						return box.width > 0 && box.height > 0
+							&& x >= box.left && x <= box.right && y >= box.top && y <= box.bottom;
+					});
+				};
+				const onDocClick = (event) => {
+					if (inside(event)) return;
 					cancelEdit();
 				};
 				document.addEventListener("click", onDocClick);
@@ -2280,7 +2350,9 @@ window.__ModuleLoader__.load({
 						modelOrder: Object.keys(DEFAULT_PRICES)
 					})
 				}, t("reset")),
-				h("div", { className: "dsb-actions", key: "__actions" }, holidayActions)
+				h("div", { className: "dsb-actions", key: "__actions" }, holidayActions),
+				/* 版本标记贴右、与行内底边对齐：改了客户端代码要刷新页面才生效，这行字让"跑的是哪版"一眼可见 */
+				h("span", { className: "dsb-version", key: "__version" }, "dsh-desktop-statusbar " + VERSION)
 			]));
 
 			return h("div", { className: "dsb-settings" }, sections);

package/lib/index.js

@@ -340,6 +340,12 @@ const timingViewSchema = z.object({
   slowestTtft: timingMark.nullable(),
   fastestTps: timingMark.nullable(),
   slowestTps: timingMark.nullable(),
+  /* 本轮累计：气泡里"本轮平均首字 / 本轮平均速度"要用（官方投影只有会话累计值） */
+  turn: z.number().nullable(),
+  turnTtftMs: z.number().nonnegative(),
+  turnTtftSamples: z.number().int().nonnegative(),
+  turnDecodeMs: z.number().nonnegative(),
+  turnDecodeTokens: z.number().nonnegative(),
 }).strict()
 
 const sessionTimingSchema = timingViewSchema.extend({ openStep: timingStep.nullable() }).strict()
@@ -417,12 +423,25 @@ const sessionTimingProjection = {
     slowestTtft: null,
     fastestTps: null,
     slowestTps: null,
+    turn: null,
+    turnTtftMs: 0,
+    turnTtftSamples: 0,
+    turnDecodeMs: 0,
+    turnDecodeTokens: 0,
     openStep: null,
   }),
   apply: (state, event) => {
     if (event.type === 'step/start') {
+      /* 换轮就把本轮累计清零：气泡里的"本轮平均…"只算当前这一轮 */
+      const turn = event.data.turn
+      const sameTurn = state.turn === turn
       return {
         ...state,
+        turn: turn,
+        turnTtftMs: sameTurn ? state.turnTtftMs : 0,
+        turnTtftSamples: sameTurn ? state.turnTtftSamples : 0,
+        turnDecodeMs: sameTurn ? state.turnDecodeMs : 0,
+        turnDecodeTokens: sameTurn ? state.turnDecodeTokens : 0,
         openStep: {
           turn: event.data.turn, step: event.data.step, startTime: event.time,
           firstTokenTime: null, firstTokenTool: false,
@@ -451,6 +470,8 @@ const sessionTimingProjection = {
       next.samples = state.samples + 1
       next.fastestTtft = pickSmaller(state.fastestTtft, { value: ttft, at: event.time, model })
       next.slowestTtft = pickLarger(state.slowestTtft, { value: ttft, at: event.time, model })
+      next.turnTtftMs = state.turnTtftMs + ttft
+      next.turnTtftSamples = state.turnTtftSamples + 1
       const output = stepOutputTokens(event.data.usage)
       const decode = Math.max(0, event.time - first.time)
       /* 纯工具调用的步骤不进速度极值：分片时间戳挤在同一刻，算出来是假值（首字照旧统计） */
@@ -458,6 +479,8 @@ const sessionTimingProjection = {
         const speed = { value: output / (decode / 1000), at: event.time, model }
         next.fastestTps = pickLarger(state.fastestTps, speed)
         next.slowestTps = pickSmaller(state.slowestTps, speed)
+        next.turnDecodeMs = state.turnDecodeMs + decode
+        next.turnDecodeTokens = state.turnDecodeTokens + output
       }
       return next
     }
@@ -475,9 +498,14 @@ const sessionTimingProjection = {
       slowestTtft: state.slowestTtft,
       fastestTps: state.fastestTps,
       slowestTps: state.slowestTps,
+      turn: state.turn,
+      turnTtftMs: state.turnTtftMs,
+      turnTtftSamples: state.turnTtftSamples,
+      turnDecodeMs: state.turnDecodeMs,
+      turnDecodeTokens: state.turnDecodeTokens,
     }),
   },
-  stateVersion: 2,
+  stateVersion: 3,
 }
 
 /* ---------------------------------------------------------------- 余额查询 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-desktop-statusbar",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "type": "module",
   "description": "把 DSH 桌面端对话区底部的统计行换成可配置状态栏：9 个字段可选可排序，按官方峰谷口径估算费用，支持自定义模型单价与账户余额。",
   "license": "PolyForm-Noncommercial-1.0.0",