@mars-sea/dsh-commandcode-provider 0.11.10 → 0.11.12

package/lib/client.js

@@ -625,7 +625,6 @@ window.__ModuleLoader__.load({
 			listeners = /* @__PURE__ */ new Set();
 			disposers = [];
 			disposed = false;
-			defaultWorkingDir;
 			/** The credential reference the default account resolves. */
 			credentialRef = DEFAULT_API_KEY_REF;
 			/** Host-reported configured/writable state per credential reference. */
@@ -669,10 +668,8 @@ window.__ModuleLoader__.load({
 			/**
 			* @param scope - bound scope for the `llm-commandcode` namespace.
 			* @param api - credentials wire face.
-			* @param hostDescription - the Host-description observable whose `cwd` is
-			*   shown as the placeholder a blank `workingDir` field resolves to.
 			*/
-			constructor(scope, api, hostDescription) {
+			constructor(scope, api) {
 				this.scope = scope;
 				this.api = api;
 				this.disposers.push(scope.subscribe(() => {
@@ -680,17 +677,6 @@ window.__ModuleLoader__.load({
 					this.describeAll();
 					this.publish();
 				}));
-				if (hostDescription !== void 0) {
-					this.defaultWorkingDir = hostDescription.getSnapshot()?.cwd;
-					this.disposers.push(hostDescription.subscribe(() => {
-						if (this.disposed) return;
-						const cwd = hostDescription.getSnapshot()?.cwd;
-						if (cwd !== this.defaultWorkingDir) {
-							this.defaultWorkingDir = cwd;
-							this.publish();
-						}
-					}));
-				}
 				this.recomputeCredentialRef();
 				this.describeAll();
 				this.refreshCatalog();
@@ -743,7 +729,6 @@ window.__ModuleLoader__.load({
 					apiKeyClearStaged: this.keyClears.has(this.credentialRef),
 					apiBase: this.field("apiBase"),
 					workingDir: this.field("workingDir"),
-					defaultWorkingDir: this.defaultWorkingDir,
 					requestTimeoutMs: this.field("requestTimeoutMs"),
 					streamIdleTimeoutMs: this.field("streamIdleTimeoutMs"),
 					transportMaxRetries: this.field("transportMaxRetries"),
@@ -1483,47 +1468,6 @@ window.__ModuleLoader__.load({
 			}
 		};
 		//#endregion
-		//#region src/client/legacy-credentials.ts
-		/** Convert a legacy credentials ApiProxy into the current settings-page face. */
-		function adaptLegacyCredentials(legacy) {
-			if (legacy === void 0) return void 0;
-			return { credentials: {
-				describe: async (refs) => {
-					const response = await legacy.describe({ refs });
-					return response.result.ok ? {
-						ok: true,
-						value: response.result.value.credentials
-					} : {
-						ok: false,
-						error: response.result.error
-					};
-				},
-				set: async (ref, value) => {
-					const response = await legacy.set({
-						ref,
-						value
-					});
-					return response.result.ok ? {
-						ok: true,
-						value: void 0
-					} : {
-						ok: false,
-						error: response.result.error
-					};
-				},
-				unset: async (ref) => {
-					const response = await legacy.unset({ ref });
-					return response.result.ok ? {
-						ok: true,
-						value: void 0
-					} : {
-						ok: false,
-						error: response.result.error
-					};
-				}
-			} };
-		}
-		//#endregion
 		//#region src/client/usage.ts
 		const IDLE$1 = {
 			status: "idle",
@@ -1803,6 +1747,21 @@ window.__ModuleLoader__.load({
 		};
 		//#endregion
 		//#region src/client/login.ts
+		/** Keep one account's login status out of every other account's row. */
+		function loginStateForTarget(state, targetRef) {
+			if (state.targetRef === targetRef) return {
+				visible: state,
+				busyElsewhere: false
+			};
+			return {
+				visible: {
+					...state,
+					phase: "idle",
+					authUrl: void 0
+				},
+				busyElsewhere: state.phase === "starting" || state.phase === "waiting"
+			};
+		}
 		/** How often a live attempt is polled. */
 		const POLL_INTERVAL_MS = 1e3;
 		/**
@@ -1817,6 +1776,7 @@ window.__ModuleLoader__.load({
 			generation = 0;
 			disposed = false;
 			phase = "idle";
+			targetRef;
 			authUrl;
 			userName;
 			keyName;
@@ -1835,6 +1795,7 @@ window.__ModuleLoader__.load({
 			state() {
 				return {
 					phase: this.phase,
+					...this.targetRef === void 0 ? {} : { targetRef: this.targetRef },
 					authUrl: this.authUrl,
 					userName: this.userName,
 					keyName: this.keyName,
@@ -1843,9 +1804,10 @@ window.__ModuleLoader__.load({
 				};
 			}
 			/** Start (or rejoin) a login attempt and begin polling its status. */
-			async begin() {
+			async begin(targetRef) {
 				if (this.disposed || this.phase === "starting" || this.phase === "waiting") return;
 				const generation = ++this.generation;
+				this.targetRef = targetRef;
 				this.set({
 					phase: "starting",
 					authUrl: void 0,
@@ -1868,7 +1830,7 @@ window.__ModuleLoader__.load({
 				}
 				let result;
 				try {
-					result = await remote.loginBegin();
+					result = await remote.loginBegin(targetRef);
 				} catch (error) {
 					result = {
 						ok: false,
@@ -2106,6 +2068,14 @@ window.__ModuleLoader__.load({
 				booleanField
 			};
 		}
+		/** Use the same strict-codec shape for invocation parameters and results. */
+		function makeStrictCodec(typeSymbol, schema) {
+			return {
+				mode: "strict",
+				typeSymbol,
+				create: () => schema
+			};
+		}
 		/**
 		* Build one strict invocation descriptor. Every Command Code Remote shares the
 		* `commandcode` namespace, the `commandcodeUsage` service, and a strict
@@ -2114,12 +2084,6 @@ window.__ModuleLoader__.load({
 		* only its own facts.
 		*/
 		function makeRemoteDescriptor(endpoint, method, typeSymbol, schema) {
-			const result = {
-				mode: "strict",
-				typeSymbol,
-				schema,
-				create: () => schema
-			};
 			return {
 				id: `${REMOTE_PACKAGE}#${endpoint}`,
 				service: REMOTE_SERVICE,
@@ -2127,7 +2091,7 @@ window.__ModuleLoader__.load({
 				method,
 				invocation: { kind: "direct" },
 				parameters: [],
-				result
+				result: makeStrictCodec(typeSymbol, schema)
 			};
 		}
 		//#endregion
@@ -2172,7 +2136,7 @@ window.__ModuleLoader__.load({
 			const report = { failures };
 			if (source.blocked !== void 0) {
 				const blocked = source.blocked;
-				if (blocked === "invalid-key" || blocked === "service-unavailable" || blocked === "network") report.blocked = blocked;
+				if (blocked === "invalid-key" || blocked === "service-unavailable" || blocked === "invalid-response" || blocked === "network") report.blocked = blocked;
 				else reject$1("blocked");
 			}
 			if (source.account !== void 0) {
@@ -2388,9 +2352,24 @@ window.__ModuleLoader__.load({
 		}
 		/** The strict result codec shared by all three login endpoints. */
 		const loginStatusSchema = { parse: parseLoginStatus };
-		/** Build one login invocation descriptor (uniform result, no parameters). */
+		/** Optional account target; the Host still checks it against saved slots. */
+		const loginTargetSchema = { parse(value) {
+			if (value === void 0 || typeof value === "string") return value;
+			return reject("targetRef");
+		} };
+		/** Build one login invocation descriptor. Only begin accepts an account ref. */
 		function loginDescriptor(endpoint, method) {
-			return makeRemoteDescriptor(endpoint, method, `${REMOTE_PACKAGE}#CommandCodeLoginStatus`, loginStatusSchema);
+			const descriptor = makeRemoteDescriptor(endpoint, method, `${REMOTE_PACKAGE}#CommandCodeLoginStatus`, loginStatusSchema);
+			return method === "loginBegin" ? {
+				...descriptor,
+				parameters: [{
+					name: "targetRef",
+					wire: "targetRef",
+					source: "json",
+					codec: makeStrictCodec(`${REMOTE_PACKAGE}#CommandCodeLoginTargetRef`, loginTargetSchema),
+					acceptsUndefined: true
+				}]
+			} : descriptor;
 		}
 		/** The Client-face contribution fragment mounted on `ctx.remote`. */
 		const LOGIN_REMOTE_CONTRIBUTION = {
@@ -2404,9 +2383,10 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/login-row.tsx
 		/** The sign-in alternative to pasting a key (settings page + Models card). */
-		function LoginRow({ state, disabled, t, onBegin, onCancel }) {
-			const busy = state.phase === "starting" || state.phase === "waiting";
-			const hint = loginHint(state, t);
+		function LoginRow({ state, targetRef, disabled, disabledHint, t, onBegin, onCancel }) {
+			const { visible: visibleState, busyElsewhere } = loginStateForTarget(state, targetRef);
+			const busy = visibleState.phase === "starting" || visibleState.phase === "waiting";
+			const hint = loginHint(visibleState, t);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "cc-field",
 				children: [
@@ -2425,17 +2405,17 @@ window.__ModuleLoader__.load({
 							}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 								type: "button",
 								className: "cc-reset",
-								disabled,
+								disabled: disabled || busyElsewhere,
 								onClick: onBegin,
 								children: t("loginButton")
 							})
 						})]
 					}),
-					state.authUrl !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+					visibleState.authUrl !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 						className: "cc-hint",
 						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("a", {
 							className: "cc-loginLink",
-							href: state.authUrl,
+							href: visibleState.authUrl,
 							target: "_blank",
 							rel: "noreferrer",
 							children: t("loginOpenLink")
@@ -2444,7 +2424,7 @@ window.__ModuleLoader__.load({
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 						className: hint.className,
 						title: hint.title,
-						children: hint.text
+						children: disabled && !busy && disabledHint !== void 0 ? disabledHint : hint.text
 					})
 				]
 			});
@@ -2593,7 +2573,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region package.json
-		var version = "0.11.10";
+		var version = "0.11.12";
 		var repository = {
 			"type": "git",
 			"url": "git+https://github.com/Mars-Sea/dsh-commandcode-provider.git"
@@ -2915,7 +2895,6 @@ window.__ModuleLoader__.load({
 								hint: t("workingDirHint"),
 								state: state.workingDir,
 								disabled,
-								placeholder: state.defaultWorkingDir,
 								onEdit: (text) => onEdit("workingDir", text),
 								onReset: () => onReset("workingDir"),
 								t
@@ -3398,12 +3377,14 @@ window.__ModuleLoader__.load({
 		function blockedTitle(reason, t) {
 			if (reason === "invalid-key") return t("usageKeyInvalid");
 			if (reason === "service-unavailable") return t("usageServiceUnavailable");
+			if (reason === "invalid-response") return t("usageInvalidResponse");
 			return t("usageNetworkError");
 		}
 		/** The actionable hint under a blocked report's headline. */
 		function blockedHint(reason, t) {
 			if (reason === "invalid-key") return t("usageKeyInvalidHint");
 			if (reason === "service-unavailable") return t("usageServiceUnavailableHint");
+			if (reason === "invalid-response") return t("usageInvalidResponseHint");
 			return t("usageNetworkHint");
 		}
 		/** The status dot on an account tab: cooling/invalid warn, everything else ok. */
@@ -3594,7 +3575,7 @@ window.__ModuleLoader__.load({
 			});
 		}
 		/** The multi-account card: the active-account selector + extra accounts in rotation order + add button. */
-		function AccountsCard({ t, state, disabled, onAdd, onRemove, onLabel, onKey, onToggleClear, onActive, onActiveReset }) {
+		function AccountsCard({ t, state, login, disabled, onAdd, onRemove, onLabel, onKey, onToggleClear, onActive, onActiveReset, onBeginLogin, onCancelLogin }) {
 			const active = state.activeAccount;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "cc-card",
@@ -3672,14 +3653,31 @@ window.__ModuleLoader__.load({
 							})
 						]
 					}),
-					state.accounts.map((account) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountRow, {
-						account,
-						disabled,
-						t,
-						onLabel: (text) => onLabel(account.id, text),
-						onKey: (text) => onKey(account.id, text),
-						onToggleClear: () => onToggleClear(account.id),
-						onRemove: () => onRemove(account.id)
+					state.accounts.map((account) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "cc-accountEditor",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountRow, {
+							account,
+							disabled: disabled || login.targetRef === account.ref && (login.phase === "starting" || login.phase === "waiting"),
+							t,
+							onLabel: (text) => onLabel(account.id, text),
+							onKey: (text) => onKey(account.id, text),
+							onToggleClear: () => onToggleClear(account.id),
+							onRemove: () => onRemove(account.id)
+						}), account.added ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							className: "cc-accountLoginHint",
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: "cc-hint",
+								children: t("accountLoginAfterSave")
+							})
+						}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(LoginRow, {
+							state: login,
+							targetRef: account.ref,
+							disabled: disabled || !account.writable || state.dirty,
+							disabledHint: state.dirty ? t("loginSaveBefore") : void 0,
+							t,
+							onBegin: () => onBeginLogin(account.ref),
+							onCancel: onCancelLogin
+						})]
 					}, account.id))
 				]
 			});
@@ -3991,6 +3989,8 @@ window.__ModuleLoader__.load({
 		/** The settings page body: connection facts for the Command Code provider. */
 		function CommandCodeSettingsPage(props) {
 			const { t } = props;
+			const footerMarker = (0, react.useRef)(null);
+			const [footerFloating, setFooterFloating] = (0, react.useState)(false);
 			const state = props.useCommandCodeSettings((snapshot) => snapshot);
 			const usage = props.useCommandCodeUsage((snapshot) => snapshot);
 			const login = props.useCommandCodeLogin((snapshot) => snapshot);
@@ -3998,6 +3998,15 @@ window.__ModuleLoader__.load({
 			const keyLocked = !state.apiKeyWritable;
 			const savedVisible = useSavedFlash(state.savedCount);
 			const updateVersion = usePluginUpdate();
+			(0, react.useEffect)(() => {
+				const marker = footerMarker.current;
+				if (!marker || typeof IntersectionObserver === "undefined") return;
+				const observer = new IntersectionObserver(([entry]) => {
+					if (entry) setFooterFloating(!entry.isIntersecting);
+				});
+				observer.observe(marker);
+				return () => observer.disconnect();
+			}, []);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 				className: "cc-section",
 				"aria-label": t("title"),
@@ -4027,6 +4036,7 @@ window.__ModuleLoader__.load({
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountsCard, {
 						t,
 						state,
+						login,
 						disabled,
 						onAdd: props.addAccount,
 						onRemove: props.removeAccount,
@@ -4034,7 +4044,9 @@ window.__ModuleLoader__.load({
 						onKey: props.editAccountKey,
 						onToggleClear: (id) => props.toggleKeyClear(id),
 						onActive: (text) => props.edit("activeAccount", text),
-						onActiveReset: () => props.resetField("activeAccount")
+						onActiveReset: () => props.resetField("activeAccount"),
+						onBeginLogin: props.beginLogin,
+						onCancelLogin: props.cancelLogin
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(RulesCard, {
 						t,
@@ -4058,7 +4070,7 @@ window.__ModuleLoader__.load({
 							label: t("apiKey"),
 							hint: keyLocked ? t("apiKeyLocked") : t("apiKeyHint"),
 							state: state.apiKey,
-							disabled: disabled || keyLocked,
+							disabled: disabled || keyLocked || login.targetRef === void 0 && (login.phase === "starting" || login.phase === "waiting"),
 							configured: state.apiKeyConfigured,
 							configuredLabel: t("apiKeySet"),
 							unconfiguredLabel: t("apiKeyUnset"),
@@ -4072,7 +4084,8 @@ window.__ModuleLoader__.load({
 							onToggleClear: () => props.toggleKeyClear("default")
 						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(LoginRow, {
 							state: login,
-							disabled: disabled || keyLocked,
+							disabled: disabled || keyLocked || state.dirty,
+							disabledHint: state.dirty ? t("loginSaveBefore") : void 0,
 							t,
 							onBegin: props.beginLogin,
 							onCancel: props.cancelLogin
@@ -4085,34 +4098,42 @@ window.__ModuleLoader__.load({
 						onEdit: props.edit,
 						onReset: props.resetField
 					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-						className: "cc-footer",
-						children: [
-							state.failed ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-								className: "cc-failed",
-								role: "status",
-								children: t("saveFailed")
-							}) : null,
-							savedVisible ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-								className: "cc-saved",
-								role: "status",
-								children: t("saved")
-							}) : null,
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-								variant: "ghost",
-								size: "sm",
-								disabled: !state.dirty || state.saving,
-								onClick: props.discard,
-								children: t("discard")
-							}),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-								variant: "primary",
-								size: "sm",
-								disabled: !state.dirty || state.invalid || state.saving,
-								onClick: props.save,
-								children: t(state.saving ? "saving" : "save")
-							})
-						]
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						ref: footerMarker,
+						className: "cc-footerMarker",
+						"aria-hidden": "true"
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						className: `cc-footer cc-footerSticky${footerFloating ? " cc-footerFloating" : ""}`,
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "cc-footerActions",
+							children: [
+								state.failed ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+									className: "cc-failed",
+									role: "status",
+									children: t("saveFailed")
+								}) : null,
+								savedVisible ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+									className: "cc-saved",
+									role: "status",
+									children: t("saved")
+								}) : null,
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+									variant: "ghost",
+									size: "sm",
+									disabled: !state.dirty || state.saving,
+									onClick: props.discard,
+									children: t("discard")
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+									variant: "primary",
+									size: "sm",
+									disabled: !state.dirty || state.invalid || state.saving,
+									onClick: props.save,
+									children: t(state.saving ? "saving" : "save")
+								})
+							]
+						})
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
 						className: "cc-version",
@@ -4399,6 +4420,8 @@ window.__ModuleLoader__.load({
 			errorServiceUnavailableHint: "服务端返回错误（5xx），请稍后点击刷新重试。",
 			errorNetwork: "无法连接 Command Code 服务",
 			errorNetworkHint: "所有请求都没有到达服务端。请检查网络连接或 API 地址设置。",
+			errorInvalidResponse: "Command Code 响应无法读取",
+			errorInvalidResponseHint: "请求已收到响应，但内容无法解析。请检查宿主的 HTTP 代理或响应解压配置。",
 			errorGeneric: "用量获取失败"
 		};
 		/** The panel's English string table (must mirror {@link PANEL_COPY_ZH}). */
@@ -4451,6 +4474,8 @@ window.__ModuleLoader__.load({
 			errorServiceUnavailableHint: "The server returned errors (5xx). Try Refresh again in a moment.",
 			errorNetwork: "Could not reach the Command Code service",
 			errorNetworkHint: "No request reached the server. Check your network connection or the API base setting.",
+			errorInvalidResponse: "Could not read the Command Code response",
+			errorInvalidResponseHint: "The requests received responses, but their bodies could not be parsed. Check the host HTTP proxy or response decoding.",
 			errorGeneric: "Could not fetch account usage"
 		};
 		/** Every panel key, in the English table's declaration order. */
@@ -4631,6 +4656,11 @@ window.__ModuleLoader__.load({
 				hint: "errorNetworkHint",
 				detail
 			};
+			if (blocked === "invalid-response") return {
+				title: "errorInvalidResponse",
+				hint: "errorInvalidResponseHint",
+				detail
+			};
 			if (state.status === "error" && state.report === void 0) return {
 				title: "errorGeneric",
 				hint: "errorGeneric",
@@ -5701,15 +5731,15 @@ window.__ModuleLoader__.load({
 		/**
 		* The shipped composer stats row (dsh-client-ui-chat `StatsPills`).
 		*
-		* A PREFERENCE, not a requirement: 0.1.6-alpha.2 dropped this attribute from the
-		* row's root while leaving the rest of the markup identical, so a lookup that
-		* insisted on it would silently stop finding the row on that engine. When it is
-		* absent the search falls back to the dock OUTLET — deliberately the outlet and
-		* never the outlet's parent, because from 0.1.6-alpha.2 the parent is the new
-		* composer footer, which holds the `ContextMeter` as well, and that meter's
-		* trigger is itself a `button[aria-haspopup="dialog"]` rendered AFTER the dock.
-		* A parent-scoped "last trigger wins" would therefore append the cost to the
-		* context ring instead of the token pill.
+		* A PREFERENCE, not a requirement: the attribute has already been dropped once
+		* upstream (0.1.6-alpha.2) while the rest of the row's markup stayed identical,
+		* so a lookup that insisted on it would silently stop finding the row. When it
+		* is absent the search falls back to the dock OUTLET — deliberately the outlet
+		* and never the outlet's parent, because the parent is the composer footer,
+		* which holds the `ContextMeter` as well, and that meter's trigger is itself a
+		* `button[aria-haspopup="dialog"]` rendered AFTER the dock. A parent-scoped
+		* "last trigger wins" would therefore append the cost to the context ring
+		* instead of the token pill.
 		*/
 		const STATS_ROOT = "[data-composer-stats]";
 		/**
@@ -5846,14 +5876,14 @@ window.__ModuleLoader__.load({
 			*
 			* The scope is the dock OUTLET (`display: contents`, one per slot), which holds
 			* exactly that slot's entries — the shipped `stats` cell and ours, in their
-			* registration order. {@link STATS_ROOT} narrows that to the stats row on the
-			* engines that still mark it; on the engines that do not, the outlet is
-			* already the narrowest correct container, because the composer footer's
-			* `ContextMeter` sits BESIDE the outlet rather than inside it.
+			* registration order. {@link STATS_ROOT} narrows that to the stats row where
+			* the markup marks it; where it does not, the outlet is already the narrowest
+			* correct container, because the composer footer's `ContextMeter` sits BESIDE
+			* the outlet rather than inside it.
 			*
 			* A missing scope is "no pill", never a document-wide search: the outlet is
 			* what makes this lookup per-composer, and a second composer can be live at
-			* once (0.1.6-alpha.2 mounts an embedded Conversation in the sidebar).
+			* once (the sidebar can mount an embedded Conversation).
 			*/
 			resolvePillButton() {
 				const scope = this.scope();
@@ -6203,9 +6233,18 @@ window.__ModuleLoader__.load({
 .cc-ruleCaret{flex-shrink:0;border-right:1.5px solid var(--dsw-alias-label-tertiary);border-bottom:1.5px solid var(--dsw-alias-label-tertiary);width:6px;height:6px;margin-right:4px;margin-bottom:2px;transform:rotate(45deg)}
 .cc-checkRow{align-items:center;gap:8px;display:inline-flex;min-width:0}
 .cc-checkRow:hover{cursor:pointer}
-.cc-check{appearance:none;flex-shrink:0;width:15px;height:15px;margin:0;border:1px solid var(--dsw-alias-border-l2);border-radius:4px;background:var(--dsw-alias-bg-layer-1);position:relative}
+/* A hand-drawn box rather than the platform's accent-color checkbox: the
+ * native control's colours come from color-scheme, which the theme sets once
+ * at BOOT (it is not re-applied when the theme is switched in-session), so a
+ * native box can paint light-chrome white on a dark page. Drawn from tokens it
+ * cannot. The mark rides a brand-primary fill, so it takes the theme's brand
+ * foreground — the platform's pairing for anything painted on that fill, and
+ * the only one that survives the dark mode's near-white brand. The box
+ * outline is a border-l3 hairline: border-l2 (#ffffff1f in dark) leaves an
+ * unchecked box all but invisible against the menu surface. */
+.cc-check{box-sizing:border-box;appearance:none;flex-shrink:0;width:16px;height:16px;margin:0;border:1px solid var(--dsw-alias-border-l3);border-radius:4px;background:0 0;position:relative}
 .cc-check:checked{background:var(--dsw-alias-brand-primary);border-color:var(--dsw-alias-brand-primary)}
-.cc-check:checked::after{content:'';position:absolute;top:2px;left:5px;width:3px;height:7px;border:solid #fff;border-width:0 1.5px 1.5px 0;transform:rotate(45deg)}
+.cc-check:checked::after{content:'';position:absolute;top:3px;left:5px;width:3px;height:7px;border:solid var(--dsw-alias-label-primary-foreground,#fff);border-width:0 1.5px 1.5px 0;transform:rotate(45deg)}
 .cc-checkName{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 /* The model multi-select search box: stacked under the trigger while the
  * dropdown is open, same input sizing so the pair reads as one control. The
@@ -6235,12 +6274,38 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 .cc-advancedBody>.cc-field:first-of-type{border-top:1px solid var(--dsw-alias-border-l2)}
 .cc-hint{color:var(--dsw-alias-label-tertiary);margin:0;font-size:12px;line-height:1.5}
 .cc-footer{justify-content:flex-end;align-items:center;gap:8px;display:flex}
+/* Keep the original footer in flow and inside the settings scrollport. */
+.cc-footerMarker{height:1px;margin:-6px 0 -7px;pointer-events:none}
+.cc-footerSticky{position:sticky;bottom:0;z-index:2;flex-shrink:0;min-height:48px;pointer-events:none}
+.cc-footerActions{align-items:center;gap:8px;display:flex;pointer-events:auto}
+.cc-footerFloating .cc-footerActions{padding:6px;border:1px solid var(--dsw-alias-border-l2);border-radius:12px;background:var(--dsw-alias-bg-layer-3,var(--dsw-alias-bg-layer-2));box-shadow:0 8px 24px rgba(0,0,0,.12)}
+.cc-accountEditor{border-top:1px solid var(--dsw-alias-border-l2)}
+.cc-accountLoginHint{padding:0 0 12px}
 .cc-toggleRow{align-items:center;gap:8px;cursor:pointer;display:flex}
 .cc-toggleRow:has(.cc-toggle:disabled){cursor:default}
-.cc-toggle{appearance:none;flex-shrink:0;background:var(--dsw-alias-border-l2);border-radius:999px;width:30px;height:18px;margin:0;cursor:pointer;position:relative;transition:background .15s ease}
+/* Modelled on the platform's own Switch primitive (ui-primitives
+ * Switch.module.css, dsh 0.1.6+): a 36x20 capsule that pads its track by 2px
+ * and slides a 16px thumb across the 32px content box, so the control is the
+ * same shape, size and motion as every other switch in the app.
+ *
+ * Three things are load-bearing. (1) corner-shape:round on BOTH the track and
+ * the thumb: the theme sets a global superellipse corner shape on every
+ * element, and a superellipse capsule squares its ends off around a round
+ * thumb (the primitive's own comment is about exactly this).
+ * (2) No literal colours. --dsw-alias-brand-primary INVERTS between the two
+ * modes (near-black in light, near-white in dark, on every engine generation
+ * this plugin supports), so the old hardcoded white thumb vanished on the
+ * checked track in dark mode; the brand foreground is the token the platform
+ * paints on that fill, so it contrasts in both modes and in any brand pack.
+ * (3) --dsw-alias-border-l3 as the off track: --dsw-alias-border-l2
+ * (#ffffff1f in dark) left the unchecked track indistinguishable from the card
+ * — the dark-mode half of the same report. */
+.cc-toggle{box-sizing:border-box;appearance:none;flex-shrink:0;width:36px;height:20px;margin:0;padding:2px;border:0;border-radius:10px;corner-shape:round;background:var(--dsw-alias-border-l3);cursor:pointer;position:relative}
 .cc-toggle:checked{background:var(--dsw-alias-brand-primary)}
-.cc-toggle::after{content:'';background:#fff;border-radius:50%;width:14px;height:14px;position:absolute;top:2px;left:2px;transition:left .15s ease}
-.cc-toggle:checked::after{left:14px}
+.cc-toggle::after{content:'';display:block;width:16px;height:16px;border-radius:50%;corner-shape:round;background:var(--dsw-alias-label-primary-foreground);box-shadow:0 0 0 .5px var(--dsw-alias-border-l2);transition:transform .12s ease}
+/* 32px content box minus the 16px thumb. */
+.cc-toggle:checked::after{transform:translateX(16px)}
+.cc-toggle:focus-visible{outline:2px solid var(--dsw-alias-brand-primary);outline-offset:2px}
 .cc-toggle:disabled{cursor:default;opacity:.5}
 .cc-failed{min-width:0;color:var(--dsw-alias-label-error);flex:1;margin:0;font-size:12px;line-height:1.5}
 .cc-usageCard{border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);border-radius:12px;padding:14px 16px;flex-direction:column;gap:12px;display:flex}
@@ -6268,7 +6333,7 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 .cc-usageBar{overflow:hidden;background:var(--dsw-alias-bg-layer-1);border-radius:999px;height:6px}
 .cc-usageBarFill{background:var(--dsw-alias-brand-primary);border-radius:999px;height:100%;transition:width .3s ease}
 .cc-usageBarFillWarn{background:var(--dsw-alias-label-error)}
-@media (prefers-reduced-motion:reduce){.cc-chevron,.cc-toggle,.cc-toggle::after,.cc-usageBarFill{transition:none}}.cc-usageWindowReset{color:var(--dsw-alias-label-tertiary);margin:0;font-size:11px;line-height:1.5}
+@media (prefers-reduced-motion:reduce){.cc-chevron,.cc-toggle::after,.cc-usageBarFill{transition:none}}.cc-usageWindowReset{color:var(--dsw-alias-label-tertiary);margin:0;font-size:11px;line-height:1.5}
 .cc-usageMeta{align-items:center;gap:8px;display:flex}
 .cc-accountReport{flex-direction:column;gap:12px;display:flex}
 .cc-tabs{flex-wrap:wrap;gap:6px;display:flex}
@@ -6526,6 +6591,7 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 			accountLabel: "账户备注名",
 			accountKey: "API 密钥",
 			accountKeyHint: "该账户的 API 密钥。留空保存不会覆盖已存储的密钥。",
+			accountLoginAfterSave: "先点击页面底部的「保存」，再点击该账户的「登录 Command Code」通过网页获取密钥。",
 			accountDefault: "默认账户",
 			activeAccount: "当前使用账户",
 			activeAccountAuto: "自动（第一个可用账户）",
@@ -6596,6 +6662,8 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 			usageServiceUnavailableHint: "服务端返回了错误（5xx），稍后点击刷新重试。",
 			usageNetworkError: "无法连接 Command Code 服务",
 			usageNetworkHint: "所有请求都没有到达服务端。请检查网络连接或 API 地址设置。",
+			usageInvalidResponse: "Command Code 响应无法读取",
+			usageInvalidResponseHint: "请求已收到响应，但内容无法解析。请检查宿主的 HTTP 代理或响应解压配置。",
 			usageUpdated: "更新于",
 			usagePeriodEnd: "账期截止",
 			usageActive: "当前使用",
@@ -6606,6 +6674,7 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 			updateHint: "已发布新版本，点击查看发布说明；更新插件后刷新本页，提示会自动消失。",
 			loginTitle: "通过官方登录获取密钥",
 			loginHintIdle: "不想手动创建密钥？点击登录后浏览器会打开 commandcode.ai 授权页，完成后密钥自动写入本机凭据服务，下次请求即生效。",
+			loginSaveBefore: "请先保存本页更改，再通过网页登录此账户。",
 			loginButton: "登录 Command Code",
 			loginStarting: "正在启动本地回调服务…",
 			loginWaiting: "等待在浏览器中完成授权…",
@@ -6623,7 +6692,7 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 			cardTitle: "Command Code",
 			cardRouteActive: "已启用",
 			cardLoadingHint: "正在读取 Command Code 配置…",
-			cardRegistrationHint: "此卡片随 Command Code 插件注册，需要较新版本的 DeepSeek Harness 才会显示完整内容。"
+			cardRegistrationHint: "此卡片由 Command Code 插件提供，正在等待设置页装配，稍后即可显示完整内容。"
 		};
 		const en = {
 			nav: "Command Code",
@@ -6670,6 +6739,7 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 			accountLabel: "Account label",
 			accountKey: "API key",
 			accountKeyHint: "This account’s API key. Saving with the field blank keeps the stored key.",
+			accountLoginAfterSave: "Use Save at the bottom of the page, then sign in to this account in your browser to obtain a key.",
 			accountDefault: "Default account",
 			activeAccount: "Active account",
 			activeAccountAuto: "Auto (first usable account)",
@@ -6740,6 +6810,8 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 			usageServiceUnavailableHint: "The server returned errors (5xx); try Refresh again later.",
 			usageNetworkError: "Could not reach the Command Code service",
 			usageNetworkHint: "No request reached the server. Check your network connection or the API base setting.",
+			usageInvalidResponse: "Could not read the Command Code response",
+			usageInvalidResponseHint: "The requests received responses, but their bodies could not be parsed. Check the host HTTP proxy or response decoding.",
 			usageUpdated: "Updated",
 			usagePeriodEnd: "Period ends",
 			usageActive: "Active",
@@ -6750,6 +6822,7 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 			updateHint: "A newer version has been published; click for release notes. The notice disappears once the plugin is updated.",
 			loginTitle: "Sign in to fetch a key",
 			loginHintIdle: "Rather not create a key by hand? Sign in and your browser opens the commandcode.ai authorization page; the approved key is stored in the local credential service and applies to the next request.",
+			loginSaveBefore: "Save page changes before signing in to this account.",
 			loginButton: "Sign in to Command Code",
 			loginStarting: "Starting the local callback server…",
 			loginWaiting: "Waiting for authorization in your browser…",
@@ -6767,7 +6840,7 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 			cardTitle: "Command Code",
 			cardRouteActive: "Active",
 			cardLoadingHint: "Loading the Command Code configuration…",
-			cardRegistrationHint: "This card is contributed by the Command Code plugin; a newer DeepSeek Harness is needed to show the full controls."
+			cardRegistrationHint: "This card is contributed by the Command Code plugin and is waiting for the settings page to finish assembling."
 		};
 		//#endregion
 		//#region src/client/index.ts
@@ -6807,15 +6880,6 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 		*/
 		const PANEL_ID = "commandcode-panel";
 		/**
-		* ui-conversation's reserved `main` key, used only as the exit fallback for a
-		* layout whose `selectPanel` predates the `null` "show the Conversation"
-		* selection (see `close` in {@link applyClientSurfaces}). Declared locally for
-		* the same reason as {@link PANEL_ID}: ui-conversation is not a dependency of
-		* this bundle, and the key is a published contract of the layout (its README
-		* names `conversation` as reserved for the Conversation).
-		*/
-		const CONVERSATION_PANEL_ID = "conversation";
-		/**
 		* The composer figure's entry id in `conversation.composer.dock`. Its own id,
 		* not the shipped `stats` cell's: reusing `stats` would REPLACE the tokens /
 		* cache-hit / throughput readout rather than inject into it, and that readout
@@ -6823,12 +6887,10 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 		*/
 		const SESSION_COST_ID = "commandcode-session-cost";
 		/**
-		* Client plugin body. Gates on the services shared by both client generations
-		* (`slots`, `locale`, `connection`, `remote`) — never on `settingsScope`,
-		* which 0.1.7 removed and which the settings scope here replaces for every
-		* generation. Current clients mount the page after `remote.credentials`
-		* appears; legacy clients mount it from the connection ApiProxy credential
-		* face.
+		* Client plugin body. Gates on `slots`, `locale` and `remote` — never on
+		* `settingsScope`, whose wrapper service the 0.1.7 settings rewrite removed
+		* (the settings scope here speaks the `remote.settings` wire directly). The
+		* page mounts once `remote.credentials` appears.
 		*/
 		function apply(ctx) {
 			injectPageCss();
@@ -6840,19 +6902,13 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 				zh: PANEL_COPY_ZH,
 				en: PANEL_COPY_EN
 			}), "dsh-commandcode-provider: panel copy");
-			const connection = ctx.get("connection");
-			const legacyApi = adaptLegacyCredentials(connection?.api?.credentials);
-			if (legacyApi !== void 0) {
-				applyClientSurfaces(ctx, legacyApi, connection?.hostDescription);
-				return;
-			}
 			ctx.inject(["remote.credentials"], (remoteCtx) => {
 				const credentials = remoteCtx.remote.credentials;
 				applyClientSurfaces(remoteCtx, { credentials });
 			});
 		}
-		/** Mount the one shared UI implementation over either credential transport. */
-		function applyClientSurfaces(ctx, api, hostDescription) {
+		/** Mount the one shared UI implementation. */
+		function applyClientSurfaces(ctx, api) {
 			let settingsNamespace;
 			const scope = createSettingsScope(ctx, COMMANDCODE_NS, () => settingsNamespace);
 			ctx.effect(() => () => {
@@ -6872,7 +6928,7 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 					ok: false,
 					error: { message: "commandcode/models remote is not mounted" }
 				})
-			}, hostDescription);
+			});
 			ctx.effect(() => () => controller.dispose(), "dsh-commandcode-provider: settings controller");
 			const store = createSnapshotStore(controller.state());
 			controller.subscribe(() => store.set(controller.state()));
@@ -6964,12 +7020,12 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 			const pricesStore = createSnapshotStore(pricesController.state());
 			pricesController.subscribe(() => pricesStore.set(pricesController.state()));
 			const loginRemote = {
-				loginBegin: async () => {
+				loginBegin: async (targetRef) => {
 					if (usageNamespace === void 0) return {
 						ok: false,
 						error: { message: usageMountError ?? "commandcode remote is not mounted" }
 					};
-					return usageNamespace.loginBegin();
+					return usageNamespace.loginBegin(targetRef);
 				},
 				loginStatus: async () => {
 					if (usageNamespace === void 0) return {
@@ -7013,7 +7069,7 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 				}),
 				discard: () => controller.discard(),
 				refreshUsage: () => void usageController.refresh(),
-				beginLogin: () => void loginController.begin(),
+				beginLogin: (targetRef) => void loginController.begin(targetRef),
 				cancelLogin: () => void loginController.cancel(),
 				addAccount: () => controller.addAccount(),
 				removeAccount: (id) => controller.removeAccount(id),
@@ -7065,21 +7121,10 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 				},
 				startAutoRefresh: () => startPanelAutoRefresh(usageController, () => true),
 				open: () => {
-					const layout = ctx.get("layout");
-					if (typeof layout?.selectPanel === "function") layout.selectPanel(PANEL_ID);
+					ctx.get("layout")?.selectPanel(PANEL_ID);
 				},
 				close: () => {
-					const layout = ctx.get("layout");
-					if (typeof layout?.selectPanel !== "function") return;
-					try {
-						layout.selectPanel(null);
-					} catch {
-						try {
-							layout.selectPanel(CONVERSATION_PANEL_ID);
-						} catch (error) {
-							console.error("[dsh-commandcode-provider] could not close the plans & quota panel:", error);
-						}
-					}
+					ctx.get("layout")?.selectPanel(null);
 				}
 			});
 			ctx.effect(() => injectPanelCss(), "dsh-commandcode-provider: panel styles");
@@ -7094,7 +7139,6 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 				console.error("[dsh-commandcode-provider] could not register the plans & quota panel:", error);
 			}
 			ctx.inject(["layout"], (layoutCtx) => {
-				if (typeof layoutCtx.get("layout")?.selectPanel !== "function") return;
 				try {
 					layoutCtx.slots.inject("sidebar.footer.action", () => layoutCtx.slots.register({
 						name: "sidebar.footer.action",
@@ -7121,7 +7165,6 @@ select.cc-input{appearance:none;-webkit-appearance:none;-moz-appearance:none;box
 		const inject = [
 			"slots",
 			"locale",
-			"connection",
 			"remote"
 		];
 		//#endregion