@liyang8246/dsh-accounts 0.1.11 → 0.1.13

package/lib/client.js

@@ -182,7 +182,8 @@
 	}
 	function activeQuota(snapshot, channel) {
 		const quota = snapshot?.accounts.find((account) => account.channel === channel && account.active)?.quota;
-		return quota?.status === "ok" ? measuredWindows(quota.windows) : [];
+		if (!quota) return [];
+		return measuredWindows(quota.windows);
 	}
 	function leftOf(window) {
 		return window.exhausted ? 0 : Math.min(100, Math.max(0, 100 - window.usedPercent));
@@ -542,6 +543,7 @@
 	}
 	// src/client/composer-quota.tsx
 	function createComposerQuota(React, ctx, store, QuotaBars) {
+		let lastChannel;
 		return function ComposerQuota({ sessionId }) {
 			React.useSyncExternalStore((fn) => ctx.locale.subscribe(fn), () => ctx.locale.getSnapshot());
 			const models = ctx.get("modelDirectories");
@@ -554,7 +556,11 @@
 			}, [models, sessionId]);
 			const state = React.useSyncExternalStore(React.useCallback((listener) => modelStore ? modelStore.subscribe(listener) : () => {}, [modelStore]), React.useCallback(() => modelStore?.getSnapshot(), [modelStore]));
 			const data = React.useSyncExternalStore(store.subscribe, store.getSnapshot);
-			const channel = channelOf(state?.current?.provider);
+			const current = state?.current;
+			let channel;
+			if (current === null) channel = lastChannel;
+			else if (current !== void 0) channel = channelOf(current.provider);
+			if (channel !== void 0) lastChannel = channel;
 			React.useEffect(() => {
 				if (channel) store.reload().catch(() => {});
 			}, [channel]);
@@ -676,18 +682,20 @@
 			}
 			return cache.value;
 		};
-		const wrapped = {
-			getSnapshot: read,
-			subscribe(listener) {
-				const stopSource = source.subscribe(listener);
-				const stopFilter = filter.subscribe(listener);
-				return () => {
-					stopSource();
-					stopFilter();
-				};
-			},
-			set: (next) => source.set(next)
+		const subscribe = (listener) => {
+			const stopSource = source.subscribe(listener);
+			const stopFilter = filter.subscribe(listener);
+			return () => {
+				stopSource();
+				stopFilter();
+			};
 		};
+		const wrapped = new Proxy(source, { get(target, property) {
+			if (property === "getSnapshot") return read;
+			if (property === "subscribe") return subscribe;
+			const value = Reflect.get(target, property, target);
+			return typeof value === "function" ? value.bind(target) : value;
+		} });
 		Object.defineProperty(catalog, "store", {
 			configurable: true,
 			get: () => wrapped
@@ -696,7 +704,7 @@
 	// src/client/quota.tsx
 	function createQuotaComponents(React, t) {
 		function Quota({ quota }) {
-			const windows = quota?.status === "ok" ? measuredWindows(quota.windows) : [];
+			const windows = measuredWindows(quota?.windows ?? []);
 			return /* @__PURE__ */ React.createElement("div", { className: windows.length ? void 0 : "zph-quota-unavailable" }, windows.length ? /* @__PURE__ */ React.createElement("div", { className: "zph-quota" }, windows.map((window) => /* @__PURE__ */ React.createElement("div", {
 				key: window.period,
 				className: "zph-window"
@@ -705,7 +713,7 @@
 				"data-level": levelOf(window),
 				role: "img",
 				"aria-label": `${window.period} ${t("left")} ${Math.round(leftOf(window))}%`
-			}, /* @__PURE__ */ React.createElement("b", { style: { width: `${leftOf(window)}%` } })), window.used !== void 0 && window.limit !== void 0 && /* @__PURE__ */ React.createElement("div", { className: "zph-muted" }, `${window.used} / ${window.limit} ${window.unit || ""}`)))) : /* @__PURE__ */ React.createElement("p", { className: "zph-muted" }, t(quota ? "unavailable" : "notFetched")), quota?.status === "ok" && quota.windows.filter((window) => window.period === "other").map((window, index) => /* @__PURE__ */ React.createElement("div", {
+			}, /* @__PURE__ */ React.createElement("b", { style: { width: `${leftOf(window)}%` } })), window.used !== void 0 && window.limit !== void 0 && /* @__PURE__ */ React.createElement("div", { className: "zph-muted" }, `${window.used} / ${window.limit} ${window.unit || ""}`)))) : /* @__PURE__ */ React.createElement("p", { className: "zph-muted" }, t(quota ? "unavailable" : "notFetched")), quota?.windows.filter((window) => window.period === "other").map((window, index) => /* @__PURE__ */ React.createElement("div", {
 				className: "zph-muted",
 				key: index
 			}, `${window.label || t("other")}: ${window.usedPercent?.toFixed(1) ?? "—"}% ${t("used")}`)), quota?.reason && /* @__PURE__ */ React.createElement("p", { className: quota.status === "error" ? "zph-error" : "zph-muted" }, quota.reason));

package/lib/index.js

@@ -7317,12 +7317,15 @@ var ModelAccountsService = class {
 					this.accounts.saveQuota(id, quota).catch(() => {});
 				}
 			} catch (error) {
-				if (!this.controller.signal.aborted && (await this.accounts.list()).some((account) => account.id === id)) this.quotas.set(id, {
-					status: "error",
-					fetchedAt: (/* @__PURE__ */ new Date()).toISOString(),
-					windows: [],
-					reason: safeError(error)
-				});
+				if (!this.controller.signal.aborted && (await this.accounts.list()).some((account) => account.id === id)) {
+					const previous = await this.lastGoodQuota(id);
+					this.quotas.set(id, {
+						status: "error",
+						fetchedAt: previous?.fetchedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+						windows: previous?.windows ?? [],
+						reason: safeError(error)
+					});
+				}
 			}
 		})();
 		this.fetching.set(id, operation);
@@ -7332,6 +7335,20 @@ var ModelAccountsService = class {
 			this.fetching.delete(id);
 		}
 	}
+	/**
+	* Read the last measurement a failed refresh should keep showing.
+	* @param id - account whose quota is being reported.
+	* @returns the cached view, else the persisted one, else the bare cached one.
+	*/
+	async lastGoodQuota(id) {
+		const cached = this.quotas.get(id);
+		if (cached?.windows.length) return cached;
+		try {
+			return (await this.accounts.quotas())[id] ?? cached;
+		} catch {
+			return cached;
+		}
+	}
 	async resetCredit(id, signal) {
 		const view = (await this.accounts.list()).find((account) => account.id === id);
 		if (!view) throw new Error("Account not found");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@liyang8246/dsh-accounts",
   "type": "module",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "Independent multi-account Codex, OpenCode Go and CommandCode Go plugin for DeepSeek Harness.",
   "repository": { "type": "git", "url": "https://github.com/liyang8246/dsh-zolin.git", "directory": "packages/dsh-accounts" },
   "exports": {