dsh-usage-state 0.4.4 → 0.4.6

package/lib/client.js

@@ -244,7 +244,7 @@ window.__ModuleLoader__.load({
 			},
 			{
 				sourceId: "kimi",
-				pattern: /(^|\.)(api\.kimi\.com|api\.moonshot\.cn|moonshot\.cn)$/
+				pattern: /(^|\.)(api\.kimi\.(com|ai)|api\.moonshot\.(cn|ai)|moonshot\.cn)$/
 			},
 			{
 				sourceId: "opencode",
@@ -285,6 +285,16 @@ window.__ModuleLoader__.load({
 				return;
 			}
 		}
+		/** Kimi Code and Moonshot use distinct keys and billing endpoints. */
+		function kimiMode(provider, endpoint) {
+			const origin = originOf(endpoint);
+			if (origin !== void 0) {
+				const host = new URL(origin).hostname;
+				if (host === "api.kimi.com" || host === "api.kimi.ai") return "coding-plan";
+				if (host === "api.moonshot.cn" || host === "api.moonshot.ai") return "api";
+			}
+			return /(?:^|[^a-z])kimi[-_ ]?(?:for[-_ ]?coding|coding|code)(?:$|[^a-z])/i.test(provider) ? "coding-plan" : "api";
+		}
 		function withTarget(resolution) {
 			if (resolution.sourceId === null || resolution.mode === null) return resolution;
 			return {
@@ -299,13 +309,17 @@ window.__ModuleLoader__.load({
 		*/
 		function resolveProvider(input) {
 			const entry = input.config.providers[input.provider];
+			const sourceId = entry?.sourceId ?? suggestSourceId(input.provider, input.endpointHint) ?? null;
+			const defaults = sourceId === null ? void 0 : input.config.sources[sourceId];
 			const declared = originOf(input.endpointHint);
-			const baseUrl = entry?.baseUrl ?? declared;
+			const explicitBaseUrl = entry?.baseUrl ?? defaults?.baseUrl;
+			const baseUrl = explicitBaseUrl ?? declared;
+			const apiKeyRef = entry?.apiKeyRef ?? defaults?.apiKeyRef;
 			const base = {
 				provider: input.provider,
 				...baseUrl === void 0 ? {} : { baseUrl },
-				...entry?.baseUrl === void 0 ? {} : { baseUrlPinned: true },
-				...entry?.apiKeyRef === void 0 ? {} : { apiKeyRef: entry.apiKeyRef }
+				...explicitBaseUrl === void 0 ? {} : { baseUrlPinned: true },
+				...apiKeyRef === void 0 ? {} : { apiKeyRef }
 			};
 			if (entry?.mode === "hidden") return {
 				...base,
@@ -313,7 +327,6 @@ window.__ModuleLoader__.load({
 				mode: null,
 				reason: "hidden"
 			};
-			const sourceId = entry?.sourceId ?? suggestSourceId(input.provider, input.endpointHint) ?? null;
 			if (sourceId === null) return {
 				...base,
 				sourceId: null,
@@ -347,8 +360,8 @@ window.__ModuleLoader__.load({
 				mode: null,
 				reason: "needs-endpoint"
 			};
-			const mode = source.modes[0];
-			if (mode === void 0) return {
+			const mode = sourceId === "kimi" ? kimiMode(input.provider, baseUrl) : source.modes[0];
+			if (mode === void 0 || !source.modes.includes(mode)) return {
 				...base,
 				sourceId,
 				mode: null,
@@ -550,6 +563,7 @@ window.__ModuleLoader__.load({
 			const [editing, setEditing] = (0, react.useState)(false);
 			const shown = editing ? draft : props.value;
 			const commit = () => {
+				if (!editing || props.disabled) return;
 				setEditing(false);
 				const next = draft.trim();
 				if (next !== props.value.trim()) props.onCommit(next);
@@ -579,29 +593,54 @@ window.__ModuleLoader__.load({
 			const { t } = props;
 			const [draft, setDraft] = (0, react.useState)("");
 			const [note, setNote] = (0, react.useState)(void 0);
+			const [pending, setPending] = (0, react.useState)(false);
+			const busy = (0, react.useRef)(false);
 			const candidates = props.description?.candidates ?? [];
-			const configuredRef = props.description?.ref ?? candidates.find((candidate) => candidate.configured)?.ref ?? props.refs[0];
-			const writable = props.description?.writable !== false;
+			const configuredRef = props.refOverride ?? props.description?.ref ?? candidates.find((candidate) => candidate.configured)?.ref ?? props.refs[0];
+			const candidate = candidates.find((value) => value.ref === configuredRef);
+			const sameDescription = props.description?.ref === configuredRef;
+			const writable = (candidate?.writable ?? (sameDescription ? props.description?.writable : void 0)) !== false;
+			const configured = candidate?.configured ?? (sameDescription && props.description?.configured === true);
 			const save = async () => {
-				if (props.credentials === void 0 || configuredRef === void 0 || draft.trim() === "") return;
-				const result = await props.credentials.set(configuredRef, draft.trim());
-				if (!result.ok) {
-					setNote(t("credentialFailed", { message: result.error.message }));
-					return;
+				if (busy.current || !writable || props.credentials === void 0 || configuredRef === void 0 || draft.trim() === "") return;
+				busy.current = true;
+				setPending(true);
+				setNote(void 0);
+				try {
+					const result = await props.credentials.set(configuredRef, draft.trim());
+					if (!result.ok) {
+						setNote(t("credentialFailed", { message: result.error.message }));
+						return;
+					}
+					setDraft("");
+					setNote(t("credentialSaved"));
+					props.onChanged();
+				} catch (error) {
+					setNote(t("credentialFailed", { message: error instanceof Error ? error.message : String(error) }));
+				} finally {
+					busy.current = false;
+					setPending(false);
 				}
-				setDraft("");
-				setNote(t("credentialSaved"));
-				props.onChanged();
 			};
 			const clear = async () => {
-				if (props.credentials === void 0 || configuredRef === void 0) return;
-				const result = await props.credentials.unset(configuredRef);
-				if (!result.ok) {
-					setNote(t("credentialFailed", { message: result.error.message }));
-					return;
+				if (busy.current || !writable || props.credentials === void 0 || configuredRef === void 0) return;
+				busy.current = true;
+				setPending(true);
+				setNote(void 0);
+				try {
+					const result = await props.credentials.unset(configuredRef);
+					if (!result.ok) {
+						setNote(t("credentialFailed", { message: result.error.message }));
+						return;
+					}
+					setNote(t("credentialSaved"));
+					props.onChanged();
+				} catch (error) {
+					setNote(t("credentialFailed", { message: error instanceof Error ? error.message : String(error) }));
+				} finally {
+					busy.current = false;
+					setPending(false);
 				}
-				setNote(t("credentialSaved"));
-				props.onChanged();
 			};
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				style: {
@@ -646,7 +685,7 @@ window.__ModuleLoader__.load({
 								type: "password",
 								autoComplete: "off",
 								value: draft,
-								disabled: !writable || props.credentials === void 0,
+								disabled: pending || !writable || props.credentials === void 0,
 								placeholder: t("credentialPlaceholder"),
 								onChange: (event) => setDraft(event.target.value),
 								style: { maxWidth: "280px" }
@@ -654,14 +693,14 @@ window.__ModuleLoader__.load({
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 								size: "sm",
 								variant: "primary",
-								disabled: draft.trim() === "",
+								disabled: pending || !writable || props.credentials === void 0 || configuredRef === void 0 || draft.trim() === "",
 								onClick: () => void save(),
 								children: t("credentialSave")
 							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 								size: "sm",
 								variant: "outline",
-								disabled: configuredRef === void 0 || props.description?.configured !== true,
+								disabled: pending || !writable || props.credentials === void 0 || configuredRef === void 0 || !configured,
 								onClick: () => void clear(),
 								children: t("credentialClear")
 							})
@@ -717,7 +756,7 @@ window.__ModuleLoader__.load({
 									size: "sm",
 									variant: "ghost",
 									"aria-label": t("moveUp"),
-									disabled: props.index === 0,
+									disabled: props.disabled || props.index === 0,
 									onClick: () => props.onMove(-1),
 									children: "↑"
 								}),
@@ -725,13 +764,14 @@ window.__ModuleLoader__.load({
 									size: "sm",
 									variant: "ghost",
 									"aria-label": t("moveDown"),
-									disabled: props.index === props.total - 1,
+									disabled: props.disabled || props.index === props.total - 1,
 									onClick: () => props.onMove(1),
 									children: "↓"
 								}),
 								row.modes.map((mode) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 									size: "sm",
 									variant: row.selected === mode ? "primary" : "outline",
+									disabled: props.disabled,
 									onClick: () => props.onMode(mode),
 									children: modeLabel(mode, t)
 								}, mode))
@@ -774,6 +814,7 @@ window.__ModuleLoader__.load({
 									style: MUTED,
 									children: t("sourceLabel")
 								}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
+									disabled: props.disabled,
 									value: entry?.sourceId ?? "",
 									onChange: (event) => {
 										const value = event.target.value;
@@ -805,6 +846,7 @@ window.__ModuleLoader__.load({
 										children: t("baseUrl")
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)(DraftInput, {
+										disabled: props.disabled,
 										value: entry?.baseUrl ?? "",
 										placeholder: row.resolution.mode === null ? t("baseUrlPlaceholder") : resolvedSource?.defaultBaseUrl[row.resolution.mode] ?? t("baseUrlPlaceholder"),
 										width: "320px",
@@ -835,6 +877,7 @@ window.__ModuleLoader__.load({
 										children: t("apiKeyRef")
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)(DraftInput, {
+										disabled: props.disabled,
 										value: entry?.apiKeyRef ?? "",
 										width: "220px",
 										onCommit: (value) => {
@@ -859,6 +902,7 @@ window.__ModuleLoader__.load({
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(CredentialPanel, {
 								t,
 								refs,
+								refOverride: row.resolution.apiKeyRef,
 								description: props.description,
 								credentials: props.credentials,
 								onChanged: props.onCredentialChanged
@@ -878,6 +922,7 @@ window.__ModuleLoader__.load({
 			const { t } = props;
 			const snapshot = useSettingsValue(props.settings);
 			const state = useStoreState(props.usageState);
+			const [writeError, setWriteError] = (0, react.useState)(void 0);
 			(0, react.useEffect)(() => {
 				props.usageState.refreshModels();
 				props.usageState.refreshCredentials();
@@ -891,17 +936,27 @@ window.__ModuleLoader__.load({
 				models: state.models,
 				config,
 				catalog: state.catalog,
-				registry: state.modelRegistry
+				registry: state.modelRegistry,
+				endpointHints: state.endpointHints
 			});
+			const mutate = async (ops) => {
+				if (!snapshot.writable) return;
+				setWriteError(void 0);
+				try {
+					await props.settings.mutate(ops);
+				} catch (error) {
+					setWriteError(error instanceof Error ? error.message : String(error));
+				}
+			};
 			const write = (path, value) => {
-				props.settings.mutate([{
+				mutate([{
 					op: "set",
 					path,
 					value
 				}]);
 			};
 			const clear = (path) => {
-				props.settings.mutate([{
+				mutate([{
 					op: "unset",
 					path
 				}]);
@@ -952,6 +1007,15 @@ window.__ModuleLoader__.load({
 									state.modelsError === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 										style: MUTED,
 										children: state.modelsError
+									}),
+									state.credentialsError === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										style: MUTED,
+										children: t("credentialFailed", { message: state.credentialsError })
+									}),
+									writeError === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										role: "alert",
+										style: MUTED,
+										children: t("settingsFailed", { message: writeError })
 									})
 								]
 							})
@@ -979,14 +1043,19 @@ window.__ModuleLoader__.load({
 								failure: row.resolution.key === void 0 ? void 0 : state.snapshots[row.resolution.key]?.error,
 								index,
 								total: rows.length,
+								disabled: !snapshot.writable,
 								onMode: (mode) => write(["providers"], setProviderMode(config.providers, row.provider, mode)),
 								onMove: (delta) => {
-									const next = reorderProviders(config.order, row.provider, delta);
+									const next = reorderProviders(rows.map((candidate) => candidate.provider), row.provider, delta);
 									if (next !== void 0) write(["order"], next);
 								},
 								onField: (path, value) => write(path, value),
 								onClearField: (path) => clear(path),
-								onCredentialChanged: () => void props.usageState.refreshCredentials()
+								onCredentialChanged: () => {
+									props.usageState.invalidate();
+									props.usageState.refreshCredentials();
+									props.usageState.refresh(true);
+								}
 							}, row.provider))
 						]
 					}),
@@ -1003,6 +1072,7 @@ window.__ModuleLoader__.load({
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)(DraftInput, {
 										type: "number",
+										disabled: !snapshot.writable,
 										value: String(config.display.thresholdWarnPercent),
 										width: "90px",
 										onCommit: (value) => write(["display", "thresholdWarnPercent"], Number(value))
@@ -1013,6 +1083,7 @@ window.__ModuleLoader__.load({
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)(DraftInput, {
 										type: "number",
+										disabled: !snapshot.writable,
 										value: String(config.display.thresholdCriticalPercent),
 										width: "90px",
 										onCommit: (value) => write(["display", "thresholdCriticalPercent"], Number(value))
@@ -1026,12 +1097,14 @@ window.__ModuleLoader__.load({
 									children: t("intervalMinutes")
 								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(DraftInput, {
 									type: "number",
+									disabled: !snapshot.writable,
 									value: String(config.refresh.intervalMinutes),
 									width: "90px",
 									onCommit: (value) => write(["refresh", "intervalMinutes"], Number(value))
 								})]
 							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Switch, {
+								disabled: !snapshot.writable,
 								checked: config.display.progressBar,
 								label: t("progressBar"),
 								onChange: (next) => write(["display", "progressBar"], next)
@@ -1123,7 +1196,9 @@ window.__ModuleLoader__.load({
 				kind: "label",
 				text: input.sourceLabel,
 				stale: true,
-				...snapshot.fetchedAt > 0 ? { staleSince: snapshot.fetchedAt } : {}
+				staleSince: snapshot.fetchedAt,
+				...snapshot.error === void 0 ? {} : { errorKind: snapshot.error.kind },
+				...snapshot.error?.detail === void 0 ? {} : { errorDetail: snapshot.error.detail }
 			} : {
 				kind: "label",
 				text: input.sourceLabel
@@ -1178,6 +1253,10 @@ window.__ModuleLoader__.load({
 			const present = pieces.filter((piece) => piece !== void 0 && piece !== "");
 			return present.length === 0 ? void 0 : present.join(" · ");
 		}
+		function failureReason(kind, detail, t) {
+			if (kind === void 0) return detail;
+			return detail === void 0 ? t(`error.${kind}`) : `${t(`error.${kind}`)}: ${detail}`;
+		}
 		function localTime(epochMs) {
 			return new Date(epochMs).toLocaleTimeString();
 		}
@@ -1195,20 +1274,17 @@ window.__ModuleLoader__.load({
 			for (const segment of segments) switch (segment.kind) {
 				case "label": {
 					const staleHint = segment.stale === true ? t("staleHint") : void 0;
-					const refreshHint = segment.staleSince === void 0 ? void 0 : t("tipUpdated", { age: formatAge(segment.staleSince, now) });
+					const tooltip = tooltipOf([
+						staleHint,
+						segment.staleSince === void 0 ? void 0 : t("tipUpdated", { age: formatAge(segment.staleSince, now) }),
+						failureReason(segment.errorKind, segment.errorDetail, t),
+						context
+					]);
 					parts.push({
 						kind: "label",
 						text: segment.text,
 						stale: segment.stale === true,
-						...tooltipOf([
-							staleHint,
-							refreshHint,
-							context
-						]) === void 0 ? {} : { tooltip: tooltipOf([
-							staleHint,
-							refreshHint,
-							context
-						]) }
+						...tooltip === void 0 ? {} : { tooltip }
 					});
 					if (segment.staleSince !== void 0) parts.push({
 						kind: "age",
@@ -1246,7 +1322,7 @@ window.__ModuleLoader__.load({
 					break;
 				}
 				case "state": {
-					const reason = segment.errorKind === void 0 ? void 0 : segment.errorDetail === void 0 ? t(`error.${segment.errorKind}`) : `${t(`error.${segment.errorKind}`)}: ${segment.errorDetail}`;
+					const reason = failureReason(segment.errorKind, segment.errorDetail, t);
 					parts.push({
 						kind: "state",
 						state: segment.state,
@@ -1435,7 +1511,7 @@ window.__ModuleLoader__.load({
 		* One read-only usage line: balance in API mode, 5h/7d quota in coding-plan mode.
 		*
 		* It reports the account's **current** reading, so it has exactly one home: the
-		* line under the composer. There is no per-turn copy — an account-level number
+		* line above the composer. There is no per-turn copy — an account-level number
 		* cannot honestly describe a single turn (see `slots.ts`).
 		*/
 		function StatusLine(props) {
@@ -1449,9 +1525,19 @@ window.__ModuleLoader__.load({
 			const status = statusOf(resolveProvider({
 				provider: current.provider,
 				config,
-				catalog: state.catalog
+				catalog: state.catalog,
+				endpointHint: state.endpointHints?.[current.provider]
 			}), state.catalog.length === 0);
-			const snapshot = status.kind === "ready" ? state.snapshots[status.key] : void 0;
+			if (status.kind === "hidden") return null;
+			const kept = status.kind === "ready" ? state.snapshots[status.key] : void 0;
+			const snapshot = kept === void 0 || state.error === void 0 ? kept : {
+				...kept,
+				stale: true,
+				error: {
+					kind: "network",
+					detail: state.error
+				}
+			};
 			const sourceLabel = status.kind === "ready" ? state.catalog.find((entry) => entry.id === status.sourceId)?.displayName ?? status.sourceId : "";
 			const fullParts = statusParts({
 				segments: state.catalog.length === 0 && state.status === "error" && state.error !== void 0 ? [{
@@ -1491,7 +1577,7 @@ window.__ModuleLoader__.load({
 		const zh = {
 			nav: "用量状态",
 			title: "用量状态",
-			intro: "为每个模型选择显示账户余额（API 模式）或套餐额度（Coding Plan 模式）。数据由宿主定时刷新，密钥存放在 DSH 凭据库中，本插件不保存明文。",
+			intro: "为每个供应商选择显示账户余额（API 模式）或套餐额度（Coding Plan 模式）。数据由宿主定时刷新，密钥交给 DSH 凭据库保存，本插件不另存明文。",
 			refreshNow: "立即刷新",
 			refreshing: "刷新中…",
 			lastChecked: "更新于 {time}",
@@ -1527,7 +1613,7 @@ window.__ModuleLoader__.load({
 			credential: "密钥",
 			credentialConfigured: "已配置（来源：{source}）",
 			credentialMissing: "未配置",
-			credentialLocked: "由环境变量提供，无法在此修改",
+			credentialLocked: "当前凭据来源无法在此修改",
 			credentialPlaceholder: "粘贴密钥…",
 			credentialSave: "保存",
 			credentialClear: "清除",
@@ -1537,7 +1623,8 @@ window.__ModuleLoader__.load({
 			intervalMinutes: "空闲刷新间隔（分钟）",
 			thresholdWarn: "黄色阈值（已用 %）",
 			thresholdCritical: "红色阈值（已用 %）",
-			progressBar: "显示进度条",
+			progressBar: "显示进度环",
+			settingsFailed: "无法保存设置：{message}",
 			refreshFailed: "刷新失败：{message}",
 			"state.loading": "读取中…",
 			"state.unconfigured": "未配置",
@@ -1561,12 +1648,14 @@ window.__ModuleLoader__.load({
 			"window.5h": "5h",
 			"window.1d": "1d",
 			"window.7d": "7d",
-			"window.30d": "30d"
+			"window.30d": "30d",
+			"window.month": "月总额度",
+			"window.month-code": "编程月用量"
 		};
 		const en = {
 			nav: "Usage state",
 			title: "Usage state",
-			intro: "Choose what to show for each model: account balance (API mode) or coding-plan quota (Coding Plan mode). The host refreshes on a timer, and keys live in the DSH credential store — this plugin never keeps a plaintext copy.",
+			intro: "Choose what to show for each provider: account balance (API mode) or coding-plan quota (Coding Plan mode). The host owns refresh timing, and DSH stores credentials — this plugin keeps no separate plaintext copy.",
 			refreshNow: "Refresh now",
 			refreshing: "Refreshing…",
 			lastChecked: "Updated {time}",
@@ -1602,7 +1691,7 @@ window.__ModuleLoader__.load({
 			credential: "API key",
 			credentialConfigured: "Configured ({source})",
 			credentialMissing: "Not configured",
-			credentialLocked: "Provided by an environment variable; not editable here",
+			credentialLocked: "This credential source cannot be edited here",
 			credentialPlaceholder: "Paste the key…",
 			credentialSave: "Save",
 			credentialClear: "Clear",
@@ -1612,7 +1701,8 @@ window.__ModuleLoader__.load({
 			intervalMinutes: "Idle refresh interval (minutes)",
 			thresholdWarn: "Amber threshold (used %)",
 			thresholdCritical: "Red threshold (used %)",
-			progressBar: "Show progress bar",
+			progressBar: "Show progress ring",
+			settingsFailed: "Could not save settings: {message}",
 			refreshFailed: "Refresh failed: {message}",
 			"state.loading": "Reading…",
 			"state.unconfigured": "Not configured",
@@ -1636,7 +1726,9 @@ window.__ModuleLoader__.load({
 			"window.5h": "5h",
 			"window.1d": "1d",
 			"window.7d": "7d",
-			"window.30d": "30d"
+			"window.30d": "30d",
+			"window.month": "Monthly total",
+			"window.month-code": "Monthly code"
 		};
 		//#endregion
 		//#region src/client/remote.ts
@@ -1660,6 +1752,9 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/client/settings-form.ts
+		async function requireAccepted(write) {
+			if (!await write) throw new Error("The host did not accept the settings write");
+		}
 		/**
 		* Present one `configForms` entry as the settings scope the components consume.
 		*
@@ -1696,13 +1791,13 @@ window.__ModuleLoader__.load({
 				getSnapshot: snapshot,
 				subscribe: (listener) => form.subscribe(listener),
 				set: async (field, value) => {
-					await form.set(field, value);
+					await requireAccepted(form.set(field, value));
 				},
 				unset: async (field) => {
-					await form.unset(field);
+					await requireAccepted(form.unset(field));
 				},
 				mutate: async (ops, expectedRevision) => {
-					await form.mutate(ops, expectedRevision);
+					await requireAccepted(form.mutate(ops, expectedRevision));
 				}
 			};
 		}
@@ -1766,7 +1861,11 @@ window.__ModuleLoader__.load({
 				credentialsError: void 0,
 				modelsError: void 0
 			};
+			generation = 0;
+			inflightGeneration = 0;
+			inflightForce = false;
 			inflight;
+			forcedAfterInflight;
 			constructor(deps) {
 				this.deps = deps;
 			}
@@ -1786,12 +1885,38 @@ window.__ModuleLoader__.load({
 				};
 				for (const listener of [...this.listeners]) listener();
 			}
+			/** A provider/credential identity changed: its previous RPC cannot restore old values. */
+			invalidate() {
+				this.generation++;
+				this.forcedAfterInflight = void 0;
+				this.publish({
+					status: "loading",
+					snapshots: {},
+					credentials: {},
+					checkedAt: void 0,
+					error: void 0,
+					credentialsError: void 0
+				});
+			}
 			refresh(force = false) {
-				if (this.inflight !== void 0) return this.inflight;
+				const generation = this.generation;
+				if (this.inflight !== void 0 && this.inflightGeneration === generation) {
+					if (!force || this.inflightForce) return this.inflight;
+					if (this.forcedAfterInflight === void 0) {
+						const queued = this.inflight.then(() => {
+							if (this.generation === generation) return this.refresh(true);
+						}).finally(() => {
+							if (this.forcedAfterInflight === queued) this.forcedAfterInflight = void 0;
+						});
+						this.forcedAfterInflight = queued;
+					}
+					return this.forcedAfterInflight;
+				}
 				this.publish({ status: "loading" });
 				const run = (async () => {
 					try {
 						const result = await this.deps.getState(force);
+						if (generation !== this.generation) return;
 						if (!result.ok) {
 							this.publish({
 								status: "error",
@@ -1802,19 +1927,22 @@ window.__ModuleLoader__.load({
 						this.publish({
 							status: "ready",
 							catalog: result.value.sources,
+							endpointHints: result.value.endpointHints ?? {},
 							snapshots: result.value.snapshots,
 							checkedAt: result.value.checkedAt,
 							error: void 0
 						});
 					} catch (error) {
-						this.publish({
+						if (generation === this.generation) this.publish({
 							status: "error",
 							error: messageOf(error)
 						});
 					}
 				})().finally(() => {
-					this.inflight = void 0;
+					if (this.inflight === run) this.inflight = void 0;
 				});
+				this.inflightGeneration = generation;
+				this.inflightForce = force;
 				this.inflight = run;
 				return run;
 			}
@@ -1843,8 +1971,10 @@ window.__ModuleLoader__.load({
 				}
 			}
 			async refreshCredentials() {
+				const generation = this.generation;
 				try {
 					const result = await this.deps.describeCredentials();
+					if (generation !== this.generation) return;
 					if (!result.ok) {
 						this.publish({ credentialsError: result.error.message });
 						return;
@@ -1854,7 +1984,7 @@ window.__ModuleLoader__.load({
 						credentialsError: void 0
 					});
 				} catch (error) {
-					this.publish({ credentialsError: messageOf(error) });
+					if (generation === this.generation) this.publish({ credentialsError: messageOf(error) });
 				}
 			}
 			/**
@@ -1946,6 +2076,15 @@ window.__ModuleLoader__.load({
 					store.refresh(false);
 					if (store.getSnapshot().models.length === 0) store.refreshModels();
 				}, POLL_INTERVAL_MS);
+				const configurationIdentity = () => {
+					const config = settings.getSnapshot().value;
+					return config === void 0 ? void 0 : JSON.stringify([
+						config.order,
+						config.providers,
+						config.sources
+					]);
+				};
+				let configuredIdentity = configurationIdentity();
 				const disposers = [
 					ctx.on("api-session/status", (...args) => {
 						if (args[1] === false) store.refresh(false);
@@ -1954,7 +2093,13 @@ window.__ModuleLoader__.load({
 						store.refresh(true);
 					}),
 					settings.subscribe(() => {
+						const nextIdentity = configurationIdentity();
+						if (nextIdentity !== configuredIdentity) {
+							configuredIdentity = nextIdentity;
+							store.invalidate();
+						}
 						store.refresh(false);
+						store.refreshCredentials();
 					})
 				];
 				return () => {