@mars-sea/dsh-commandcode-provider 0.12.1 → 0.12.2

package/lib/client.js

@@ -36,6 +36,38 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
+		//#region src/client/error-text.ts
+		/**
+		* Turn a caught value into readable text for the settings page's error UI.
+		*
+		* @module dsh-commandcode-provider/client/error-text
+		*/
+		/**
+		* `error instanceof Error ? error.message : String(error)` degrades to the
+		* literal string `[object Object]` for a plain object with no `Error`
+		* prototype — which is exactly what a Remote call across the webview/host
+		* boundary can hand back: `dsh-typert-protocol` serializes a rejection for
+		* the wire, and a structurally-cloned value loses its prototype chain even
+		* when the host threw a real `Error` (issue #74). Reading a `message` string
+		* off the plain object first recovers the original text in that case; only a
+		* value with neither an `Error` prototype nor a usable `message` field falls
+		* through to a JSON dump.
+		*/
+		function readableErrorText(error) {
+			if (error instanceof Error) return error.message;
+			if (typeof error === "string") return error;
+			if (error !== null && typeof error === "object") {
+				const message = error.message;
+				if (typeof message === "string" && message !== "") return message;
+				try {
+					return JSON.stringify(error);
+				} catch {
+					return Object.prototype.toString.call(error);
+				}
+			}
+			return String(error);
+		}
+		//#endregion
 		//#region src/client/settings-scope.ts
 		/**
 		* Backoff before re-reading a directory whose FIRST read failed, in millis.
@@ -169,7 +201,7 @@ window.__ModuleLoader__.load({
 								outcome = typeof value === "object" && value !== null ? { view: value } : { failure: "settings describe answered no view" };
 							} else outcome = { failure: response.error?.message ?? "settings describe failed" };
 						} catch (error) {
-							outcome = { failure: error instanceof Error ? error.message : String(error) };
+							outcome = { failure: readableErrorText(error) };
 						}
 						if (generation !== this.generation) continue;
 						if ("view" in outcome) {
@@ -310,7 +342,7 @@ window.__ModuleLoader__.load({
 				} catch (error) {
 					return {
 						ok: false,
-						error: { message: error instanceof Error ? error.message : String(error) }
+						error: { message: readableErrorText(error) }
 					};
 				}
 			}
@@ -417,6 +449,7 @@ window.__ModuleLoader__.load({
 				subscribe: (listener) => scope.subscribe(listener),
 				set: (field, value) => scope.set(field, value),
 				unset: (field) => scope.unset(field),
+				mutate: (ops, revision) => scope.mutate(ops, revision),
 				refresh: () => {
 					mirror.load();
 				},
@@ -428,6 +461,23 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
+		//#region src/timeout-limits.ts
+		/** 两端共用可编辑超时范围，存储仍是整数毫秒；提示不能借用重试退避上限。 */
+		const MIN_TIMEOUT_SECONDS = .001;
+		const MAX_TIMEOUT_SECONDS = 3600;
+		//#endregion
+		//#region src/model-visibility.ts
+		/** 网页、终端与模型目录共用的选择规则；显式开关优先于白名单。 */
+		function modelIsVisible(id, allowlist, overrides) {
+			const flag = overrides !== null && typeof overrides === "object" && !Array.isArray(overrides) ? overrides[id] : void 0;
+			return typeof flag === "boolean" ? flag : allowlist.length === 0 || allowlist.includes(id);
+		}
+		/** 只接收布尔事实，手工配置中的其他值不能成为可见性开关。 */
+		function readVisibility(raw) {
+			if (raw === null || typeof raw !== "object" || Array.isArray(raw)) return {};
+			return Object.fromEntries(Object.entries(raw).filter(([id, value]) => id !== "" && typeof value === "boolean"));
+		}
+		//#endregion
 		//#region src/client/settings.ts
 		/**
 		* Browser controller for the "Command Code" settings page (a `settings.section`
@@ -526,28 +576,25 @@ window.__ModuleLoader__.load({
 				}
 			};
 		}
-		const MAX_TIMEOUT_SECONDS = 3600;
 		/**
-		* A duration field the user edits in WHOLE SECONDS.
+		* 秒制输入保留毫秒精度，兼容已有 1500ms、1ms 等配置。
 		*
 		* Milliseconds are the wrong unit to show: the defaults are 300000 and the
 		* ceiling is 2147483647, so the page asked users to do arithmetic to answer
 		* "how long is a reasonable wait". `format` divides, `parse` multiplies, and
 		* the stored value never leaves milliseconds.
 		*
-		* Decimals are refused rather than rounded. "1.5" is a format the control does
-		* not accept, and silently storing 1000 or 2000 for it would make the saved
-		* profile disagree with the box it was typed in.
+		* 最多三位小数；不接受更多位数后悄悄取整，避免页面与存储不一致。
 		*/
 		function secondsField(field, bounds) {
 			return {
 				field,
-				format: (value) => typeof value === "number" ? String(Math.round(value / 1e3)) : "",
+				format: (value) => typeof value === "number" ? String(value / 1e3) : "",
 				parse: (text) => {
 					const trimmed = text.trim();
 					if (trimmed === "") return { kind: "clear" };
 					const parsed = Number(trimmed);
-					if (!Number.isFinite(parsed) || !Number.isInteger(parsed)) return {
+					if (!Number.isFinite(parsed) || !/^-?(?:\d+(?:\.\d{1,3})?|\.\d{1,3})$/.test(trimmed)) return {
 						kind: "invalid",
 						reason: "format"
 					};
@@ -561,7 +608,7 @@ window.__ModuleLoader__.load({
 					};
 					return {
 						kind: "set",
-						value: parsed * 1e3
+						value: Math.round(parsed * 1e3)
 					};
 				}
 			};
@@ -570,11 +617,11 @@ window.__ModuleLoader__.load({
 		const SECTION_FIELDS = [
 			textField("apiBase"),
 			secondsField("requestTimeoutMs", {
-				min: 1,
+				min: MIN_TIMEOUT_SECONDS,
 				max: MAX_TIMEOUT_SECONDS
 			}),
 			secondsField("streamIdleTimeoutMs", {
-				min: 1,
+				min: MIN_TIMEOUT_SECONDS,
 				max: MAX_TIMEOUT_SECONDS
 			}),
 			numberField$1("transportMaxRetries", {
@@ -726,7 +773,9 @@ window.__ModuleLoader__.load({
 					accountModels: Object.fromEntries(accountModelMap(this.storedRules())),
 					accountBusy: this.accountPending > 0,
 					accountFailed: this.accountFailed,
+					pendingCredentialCleanup: this.cleanupRefs(),
 					visibleModels: this.effectiveVisibleModels(),
+					visibleModelsAll: this.visibleModelsDraft === void 0 ? this.storedShowsAll() : this.visibleModelsDraft.length === 0,
 					catalogModels: this.catalogModels,
 					catalogFailed: this.catalogFailed,
 					dirty: plan.length > 0 || this.visibleModelsDirty(),
@@ -780,6 +829,8 @@ window.__ModuleLoader__.load({
 			}
 			/** Write every staged edit, then re-read the Host's accepted state. */
 			async save() {
+				const submitted = new Map(this.staged);
+				const submittedVisible = this.visibleModelsDraft;
 				const plan = this.plan();
 				const visibleRuns = this.visibleModelsPlan();
 				if (plan.length === 0 && visibleRuns.length === 0 || this.saving) return;
@@ -808,8 +859,8 @@ window.__ModuleLoader__.load({
 				this.failed = !landed;
 				if (landed) {
 					this.savedCount += 1;
-					this.staged.clear();
-					this.visibleModelsDraft = void 0;
+					for (const [field, draft] of submitted) if (this.staged.get(field) === draft) this.staged.delete(field);
+					if (this.visibleModelsDraft === submittedVisible) this.visibleModelsDraft = void 0;
 				} else this.reconcileStaging();
 				this.publish();
 			}
@@ -869,23 +920,74 @@ window.__ModuleLoader__.load({
 				});
 			}
 			/**
-			* Remove one stored extra account now: its stored key, its dedicated
-			* models and a pin naming it go with it, so nothing orphaned remains.
+			* 账户、路由、固定账户与清理队列一起提交；随后才删密钥。
+			* 跨服务不能构造事务，持久化队列让中断或凭据失败后仍可重试。
 			*/
 			removeAccount(ref) {
 				return this.runAccountOp("remove", async () => {
-					if (this.credentialStates.get(ref)?.configured === true && !await this.unsetKey(ref)) return false;
+					if (this.scope.mutate === void 0) return false;
+					if (!this.rawStoredAccounts().some((entry) => entry.apiKeyEnv === ref) && !this.cleanupRefs().includes(ref)) return false;
+					const snapshot = this.scope.getSnapshot();
 					const list = this.rawStoredAccounts().filter((entry) => entry.apiKeyEnv !== ref).map((entry) => ({ ...entry }));
-					if (!await this.writeAccountList(list)) return false;
-					const map = accountModelMap(this.storedRules());
-					if (map.has(ref)) {
-						map.delete(ref);
-						if (!await this.writeRules(rulesFromMap(map))) return false;
-					}
-					if (this.sectionValue("activeAccount") === ref) return this.clear("activeAccount");
-					return true;
+					const rules = this.storedRules().filter((rule) => rule.account !== ref);
+					const cleanup = [.../* @__PURE__ */ new Set([...this.cleanupRefs(), ref])];
+					const ops = [
+						{
+							op: "set",
+							path: ["accounts"],
+							value: list
+						},
+						{
+							op: "set",
+							path: ["modelAccountRules"],
+							value: rules
+						},
+						{
+							op: "set",
+							path: ["credentialCleanupRefs"],
+							value: cleanup
+						}
+					];
+					const pinned = this.sectionValue("activeAccount") === ref;
+					if (pinned) ops.push(this.baseValue("activeAccount") === ref ? {
+						op: "set",
+						path: ["activeAccount"],
+						value: ""
+					} : {
+						op: "unset",
+						path: ["activeAccount"]
+					});
+					await this.scope.mutate(ops, snapshot.revision);
+					if (this.rawStoredAccounts().some((entry) => entry.apiKeyEnv === ref) || this.storedRules().some((rule) => rule.account === ref) || pinned && this.sectionValue("activeAccount") === ref || !this.cleanupRefs().includes(ref)) return false;
+					return this.cleanRemovedCredential(ref);
 				});
 			}
+			/** 清理重试不能再次删除同名新账户，配置移除与凭据清理分开调用。 */
+			retryCredentialCleanup(ref) {
+				return this.runAccountOp("remove", () => this.cleanRemovedCredential(ref));
+			}
+			async cleanRemovedCredential(ref) {
+				if (!this.cleanupRefs().includes(ref) || this.scope.mutate === void 0) return false;
+				if (!await this.describeAll([ref])) return false;
+				const baseAccounts = this.baseValue("accounts");
+				const inherited = Array.isArray(baseAccounts) && baseAccounts.some((entry) => typeof entry === "object" && entry !== null && entry.apiKeyEnv === ref);
+				if (!(ref === this.credentialRef || inherited || this.rawStoredAccounts().some((entry) => entry.apiKeyEnv === ref) || this.storedRules().some((rule) => rule.account === ref) || this.sectionValue("activeAccount") === ref) && this.credentialStates.get(ref)?.configured === true && !await this.unsetKey(ref)) return false;
+				return this.finishCleanup(ref);
+			}
+			cleanupRefs() {
+				const raw = this.sectionValue("credentialCleanupRefs");
+				return Array.isArray(raw) ? [...new Set(raw.filter((ref) => typeof ref === "string" && ref !== ""))] : [];
+			}
+			async finishCleanup(ref) {
+				const snapshot = this.scope.getSnapshot();
+				const refs = this.cleanupRefs().filter((entry) => entry !== ref);
+				await this.scope.mutate?.([{
+					op: "set",
+					path: ["credentialCleanupRefs"],
+					value: refs
+				}], snapshot.revision);
+				return !this.cleanupRefs().includes(ref);
+			}
 			/** Store a replacement key now; `target` is `'default'` or an extra account's reference. */
 			setAccountKey(target, key) {
 				const value = key.trim();
@@ -1037,7 +1139,7 @@ window.__ModuleLoader__.load({
 					if (field === "apiKey" || staged.clear) continue;
 					if (staged.text === this.spec(field).format(this.sectionValue(field))) this.staged.delete(field);
 				}
-				if (this.visibleModelsDraft !== void 0 && sameModels(this.visibleModelsDraft, this.storedVisibleModels())) this.visibleModelsDraft = void 0;
+				if (this.visibleModelsDraft !== void 0 && !this.visibleModelsDirty()) this.visibleModelsDraft = void 0;
 			}
 			async clear(field) {
 				if (!this.stored(field)) return true;
@@ -1082,9 +1184,10 @@ window.__ModuleLoader__.load({
 				try {
 					response = await this.api.credentials.describe(refs);
 				} catch {
-					return;
+					return false;
 				}
-				if (!response.ok) return;
+				if (!response.ok) return false;
+				if (extra.some((ref) => typeof response.value?.[ref]?.configured !== "boolean")) return false;
 				let changed = false;
 				for (const ref of refs) {
 					const view = response.value?.[ref];
@@ -1099,6 +1202,7 @@ window.__ModuleLoader__.load({
 					}
 				}
 				if (changed) this.publish();
+				return true;
 			}
 			/**
 			* Fetch the model catalog through the Host Remote. Runs once at construction;
@@ -1200,24 +1304,61 @@ window.__ModuleLoader__.load({
 				const after = this.storedRules();
 				return after.length === list.length && list.every((item, index) => after[index] !== void 0 && sameModels(after[index].models, item.models) && after[index].account === item.account);
 			}
-			/** The stored visible-model allowlist (`visibleModels`); empty = show all. */
-			storedVisibleModels() {
+			/** 原始白名单；空列表延续现有的显示全部语义。 */
+			storedAllowlist() {
 				const raw = this.scope.getSnapshot().value?.visibleModels;
 				if (!Array.isArray(raw)) return [];
 				return raw.filter((m) => typeof m === "string" && m !== "");
 			}
+			storedShowsAll() {
+				return this.storedAllowlist().length === 0 && !Object.values(readVisibility(this.scope.getSnapshot().value?.modelVisibility)).includes(false);
+			}
+			/** 目录、白名单与显式显示的旧模型一起投影，目录失败不删除旧选择。 */
+			storedVisibleModels() {
+				const list = this.storedAllowlist();
+				const flags = readVisibility(this.scope.getSnapshot().value?.modelVisibility);
+				return [.../* @__PURE__ */ new Set([
+					...list,
+					...this.catalogModels.map((model) => model.id),
+					...Object.keys(flags)
+				])].filter((id) => modelIsVisible(id, list, flags));
+			}
 			effectiveVisibleModels() {
-				return this.visibleModelsDraft ?? this.storedVisibleModels();
+				if (this.visibleModelsDraft === void 0) return this.storedVisibleModels();
+				return this.visibleModelsDraft.length === 0 ? this.catalogModels.map((model) => model.id) : this.visibleModelsDraft;
 			}
 			visibleModelsDirty() {
-				return this.visibleModelsDraft !== void 0 && !sameModels(this.visibleModelsDraft, this.storedVisibleModels());
+				if (this.visibleModelsDraft === void 0) return false;
+				if (this.visibleModelsDraft.length === 0) return !this.storedShowsAll();
+				return this.storedShowsAll() || !sameModels(this.visibleModelsDraft, this.storedVisibleModels());
 			}
 			visibleModelsPlan() {
 				if (!this.visibleModelsDirty()) return [];
+				const list = [...this.visibleModelsDraft ?? []];
 				return [async () => {
-					const list = this.visibleModelsDraft ?? [];
-					await this.scope.set("visibleModels", list);
-					return sameModels(this.storedVisibleModels(), list);
+					if (this.scope.mutate === void 0) return false;
+					const snapshot = this.scope.getSnapshot();
+					const layers = [
+						snapshot.base,
+						snapshot.user,
+						snapshot.value
+					];
+					const keys = /* @__PURE__ */ new Set();
+					for (const layer of layers) {
+						if (layer === null || typeof layer !== "object") continue;
+						for (const id of Object.keys(readVisibility(layer.modelVisibility))) keys.add(id);
+					}
+					const flags = Object.fromEntries([...keys].map((id) => [id, list.length === 0 || list.includes(id)]));
+					await this.scope.mutate([{
+						op: "set",
+						path: ["visibleModels"],
+						value: list
+					}, {
+						op: "set",
+						path: ["modelVisibility"],
+						value: flags
+					}], snapshot.revision);
+					return list.length === 0 ? this.storedShowsAll() : sameModels(this.storedVisibleModels(), list);
 				}];
 			}
 			publish() {
@@ -1324,7 +1465,7 @@ window.__ModuleLoader__.load({
 					this.current = {
 						...this.current,
 						status: "error",
-						error: error instanceof Error ? error.message : String(error)
+						error: readableErrorText(error)
 					};
 				} finally {
 					if (generation === this.generation) this.inFlight = false;
@@ -1458,7 +1599,7 @@ window.__ModuleLoader__.load({
 					this.publish({
 						status: "error",
 						table: void 0,
-						error: error instanceof Error ? error.message : String(error)
+						error: readableErrorText(error)
 					});
 					this.scheduleRetry();
 				});
@@ -1578,7 +1719,7 @@ window.__ModuleLoader__.load({
 				} catch (error) {
 					result = {
 						ok: false,
-						error: { message: error instanceof Error ? error.message : String(error) }
+						error: { message: readableErrorText(error) }
 					};
 				}
 				if (this.superseded(generation)) return;
@@ -2262,7 +2403,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region package.json
-		var version = "0.12.1";
+		var version = "0.12.2";
 		var repository = {
 			"type": "git",
 			"url": "git+https://github.com/Mars-Sea/dsh-commandcode-provider.git"
@@ -2520,7 +2661,7 @@ window.__ModuleLoader__.load({
 			}) : null;
 		}
 		/** One text/number field row. */
-		function Field({ id, label, hint, state, disabled, numeric, wide, placeholder, onEdit, onReset, t }) {
+		function Field({ id, label, hint, state, disabled, numeric, decimal, wide, placeholder, onEdit, onReset, t }) {
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SettingRow, {
 				title: label,
 				titleFor: id,
@@ -2529,7 +2670,7 @@ window.__ModuleLoader__.load({
 					t
 				}),
 				description: hint,
-				error: state.invalid ? invalidCopy(state.invalidReason, t) : void 0,
+				error: state.invalid ? invalidCopy(state.invalidReason, t, decimal) : void 0,
 				control: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(FieldOverride, {
 					label,
 					state,
@@ -2540,7 +2681,7 @@ window.__ModuleLoader__.load({
 					id,
 					className: `cc-input ${wide ? "cc-rowInputWide" : "cc-rowInput"}${state.invalid ? " cc-inputInvalid" : ""}`,
 					type: "text",
-					inputMode: numeric ? "numeric" : void 0,
+					inputMode: decimal ? "decimal" : numeric ? "numeric" : void 0,
 					"aria-invalid": state.invalid || void 0,
 					value: state.text,
 					placeholder,
@@ -2550,7 +2691,12 @@ window.__ModuleLoader__.load({
 			});
 		}
 		/** The per-field error copy for a staged draft's failure reason. */
-		function invalidCopy(reason, t) {
+		function invalidCopy(reason, t, duration = false) {
+			if (duration) {
+				if (reason === "tooSmall") return t("durationTooSmall");
+				if (reason === "tooLarge") return t("durationTooLarge");
+				return t("durationInvalid");
+			}
 			if (reason === "tooSmall") return t("numberTooSmall");
 			if (reason === "tooLarge") return t("numberTooLarge");
 			return t("invalidNumber");
@@ -2923,8 +3069,7 @@ window.__ModuleLoader__.load({
 		function VisibleModelsRow({ t, state, disabled, onSelect, onClear }) {
 			const count = state.visibleModels.length;
 			const pickT = (key, params) => {
-				if (key === "modelPick") return t("visibleModelsPick");
-				if (key === "modelCount") return t("visibleModelsCount", params);
+				if (key === "modelPick" || key === "modelCount") return state.visibleModelsAll ? t("visibleModelsShowAll") : t("visibleModelsCount", { count });
 				return t(key, params);
 			};
 			const readiness = {
@@ -2946,7 +3091,7 @@ window.__ModuleLoader__.load({
 						onClick: () => onSelect(state.visibleModels.filter((id) => !staleIds.includes(id))),
 						children: t("visibleModelsCleanStale", { count: staleIds.length })
 					}) : null,
-					count > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					!state.visibleModelsAll ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 						type: "button",
 						className: "cc-linkButton",
 						disabled,
@@ -3127,6 +3272,7 @@ window.__ModuleLoader__.load({
 								state: state.requestTimeoutMs,
 								disabled,
 								numeric: true,
+								decimal: true,
 								onEdit: (text) => onEdit("requestTimeoutMs", text),
 								onReset: () => onReset("requestTimeoutMs"),
 								t
@@ -3138,6 +3284,7 @@ window.__ModuleLoader__.load({
 								state: state.streamIdleTimeoutMs,
 								disabled,
 								numeric: true,
+								decimal: true,
 								onEdit: (text) => onEdit("streamIdleTimeoutMs", text),
 								onReset: () => onReset("streamIdleTimeoutMs"),
 								t
@@ -3876,6 +4023,19 @@ window.__ModuleLoader__.load({
 						role: "status",
 						children: t("accountOpFailed")
 					}) : null,
+					state.pendingCredentialCleanup.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "cc-rowError",
+						role: "status",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: t("accountCleanupPending") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+							type: "button",
+							className: "cc-btn cc-btnSm",
+							disabled: disabled || state.accountBusy,
+							onClick: () => {
+								for (const ref of state.pendingCredentialCleanup) actions.cleanup(ref);
+							},
+							children: t("accountCleanupRetry")
+						})]
+					}) : null,
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: "cc-accountList",
 						children: rows.map((row) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountItem, {
@@ -4071,11 +4231,12 @@ window.__ModuleLoader__.load({
 			const disabled = !state.writable;
 			const savedVisible = useSavedFlash(state.savedCount);
 			const updateVersion = usePluginUpdate();
-			const { createAccount, renameAccount, removeAccount, setAccountKey, clearAccountKey, setActiveAccount, setAccountModels, beginLogin, cancelLogin } = props;
+			const { createAccount, renameAccount, removeAccount, retryCredentialCleanup, setAccountKey, clearAccountKey, setActiveAccount, setAccountModels, beginLogin, cancelLogin } = props;
 			const actions = (0, react.useMemo)(() => ({
 				create: createAccount,
 				rename: renameAccount,
 				remove: removeAccount,
+				cleanup: retryCredentialCleanup,
 				setKey: setAccountKey,
 				clearKey: clearAccountKey,
 				setActive: setActiveAccount,
@@ -4086,6 +4247,7 @@ window.__ModuleLoader__.load({
 				createAccount,
 				renameAccount,
 				removeAccount,
+				retryCredentialCleanup,
 				setAccountKey,
 				clearAccountKey,
 				setActiveAccount,
@@ -6362,7 +6524,7 @@ window.__ModuleLoader__.load({
 .cc-usageHead{align-items:center;gap:8px;display:flex}
 .cc-usageTitle{color:var(--dsw-alias-label-primary);flex:1;margin:0;font-size:14px;font-weight:500;line-height:22px}
 .cc-usageAccount{max-width:40%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px}
-.cc-usagePlan{flex:none;white-space:nowrap;border:.5px solid var(--dsw-alias-border-l3);color:var(--dsw-alias-label-secondary);border-radius:999px;corner-shape:round;padding:0 7px;font-size:11px;font-weight:500;line-height:17px}
+.cc-usagePlan{flex:none;white-space:nowrap;border:.5px solid var(--dsw-alias-border-l3);color:var(--dsw-alias-label-secondary);border-radius:999px;corner-shape:round;padding:0 7px;font-size:12px;font-weight:500;line-height:17px}
 .cc-usagePlanStatus{flex:none;margin:0;white-space:nowrap;color:var(--dsw-alias-state-error-primary);font-size:12px;line-height:18px}
 .cc-usageHint{color:var(--dsw-alias-label-tertiary);margin:0;font-size:12px;line-height:18px}
 /* Two fixed grids, not one auto-fit track: auto-fit wrapped the four activity
@@ -6494,8 +6656,8 @@ window.__ModuleLoader__.load({
    bar into what is left beside them. Mirrors the dashboard's window block. */
 .ccp-footRow{flex-direction:column;gap:4px;min-width:0;display:flex}
 .ccp-footHead{align-items:baseline;gap:8px;min-width:0;display:flex}
-.ccp-footLabel{flex:1;color:var(--dsw-alias-label-tertiary);font-size:11px;line-height:16px}
-.ccp-footAmount{flex:none;color:var(--dsw-alias-label-secondary);font-size:11px;line-height:16px;font-variant-numeric:tabular-nums;white-space:nowrap}
+.ccp-footLabel{flex:1;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:16px}
+.ccp-footAmount{flex:none;color:var(--dsw-alias-label-secondary);font-size:12px;line-height:16px;font-variant-numeric:tabular-nums;white-space:nowrap}
 /* The card's markup must stay PHRASING content — it renders inside the shell's
    own button — so these bars are spans, which makes display:block load-bearing:
    an inline box ignores width outright, so the fill would collapse to 0x0 and
@@ -6503,7 +6665,7 @@ window.__ModuleLoader__.load({
 .ccp-footBar{display:block;background:var(--dsw-alias-bg-layer-2);border-radius:999px;height:5px;overflow:hidden}
 .ccp-footFill{display:block;background:var(--dsw-alias-brand-primary);border-radius:999px;height:100%;transition:width .3s ease}
 .ccp-footFillWarn{background:var(--dsw-alias-state-error-primary)}
-.ccp-footPct{flex:none;width:34px;color:var(--dsw-alias-label-secondary);text-align:right;font-size:11px;line-height:16px;font-variant-numeric:tabular-nums}
+.ccp-footPct{flex:none;width:34px;color:var(--dsw-alias-label-secondary);text-align:right;font-size:12px;line-height:16px;font-variant-numeric:tabular-nums}
 
 /* The 56px rail: one icon button on the shell's own 36px rail cell, so the
    collapsed column keeps a single 18px glyph like its siblings. */
@@ -6523,7 +6685,7 @@ window.__ModuleLoader__.load({
 .ccp-title{margin:0;font-size:18px;font-weight:600;line-height:1.4}
 .ccp-subtitle{margin:0;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:1.5}
 .ccp-spacer{flex:1}
-.ccp-meta{color:var(--dsw-alias-label-tertiary);font-size:11px;line-height:1.5;font-variant-numeric:tabular-nums}
+.ccp-meta{color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:1.5;font-variant-numeric:tabular-nums}
 /* The dashboard's exit: the primitive's own size="sm" geometry is kept; only the
    glyph is enlarged and optically centred, so it reads as a dismiss control. */
 .ccp-close{min-width:28px;justify-content:center;padding-left:0;padding-right:0}
@@ -6535,16 +6697,16 @@ window.__ModuleLoader__.load({
 .ccp-noticeTitle{margin:0;font-size:13px;font-weight:600;line-height:1.5}
 .ccp-noticeError .ccp-noticeTitle{color:var(--dsw-alias-state-error-primary)}
 .ccp-noticeHint{margin:0;color:var(--dsw-alias-label-secondary);font-size:12px;line-height:1.55}
-.ccp-noticeDetail{margin:0;color:var(--dsw-alias-label-tertiary);font-size:11px;line-height:1.5;word-break:break-word}
+.ccp-noticeDetail{margin:0;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:1.5;word-break:break-word}
 
 .ccp-card{border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);border-radius:14px;padding:16px 18px;flex-direction:column;gap:16px;display:flex}
 .ccp-cardHead{align-items:center;gap:10px;display:flex;flex-wrap:wrap}
 .ccp-avatar{flex:none;width:28px;height:28px;color:var(--dsw-alias-brand-primary);background:var(--dsw-alias-bg-module-platform);border-radius:50%;justify-content:center;align-items:center;font-size:12px;font-weight:600;line-height:1;display:inline-flex}
 .ccp-cardIdentity{flex-direction:column;gap:1px;min-width:0;display:flex}
 .ccp-cardTitle{font-size:13px;font-weight:600;line-height:1.4}
-.ccp-cardOwner{color:var(--dsw-alias-label-tertiary);font-size:11px;line-height:1.4;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:220px}
+.ccp-cardOwner{color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:1.4;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:220px}
 .ccp-block{flex-direction:column;gap:8px;display:flex}
-.ccp-blockTitle{margin:0;color:var(--dsw-alias-label-tertiary);font-size:11px;font-weight:600;line-height:1.5;text-transform:uppercase;letter-spacing:.04em}
+.ccp-blockTitle{margin:0;color:var(--dsw-alias-label-tertiary);font-size:12px;font-weight:600;line-height:1.5;text-transform:uppercase;letter-spacing:.04em}
 .ccp-planRow{align-items:center;gap:8px;display:flex;flex-wrap:wrap}
 .ccp-fieldLabel{color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:1.5}
 .ccp-planName{color:var(--dsw-alias-label-primary);font-size:13px;font-weight:600;line-height:1.5}
@@ -6552,9 +6714,9 @@ window.__ModuleLoader__.load({
 /* The monthly credits and the usage totals share one grid. */
 .ccp-tiles{display:grid;grid-template-columns:repeat(auto-fit,minmax(120px,1fr));gap:8px}
 .ccp-tile{border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-1);border-radius:8px;padding:8px 10px;flex-direction:column;gap:2px;display:flex;min-width:0}
-.ccp-tileLabel{color:var(--dsw-alias-label-tertiary);font-size:11px;line-height:1.5}
+.ccp-tileLabel{color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:1.5}
 .ccp-tileValue{color:var(--dsw-alias-label-primary);font-size:15px;font-weight:600;line-height:1.4;font-variant-numeric:tabular-nums}
-.ccp-tileSub{color:var(--dsw-alias-label-tertiary);font-size:11px;line-height:1.5;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.ccp-tileSub{color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:1.5;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 
 /* Quota bars: the monthly bar and the two windows. */
 .ccp-windows{flex-direction:column;gap:14px;display:flex}
@@ -6563,16 +6725,16 @@ window.__ModuleLoader__.load({
 .ccp-windowLabel{color:var(--dsw-alias-label-secondary);font-size:12px;font-weight:500;line-height:1.5}
 .ccp-windowValue{color:var(--dsw-alias-label-secondary);font-size:12px;line-height:1.5;font-variant-numeric:tabular-nums;white-space:nowrap}
 .ccp-windowPct{color:var(--dsw-alias-label-primary);min-width:38px;text-align:right;font-size:12px;font-weight:600;line-height:1.5;font-variant-numeric:tabular-nums}
-.ccp-warnTag{white-space:nowrap;background:var(--dsw-alias-state-warn-tertiary,var(--dsw-alias-bg-module-platform));color:var(--dsw-alias-state-warn-primary,var(--dsw-alias-label-secondary));border-radius:999px;padding:0 8px;font-size:11px;font-weight:600;line-height:17px}
+.ccp-warnTag{white-space:nowrap;background:var(--dsw-alias-state-warn-tertiary,var(--dsw-alias-bg-module-platform));color:var(--dsw-alias-state-warn-primary,var(--dsw-alias-label-secondary));border-radius:999px;padding:0 8px;font-size:12px;font-weight:600;line-height:17px}
 .ccp-bar{overflow:hidden;background:var(--dsw-alias-bg-layer-1);border-radius:999px;height:8px}
 .ccp-barFill{background:var(--dsw-alias-brand-primary);border-radius:999px;height:100%;transition:width .3s ease}
 .ccp-barFillWarn{background:var(--dsw-alias-state-error-primary)}
-.ccp-windowReset{color:var(--dsw-alias-label-tertiary);margin:0;font-size:11px;line-height:1.5}
+.ccp-windowReset{color:var(--dsw-alias-label-tertiary);margin:0;font-size:12px;line-height:1.5}
 
-.ccp-badge{white-space:nowrap;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-brand-primary);border-radius:999px;padding:1px 8px;font-size:11px;font-weight:600;line-height:17px}
+.ccp-badge{white-space:nowrap;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-brand-primary);border-radius:999px;padding:1px 8px;font-size:12px;font-weight:600;line-height:17px}
 .ccp-badgeError{background:transparent;color:var(--dsw-alias-state-error-primary)}
 .ccp-badgeWarn{background:var(--dsw-alias-state-warn-tertiary,var(--dsw-alias-bg-module-platform));color:var(--dsw-alias-state-warn-primary,var(--dsw-alias-label-secondary))}
-.ccp-badgeMuted{white-space:nowrap;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-secondary);border-radius:999px;padding:1px 8px;font-size:11px;font-weight:500;line-height:17px;max-width:220px;overflow:hidden;text-overflow:ellipsis}
+.ccp-badgeMuted{white-space:nowrap;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-secondary);border-radius:999px;padding:1px 8px;font-size:12px;font-weight:500;line-height:17px;max-width:220px;overflow:hidden;text-overflow:ellipsis}
 
 /* Account switch: plain buttons, like the settings page's usage carousel. */
 .ccp-tabs{flex-wrap:wrap;gap:6px;display:flex}
@@ -6626,7 +6788,7 @@ window.__ModuleLoader__.load({
 			modelAllowance: "${amount}/月",
 			modelAllowanceTitle: "该模型每月可用的额度（美元）。套餐内所有模型共用同一个月度额度池，这不是额外赠送的额度。",
 			visibleModelsTitle: "模型白名单",
-			visibleModelsHint: "勾选要保留的模型，模型选择器就只列出这些；一个都不勾选时则显示全部模型。保存后，下次打开模型选择器生效。",
+			visibleModelsHint: "勾选要保留的模型，模型选择器就只列出这些；一个都不勾选时则显示全部模型。这里显示网页与终端合并后的有效选择；保存后两端一致，套餐权限仍独立过滤。",
 			visibleModelsPick: "选择要保留的模型…",
 			visibleModelsCount: "已选 {count} 个模型",
 			visibleModelsShowAll: "显示全部",
@@ -6635,8 +6797,11 @@ window.__ModuleLoader__.load({
 			overridden: "已覆盖",
 			reset: "重置",
 			invalidNumber: "无效数字",
-			numberTooSmall: "不能小于 1（毫秒）",
-			numberTooLarge: "超出允许上限（2147483647 毫秒）",
+			numberTooSmall: "重试次数不能小于 0",
+			numberTooLarge: "重试次数不能大于 50",
+			durationTooSmall: "不能小于 0.001 秒（1 毫秒）",
+			durationTooLarge: "不能大于 3600 秒",
+			durationInvalid: "请输入秒数，最多保留三位小数",
 			readOnly: "当前配置为只读。",
 			save: "保存",
 			saving: "保存中",
@@ -6730,6 +6895,8 @@ window.__ModuleLoader__.load({
 			accountNameN: "账户 {n}",
 			accountKeyPlaceholder: "粘贴 API 密钥",
 			accountOpFailed: "账户操作未能完成，请重试。",
+			accountCleanupPending: "账户已移除，但有密钥尚未清理。可重试，不影响其他账户。",
+			accountCleanupRetry: "重试清理密钥",
 			accountModels: "专用模型",
 			accountModelsHint: "选中的模型优先由此账户处理，此账户不可用时仍会自动切换。一个模型只属于一个账户，选中会把它从其他账户移过来。",
 			accountModelOwner: "属于 {name}",
@@ -6782,7 +6949,7 @@ window.__ModuleLoader__.load({
 			modelAllowance: "${amount}/mo",
 			modelAllowanceTitle: "Monthly usage this model can draw, in USD. Every model shares one monthly pool — this is not extra credit on top of the plan.",
 			visibleModelsTitle: "Model allowlist",
-			visibleModelsHint: "Check the models you want to keep, and model pickers will list only those. If nothing is checked, every model is shown. After saving, the change applies the next time you open a model picker.",
+			visibleModelsHint: "Check the models you want to keep, and model pickers will list only those. If nothing is checked, every model is shown. After saving, the change applies in both web and terminal settings. This page shows their effective selection; plan access is filtered separately.",
 			visibleModelsPick: "Select models to keep…",
 			visibleModelsCount: "{count} model(s) selected",
 			visibleModelsShowAll: "Show all",
@@ -6791,8 +6958,11 @@ window.__ModuleLoader__.load({
 			overridden: "Overridden",
 			reset: "Reset",
 			invalidNumber: "Invalid number",
-			numberTooSmall: "Must be at least 1 (ms)",
-			numberTooLarge: "Above the allowed maximum (2147483647 ms)",
+			numberTooSmall: "Retries must be at least 0",
+			numberTooLarge: "Retries must not exceed 50",
+			durationTooSmall: "Must be at least 0.001 seconds (1 ms)",
+			durationTooLarge: "Must not exceed 3600 seconds",
+			durationInvalid: "Enter seconds with at most three decimal places",
 			readOnly: "Settings are read-only.",
 			save: "Save",
 			saving: "Saving",
@@ -6886,6 +7056,8 @@ window.__ModuleLoader__.load({
 			accountNameN: "Account {n}",
 			accountKeyPlaceholder: "Paste an API key",
 			accountOpFailed: "The account change did not complete. Try again.",
+			accountCleanupPending: "The account was removed, but credential cleanup is still pending. Retry without affecting other accounts.",
+			accountCleanupRetry: "Retry credential cleanup",
 			accountModels: "Dedicated models",
 			accountModelsHint: "These models prefer this account and still switch when it is unavailable. A model belongs to one account; selecting it here moves it from any other.",
 			accountModelOwner: "on {name}",
@@ -7017,7 +7189,7 @@ window.__ModuleLoader__.load({
 						}, "dsh-commandcode-provider: usage namespace");
 					});
 				}, (error) => {
-					usageMountError = error instanceof Error ? error.message : String(error);
+					usageMountError = readableErrorText(error);
 				});
 				return () => {
 					cancelled = true;
@@ -7130,7 +7302,11 @@ window.__ModuleLoader__.load({
 					return ref;
 				}),
 				renameAccount: (ref, label) => controller.renameAccount(ref, label),
-				removeAccount: (ref) => controller.removeAccount(ref).then(refreshUsageOn),
+				removeAccount: (ref) => controller.removeAccount(ref).then((ok) => {
+					if (ok || !controller.state().accounts.some((account) => account.ref === ref)) usageController.refresh();
+					return ok;
+				}),
+				retryCredentialCleanup: (ref) => controller.retryCredentialCleanup(ref),
 				setAccountKey: (target, key) => controller.setAccountKey(target, key).then(refreshUsageOn),
 				clearAccountKey: (target) => controller.clearAccountKey(target).then(refreshUsageOn),
 				setActiveAccount: (id) => controller.setActiveAccount(id).then(refreshUsageOn),