dsh-subusage 0.10.3 → 0.10.4

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.3-blue)](https://www.npmjs.com/package/dsh-subusage)
+[![npm version](https://img.shields.io/badge/npm-0.10.4-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

@@ -891,10 +891,27 @@ window.__ModuleLoader__.load({
 			);
 		}
 
-		/** 单窗口行（药丸弹层与设置页共用）：徽标 + 已用% 主数字 + 进度条 + 明细行。 */
+		/**
+		 * 单窗口行（药丸弹层与设置页共用）：徽标 + 已用% 主数字 + 进度条 + 明细行。
+		 * 明细分两行：用量/适用范围一行，重置时间一行。挤在一行时「重置于 …（还有 …）」
+		 * 会在窄弹层里被从中间折断，读起来像属性和数值分了家。
+		 */
 		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 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 || "")
+					: null,
+				// 不同额度线之间不可比（例如 AFP 的日限额只覆盖视觉 / 语音模型与 Harness）：如实标出适用范围，
+				// 否则"日比周还高"会被读成插件算错。
+				w.detail && w.detail.note ? w.detail.note : null,
+				w.detail && w.detail.limitSource === "plan-snapshot" ? t("planSnapshotLimit") : null
+			].filter(Boolean).join(" · ");
+			const resetParts = [
+				resetLine(w, t, getLocale),
+				w.cascade ? t("cascadeLimited") + (w.detail && w.detail.blockedBy ? ` [${w.detail.blockedBy.join(", ")}]` : "") : null
+			].filter(Boolean).join(" · ");
 			return h("div", {
 				style: {
 					marginTop: 8, padding: "8px 10px", borderRadius: 8,
@@ -918,21 +935,27 @@ window.__ModuleLoader__.load({
 					max: 100, value: Math.min(100, w.percent),
 					style: { width: "100%", height: 6, marginTop: 6, accentColor: tier.color }
 				}),
-				h("div", { style: { fontSize: 11, opacity: 0.7, marginTop: 4 } },
-					[
-						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 || "")
-							: null,
-						// 不同额度线之间不可比（例如 AFP 的日限额只覆盖视觉 / 语音模型与 Harness）：如实标出适用范围，
-						// 否则"日比周还高"会被读成插件算错。
-						w.detail && w.detail.note ? w.detail.note : null,
-						w.detail && w.detail.limitSource === "plan-snapshot" ? t("planSnapshotLimit") : null,
-						resetLine(w, t, getLocale),
-						w.cascade ? t("cascadeLimited") + (w.detail && w.detail.blockedBy ? ` [${w.detail.blockedBy.join(", ")}]` : "") : null
-					].filter(Boolean).join(" · "))
+				usageLine || resetParts
+					? h("div", { style: { fontSize: 11, opacity: 0.7, marginTop: 4 } },
+						usageLine ? h("div", { style: { overflowWrap: "anywhere" } }, usageLine) : null,
+						resetParts ? h("div", { style: { marginTop: usageLine ? 2 : 0, overflowWrap: "anywhere" } }, resetParts) : null)
+					: null
 			);
 		}
 
+		/**
+		 * 窗口列表：额度线切换时插一条分组标题。AFP 的日限额只覆盖视觉 / 语音模型与 Harness，
+		 * 与文本模型的 5 小时 / 周 / 月不是同一条线，混排会让人把两条线的配额当成一组互相比较。
+		 * 弹层与设置页共用，避免只有其中一处带分组。
+		 */
+		function UsageWindowList({ windows, t, getLocale, uncertain = false }) {
+			return (windows || []).map((w, index) => h(react.Fragment, { key: w.kind },
+				w.groupLabel && w.groupLabel !== windows[index - 1]?.groupLabel
+					? h("p", { role: "note", style: { margin: index ? "14px 0 0" : "6px 0 0", fontSize: 11, opacity: 0.6 } }, w.groupLabel)
+					: null,
+				h(UsageWindowRow, { w, t, getLocale, uncertain })));
+		}
+
 		function UsagePill({ providerId, label, readEntry, t, getLocale, cc, setCommandCodeAccount }) {
 			const [snapshot, setSnapshot] = react.useState(null);
 			const [failed, setFailed] = react.useState(null);
@@ -1086,11 +1109,7 @@ window.__ModuleLoader__.load({
 						: null,
 					// 额度线切换时插一条分组标题：AFP 的日限额只覆盖视觉 / 语音模型与 Harness，与文本模型的
 					// 5 小时 / 周 / 月不是同一条线，混排会让人把两条线的配额当成一组来互相比较。
-					windows.map((w, index) => h(react.Fragment, { key: w.kind },
-						w.groupLabel && w.groupLabel !== windows[index - 1]?.groupLabel
-							? h("p", { style: { margin: index ? "14px 0 0" : "6px 0 0", fontSize: 11, opacity: 0.6 } }, w.groupLabel)
-							: null,
-						h(UsageWindowRow, { w, t, getLocale, uncertain: degraded }))),
+					UsageWindowList({ windows, t, getLocale, uncertain: degraded }),
 					entry && entry.extras && entry.extras.length > 0
 						? h("div", { style: { marginTop: 10, opacity: 0.85 } },
 							entry.extras.map((x) => h("div", { key: x.kind }, `${extraLabel(x, t)}: ${x.value}`)))
@@ -1469,7 +1488,7 @@ window.__ModuleLoader__.load({
 						h("span", { style: { flex: 1, minWidth: 150, fontSize: 12 } }, usageAction === "mimo-relogin" ? text("Cookie 已过期，重新登录即可恢复。", "Cookie expired — sign in again to restore.") : usageAction === "mimo-login" ? text("需要登录 MiMo（或 Cookie 即将到期）。", "MiMo sign-in needed (or the cookie is about to expire).") : text("这家还没有可用的凭据。", "No usable credentials for this provider.")),
 						usageAction !== "credentials" ? h("button", { type: "button", style: primary, disabled: busy || loginActive, onClick: startLogin }, usageAction === "mimo-relogin" ? text("重新登录", "Sign in again") : text("登录并自动导入", "Sign in & import")) : null,
 						h("button", { type: "button", style: usageAction === "credentials" ? primary : btnStyle, disabled: busy, onClick: () => revealEditor(usageId) }, usageAction === "credentials" ? text("配置凭据", "Configure credentials") : text("手动填写", "Enter manually"))) : null,
-					canShowUsage(usageEntry) && (usageEntry.windows || []).length ? (usageEntry.windows || []).map((w) => h(UsageWindowRow, { key: w.kind, w, t, getLocale, uncertain: usageEntry.coverage === "partial" || usageEntry.freshness === "stale" || usageEntry.state !== "ok" })) : h("p", { style: { opacity: .75 } }, usageEntry ? t("noUsageData") : t("loading")),
+					canShowUsage(usageEntry) && (usageEntry.windows || []).length ? UsageWindowList({ windows: usageEntry.windows, t, getLocale, uncertain: usageEntry.coverage === "partial" || usageEntry.freshness === "stale" || usageEntry.state !== "ok" }) : h("p", { style: { opacity: .75 } }, usageEntry ? t("noUsageData") : t("loading")),
 					canShowUsage(usageEntry) && usageEntry.extras ? h("p", { style: { opacity: .75 } }, usageEntry.extras.map((x) => `${extraLabel(x, t)}: ${x.value}`).join(" · ")) : null,
 					usageEntry?.lastAttemptAt ? h("p", { style: { opacity: .65 } }, `${t("lastUpdated")} ${new Date(usageEntry.lastAttemptAt).toLocaleString(getLocale())}`) : null
 				) : null,

package/lib/index.js

@@ -312,7 +312,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.3", ...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.4", ...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) {
@@ -883,7 +883,9 @@ export class SubUsageService extends TypertRemoteService {
     if (apiError) throw volcFailure(action, apiError);
     return response;
    };
-   const toWindows = parsed => cascadeRateLimited(parsed.windows.map(w => windowRow(w.kind, w.percent, w.resetsAt, w.percent >= 100 ? "rate-limited" : undefined, w.detail)));
+   // 额度线分组标注（AFP 的日限额只覆盖视觉 / 语音模型与 Harness）由 volcengine.js 的解析器产出，
+   // 这里是把它带进 wire 的唯一通道：windowRow 只认五个字段，漏掉 groupLabel 会让前端静默失去分组。
+   const toWindows = parsed => cascadeRateLimited(parsed.windows.map(w => ({ ...windowRow(w.kind, w.percent, w.resetsAt, w.percent >= 100 ? "rate-limited" : undefined, w.detail), ...(w.groupLabel ? { groupLabel: w.groupLabel } : {}) })));
    // 企业版/团队版：额度挂在席位上，先取 SeatID 再查该席位。
    if (spec.volcSeat) {
     const seatIds = parseVolcSeatIds(await call("ListSeatInfos", { Filter: {}, Scene: spec.volcScene, PageNum: 1, PageSize: 100 }));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-subusage",
   "displayName": "订阅用量显示",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"