dsh-subscriptions 0.1.2 → 0.1.3

package/lib/client.js

@@ -190,8 +190,9 @@ const en = {
 	usageBadgeTitle: "Provider usage",
 	usageBadgeDisplay: "Status-bar quota display",
 	usageBadgeDisplayRecent: "Current / most recent provider with usage",
+	usageBadgeDisplayAlways: "Always show one provider, rotating through the rest",
 	usageBadgeDisplayHidden: "Hidden",
-	usageBadgeDisplayHint: "Saved automatically in this browser. One provider is shown at a time. Models without a quota source keep the most recent provider selected in this view, or show nothing. Hiding does not affect usage details here.",
+	usageBadgeDisplayHint: "Saved automatically in this browser. One provider is shown at a time. Models without a quota source keep the most recent provider selected in this view, or show nothing. Always show instead rotates through the providers with usage every 10 seconds while the current model has no quota source. Hiding does not affect usage details here.",
 	usageBadgeDisplaySaveFailed: "Could not save the display preference. Check browser storage permissions.",
 	usageBadgeCurrent: "current",
 	usageBadgeModelCount: "{count} model quotas",
@@ -361,8 +362,9 @@ const zh = {
 	usageBadgeTitle: "服务商用量",
 	usageBadgeDisplay: "状态栏额度显示",
 	usageBadgeDisplayRecent: "仅显示当前／最近使用的用量服务商",
+	usageBadgeDisplayAlways: "始终显示一家，其余服务商轮播",
 	usageBadgeDisplayHidden: "不显示",
-	usageBadgeDisplayHint: "自动保存到当前浏览器。状态栏一次显示一家服务商；没有额度来源的模型沿用本视图最近选择的服务商，没有记录则隐藏。关闭不影响本页的额度详情。",
+	usageBadgeDisplayHint: "自动保存到当前浏览器。状态栏一次显示一家服务商；没有额度来源的模型沿用本视图最近选择的服务商，没有记录则隐藏。选择“始终显示”时，当前模型没有额度来源，就每 10 秒轮播一家有额度的服务商。关闭不影响本页的额度详情。",
 	usageBadgeDisplaySaveFailed: "显示设置保存失败，请检查浏览器存储权限。",
 	usageBadgeCurrent: "当前",
 	usageBadgeModelCount: "{count} 个模型配额",
@@ -1402,7 +1404,8 @@ const USAGE_BADGE_REFRESH_EVENT = "dsh:subscriptions:usage-refresh";
 function readUsageBadgeMode() {
 	if (typeof window === "undefined") return "recent";
 	try {
-		return window.localStorage.getItem(MODE_KEY) === "hidden" ? "hidden" : "recent";
+		const value = window.localStorage.getItem(MODE_KEY);
+		return value === "hidden" || value === "always" ? value : "recent";
 	} catch (error) {
 		if (!(error instanceof DOMException) || error.name !== "SecurityError") throw error;
 		return "recent";
@@ -1410,7 +1413,7 @@ function readUsageBadgeMode() {
 }
 /** Save first, then notify; the settings control reports a rejected write. */
 function setUsageBadgeMode(mode) {
-	if (mode !== "recent" && mode !== "hidden") throw new TypeError("Invalid subscription usage display mode");
+	if (mode !== "recent" && mode !== "always" && mode !== "hidden") throw new TypeError("Invalid subscription usage display mode");
 	window.localStorage.setItem(MODE_KEY, mode);
 	window.dispatchEvent(new Event(MODE_EVENT));
 }
@@ -1466,10 +1469,23 @@ function resetCountdownParts(ms) {
 		}
 	].filter((part) => part.count > 0).slice(0, 2);
 }
+/**
+* Whether the reported percentage still describes the window now. Only a fresh
+* reading may be compared with the current time (pace warnings); an old one
+* keeps its absolute color. This does not decide whether the time cursor is
+* drawn: where the window stands in time never depends on the reading.
+*/
 function isUsageFresh(window$1, observation, now = Date.now()) {
 	return validUsage(window$1.usedPercent) && observation.stale !== true && observation.observedAt !== void 0 && Number.isFinite(observation.observedAt) && observation.observedAt <= now && now - observation.observedAt <= USAGE_FRESHNESS_MS && (window$1.resetsAt === void 0 || Number.isFinite(window$1.resetsAt) && window$1.resetsAt > now);
 }
-/** Only explicit intervals or provider-verified fixed durations support linear pace. */
+/**
+* How far through its window the clock is, from the window's own timing alone.
+* It ignores the percentage and how recently it was read, so an unused,
+* stale, aged or unobserved reading keeps its cursor whenever the timing
+* places it. Returns undefined when the timing cannot: only an explicit
+* interval or a provider-verified fixed duration supports linear pace, and no
+* start is invented from a window's kind or label.
+*/
 function elapsedPercent(window$1, now = Date.now()) {
 	const end = window$1.resetsAt;
 	if (end === void 0 || !Number.isFinite(end) || end <= now) return void 0;
@@ -1548,17 +1564,18 @@ function UsageMeter({ window: quota, t, style, observedAt, stale }) {
 		observedAt,
 		stale
 	}, current);
-	const elapsed = fresh ? elapsedPercent(quota, current) : void 0;
-	const state = usageColorState(quota.usedPercent, elapsed, preset, fresh);
-	const lead = elapsed === void 0 ? 0 : Math.round(used - elapsed);
+	const elapsed = elapsedPercent(quota, current);
+	const pace = fresh ? elapsed : void 0;
+	const state = usageColorState(quota.usedPercent, pace, preset, fresh);
+	const lead = pace === void 0 ? 0 : Math.round(used - pace);
 	const label = [
 		valid ? t("usageMeterUsed", {
 			used: Math.round(used),
 			remaining: Math.round(100 - used)
 		}) : t("usageMeterInvalid"),
-		!valid ? "" : !fresh ? t("usageMeterStale") : state === "red" ? t("usageMeterNearLimit") : elapsed === void 0 && preset !== "remaining" ? t("usageMeterUnknownTime") : state === "yellow" ? t("usageMeterAhead") : t("usageMeterNoWarning"),
+		!valid ? "" : !fresh ? t("usageMeterStale") : state === "red" ? t("usageMeterNearLimit") : pace === void 0 && preset !== "remaining" ? t("usageMeterUnknownTime") : state === "yellow" ? t("usageMeterAhead") : t("usageMeterNoWarning"),
 		elapsed === void 0 ? "" : t("usageMeterPace", { elapsed: Math.round(elapsed) }),
-		elapsed === void 0 ? "" : lead > 0 ? t("usageMeterPaceAhead", { points: lead }) : lead < 0 ? t("usageMeterPaceBehind", { points: -lead }) : t("usageMeterPaceEven"),
+		pace === void 0 ? "" : lead > 0 ? t("usageMeterPaceAhead", { points: lead }) : lead < 0 ? t("usageMeterPaceBehind", { points: -lead }) : t("usageMeterPaceEven"),
 		quota.resetsAt !== void 0 && quota.resetsAt > current ? t("usageMeterReset", { duration: resetCountdownParts(quota.resetsAt - current).map((part) => t(UNIT_KEYS[part.unit][part.count === 1 ? 0 : 1], { count: part.count })).join(" ") }) : ""
 	].filter(Boolean).join(" · ");
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -1579,7 +1596,7 @@ function UsageMeter({ window: quota, t, style, observedAt, stale }) {
 			height: "100%",
 			borderRadius: "inherit",
 			width: `${used}%`,
-			background: usageBarColor(quota.usedPercent, elapsed, preset, fresh)
+			background: usageBarColor(quota.usedPercent, pace, preset, fresh)
 		} }), elapsed !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 			"aria-hidden": "true",
 			"data-usage-time-marker": true,
@@ -1623,6 +1640,21 @@ const SOURCES = [
 function errorText(error) {
 	return error instanceof Error ? error.message : String(error);
 }
+/**
+* Row label of one window on an external usage card. A session or weekly
+* window appends the model it belongs to when the provider names one (MiniMax
+* reports a window per model), so two models' weekly rows stay distinguishable.
+* The monthly pool is a scope on an `other` window, not a model.
+* @param t - section translate.
+* @param window - the reported window.
+* @returns the localized label, e.g. "Weekly · general".
+*/
+function externalUsageWindowLabel(t, window$1) {
+	const named = window$1.scope !== void 0 && window$1.scope !== "";
+	if (window$1.kind === "other") return window$1.scope === "Monthly" ? t("usageMonthly") : named ? window$1.scope : t("usageWindow");
+	const base = window$1.kind === "session" ? t("usageSession") : t("usageWeekly");
+	return named ? `${base} · ${window$1.scope}` : base;
+}
 /** Quota cards for API-key providers already available through DSH itself. */
 function ExternalUsageCards({ rpc, t }) {
 	const [status, setStatus] = (0, react.useState)();
@@ -1755,7 +1787,7 @@ function ExternalUsageCards({ rpc, t }) {
 							}),
 							snapshot?.windows?.map((window$1, index) => {
 								const percent = displayUsedPercent(window$1.usedPercent);
-								const label = window$1.kind === "session" ? t("usageSession") : window$1.kind === "weekly" ? t("usageWeekly") : window$1.scope === "Monthly" ? t("usageMonthly") : window$1.scope ?? t("usageWindow");
+								const label = externalUsageWindowLabel(t, window$1);
 								return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 									style: subscriptionCardStyles.usageRow,
 									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -2050,7 +2082,7 @@ function UsageBadgeDisplaySetting({ t }) {
 					value: mode,
 					onChange: (event) => {
 						const value = event.currentTarget.value;
-						if (value !== "recent" && value !== "hidden") return;
+						if (value !== "recent" && value !== "always" && value !== "hidden") return;
 						try {
 							setUsageBadgeMode(value);
 							setFailed(false);
@@ -2059,13 +2091,20 @@ function UsageBadgeDisplaySetting({ t }) {
 							setFailed(true);
 						}
 					},
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-						value: "recent",
-						children: t("usageBadgeDisplayRecent")
-					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-						value: "hidden",
-						children: t("usageBadgeDisplayHidden")
-					})]
+					children: [
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+							value: "recent",
+							children: t("usageBadgeDisplayRecent")
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+							value: "always",
+							children: t("usageBadgeDisplayAlways")
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+							value: "hidden",
+							children: t("usageBadgeDisplayHidden")
+						})
+					]
 				})]
 			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
@@ -3893,6 +3932,8 @@ const UsageBadgeIcon = usageBadgeIcon(__deepseek_ai_dsh_client_ui_primitives);
 const USAGE_POLL_INTERVAL_MS = 15 * 6e4;
 /** How often the badge re-reads the session's current model (model switches arrive only by asking). */
 const MODEL_POLL_INTERVAL_MS = 3e3;
+/** How long the rotation holds one provider in `always` mode (a display cadence, not a data poll). */
+const BADGE_ROTATION_INTERVAL_MS = 1e4;
 /** Distance between the trigger's top edge and the dialog's bottom (host stat dialogs use the same). */
 const PANEL_GAP = 8;
 /** Distance kept between the dialog and each viewport edge. */
@@ -4092,6 +4133,24 @@ function collapsedDisplays(displays, current) {
 	const match = displays.find((d) => d.provider === current);
 	return match === void 0 ? [] : [match];
 }
+/**
+* `always` mode: the current model's provider while it reports usage,
+* otherwise the rotation steps through the providers that do, in display
+* order, wrapping around. The index is taken modulo the current provider
+* count, so providers appearing or dropping out stay inside range; the
+* sequence itself may shift when the roster changes. Unlike `recent`, the
+* retained subscription does not pin the pill — that retention is exactly
+* what this mode exists to escape.
+* @param displays - providers with usage, in display order.
+* @param current - the provider of the session's current model.
+* @param step - rotation tick; consecutive ticks advance one provider.
+*/
+function rotatingDisplay(displays, current, step) {
+	if (displays.length === 0) return [];
+	const match = displays.find((d) => d.provider === current);
+	if (match !== void 0) return [match];
+	return [displays[((Number.isFinite(step) ? Math.floor(step) : 0) % displays.length + displays.length) % displays.length]];
+}
 /** Order for the expanded dialog: the current provider first, the rest in poll order. */
 function expandedDisplays(displays, current) {
 	const match = displays.find((d) => d.provider === current);
@@ -4125,7 +4184,7 @@ function usageWindowLabel(t, window$1) {
 * every provider's accounts and their windows. Returns null when no data is
 * available.
 */
-function SubscriptionUsageBadge({ rpc, currentModel, t }) {
+function SubscriptionUsageBadge({ rpc, currentModel, t, rotationMs }) {
 	const translate = t ?? fallbackTranslate;
 	const [displays, setDisplays] = (0, react.useState)([]);
 	const [selection, setSelection] = (0, react.useState)(void 0);
@@ -4135,6 +4194,8 @@ function SubscriptionUsageBadge({ rpc, currentModel, t }) {
 	const badgeSelection = retainSubscriptionSelection(lastSubscription, selection);
 	const [open, setOpen] = (0, react.useState)(false);
 	const [hover, setHover] = (0, react.useState)(false);
+	const [rotation, setRotation] = (0, react.useState)(0);
+	const [dialogLead, setDialogLead] = (0, react.useState)(void 0);
 	const inflightRef = (0, react.useRef)(false);
 	const mountedRef = (0, react.useRef)(true);
 	const rootRef = (0, react.useRef)(null);
@@ -4298,18 +4359,32 @@ function SubscriptionUsageBadge({ rpc, currentModel, t }) {
 	(0, react.useEffect)(() => {
 		if (displayMode === "hidden") setOpen(false);
 	}, [displayMode]);
+	(0, react.useEffect)(() => {
+		if (displayMode !== "always") return;
+		const interval = rotationMs !== void 0 && Number.isFinite(rotationMs) && rotationMs > 0 ? rotationMs : BADGE_ROTATION_INTERVAL_MS;
+		const timer = setInterval(() => {
+			setRotation((step) => step + 1);
+		}, interval);
+		return () => {
+			clearInterval(timer);
+		};
+	}, [displayMode, rotationMs]);
 	const seat = /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 		ref: seatRef,
 		style: styles.seat,
 		"aria-hidden": true
 	});
-	const collapsed = collapsedDisplays(displays, badgeSelection?.provider);
+	const collapsed = displayMode === "always" ? rotatingDisplay(displays, current, rotation) : collapsedDisplays(displays, badgeSelection?.provider);
 	if (displayMode === "hidden" || collapsed.length === 0) return seat;
-	const label = compactSegment(collapsed[0], badgeSelection?.model, translate);
-	const expanded = expandedDisplays(displays, badgeSelection?.provider);
+	const pillModel = displayMode === "always" ? current === collapsed[0]?.provider ? selection?.model : void 0 : badgeSelection?.model;
+	const label = compactSegment(collapsed[0], pillModel, translate);
+	const dialogProvider = open && displayMode === "always" ? dialogLead : badgeSelection?.provider;
+	const dialogModel = open && displayMode === "always" ? dialogLead === current ? selection?.model : void 0 : badgeSelection?.model;
+	const expanded = expandedDisplays(displays, dialogProvider);
 	const title = translate("usageBadgeTitle");
 	const toggle = () => {
 		const next = !open;
+		setDialogLead(collapsed[0]?.provider);
 		setOpen(next);
 		if (next) refresh();
 	};
@@ -4383,10 +4458,10 @@ function SubscriptionUsageBadge({ rpc, currentModel, t }) {
 							windows: account.windows,
 							observedAt: account.observedAt,
 							stale: account.stale,
-							model: d.provider === badgeSelection?.provider ? badgeSelection.model : void 0,
+							model: d.provider === dialogProvider ? dialogModel : void 0,
 							provider: d.provider,
 							translate
-						}, `${d.provider}:${badgeSelection?.model ?? ""}`)]
+						}, `${d.provider}:${dialogModel ?? ""}`)]
 					}, account.key))]
 				}, d.provider))
 			]