dsh-subusage 0.10.9 → 0.10.10

package/README.md

@@ -6,7 +6,7 @@
 
 > **English.** dsh-subusage shows subscription quota and balance for the AI providers you already use, as a pill next to the model selector in DeepSeek Harness. Provider switches and credentials live in one settings page, and other plugins or agents can read the same snapshot through a read-only quota API.
 
-[![npm version](https://img.shields.io/badge/npm-0.10.9-blue)](https://www.npmjs.com/package/dsh-subusage)
+[![npm version](https://img.shields.io/badge/npm-0.10.10-blue)](https://www.npmjs.com/package/dsh-subusage)
 [![license](https://img.shields.io/badge/license-MIT-green)](#license--security--许可与安全)
 [![DSH](https://img.shields.io/badge/DSH-%3E%3D0.2.0--rc.1%20%3C0.3.0--0-informational)](#compatibility--兼容性)
 

package/lib/client.js

@@ -389,13 +389,16 @@ window.__ModuleLoader__.load({
 			}
 			return worst;
 		}
+		function remainingPercent(percent) {
+			return Math.round(Math.max(0, 100 - (Number(percent) || 0)) * 10) / 10;
+		}
 		/** 药丸文案：永远答「还能用多少」（余），限额/连坐直说。多窗带窗口短名。 */
 		function pillText(w, multi, t) {
 			// 短标签走 locale（中文「周 / 月 / 日」，英文 1w / 1m / 1d），不让人猜 W 是哪个窗口。
 			const short = multi ? `${t(KIND_SHORT[w.kind] ?? "srolling")} ` : "";
 			if (w.status === "rate-limited" && !w.cascade) return `${short}${t("pillLimited")}`;
 			if (w.status === "rate-limited") return `${short}${t("pillBlocked")}`;
-			return `${short}${t("pillRemaining").replace("{p}", String(Math.round(Math.max(0, 100 - w.percent) * 10) / 10))}`;
+			return `${short}${t("pillRemaining").replace("{p}", String(remainingPercent(w.percent)))}`;
 		}
 		/** extras 标签：plan / account / balance 三类，未知类型回退为余额。 */
 		function extraLabel(x, t) {
@@ -917,14 +920,23 @@ window.__ModuleLoader__.load({
 			);
 		}
 
+		function RemainingBar({ value, color, label }) {
+			const pct = Math.max(0, Math.min(100, Number(value) || 0));
+			return h("div", {
+				role: "progressbar",
+				"aria-valuemin": 0, "aria-valuemax": 100, "aria-valuenow": pct, "aria-label": label,
+				style: { width: "100%", height: 10, marginTop: 8, borderRadius: 6, background: "rgba(148,163,184,.22)", overflow: "hidden" }
+			}, h("div", { style: { width: `${pct}%`, height: "100%", borderRadius: 6, background: color, boxShadow: pct ? "inset 0 1px 0 rgba(255,255,255,.2)" : "none" } }));
+		}
 		/**
-		 * 单窗口行（药丸弹层与设置页共用）：徽标 + 已用% 主数字 + 进度条 + 明细行。
+		 * 单窗口行（药丸弹层与设置页共用）：徽标 + 余量% 主数字 + 进度条（满格=100% 剩余，随已用扣减）+ 明细行。
 		 * 明细分两行：用量/适用范围一行，重置时间一行。挤在一行时「重置于 …（还有 …）」
 		 * 会在窄弹层里被从中间折断，读起来像属性和数值分了家。
 		 */
 		function UsageWindowRow({ w, t, getLocale, uncertain = false }) {
 			const tier = uncertain && w.status !== "rate-limited" ? { icon: "?", badge: "badgeUnknown", color: "#b7791f", rank: 2 } : usageTier(w);
 			const blocked = w.status === "rate-limited";
+			const left = blocked ? 0 : remainingPercent(w.percent);
 			const usageLine = [
 				w.detail && typeof w.detail.used === "number" && typeof w.detail.limit === "number" && w.detail.limit > 0
 					? t("detailUsed").replace("{used}", fmtTokens(w.detail.used)).replace("{limit}", fmtTokens(w.detail.limit)).replace("{unit}", w.detail.unit || "")
@@ -955,12 +967,9 @@ window.__ModuleLoader__.load({
 					}, `${tier.icon} ${t(tier.badge)}`),
 					h("span", { style: { flex: 1 } }),
 					h("strong", { style: { fontSize: 13, color: numColor(w), whiteSpace: "nowrap" } },
-						blocked ? t(tier.num) : t("numUsed").replace("{p}", String(w.percent)))
+						blocked ? t(tier.num) : t("pillRemaining").replace("{p}", String(remainingPercent(w.percent))))
 				),
-				h("progress", {
-					max: 100, value: Math.min(100, w.percent),
-					style: { width: "100%", height: 6, marginTop: 6, accentColor: tier.color }
-				}),
+				RemainingBar({ value: left, color: tier.color, label: blocked ? t(tier.num) : t("pillRemaining").replace("{p}", String(remainingPercent(w.percent))) }),
 				usageLine || resetParts
 					? h("div", { style: { fontSize: 11, opacity: 0.7, marginTop: 4 } },
 						usageLine ? h("div", { style: { overflowWrap: "anywhere" } }, usageLine) : null,

package/lib/index.js

@@ -411,7 +411,7 @@ function volcFailure(action, error) {
 }
 async function fetchJson(fetcher, url, headers, lifetimeSignal, init = {}) {
  let response;
- try { response = await fetcher(url, { method: init.method ?? "GET", ...(init.body !== undefined ? { body: init.body } : {}), headers: { accept: "application/json", "user-agent": "dsh-subusage/0.10.9", ...headers }, signal: lifetimeSignal ? AbortSignal.any([AbortSignal.timeout(10000), lifetimeSignal]) : AbortSignal.timeout(10000), redirect: "manual" }); }
+ try { response = await fetcher(url, { method: init.method ?? "GET", ...(init.body !== undefined ? { body: init.body } : {}), headers: { accept: "application/json", "user-agent": "dsh-subusage/0.10.10", ...headers }, signal: lifetimeSignal ? AbortSignal.any([AbortSignal.timeout(10000), lifetimeSignal]) : AbortSignal.timeout(10000), redirect: "manual" }); }
  catch { throw failure("subusage/network", "网络请求失败或超时", true); }
  if (response.status >= 300 && response.status < 400 || response.status === 401 || response.status === 403) throw failure("subusage/auth", "登录或凭据已失效");
  if (!response.ok) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-subusage",
-  "version": "0.10.9",
+  "version": "0.10.10",
   "displayName": "订阅用量显示",
   "description": "显示 DeepSeek 官方余额、火山方舟（arkcli 官方 CLI 路由：Agent / Coding Plan 个人版与企业版席位，设置页合并为一组）、Z.ai（中国与国际）、Kimi、MiMo、OpenCode Go、Command Code、SuperGrok、Codex（ChatGPT 订阅，默认关闭）、MiniMax（中国）、Synthetic、NanoGPT、SiliconFlow、OpenRouter、Novita、Hyperbolic、DeepInfra、Chutes、Ollama Cloud、Vercel AI Gateway、ZenMux、LiteLLM 的订阅余量与余额；共享刷新与凭据管理，默认关闭 17 家。",
   "keywords": [