dsh-client-ui-cpa-quota 0.4.2 → 0.5.0

package/README.md

@@ -180,6 +180,7 @@ Point the plugin's manual instance input at the mock to see a full five-account
 - **Stale numbers?** Numbers refresh on the configured interval; a failed refresh keeps the last good snapshot and says so on the card.
 - **Where are my keys stored?** In this browser's `localStorage` only. Quota requests go straight from the browser to each instance; the DSH host never sees your keys.
 - **Switching browsers?** Use **Export config / Import config** on the card to move instances and keys between browsers. The exported JSON is plaintext — store it carefully.
+- **Tooltip shows every account?** The tooltip filters accounts by the selected model's family — from the model name first, then the DSH provider id. If a custom route name reveals neither, the plugin cannot know which account CPA will route the request to, so it lists every usable account and says so in the tooltip.
 
 ## Community
 

package/README.zh.md

@@ -180,6 +180,7 @@ node tests/mock-cpa.mjs     # 可选：在 http://127.0.0.1:8317 起一个假 CP
 - **数字不新鲜？** 按设定间隔自动刷新；刷新失败会保留上次成功数据并在卡片上说明。
 - **密钥存在哪？** 只存当前浏览器的 `localStorage`。额度请求由浏览器直达各实例，DSH 宿主完全接触不到你的密钥。
 - **换浏览器？** 用卡片里的「导出配置 / 导入配置」在浏览器之间迁移实例与密钥。导出的 JSON 是明文，注意保管。
+- **悬浮卡片显示了全部账号？** 卡片按当前模型的「家族」过滤账号——先看模型名，识别不出再看 DSH 提供方 id。自定义路由名两者都看不出时，插件无法判断 CPA 会把请求路由给哪个账号，于是列出全部可用账号并在卡片里注明。
 
 ## 社区
 

package/lib/client.js

@@ -39,6 +39,9 @@ window.__ModuleLoader__.load({
 		const EV_UPDATED = "dsh-cpa-quota:updated";
 		const EV_REFRESH = "dsh-cpa-quota:refresh-requested";
 		const PROBE_TTL = 60 * 60 * 1000;
+		/** Unreachable/unknown verdicts retry on this shorter clock so one
+		 * transient network failure never hides a ring for an hour. */
+		const PROBE_RETRY_TTL = 2 * 60 * 1000;
 		const W5H = 5 * 60 * 60;
 		const W7D = 7 * 24 * 60 * 60;
 		const W28D = 28 * 24 * 60 * 60;
@@ -170,6 +173,7 @@ window.__ModuleLoader__.load({
 			if (provider === "anthropic" || provider === "claude-code") return "claude";
 			if (provider === "grok" || provider === "x-ai" || provider === "x.ai") return "xai";
 			if (provider === "gemini-cli" || provider === "gemini") return provider;
+			if (provider === "zai" || provider === "zhipu" || provider === "chatglm") return "glm";
 			return provider;
 		};
 
@@ -457,13 +461,29 @@ window.__ModuleLoader__.load({
 			}
 		}
 
+		/**
+		 * The ChatGPT account id for a Codex auth file. CPA stores it in more
+		 * than one place depending on version: `tokens.account_id` is the
+		 * canonical field in current builds, older ones only carry the JWT
+		 * `id_token`, and metadata/attributes copies appear on the management
+		 * API projection.
+		 */
 		function codexAccountId(entry) {
-			const candidates = [entry.id_token, getPath(entry, ["metadata", "id_token"]), getPath(entry, ["attributes", "id_token"])];
+			const direct = firstText(
+				entry.chatgpt_account_id,
+				entry.account_id,
+				getPath(entry, ["tokens", "account_id"]),
+				getPath(entry, ["tokens", "chatgpt_account_id"]),
+				getPath(entry, ["metadata", "account_id"]),
+				getPath(entry, ["attributes", "account_id"]),
+			);
+			if (direct !== "") return direct;
+			const candidates = [entry.id_token, getPath(entry, ["tokens", "id_token"]), getPath(entry, ["metadata", "id_token"]), getPath(entry, ["attributes", "id_token"])];
 			for (const candidate of candidates) {
 				const claims = jwtClaims(candidate);
 				if (claims === null) continue;
-				const direct = text(claims.chatgpt_account_id);
-				if (direct !== "") return direct;
+				const directClaim = text(claims.chatgpt_account_id);
+				if (directClaim !== "") return directClaim;
 				const auth = claims["https://api.openai.com/auth"];
 				if (auth !== null && typeof auth === "object") {
 					const nestedId = text(auth.chatgpt_account_id);
@@ -474,7 +494,7 @@ window.__ModuleLoader__.load({
 		}
 
 		function codexPlanFromEntry(entry) {
-			const candidates = [entry.id_token, getPath(entry, ["metadata", "id_token"]), getPath(entry, ["attributes", "id_token"])]
+			const candidates = [entry.id_token, getPath(entry, ["tokens", "id_token"]), getPath(entry, ["metadata", "id_token"]), getPath(entry, ["attributes", "id_token"])]
 				.map(jwtClaims)
 				.filter((claims) => claims !== null);
 			return extractPlan(...candidates);
@@ -620,8 +640,12 @@ window.__ModuleLoader__.load({
 		 * @returns {'cpa'|'no'|'unknown'|'unreachable'}
 		 */
 		async function probeCpa(base) {
+			// A hung probe never yields a verdict and the ring stays missing, so
+			// bound the request like every other network call.
+			const controller = typeof AbortController === "function" ? new AbortController() : null;
+			const timer = controller === null ? 0 : window.setTimeout(() => controller.abort(), 10_000);
 			try {
-				const response = await fetch(`${base}/v0/management/usage-statistics-enabled`, { method: "GET" });
+				const response = await fetch(`${base}/v0/management/usage-statistics-enabled`, { method: "GET", ...(controller === null ? {} : { signal: controller.signal }) });
 				const body = await response.text();
 				if (response.status === 401) return /management|unauthor/i.test(body) ? "cpa" : "unknown";
 				if (response.status === 404) return "no";
@@ -631,6 +655,8 @@ window.__ModuleLoader__.load({
 				return "unknown";
 			} catch {
 				return "unreachable";
+			} finally {
+				if (timer !== 0) window.clearTimeout(timer);
 			}
 		}
 
@@ -639,9 +665,16 @@ window.__ModuleLoader__.load({
 			const targets = [];
 			for (const [key, info] of providerBases) {
 				const hit = cache[key];
-				if (!force && hit !== undefined && Date.now() - hit.at < PROBE_TTL) {
-					discoveredByKey.set(key, { ...hit, baseURL: info.baseURL });
-					continue;
+				if (!force && hit !== undefined) {
+					// Confirmed verdicts (cpa / a plain 404) keep the long cache; a
+					// transient network failure or ambiguous answer must retry
+					// quickly — caching it for an hour left rings missing after a
+					// single hiccup.
+					const ttl = hit.cpa === true || hit.verdict === "no" ? PROBE_TTL : PROBE_RETRY_TTL;
+					if (Date.now() - hit.at < ttl) {
+						discoveredByKey.set(key, { ...hit, baseURL: info.baseURL });
+						continue;
+					}
 				}
 				targets.push([key, info]);
 			}
@@ -1374,21 +1407,21 @@ window.__ModuleLoader__.load({
 			}
 			try {
 				if (provider === "codex") {
+					// No id found is not fatal: some CPA setups bind the account
+					// server-side, so try without the Chatgpt-Account-Id header
+					// and let an upstream rejection surface as the account error.
 					const accountID = codexAccountId(entry);
-					if (accountID === "") {
-						account.error = ZH ? "缺少 chatgpt_account_id" : "missing chatgpt_account_id";
-						return account;
-					}
+					const usageHeaders = {
+						Authorization: "Bearer $TOKEN$",
+						"Content-Type": "application/json",
+						"User-Agent": "codex_cli_rs/0.76.0 (Debian 13.0.0; x86_64) WindowsTerminal",
+					};
+					if (accountID !== "") usageHeaders["Chatgpt-Account-Id"] = accountID;
 					const body = unwrapApiCall(await apiCall(instance, {
 						auth_index: authIndex,
 						method: "GET",
 						url: UPSTREAM.codexUsage,
-						header: {
-							Authorization: "Bearer $TOKEN$",
-							"Content-Type": "application/json",
-							"User-Agent": "codex_cli_rs/0.76.0 (Debian 13.0.0; x86_64) WindowsTerminal",
-							"Chatgpt-Account-Id": accountID,
-						},
+						header: usageHeaders,
 					}));
 					account.windows = parseCodexWindows(body);
 					account.plan = extractPlan(body) || account.plan;
@@ -1613,12 +1646,35 @@ window.__ModuleLoader__.load({
 			if (lower === "") return "";
 			if (/(?:grok|xai)/.test(lower)) return "xai";
 			if (/(?:kimi|moonshot)/.test(lower)) return "kimi";
+			if (/(?:qwen|qwq)/.test(lower)) return "qwen";
+			if (/(?:iflow)/.test(lower)) return "iflow";
+			if (/(?:glm|chatglm|zhipu)/.test(lower)) return "glm";
+			if (/(?:deepseek)/.test(lower)) return "deepseek";
 			if (/(?:gemini|gemma)/.test(lower)) return "gemini";
 			if (/(?:claude|sonnet|opus|haiku|fable)/.test(lower)) return "claude";
 			if (/(?:gpt|openai|codex)/.test(lower) || /(?:^|[-_:/.])o[1-4](?:$|[-_:/.])/.test(lower)) return "gpt";
 			return "";
 		}
 
+		/**
+		 * Second signal for the account filter: the DSH provider id that serves
+		 * the model. Custom route names ("team-claude", "fast-tier") reveal
+		 * nothing on their own, but the provider usually does.
+		 */
+		function providerFamilyFromId(providerId) {
+			const p = text(providerId).toLowerCase();
+			if (/(?:anthropic|claude)/.test(p)) return "claude";
+			if (/(?:gemini)/.test(p)) return "gemini";
+			if (/(?:codex|openai|gpt)/.test(p)) return "gpt";
+			if (/(?:kimi|moonshot)/.test(p)) return "kimi";
+			if (/(?:grok|xai)/.test(p)) return "xai";
+			if (/(?:qwen)/.test(p)) return "qwen";
+			if (/(?:iflow)/.test(p)) return "iflow";
+			if (/(?:deepseek)/.test(p)) return "deepseek";
+			if (/(?:glm|zai|zhipu)/.test(p)) return "glm";
+			return "";
+		}
+
 		function modelSpecificWindows(account, modelId) {
 			const lower = text(modelId).toLowerCase();
 			if (lower === "") return [];
@@ -1648,25 +1704,37 @@ window.__ModuleLoader__.load({
 				case "openai": return family === "gpt";
 				case "kimi": return family === "kimi";
 				case "xai": return family === "xai";
+				case "qwen": return family === "qwen";
+				case "iflow": return family === "iflow";
+				case "glm": return family === "glm";
+				case "deepseek": return family === "deepseek";
 				default: return false;
 			}
 		}
 
-		/** Accounts whose provider/model rows match the selected model. */
-		function accountsForModel(accounts, modelId) {
+		/**
+		 * Accounts whose provider/model rows match the selected model. Two
+		 * signals: the model name's family, then the DSH provider id that serves
+		 * it (custom route names reveal nothing on their own). When neither
+		 * yields a family, CPA's routing decision is unknowable from the client,
+		 * so every usable account is listed and the tooltip says why.
+		 */
+		function accountsForModel(accounts, modelId, providerHint = "") {
 			if (!Array.isArray(accounts)) return [];
-			const family = modelFamily(modelId);
-			if (text(modelId) === "" || family === "") return accounts;
+			if (text(modelId) === "") return accounts;
+			let family = modelFamily(modelId);
+			if (family === "") family = providerFamilyFromId(providerHint);
+			if (family === "") return accounts.filter((account) => !account.disabled && !account.unavailable);
 			const specific = accounts.filter((account) => modelSpecificWindows(account, modelId).length > 0);
 			if (specific.length > 0) return specific;
-		return accounts.filter((account) => {
-			if (!providerMatchesFamily(account.provider, family)) return false;
-			const rows = Array.isArray(account.windows) ? account.windows : [];
-			// An account with model/prefix-tagged rows for another family must not
-			// fall through as a generic provider account for this model.
-			const hasTaggedRows = rows.some((row) => row.modelId !== null || Array.isArray(row.modelIds) || Array.isArray(row.prefixes));
-			return !hasTaggedRows;
-		});
+			return accounts.filter((account) => {
+				if (!providerMatchesFamily(account.provider, family)) return false;
+				const rows = Array.isArray(account.windows) ? account.windows : [];
+				// An account with model/prefix-tagged rows for another family must not
+				// fall through as a generic provider account for this model.
+				const hasTaggedRows = rows.some((row) => row.modelId !== null || Array.isArray(row.modelIds) || Array.isArray(row.prefixes));
+				return !hasTaggedRows;
+			});
 		}
 
 		function modelRowsForAccount(account, modelId) {
@@ -1728,12 +1796,12 @@ window.__ModuleLoader__.load({
 			});
 		}
 
-		/** Ring level for one instance given the current model. */
-		function levelFor(state, modelId) {
-			if (state === undefined) return { level: "pending", remaining: null };
-			if (state.state === "nokey") return { level: "pending", remaining: null };
-			if (state.state === "error") return { level: "error", remaining: null };
-			const matchingAccounts = accountsForModel(state.accounts, modelId);
+			/** Ring level for one instance given the current model. */
+			function levelFor(state, modelId, providerHint = "") {
+				if (state === undefined) return { level: "pending", remaining: null };
+				if (state.state === "nokey") return { level: "pending", remaining: null };
+				if (state.state === "error") return { level: "error", remaining: null };
+				const matchingAccounts = accountsForModel(state.accounts, modelId, providerHint);
 			const rows = [];
 			for (const account of matchingAccounts) {
 				if (account.disabled || account.unavailable) continue;
@@ -2464,6 +2532,7 @@ body[data-ds-dark-theme] .cpa-q-select{color-scheme:dark}
 			function showTooltip(dot) {
 				const key = dot.getAttribute("data-cpa-base") ?? "";
 				const modelId = dot.getAttribute("data-cpa-model") ?? "";
+				const providerHint = dot.getAttribute("data-cpa-provider") ?? "";
 				const instance = instanceByKey.get(key);
 				const state = quotaByKey.get(key);
 				if (instance === undefined) return;
@@ -2515,12 +2584,17 @@ body[data-ds-dark-theme] .cpa-q-select{color-scheme:dark}
 				} else if (state.accounts.length === 0) {
 					tip.appendChild(el("div", "cpa-q-row", ZH ? "该实例没有账号（auth-files 为空）" : "no auth files on this instance"));
 				} else {
-					const matchingAccounts = accountsForModel(state.accounts, modelId);
-					if (matchingAccounts.length === 0) {
-						tip.appendChild(el("div", "cpa-q-row", ZH ? "该模型没有匹配的厂商额度" : "no matching provider quota for this model"));
-					} else {
-						for (const account of matchingAccounts) tip.appendChild(accountSection(account, modelId));
-					}
+					const matchingAccounts = accountsForModel(state.accounts, modelId, providerHint);
+						if (matchingAccounts.length === 0) {
+							tip.appendChild(el("div", "cpa-q-row", ZH ? "该模型没有匹配的厂商额度" : "no matching provider quota for this model"));
+						} else {
+							if (modelFamily(modelId) === "" && providerFamilyFromId(providerHint) === "") {
+								tip.appendChild(el("div", "cpa-q-hint", ZH
+									? "无法从模型名识别账号归属，以下为该实例全部可用账号"
+									: "model family unknown — listing every usable account on this instance"));
+							}
+							for (const account of matchingAccounts) tip.appendChild(accountSection(account, modelId));
+						}
 					if (state.stale && state.lastError) {
 						const hint = el("div", "cpa-q-hint");
 						hint.textContent = ZH ? "暂时无法刷新，显示上次成功数据" : "refresh temporarily unavailable; showing the last good snapshot";
@@ -2612,7 +2686,7 @@ body[data-ds-dark-theme] .cpa-q-select{color-scheme:dark}
 			function applyDotState(ring) {
 				const key = ring.getAttribute("data-cpa-base") ?? "";
 				const modelId = ring.getAttribute("data-cpa-model") ?? "";
-				const agg = levelFor(quotaByKey.get(key), modelId);
+				const agg = levelFor(quotaByKey.get(key), modelId, ring.getAttribute("data-cpa-provider") ?? "");
 				ring.setAttribute("data-cpa-level", agg.level);
 				const arc = ring.querySelector(".cpa-q-arc");
 				if (arc !== null) {
@@ -2805,9 +2879,11 @@ body[data-ds-dark-theme] .cpa-q-select{color-scheme:dark}
 					if (ring.getAttribute("data-cpa-model") !== modelId) {
 						ring.setAttribute("data-cpa-model", modelId);
 						ring.setAttribute("data-cpa-base", key);
+						ring.setAttribute("data-cpa-provider", model.providerId ?? "");
 						if (tipAnchor === ring) showTooltip(ring);
 					}
 					ring.setAttribute("data-cpa-base", key);
+					ring.setAttribute("data-cpa-provider", model.providerId ?? "");
 					placeRing(ring, button);
 					applyDotState(ring);
 				}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-client-ui-cpa-quota",
   "description": "CliProxyAPI quota indicator: a native-styled ring left of the composer model name; hover shows per-account provider quotas, subscription plans, and status for Codex, Claude, Antigravity, Gemini CLI, Kimi, xAI/Grok, and other CPA auth providers. Targets the current dsh plugin contract (settings-namespace-keyed plugin cards).",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "author": "wkscc310",
   "repository": {
     "type": "git",