@liyang8246/dsh-accounts 0.1.12 → 0.1.14

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]);
@@ -698,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"
@@ -707,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");
@@ -7339,7 +7356,7 @@ var ModelAccountsService = class {
 		await consumeCodexResetCredit(await this.accounts.resolve(view.channel, signal, id), signal);
 		await this.refreshQuota(id, signal);
 	}
-	async dispatch(raw, origin, signal) {
+	async dispatch(raw, signal) {
 		if (this.controller.signal.aborted) throw new Error("Plugin is unloading");
 		const args = record(raw);
 		const action = text(args.action, "action");
@@ -7347,7 +7364,7 @@ var ModelAccountsService = class {
 			case "list": {
 				const snapshot = await this.snapshot();
 				const login = this.logins.pending;
-				return origin === "ui" && login ? {
+				return login ? {
 					...snapshot,
 					login
 				} : snapshot;
@@ -7371,11 +7388,9 @@ var ModelAccountsService = class {
 				break;
 			}
 			case "reset_credit":
-				if (origin !== "ui") throw new Error("Resetting quota is user-only; open Settings → Model Accounts");
 				await this.resetCredit(text(args.id, "account id"), signal);
 				break;
 			case "set_filter":
-				if (origin !== "ui") throw new Error("The model filter is user-only; open Settings → Model Accounts");
 				await this.accounts.saveFilter(filterText(args.filter));
 				break;
 			case "refresh_quota": {
@@ -7386,7 +7401,6 @@ var ModelAccountsService = class {
 				break;
 			}
 			default:
-				if (origin !== "ui") throw new Error("Authentication is user-only; open Settings → Model Accounts");
 				if (action !== "add_key") return this.logins.dispatch(action, args);
 				await this.accounts.add(channelFor(args.channel).id, text(args.label, "account label"), {
 					kind: "api-key",
@@ -29354,57 +29368,8 @@ const inject = [
 	"llm",
 	"credentials",
 	"connection",
-	"tools",
 	"attachments"
 ];
-function accountTool(service) {
-	return {
-		name: "zephyr_accounts",
-		description: "List model-channel accounts, select one active account per channel, rename/remove a saved login, or refresh quota. Removal does not revoke upstream access. Login and API-key entry are user-only in Settings → Model Accounts. Never returns tokens.",
-		parameters: {
-			type: "object",
-			properties: {
-				action: {
-					type: "string",
-					enum: [
-						"list",
-						"activate",
-						"deactivate",
-						"rename",
-						"remove",
-						"refresh_quota"
-					]
-				},
-				channel: {
-					type: "string",
-					enum: channels.map((channel) => channel.id),
-					description: "Required for activate/deactivate."
-				},
-				id: {
-					type: "string",
-					description: "Account id returned by list. Required for activate/rename/remove; omit to refresh all quotas."
-				},
-				label: {
-					type: "string",
-					description: "New display label, required for rename."
-				}
-			},
-			required: ["action"],
-			additionalProperties: false
-		},
-		output: {
-			schema: {
-				type: "object",
-				additionalProperties: true
-			},
-			render: (_args, value) => [{
-				type: "text",
-				text: JSON.stringify(value)
-			}]
-		},
-		execute: (args, exec) => service.dispatch(args, "agent", exec.signal)
-	};
-}
 function apply(ctx) {
 	const service = new ModelAccountsService(ctx);
 	const transport = createTransport(ctx, (channel, signal) => service.accounts.resolve(channel, signal), service.catalog, (channel, signal) => service.refreshCatalog(channel, signal));
@@ -29432,7 +29397,6 @@ function apply(ctx) {
 			registration?.();
 		};
 	});
-	ctx.effect(() => ctx.tools.register(accountTool(service)));
 	ctx.effect(() => ctx.connection.fetch.register({
 		path: "/api/zephyr-models",
 		methods: ["POST"],
@@ -29440,7 +29404,7 @@ function apply(ctx) {
 		async fetch(request) {
 			try {
 				const args = await jsonResponse(new Response(request.body), 65536);
-				const value = await service.dispatch(args, "ui", request.signal);
+				const value = await service.dispatch(args, request.signal);
 				return Response.json(value, { headers: { "Cache-Control": "no-store" } });
 			} catch (error) {
 				return Response.json({ error: safeError(error) }, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@liyang8246/dsh-accounts",
   "type": "module",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "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": {
@@ -33,7 +33,6 @@
     "@deepseek-ai/dsh-client-ui-slots": "0.2.1-rc.5",
     "@deepseek-ai/dsh-credentials": "0.2.1-rc.5",
     "@deepseek-ai/dsh-llm": "0.2.1-rc.5",
-    "@deepseek-ai/dsh-tools": "0.2.1-rc.5",
     "@earendil-works/pi-ai": "1.1.0"
   },
   "dsh": {