dsh-subusage 0.8.1 → 0.8.2

package/README.md

@@ -6,7 +6,7 @@
 
 ## 安装与快速开始
 
-当前仓库版本 **0.8.1**，可从 GitHub Release 获取。npm 自动发布采用 Trusted Publishing（GitHub OIDC）；可用版本见 [npm](https://www.npmjs.com/package/dsh-subusage)。安装时使用目标 DSH 部署提供的插件管理器或 CLI，并启用本 bundle：
+当前仓库版本 **0.8.2**，可从 GitHub Release 获取。npm 自动发布采用 Trusted Publishing（GitHub OIDC）；可用版本见 [npm](https://www.npmjs.com/package/dsh-subusage)。安装时使用目标 DSH 部署提供的插件管理器或 CLI，并启用本 bundle：
 
 | 来源 | 安装标识或下载地址 |
 |---|---|
@@ -29,7 +29,7 @@
 
 ### 药丸
 
-选中已开启且未被默认隐藏的模型商时显示，例如 `✓ 余 87%`、`⚠ 7d 余 12%`、`✕ 7d 已达限额`。多窗口取最差一窗，点击看完整详情。Command Code 药丸弹层底部可切换提供方插件的服务账户（自动轮换 / 默认账户 / 各额外账户，与其设置页同一开关，即时生效）；弹层额度数字始终为默认账户（顶层 Key）的用量，不随切换改变。关闭默认隐藏后，缺凭据时显示配置指引；可保留的临时网络错误会明确标注缓存，而非冒充当前成功。
+选中已开启且未被默认隐藏的模型商时显示，例如 `✓ 余 87%`、`⚠ 7d 余 12%`、`✕ 7d 已达限额`。多窗口取最差一窗，点击看完整详情。Command Code 药丸弹层底部可切换提供方插件的服务账户（自动轮换 / 默认账户 / 各额外账户，与其设置页同一开关，即时生效）；切换后药丸与弹层上方的用量同步改为所选账户的额度（自动轮换时仍显示默认账户/顶层 Key 的用量，弹层有标注说明）。关闭默认隐藏后，缺凭据时显示配置指引；可保留的临时网络错误会明确标注缓存，而非冒充当前成功。
 
 ### 设置
 
@@ -124,7 +124,7 @@ JSON 中有域名的条目按 `platform.xiaomimimo.com` 的 Cookie 域规则过
 | 保存成功但验证失败 | 凭据已保存，检查网络、区域或账号后重试；保存与在线验证分别反馈 |
 | 保存提示配置已改变 | 另一窗口或实例更新了设置；重新读取配置后再编辑，避免旧表单覆盖新值 |
 | 升级后仍是旧界面或 RPC 不匹配 | 确认运行中的 Host 和 Client 都已重载；仅刷新页面不能保证 Host 升级 |
-| Command Code 额度与实际账户不同 | 弹层额度始终读取默认顶层账户，不随账户切换改变；可在药丸弹层切换提供方插件的服务账户（activeAccount），多账户轮换或提供方自定义 apiBase 仍不跟随 |
+| Command Code 额度与实际账户不同 | 可在药丸弹层切换提供方插件的服务账户（activeAccount），切换后药丸与弹层用量同步显示所选账户的额度；「自动轮换」时仍显示默认账户（顶层 Key）的用量，不跟随轮换中的实际服务账户，提供方自定义 apiBase 也不跟随 |
 
 ## 提供商 ID 与默认开关
 

package/lib/client.js

@@ -106,13 +106,15 @@ window.__ModuleLoader__.load({
 			pillNeedCommandcode: "需配置 —— 可在 设置 → Command Code 登录、运行 cmd login，或导出 COMMANDCODE_API_KEY 后重试。",
 			accountLabel: "账户",
 			commandcodeManaged: "凭据由 Command Code 提供方插件（设置 → Command Code）管理；本页只读、不保存凭据。用量由本插件直接拉取其计费接口，取用同一凭据来源（凭据服务 COMMANDCODE_API_KEY → 启动环境 → ~/.commandcode/auth.json）。",
-			commandcodeHelp: "并行读取 /alpha/billing/credits 和 /alpha/billing/subscriptions（默认 API 地址 https://api.commandcode.ai）。月总额按已知套餐快照推算，未知套餐只显示月剩余；月池耗尽不代表已购/赠送池不可用。多账户轮换或固定 activeAccount 时这里显示默认账户（顶层 Key）的额度，可能与实际服务账户不同；插件里自定义 apiBase 不会被跟随。",
+			commandcodeHelp: "并行读取 /alpha/billing/credits 和 /alpha/billing/subscriptions（默认 API 地址 https://api.commandcode.ai）。月总额按已知套餐快照推算，未知套餐只显示月剩余；月池耗尽不代表已购/赠送池不可用。显示药丸弹层中选择的账户的额度（未选择时为默认账户/顶层 Key），可能与实际服务账户不同；插件里自定义 apiBase 不会被跟随。",
 			ccAccountsTitle: "Command Code 账户",
 			ccAccountAuto: "自动轮换",
 			ccAccountDefault: "默认账户",
 			ccAccountActive: "使用中",
-			ccAccountsHint: "切换对 Command Code 提供方插件全局生效（与其设置页同一开关）；上方额度数字始终是默认账户（顶层 Key）的用量，不随切换改变。",
+			ccAccountsHint: "切换对 Command Code 提供方插件全局生效（与其设置页同一开关）；上方用量同步切换为所选账户的额度。",
 			ccAccountsUnavailable: "账户列表不可用（需要 Command Code 提供方插件在运行）",
+			ccUsageAccount: "上方用量：{account}",
+			ccUsageAutoNote: "自动轮换时上方用量仍是默认账户（顶层 Key），不跟随实际服务账户",
 			ccSwitching: "切换中…",
 			ccSwitchFailed: "切换失败"
 		};
@@ -204,13 +206,15 @@ window.__ModuleLoader__.load({
 			pillNeedCommandcode: "Setup required — sign in under Settings → Command Code, run cmd login, or export COMMANDCODE_API_KEY and retry.",
 			accountLabel: "Account",
 			commandcodeManaged: "Credentials are managed by the Command Code provider plugin (Settings → Command Code); this page is read-only and stores nothing. Usage is fetched directly by this plugin from its billing endpoint, using the same credential sources (credential service COMMANDCODE_API_KEY → launch environment → ~/.commandcode/auth.json).",
-			commandcodeHelp: "Parallel requests to /alpha/billing/credits and /alpha/billing/subscriptions (default API base https://api.commandcode.ai). Monthly totals use a known-plan snapshot; unknown plans show remaining credits only. Monthly-pool depletion does not imply purchased/free credits are unusable. With account rotation or a pinned activeAccount this shows the default (top-level key) account's quota, which may differ from the serving account; a custom apiBase in the provider plugin is not followed.",
+			commandcodeHelp: "Parallel requests to /alpha/billing/credits and /alpha/billing/subscriptions (default API base https://api.commandcode.ai). Monthly totals use a known-plan snapshot; unknown plans show remaining credits only. Monthly-pool depletion does not imply purchased/free credits are unusable. Shows the quota of the account selected in the pill popover (the default/top-level key account when none is selected), which may differ from the serving account; a custom apiBase in the provider plugin is not followed.",
 			ccAccountsTitle: "Command Code accounts",
 			ccAccountAuto: "Automatic (rotation order)",
 			ccAccountDefault: "Default account",
 			ccAccountActive: "in use",
-			ccAccountsHint: "Switching applies globally to the Command Code provider plugin (same switch as its settings page); the quota numbers above always reflect the default (top-level key) account and do not follow the switch.",
+			ccAccountsHint: "Switching applies globally to the Command Code provider plugin (same switch as its settings page); the usage above switches to the selected account's quota.",
 			ccAccountsUnavailable: "Account list unavailable (requires the Command Code provider plugin to be running)",
+			ccUsageAccount: "Usage above: {account}",
+			ccUsageAutoNote: "with automatic rotation the usage above stays on the default (top-level key) account, not the serving one",
 			ccSwitching: "Switching…",
 			ccSwitchFailed: "Switch failed"
 		};
@@ -402,7 +406,7 @@ window.__ModuleLoader__.load({
 					namespace: "subUsage",
 					method: "read",
 					invocation: { kind: "direct" },
-					parameters: [],
+					parameters: [{ name: "request", wire: "request", source: "json", acceptsUndefined: true, codec: queryCodec }],
 					result: resultCodec
 				},
 				{
@@ -527,6 +531,9 @@ window.__ModuleLoader__.load({
 			let snapshot = { updatedAt: null, settings: null, configured: {}, entries: [] };
 			let disposed = false, initial = null, timer = null, epoch = 0, sequence = 0, metadataSequence = 0;
 			let loginGeneration = 0, loginJobId = null, loginPending = false;
+			// Command Code 显示账户：弹层账户区选中的账户（"" = 默认账户/顶层 Key）。
+			// 所有 commandcode 读取（readAll/refresh/定时刷新）都携带它，切换后用量同步跟随。
+			let ccAccount = "";
 			const mergedLoginJobs = new Set();
 			const providerSequence = new Map();
 			const markRequest = (ids) => { const version = ++sequence; for (const id of ids) providerSequence.set(id, version); return { version, ids }; };
@@ -555,7 +562,7 @@ window.__ModuleLoader__.load({
 				const missing = unique.filter((id) => !inflight.has(id));
 				if (missing.length) {
 					const startedEpoch = epoch, request = markRequest(missing);
-					const task = Promise.resolve().then(() => call("refresh", { providerIds: missing, force: !!force })).then((value) => startedEpoch === epoch ? merge(value, request) : snapshot).catch((error) => {
+					const task = Promise.resolve().then(() => call("refresh", { providerIds: missing, force: !!force, commandCodeAccount: ccAccount })).then((value) => startedEpoch === epoch ? merge(value, request) : snapshot).catch((error) => {
 						// 传输失败不能擅自 retainPrevious：只有 Host 明确标 stale 才保留。
 						if (startedEpoch === epoch) merge({ entries: missing.map((providerId) => ({ providerId, state: "error", error: error instanceof Error ? error.message : String(error), freshness: "unknown", coverage: "partial", windows: [], extras: [] })) }, request);
 						throw error;
@@ -594,12 +601,24 @@ window.__ModuleLoader__.load({
 				}
 				return value;
 			};
+			const setCommandCodeAccount = (id) => {
+				const next = typeof id === "string" ? id.trim() : "";
+				if (disposed || ccAccount === next) return Promise.resolve(snapshot);
+				ccAccount = next;
+				// 账户变了：旧账户的在途/缓存数据立即失效，强制按新账户重拉。
+				invalidate(["commandcode"]);
+				// invalidate 只重写快照不通知：补一次 emit 让药丸立即进入加载态，
+				// 避免强制刷新返回前「标注已是新账户、数字还是旧账户」的瞬态错标。
+				emit();
+				return refresh(["commandcode"], true);
+			};
 			return {
 				subscribe, getSnapshot: () => snapshot, refresh, activate,
+				getCommandCodeAccount: () => ccAccount, setCommandCodeAccount,
 				startMimoLogin: async (request) => { const generation = ++loginGeneration, startedEpoch = epoch; loginJobId = null; return acceptLogin(await call("startMimoLogin", request), generation, startedEpoch); },
 				getMimoLoginStatus: async () => { const generation = loginGeneration, startedEpoch = epoch, jobId = loginPending ? loginJobId : null; return acceptLogin(await call("getMimoLoginStatus"), generation, startedEpoch, jobId); },
 				cancelMimoLogin: async (request) => { if (loginJobId && request.jobId !== loginJobId) return null; const generation = ++loginGeneration, startedEpoch = epoch; return acceptLogin(await call("cancelMimoLogin", request), generation, startedEpoch, request.jobId); },
-				readAll: () => { if (!initial) { const startedEpoch = epoch, request = markRequest(PROVIDER_ORDER); initial = Promise.resolve().then(() => call("read")).then((value) => startedEpoch === epoch ? merge(value, request) : snapshot).catch((error) => { initial = null; throw error; }); } return initial.then(() => snapshot); },
+				readAll: () => { if (!initial) { const startedEpoch = epoch, request = markRequest(PROVIDER_ORDER); initial = Promise.resolve().then(() => call("read", { providerIds: PROVIDER_ORDER, force: false, commandCodeAccount: ccAccount })).then((value) => startedEpoch === epoch ? merge(value, request) : snapshot).catch((error) => { initial = null; throw error; }); } return initial.then(() => snapshot); },
 				save: async (patch) => {
 					const value = await call("save", patch); epoch++;
 					if (patch.visibility) { const entries = snapshot.entries; markRequest(PROVIDER_ORDER); return merge({ ...value, entries }, null, true); }
@@ -628,8 +647,10 @@ window.__ModuleLoader__.load({
 
 		// ── Command Code 账户切换（对齐提供方插件的账户显示）────────────────────
 		// 账户列表与 id 规则对齐 @mars-sea/dsh-commandcode-provider 的 slots()：
-		// 默认账户 id 固定 "default"；额外账户 id 取其 apiKeyEnv（凭据引用名），
-		// 缺失时按位置回退 account-N。enrollment 进行中的账户不进列表（与其一致）。
+		// 默认账户 id 固定 "default"；额外账户 id 取其 apiKeyEnv（凭据引用名）。
+		// 与 slots() 的差异：仅配置 literal apiKey（无凭据引用）的槽位不进列表——
+		// 其 Key 存在提供方配置内，本插件无法按引用解析，列出只会选中即报 no-key。
+		// enrollment 进行中的账户不进列表（与其一致）。
 		const COMMANDCODE_SETTINGS_NS = "llm-commandcode";
 		function commandCodeAccountList(value) {
 			const list = [{ id: "default", label: "default" }];
@@ -779,7 +800,7 @@ window.__ModuleLoader__.load({
 			);
 		}
 
-		function UsagePill({ providerId, label, readEntry, t, getLocale, cc }) {
+		function UsagePill({ providerId, label, readEntry, t, getLocale, cc, setCommandCodeAccount }) {
 			const [snapshot, setSnapshot] = react.useState(null);
 			const [failed, setFailed] = react.useState(null);
 			const [failState, setFailState] = react.useState(void 0);
@@ -790,6 +811,14 @@ window.__ModuleLoader__.load({
 			// Command Code 账户区：cc 由装配层注入（提供方插件未运行时为 null，区块整体隐藏）。
 			const ccState = react.useSyncExternalStore(cc ? cc.subscribe : () => () => {}, cc ? cc.getSnapshot : () => null);
 			react.useEffect(() => { if (open && cc) void cc.load(); }, [open, cc]);
+			// 挂载即读一次账户配置：提供方插件固定了账户时，药丸本体不必等弹层打开就跟随。
+			react.useEffect(() => { if (providerId === "commandcode" && cc) void cc.load(); }, [providerId, cc]);
+			// 显示账户跟随账户区的当前固定项（含切换成功后的回读）：ready 才同步，
+			// unavailable/loading 保持现状；store 内部对相同账户去重，不产生多余请求。
+			react.useEffect(() => {
+				if (providerId !== "commandcode" || !ccState || !setCommandCodeAccount) return;
+				if (ccState.status === "ready") void setCommandCodeAccount(ccState.activeId);
+			}, [providerId, setCommandCodeAccount, ccState && ccState.status, ccState && ccState.activeId]);
 			react.useEffect(() => {
 				let alive = true;
 				let busy = false;
@@ -916,6 +945,12 @@ window.__ModuleLoader__.load({
 					cacheAge(rawEntry, t) ? h("p", { style: { color: "#b7791f" } }, cacheAge(rawEntry, t)) : null,
 					// 到期提醒常驻弹层：即使用量正常，也让用户看见 Cookie 还剩多久。
 					expiry ? h("p", { role: "status", style: { margin: "6px 0 0", color: expiring ? expiry.color : "inherit" } }, `${expiry.label} · ${t("mimoCookieExpiresAt").replace("{time}", new Date(expiry.expiresAt).toLocaleString(getLocale()))}`) : null,
+					// 用量账户标注：账户区 ready 时说明上方数字属于哪个账户；自动轮换时明确不跟随实际服务账户。
+					providerId === "commandcode" && ccState && ccState.status === "ready"
+						? h("p", { style: { margin: "6px 0 0", fontSize: 11, opacity: 0.75 } },
+							t("ccUsageAccount").replace("{account}", ccState.activeId === "" || ccState.activeId === "default" ? t("ccAccountDefault") : (ccState.accounts.find((a) => a.id === ccState.activeId)?.label ?? ccState.activeId)),
+							ccState.activeId === "" ? h("span", { style: { opacity: 0.85 } }, ` · ${t("ccUsageAutoNote")}`) : null)
+						: null,
 					windows.map((w) => h(UsageWindowRow, { key: w.kind, w, t, getLocale, uncertain: degraded })),
 					entry && entry.extras && entry.extras.length > 0
 						? h("div", { style: { marginTop: 10, opacity: 0.85 } },
@@ -1263,13 +1298,13 @@ window.__ModuleLoader__.load({
 			ctx.inject(["modelDirectories"], (scope) => {
 				try {
 					scope.slots.inject("conversation.input.right", () => scope.slots.register({ name: "conversation.input.right", id: "subusage-usage", order: 1001,
-						inject: (sessionId) => ({ store: scope.modelDirectories.directoryFor(sessionId).store, readEntry, t, getLocale, cc }) }, SubusagePillEntry));
+						inject: (sessionId) => ({ store: scope.modelDirectories.directoryFor(sessionId).store, readEntry, t, getLocale, cc, setCommandCodeAccount: usageStore.setCommandCodeAccount }) }, SubusagePillEntry));
 				} catch (error) { console.error("[dsh-subusage] 药丸注册失败:", error); }
 			});
 		}
 
 		/** 槽包装：先看当前模型的 provider，再分发到对应药丸。 */
-		function SubusagePillEntry({ store, readEntry, t, getLocale, cc }) {
+		function SubusagePillEntry({ store, readEntry, t, getLocale, cc, setCommandCodeAccount }) {
 			const state = react.useSyncExternalStore(store.subscribe, store.getSnapshot, store.getSnapshot);
 			const provider = state.current && state.current.provider;
 			const info = PROVIDER_ORDER.includes(provider) ? PROVIDER_META[provider] : null;
@@ -1286,7 +1321,8 @@ window.__ModuleLoader__.load({
 				readEntry: reader,
 				t,
 				getLocale,
-				cc
+				cc,
+				setCommandCodeAccount
 			});
 		}
 

package/lib/index.js

@@ -1,6 +1,6 @@
 // dsh-subusage Host：秘密仅保存在 Host，远端只暴露 provider 补丁和公开设置。
 import { RemoteError, TypertRemoteService } from "@deepseek-ai/dsh-typert-protocol";
-import { credentialRef } from "@deepseek-ai/dsh-credentials";
+import { credentialRef, isCredentialRefName } from "@deepseek-ai/dsh-credentials";
 import { launchEnvironmentOf } from "@deepseek-ai/dsh-launch-environment";
 import { chmodSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { createHash } from "node:crypto";
@@ -133,15 +133,21 @@ function parseSettings(value) {
  return out;
 }
 function parseQuery(value) {
+ // request 在 wire 层可选（read 描述符声明 acceptsUndefined）：缺参/undefined/null
+ // = 全量默认账户查询，兼容旧 client bundle 的无参 read。
+ if (value === undefined || value === null) return { providerIds: [...IDS], force: false, commandCodeAccount: "" };
  if (!value || !Array.isArray(value.providerIds) || value.providerIds.some(id => !IDS.includes(id)) || typeof value.force !== "boolean") throw invalid("Invalid refresh request");
- return { providerIds: [...new Set(value.providerIds)], force: value.force };
+ // commandCodeAccount 是可选的显示账户选择：空串/缺省 = 默认账户（顶层 Key）；
+ // 额外账户 id 即其凭据引用名（apiKeyEnv），由 identity 按引用解析。
+ if (value.commandCodeAccount !== undefined && typeof value.commandCodeAccount !== "string") throw invalid("Invalid account selection");
+ return { providerIds: [...new Set(value.providerIds)], force: value.force, commandCodeAccount: typeof value.commandCodeAccount === "string" ? value.commandCodeAccount.trim() : "" };
 }
 function failure(code, message, retryable = false, retryAfterMs) {
  return new RemoteError(code, message, { retryable, retainPrevious: retryable, ...(retryAfterMs !== undefined ? { retryAfterMs } : {}) });
 }
 async function fetchJson(fetcher, url, headers, lifetimeSignal) {
  let response;
- try { response = await fetcher(url, { headers: { accept: "application/json", "user-agent": "dsh-subusage/0.8.1", ...headers }, signal: lifetimeSignal ? AbortSignal.any([AbortSignal.timeout(10000), lifetimeSignal]) : AbortSignal.timeout(10000), redirect: "manual" }); }
+ try { response = await fetcher(url, { headers: { accept: "application/json", "user-agent": "dsh-subusage/0.8.2", ...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) {
@@ -341,7 +347,7 @@ const loginCodec = codec("SubUsageLoginState", value => {
 export const subUsageRemote = {
  package: name,
  descriptors: [
-  { id: `${name}#subUsage/read`, service: "subUsage", namespace: "subUsage", method: "read", invocation: { kind: "direct" }, parameters: [], result: resultCodec },
+  { id: `${name}#subUsage/read`, service: "subUsage", namespace: "subUsage", method: "read", invocation: { kind: "direct" }, parameters: [{ name: "request", wire: "request", source: "json", acceptsUndefined: true, codec: codec("SubUsageQuery", parseQuery) }], result: resultCodec },
   ...[["refresh", "request", "SubUsageQuery", parseQuery], ["save", "settings", "SubUsageSettings", parseSettings]].map(([method, param, type, parse]) => ({ id: `${name}#subUsage/${method}`, service: "subUsage", namespace: "subUsage", method, invocation: { kind: "direct" }, parameters: [{ name: param, wire: param, source: "json", codec: codec(type, parse) }], result: resultCodec })),
   { id: `${name}#subUsage/getMimoLoginStatus`, service: "subUsage", namespace: "subUsage", method: "getMimoLoginStatus", invocation: { kind: "direct" }, parameters: [], result: loginCodec },
   ...[["startMimoLogin", "MimoLoginStart", parseLoginStart], ["cancelMimoLogin", "MimoLoginCancel", parseLoginCancel]].map(([method, type, parse]) => ({ id: `${name}#subUsage/${method}`, service: "subUsage", namespace: "subUsage", method, invocation: { kind: "direct" }, parameters: [{ name: "request", wire: "request", source: "json", codec: codec(type, parse) }], result: loginCodec }))
@@ -357,6 +363,10 @@ export class SubUsageService extends TypertRemoteService {
   this.now = options.now ?? Date.now;
   this.credentials = options.resolveCredentials ?? (async id => await ctx.get("credentials")?.resolve(credentialRef(PROVIDERS[id].envName)));
   this.environment = options.resolveEnvironment ?? (id => launchEnvironmentOf(ctx).get(PROVIDERS[id].envName));
+  // 额外账户按凭据引用名（apiKeyEnv）解析，与提供方插件 slots()/resolveRef 同一通道；
+  // 默认账户仍走上面的 envName 链（凭据服务 → 启动环境 → ~/.commandcode/auth.json）。
+  this.accountCredentials = options.resolveAccountCredentials ?? (async ref => await ctx.get("credentials")?.resolve(credentialRef(ref)));
+  this.accountEnvironment = options.resolveAccountEnvironment ?? (ref => launchEnvironmentOf(ctx).get(ref));
   this.authFile = options.resolveAuthFile ?? (async () => commandCodeAuthFileKey(this.io));
   this.cache = new Map(); this.inflight = new Map(); this.generations = new Map(); this.fingerprints = new Map(); this.disposed = false; this.controller = new AbortController();
   this.login = new MimoLogin({
@@ -379,9 +389,19 @@ export class SubUsageService extends TypertRemoteService {
   catch (e) { if (e?.code === "ENOENT") return defaultSettings(); throw failure("subusage/config", "无法读取订阅设置"); }
  }
  result(settings, entries) { return { updatedAt: new Date(this.now()).toISOString(), settings: publicSettings(settings), configured: detectConfigured(this.ctx), entries }; }
- async identity(id, s) {
+ async identity(id, s, account) {
   if (id === "xiaomi-token-plan-cn") return { key: s.xiaomi.cookie.trim(), source: s.xiaomi.cookie.trim() ? "cookie" : "none" };
   if (!PROVIDERS[id].managedByPlugin && s.keyModes[id] === "manual") return { key: s.keys[id]?.trim(), source: s.keys[id]?.trim() ? "manual" : "none" };
+  if (id === "commandcode" && account && account !== "default") {
+   // 额外账户：id 即凭据引用名（apiKeyEnv）。引用名不合法（不可能来自提供方
+   // 插件的 slots，但 client 输入不可信）按未配置处理，不让 credentialRef 抛错。
+   if (!isCredentialRefName(account)) return { key: undefined, source: "none" };
+   const hit = await this.accountCredentials(account);
+   if (typeof hit?.value === "string" && hit.value.trim()) return { key: hit.value.trim(), source: "credentials" };
+   const env = await this.accountEnvironment(account);
+   if (typeof env?.value === "string" && env.value.trim()) return { key: env.value.trim(), source: "env" };
+   return { key: undefined, source: "none" };
+  }
   const hit = await this.credentials(id);
   if (typeof hit?.value === "string" && hit.value.trim()) return { key: hit.value.trim(), source: "credentials" };
   const env = await this.environment(id);
@@ -432,23 +452,27 @@ export class SubUsageService extends TypertRemoteService {
   if (usageError) data.usageError = usageError;
   return data;
  }
- base(id, source, settings) {
+ base(id, source, settings, account = "") {
   // MiMo 会话 Cookie 自签发起 24 小时有效；到期时间随每条 entry 下发，供药丸与设置页倒计时。
   const expiresAt = id === "xiaomi-token-plan-cn" ? isoStamp(settings?.xiaomi?.expiresAt) : null;
-  return { providerId: id, label: PROVIDERS[id].label, envName: PROVIDERS[id].envName, keySource: source, apiDetected: source === "none" ? null : true, coverage: "partial", freshness: "unknown", lastSuccessAt: null, lastAttemptAt: new Date(this.now()).toISOString(), retryable: false, retainPrevious: false, ...(expiresAt ? { cookieExpiresAt: expiresAt } : {}) };
+  // commandcode 记录本条用量所属账户（default 或额外账户引用名），供弹层标注与测试核对。
+  const shown = id === "commandcode" ? { account: account !== "" ? account : "default" } : {};
+  return { providerId: id, label: PROVIDERS[id].label, envName: PROVIDERS[id].envName, keySource: source, apiDetected: source === "none" ? null : true, coverage: "partial", freshness: "unknown", lastSuccessAt: null, lastAttemptAt: new Date(this.now()).toISOString(), retryable: false, retainPrevious: false, ...shown, ...(expiresAt ? { cookieExpiresAt: expiresAt } : {}) };
  }
- async provider(id, settings, force) {
+ async provider(id, settings, force, account = "") {
   const startedGeneration = this.generations.get(id) ?? 0;
   let identity;
-  try { identity = await this.identity(id, settings); }
-  catch { this.cache.delete(id); return { ...this.base(id, "none", settings), state: "error", errorCode: "subusage/credentials", error: "无法解析凭据" }; }
+  try { identity = await this.identity(id, settings, account); }
+  catch { this.cache.delete(id); return { ...this.base(id, "none", settings, account), state: "error", errorCode: "subusage/credentials", error: "无法解析凭据" }; }
   if (this.disposed) throw failure("subusage/disposed", "服务已卸载");
-  if (startedGeneration !== (this.generations.get(id) ?? 0)) return this.provider(id, this.load(), force);
+  if (startedGeneration !== (this.generations.get(id) ?? 0)) return this.provider(id, this.load(), force, account);
   if (!settings.visibility.providers[id]) {
    this.cache.delete(id); this.inflight.delete(id);
-   return { ...this.base(id, identity.source, settings), state: "disabled", apiDetected: !!identity.key, windows: [], extras: [] };
+   return { ...this.base(id, identity.source, settings, account), state: "disabled", apiDetected: !!identity.key, windows: [], extras: [] };
   }
-  const fingerprint = hash([identity.key ?? "", identity.source, settings.keyModes[id], id === "zai-coding-cn" ? settings.zai : null]);
+  // fingerprint 计入账户选择：切换账户后同 id 缓存/inflight 不串账（不同账户 key 必不同）；
+  // 空串与 "default" 同为默认账户，归一后共享缓存。
+  const fingerprint = hash([identity.key ?? "", identity.source, settings.keyModes[id], id === "zai-coding-cn" ? settings.zai : null, id === "commandcode" ? (account && account !== "default" ? account : "default") : null]);
   if (this.fingerprints.has(id) && this.fingerprints.get(id) !== fingerprint) this.generations.set(id, (this.generations.get(id) ?? 0) + 1);
   this.fingerprints.set(id, fingerprint);
   const generation = this.generations.get(id) ?? 0;
@@ -461,8 +485,8 @@ export class SubUsageService extends TypertRemoteService {
   const resetDue = previous?.entry.windows?.some(w => Number.isFinite(Date.parse(w.resetsAt)) && Date.parse(w.resetsAt) > previous.at && Date.parse(w.resetsAt) <= now);
   if (previous && (now < previous.retryAt || !resetDue && !force && now - previous.at < TTL)) return previous.entry;
   const promise = (async () => {
-   const base = this.base(id, identity.source, settings); let entry; let retryAt = 0; let failures = previous?.failures ?? 0;
-   if (!identity.key) entry = { ...base, apiDetected: false, state: id === "xiaomi-token-plan-cn" ? "no-cookie" : "no-key", error: id === "xiaomi-token-plan-cn" ? "需登录或粘贴 Cookie" : id === "commandcode" ? "未检测到 Key：可在 设置 → Command Code 登录、运行 cmd login，或使用 COMMANDCODE_API_KEY（凭据服务/启动环境）" : "未配置 API Key", errorCode: "subusage/no-key" };
+   const base = this.base(id, identity.source, settings, account); let entry; let retryAt = 0; let failures = previous?.failures ?? 0;
+   if (!identity.key) entry = { ...base, apiDetected: false, state: id === "xiaomi-token-plan-cn" ? "no-cookie" : "no-key", error: id === "xiaomi-token-plan-cn" ? "需登录或粘贴 Cookie" : id === "commandcode" ? (account && account !== "default" ? `未检测到账户 ${account} 的 Key：确认提供方插件已保存该账户的凭据（凭据服务或启动环境中无引用 ${account}）` : "未检测到 Key：可在 设置 → Command Code 登录、运行 cmd login，或使用 COMMANDCODE_API_KEY（凭据服务/启动环境）") : "未配置 API Key", errorCode: "subusage/no-key" };
    else try {
     const data = await this.fetchProvider(id, identity, settings);
     const usageError = data.usageError; delete data.usageError;
@@ -478,19 +502,19 @@ export class SubUsageService extends TypertRemoteService {
     if (temporary) retryAt = this.now() + Math.max(e.details?.retryAfterMs ?? 0, Math.min(300000, 1000 * 2 ** Math.min(failures, 8)));
    }
    if (!this.disposed && generation === (this.generations.get(id) ?? 0)) this.cache.set(id, { fingerprint, entry, at: this.now(), retryAt, failures });
-   if (this.disposed || generation !== (this.generations.get(id) ?? 0)) return { ...this.base(id, "none", settings), state: "error", errorCode: "subusage/config-changed", error: "读取期间配置已改变，请刷新" };
+   if (this.disposed || generation !== (this.generations.get(id) ?? 0)) return { ...this.base(id, "none", settings, account), state: "error", errorCode: "subusage/config-changed", error: "读取期间配置已改变，请刷新" };
    return entry;
   })();
   this.inflight.set(id, { fingerprint, generation, promise });
   try { return await promise; } finally { if (this.inflight.get(id)?.promise === promise) this.inflight.delete(id); }
  }
- async read() { return this.refresh({ providerIds: IDS, force: false }); }
+ async read(request) { return this.refresh(request && request.providerIds ? request : { providerIds: IDS, force: false }); }
  async refresh(request) {
   if (this.disposed) throw failure("subusage/disposed", "服务已卸载");
   const query = parseQuery(request); const settings = this.load();
-  const entries = await Promise.all(query.providerIds.map(id => this.provider(id, settings, query.force).catch(() => ({ ...this.base(id, "none", settings), state: "error", errorCode: "subusage/internal", error: "读取用量失败" }))));
+  const entries = await Promise.all(query.providerIds.map(id => this.provider(id, settings, query.force, query.commandCodeAccount).catch(() => ({ ...this.base(id, "none", settings, query.commandCodeAccount), state: "error", errorCode: "subusage/internal", error: "读取用量失败" }))));
   const latest = this.load();
-  if (hash(latest) !== hash(settings)) return this.result(latest, query.providerIds.map(id => ({ ...this.base(id, "none", latest), state: "error", errorCode: "subusage/config-changed", error: "读取期间配置已改变，请刷新" })));
+  if (hash(latest) !== hash(settings)) return this.result(latest, query.providerIds.map(id => ({ ...this.base(id, "none", latest, query.commandCodeAccount), state: "error", errorCode: "subusage/config-changed", error: "读取期间配置已改变，请刷新" })));
   return this.result(latest, entries);
  }
  startMimoLogin(request) { return this.login.start(parseLoginStart(request)); }
@@ -506,7 +530,7 @@ export class SubUsageService extends TypertRemoteService {
   const entry = { ...this.base(id, "cookie", stored), ...data, state: "ok", coverage: data.coverage ?? "partial", freshness: "fresh", lastSuccessAt: new Date(this.now()).toISOString(), ...(usageError ? { errorCode: usageError.code, error: "额度暂时无法读取", retryable: usageError.details?.retryable === true } : {}) };
   // 响应内容也不得回显本次 Cookie（服务端字段属于不可信输入）。
   const safeEntry = redactMimo(entry, cookie);
-  const fingerprint = hash([cookie, "cookie", stored.keyModes[id], null]);
+  const fingerprint = hash([cookie, "cookie", stored.keyModes[id], null, null]);
   this.fingerprints.set(id, fingerprint); this.cache.set(id, { fingerprint, entry: safeEntry, at: this.now(), retryAt: usageError ? this.now() + 15000 : 0, failures: 0 });
   this.loginResultMaterial = this.mimoMaterial(stored);
   return this.result(stored, [safeEntry]);

package/package.json

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