@klarkxy/dsh-git-commit 0.3.0 → 0.3.2

package/lib/client.js

@@ -268,7 +268,14 @@ function useModelCatalog(load, options = {}) {
 		refresh
 	};
 }
-/** Also accepts a mapped state from a caller that owns broader async orchestration. */
+/**
+* Also accepts a mapped state from a caller that owns broader async orchestration.
+*
+* The dsh-ui-* classes carry the styling and resolve through the consuming
+* plugin's own officialUiCss scope (every consumer mounts its root class, so
+* e.g. `.dsh-model-hub .dsh-ui-loading` paints this); dsh-model-catalog-status
+* stays as a structural hook for tests and layout, never a colour source.
+*/
 function ModelCatalogStatus({ state, locale }) {
 	const zh = locale?.toLowerCase().startsWith("zh") === true;
 	const copy = zh ? {
@@ -284,15 +291,17 @@ function ModelCatalogStatus({ state, locale }) {
 	};
 	if (!state.loading && !state.error && state.failures.length === 0) return null;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-		className: "dsh-model-catalog-status",
+		className: "dsh-model-catalog-status dsh-ui-stack",
 		lang: zh ? "zh" : "en",
 		children: [
 			state.loading ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 				role: "status",
+				className: "dsh-ui-loading",
 				children: copy.loading
 			}) : null,
 			state.error ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
 				role: "alert",
+				className: "dsh-ui-error dsh-ui-wrap",
 				children: [
 					copy.error,
 					": ",
@@ -301,20 +310,27 @@ function ModelCatalogStatus({ state, locale }) {
 			}) : null,
 			state.failures.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				role: "status",
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: copy.partial }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", { children: state.failures.map((failure, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", { children: [
-					failure.name || failure.id,
-					": ",
-					failure.message
-				] }, `${failure.id}:${index}`)) })]
+				className: "dsh-ui-meta",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: copy.partial }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", {
+					className: "dsh-ui-list",
+					children: state.failures.map((failure, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", { children: [
+						failure.name || failure.id,
+						": ",
+						failure.message
+					] }, `${failure.id}:${index}`))
+				})]
 			}) : null,
-			state.error || state.failures.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-				type: "button",
-				size: "sm",
-				disabled: state.loading,
-				onClick: () => {
-					state.refresh();
-				},
-				children: copy.retry
+			state.error || state.failures.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+				className: "dsh-ui-actions",
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+					type: "button",
+					size: "sm",
+					disabled: state.loading,
+					onClick: () => {
+						state.refresh();
+					},
+					children: copy.retry
+				})
 			}) : null
 		]
 	});
@@ -334,7 +350,8 @@ function ModelCatalogStatus({ state, locale }) {
 * Sticky group headings, subsequence ranking, highlight walking and focus
 * hand-back all match the host. SYNC POINT: when the host's ModelSelect or
 * ModelSelect.module.css changes, this copy must be re-transcribed; styles
-* below may only reference --dsw-* theme tokens, never literal colors.
+* below may only reference allowlisted theme tokens (the --dsw-* set plus the
+* host's --ds-* motion tokens), never literal colors.
 *
 * It statically imports the primitives, so only browser clients should load
 * this entry; host code and node tests use the core entry (`./index.ts`).
@@ -842,7 +859,8 @@ function ModelMenu(props) {
 * sticky group headings (MenuGroup's own CSS), and the l1-stroke prominent
 * elevation at portal z-index 1100. The trigger mirrors the composer's 28px
 * model pill, chevron rotating open. MenuSurface paints fill and backdrop.
-* Only --dsw-* theme tokens may appear here — a literal color is a bug.
+* Only allowlisted --dsw- and --ds- theme tokens may appear here — a literal
+* color is a bug.
 */
 const modelMenuCss = `
 .dsh-model-menu-root { min-width: 0; position: relative; display: inline-flex; }
@@ -865,12 +883,14 @@ const modelMenuCss = `
   display: flex;
 }
 .dsh-model-menu-trigger:hover:not(:disabled) { background: var(--dsw-alias-interactive-bg-hover); }
-.dsh-model-menu-trigger:focus-visible:not([data-selection-focus]) { box-shadow: 0 0 0 2px var(--dsw-focus-ring-color, var(--dsw-alias-state-business-primary)); }
+.dsh-model-menu-trigger:focus-visible:not([data-selection-focus]) { box-shadow: 0 0 0 var(--dsw-focus-ring-width) var(--dsw-focus-ring-color, var(--dsw-alias-state-business-primary)); }
 .dsh-model-menu-trigger:disabled { color: var(--dsw-alias-label-dimmed); cursor: default; }
 .dsh-model-menu-triggerLabel { text-overflow: ellipsis; white-space: nowrap; min-width: 0; overflow: hidden; }
 .dsh-model-menu-triggerEffort { text-overflow: ellipsis; white-space: nowrap; min-width: 0; color: var(--dsw-alias-label-caption); flex-shrink: 1000; overflow: hidden; }
-.dsh-model-menu-chevron { color: var(--dsw-alias-label-caption); flex: none; transition: transform 0.12s; }
+.dsh-model-menu-chevron { color: var(--dsw-alias-label-caption); flex: none; transition: transform var(--ds-transition-duration) var(--ds-ease-in-out); }
 .dsh-model-menu-chevronOpen { transform: rotate(180deg); }
+/* Portal overlay: the host publishes no z-index token, so the card keeps the
+ * native menu layer's 1100 verbatim. */
 .dsh-model-menu-menu {
   z-index: 1100;
   --dsw-elevation-stroke-color: var(--dsw-alias-border-l1);
@@ -896,6 +916,8 @@ const modelMenuCss = `
 .dsh-model-menu-searchWithQuery { padding-right: 34px; }
 .dsh-model-menu-searchRow .dsh-model-menu-search input { padding: 0; font-size: 12px; line-height: normal; }
 .dsh-model-menu-searchRow .dsh-model-menu-search input::placeholder { color: var(--dsw-alias-label-caption); }
+/* The clear button is a circle by geometry (border-radius: 50%), a shape the
+ * radius token scale does not describe. */
 .dsh-model-menu-searchClear {
   width: 24px;
   height: 24px;
@@ -1143,6 +1165,17 @@ ${scope} {
 /* --- Layout scaffolding. --- */
 & .dsh-ui-stack { display: flex; flex-direction: column; gap: 12px; }
 & .dsh-ui-stack-lg { display: flex; flex-direction: column; gap: 20px; }
+/* Plugin detail pages share one reading column. These are layout recipes;
+ * controls keep their own primitive styles. Form spacing follows the host's
+ * settings-form/fields.module.css and SettingsForm.module.css. */
+& .dsh-ui-page { display: flex; flex-direction: column; gap: 16px; width: 100%; max-width: 760px; min-width: 0; }
+& .dsh-ui-form { display: flex; flex-direction: column; gap: 0; min-width: 0; }
+&.dsh-ui-form > .dsh-ui-field, & .dsh-ui-form > .dsh-ui-field { padding: 12px 0; }
+& .dsh-ui-form-footer { display: flex; align-items: center; flex-wrap: wrap; gap: 8px; padding-top: 16px; min-width: 0; }
+& .dsh-ui-fields-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 12px 20px; min-width: 0; margin: 0; padding: 0; border: 0; }
+@media (max-width: 560px) {
+  & .dsh-ui-fields-grid { grid-template-columns: minmax(0, 1fr); }
+}
 & .dsh-ui-row { display: flex; align-items: center; gap: 8px; min-width: 0; }
 & .dsh-ui-row-wrap { display: flex; align-items: center; flex-wrap: wrap; gap: 8px; }
 & .dsh-ui-spacer { flex: 1; min-width: 0; }
@@ -1170,6 +1203,9 @@ ${scope} {
  * official primitive, so this only owns the vertical rhythm. --- */
 & .dsh-ui-field { display: flex; flex-direction: column; gap: 6px; min-width: 0; }
 & .dsh-ui-field + .dsh-ui-field { border-top: 0.5px solid var(--dsw-alias-border-l2); padding-top: 12px; }
+/* Grid fields share a row, so the stacked-field divider must not win later in
+ * the cascade. Reset it here, after the field recipe. */
+& .dsh-ui-fields-grid > .dsh-ui-field { padding: 0; border: 0; }
 & .dsh-ui-label { display: flex; align-items: center; gap: 6px; font-size: 13px; line-height: 20px; font-weight: 500; color: var(--dsw-alias-label-primary); }
 & .dsh-ui-label-row { display: flex; align-items: baseline; justify-content: space-between; gap: 8px; }
 & .dsh-ui-help { font-size: 12px; line-height: 1.6; color: var(--dsw-alias-label-secondary); }
@@ -1360,7 +1396,7 @@ ${scope} {
   & *, & *::before, & *::after { transition-duration: 0.01ms !important; animation-duration: 0.01ms !important; }
 }
 }
-`.replace(/^& (\.dsh-ui-[a-z0-9-]+)(?![+>~])/gm, (_match, className) => `&${className}, & ${className}`);
+`.replace(/^& (\.dsh-ui-[a-z0-9-]+)(?=\s*\{)/gm, (_match, className) => `&${className}, & ${className}`);
 }
 //#endregion
 //#region ../dsh-plugin-kit/src/contracts.ts
@@ -1376,6 +1412,37 @@ function modelSettingsChangesIdentity(packageName) {
 		namespace: segment
 	};
 }
+/**
+* Shared "Session Management" settings section id. The section is provided by
+* shared infrastructure (see `registerSessionSettingsItem` in `client-utils`),
+* not by any one business plugin: every participant registers only a row into
+* {@link SESSION_SETTINGS_ITEM_SLOT}, so any enabled subset yields the same page.
+*/
+const SESSION_SETTINGS_SECTION_ID = "session-manager";
+/**
+* Child list slot declared by the shared Session Management page. Neutral
+* naming on purpose: participants never import each other, they only
+* contribute `{id, order}` rows into this slot while the page is alive.
+*/
+const SESSION_SETTINGS_ITEM_SLOT = "dsh.session-settings.item";
+/**
+* Host-owned nav icon seat: a root-scoped list where each entry's `id` must
+* equal the `settings.section` id it decorates. Owner props are
+* `{size, active}`; icons stay `aria-hidden` so the section label remains the
+* accessible name. Contributors into a shared section may register the same
+* icon `id` with different priorities — the ledger keeps every entry while the
+* host renders one icon per section.
+*/
+const SETTINGS_SECTION_ICON_SLOT = "settings.section.icon";
+/** Authenticated host-RPC channel for get/set of the shared default. */
+const AUXILIARY_MODEL_CHANNEL = "/dsh-auxiliary-model";
+/** Model-settings namespace under which the shared default is published. */
+const AUXILIARY_MODEL_NS = "@klarkxy/dsh-plugin-kit/auxiliary-model";
+/**
+* Typert identity of the shared change stream. Mounted on the root context
+* with ownerNs filtering, so frames only carry {@link AUXILIARY_MODEL_NS}.
+*/
+const AUXILIARY_MODEL_CHANGES_IDENTITY = modelSettingsChangesIdentity("@klarkxy/dsh-plugin-kit");
 //#endregion
 //#region ../dsh-plugin-kit/src/model-settings-client.ts
 /** This stream carries invalidations only; ready is never a settings snapshot. */
@@ -1545,6 +1612,604 @@ function createModelSettingsSubscriber(ctx, packageName, identity = modelSetting
 	} });
 }
 //#endregion
+//#region ../dsh-plugin-kit/src/client-utils.ts
+/** One `<svg>` with the shared icon chrome; children are plain elements. */
+function lineIcon(children) {
+	return function SettingsSectionIcon(props) {
+		return (0, react.createElement)("svg", {
+			"aria-hidden": "true",
+			width: props.size ?? 16,
+			height: props.size ?? 16,
+			viewBox: "0 0 16 16",
+			fill: "none",
+			stroke: "currentColor",
+			strokeWidth: 1,
+			strokeLinecap: "round",
+			strokeLinejoin: "round"
+		}, ...children.map(([tag, attrs], index) => (0, react.createElement)(tag, {
+			key: index,
+			...attrs
+		})));
+	};
+}
+/** Chat bubble for the shared Session Management section. */
+const IconSessionSettings = lineIcon([["path", { d: "M8.5 13a5.5 5.5 0 0 0 5.5-5.5A5.5 5.5 0 0 0 8.5 2 5.5 5.5 0 0 0 3 7.5a5.48 5.48 0 0 0 .9 3L2.8 12.6a.5.5 0 0 0 .62.62l2.9-.98a5.48 5.48 0 0 0 2.18.76Z" }]]);
+/** Private Cordis rendezvous; every bundled copy of this helper resolves the same root service. */
+const SESSION_SETTINGS_PAGE_SERVICE = "dshSessionSettingsPage";
+/** The page component renders only its declared child list: items paint their own titles and styles. */
+function SessionSettingsPageView(props) {
+	return props.renderSlot(SESSION_SETTINGS_ITEM_SLOT, {});
+}
+/**
+* Acquire the root-owned page service, creating and providing it on first use.
+* One counter covers participants, the section wait and the provider: the last
+* release removes the wait and then the provider synchronously (Cordis deletes
+* the impl before its async disposer awaits), so a later acquire sees a clean
+* get() miss and can re-establish the page.
+*/
+function acquireSessionSettingsPage(root) {
+	const existing = root.get(SESSION_SETTINGS_PAGE_SERVICE, false);
+	if (existing) return existing;
+	const slots = root.slots;
+	let users = 0;
+	let stopPage;
+	let unprovide;
+	const page = {
+		retain() {
+			users += 1;
+			if (!stopPage) stopPage = slots.inject("settings.section", () => slots.register({
+				name: "settings.section",
+				id: SESSION_SETTINGS_SECTION_ID,
+				order: 30,
+				label: () => {
+					const locale = root.get("locale", false);
+					return String(locale?.getSnapshot?.().active ?? "").startsWith("zh") ? "会话管理" : "Session Management";
+				},
+				children: { [SESSION_SETTINGS_ITEM_SLOT]: {
+					kind: "list",
+					scope: "root"
+				} }
+			}, SessionSettingsPageView));
+		},
+		release() {
+			if (users <= 0) return;
+			users -= 1;
+			if (users > 0) return;
+			stopPage?.();
+			stopPage = void 0;
+			unprovide?.();
+		}
+	};
+	unprovide = root.provide(SESSION_SETTINGS_PAGE_SERVICE, page);
+	return page;
+}
+/**
+* Contribute one row to the shared Session Management settings page.
+*
+* `ctx` is the plugin's own context: the row's slot wait unloads with the
+* plugin, while the page itself is retained on the shared root context for as
+* long as any contributor lives. There is no fallback seat — when every
+* contributor is gone the section disappears with the page. Returns a disposer.
+* Shared root-owned infrastructure (the auxiliary-model card) calls this on
+* `ctx.root` so its row, icon and page share are owned by the root lifetime
+* and released by the returned disposer, not by any plugin fiber.
+*/
+function registerSessionSettingsItem(ctx, item, component) {
+	const slots = ctx.slots;
+	const root = ctx.root;
+	const page = acquireSessionSettingsPage(root);
+	let stopItem;
+	let stopIcon;
+	try {
+		page.retain();
+		stopItem = slots.inject(SESSION_SETTINGS_ITEM_SLOT, () => slots.register({
+			name: SESSION_SETTINGS_ITEM_SLOT,
+			...item
+		}, component));
+		stopIcon = slots.inject(SETTINGS_SECTION_ICON_SLOT, () => slots.register({
+			name: SETTINGS_SECTION_ICON_SLOT,
+			id: SESSION_SETTINGS_SECTION_ID,
+			order: item.order,
+			priority: item.order
+		}, IconSessionSettings));
+	} catch (error) {
+		stopIcon?.();
+		stopItem?.();
+		page.release();
+		throw error;
+	}
+	let disposed = false;
+	return () => {
+		if (disposed) return;
+		disposed = true;
+		stopIcon?.();
+		stopItem?.();
+		page.release();
+	};
+}
+//#endregion
+//#region ../dsh-plugin-kit/src/auxiliary-model-client.tsx
+const AUXILIARY_MODEL_PACKAGE = "@klarkxy/dsh-plugin-kit";
+const AUXILIARY_MODEL_SEAT_ID = "auxiliary-model";
+/** Private Cordis rendezvous; every bundled copy resolves the same root service. */
+const AUXILIARY_MODEL_CARD_SERVICE = "dshAuxiliaryModelSettingsCard";
+/** Theme-token-only stylesheet: officialUiCss scope plus the shared ModelMenu recipe. */
+const auxiliaryModelCss = `${officialUiCss("ams-root")}${modelMenuCss}
+.ams-root .ams-row { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; min-width: 0; }
+`;
+const auxiliaryCopy = {
+	zh: {
+		title: "默认辅助模型",
+		help: "各辅助功能（如标题生成、摘要）没有单独指定模型时使用的模型；仅影响声明使用它的功能。",
+		model: "辅助模型",
+		modelDefault: "跟随会话或宿主默认",
+		modelHint: "不选择模型时，各功能按自己的规则决定对话模型。",
+		effortDefault: "跟随模型默认",
+		loading: "正在读取设置…",
+		failed: "无法读取模型设置。",
+		stale: "设置已被其他窗口更新，请刷新后重试。",
+		saveFailed: "保存失败，原设置未更改。请重试。",
+		saved: "已保存。",
+		retry: "重试",
+		refresh: "刷新设置",
+		syncUnavailable: "自动刷新不可用，请手动刷新设置。"
+	},
+	en: {
+		title: "Default Auxiliary Model",
+		help: "The model used by auxiliary features (such as title generation or summarizing) that do not name their own model; only features that opted in are affected.",
+		model: "Auxiliary model",
+		modelDefault: "Follow session or host default",
+		modelHint: "With no model selected, each feature follows its own rules for the conversation model.",
+		effortDefault: "Follow model default",
+		loading: "Loading settings…",
+		failed: "Could not load model settings.",
+		stale: "Settings were changed elsewhere; refresh and retry.",
+		saveFailed: "Save failed; the previous setting was not changed. Try again.",
+		saved: "Saved.",
+		retry: "Retry",
+		refresh: "Refresh settings",
+		syncUnavailable: "Automatic refresh unavailable; refresh settings manually."
+	}
+};
+/** A failed RPC keeps its code so the card can translate known rejections. */
+var AuxiliaryRpcError = class extends Error {
+	code;
+	constructor(code, message) {
+		super(message);
+		this.code = code;
+		this.name = "AuxiliaryRpcError";
+	}
+};
+/** Host UI language, following live switches with the host's English fallback. */
+function useAuxiliaryLocale(client) {
+	const subscribe = (0, react.useCallback)((listener) => client.locale?.subscribe(listener) ?? (() => {}), [client]);
+	const snapshot = (0, react.useCallback)(() => client.locale?.getSnapshot().active ?? "en", [client]);
+	return String((0, react.useSyncExternalStore)(subscribe, snapshot, snapshot)).startsWith("zh") ? "zh" : "en";
+}
+function isAbort(error) {
+	return error instanceof Error && (error.name === "AbortError" || /abort|cancel/i.test(error.message));
+}
+function isStaleRejection(error) {
+	if (!(error instanceof AuxiliaryRpcError)) return false;
+	return error.code === "stale" || error.code === "auxiliary-model/conflict" || /changed|revision|reload|stale|conflict/i.test(error.message);
+}
+async function callAuxiliaryRpc(client, endpoint, payload = {}) {
+	const result = await client.connection.rpc.call(AUXILIARY_MODEL_CHANNEL, endpoint, payload);
+	if (!result || result.ok !== true) {
+		const error = result && "error" in result ? result.error : void 0;
+		throw new AuxiliaryRpcError(error?.code ?? "unknown", error?.message ?? `RPC ${endpoint} failed`);
+	}
+	return result.value;
+}
+/**
+* The shared card. All state comes from the shared host service over the
+* plugin-kit RPC channel; the card only renders the stored row.
+*/
+function AuxiliaryModelCard({ client, subscribe }) {
+	const language = useAuxiliaryLocale(client);
+	const text = auxiliaryCopy[language];
+	const [settings, setSettings] = (0, react.useState)();
+	const catalogState = useModelCatalog((0, react.useCallback)(() => readModelCatalog(client), [client]), { subscribe: (0, react.useCallback)((change) => client.connection.generation?.subscribe(change), [client]) });
+	const { refresh: refreshCatalog } = catalogState;
+	const choices = parseModelMenuChoices(catalogState.catalog, settings?.model ?? void 0);
+	const [menuOpen, setMenuOpen] = (0, react.useState)(false);
+	const [error, setError] = (0, react.useState)("");
+	const [note, setNote] = (0, react.useState)(false);
+	const [busy, setBusy] = (0, react.useState)(false);
+	const [syncError, setSyncError] = (0, react.useState)("");
+	const operation = (0, react.useRef)({
+		epoch: 0,
+		active: false,
+		reading: false,
+		writing: false,
+		pending: false
+	});
+	const refreshRef = (0, react.useRef)(() => {});
+	const refresh = () => {
+		const state = operation.current;
+		if (!state.active) return;
+		if (state.reading || state.writing) {
+			state.pending = true;
+			return;
+		}
+		state.pending = false;
+		state.reading = true;
+		setBusy(true);
+		const epoch = state.epoch;
+		callAuxiliaryRpc(client, "defaults.get").then((next) => {
+			if (state.active && state.epoch === epoch && !state.pending) {
+				setSettings(next);
+				setError("");
+			}
+		}).catch((reason) => {
+			if (state.active && state.epoch === epoch && !state.pending && !isAbort(reason)) setError("failed");
+		}).finally(() => {
+			if (!state.active || state.epoch !== epoch) return;
+			state.reading = false;
+			setBusy(false);
+			if (state.pending) refreshRef.current();
+		});
+	};
+	refreshRef.current = refresh;
+	(0, react.useEffect)(() => {
+		const state = operation.current;
+		state.epoch++;
+		state.active = true;
+		state.reading = false;
+		state.writing = false;
+		state.pending = false;
+		setBusy(false);
+		setSettings(void 0);
+		setError("");
+		setNote(false);
+		refreshRef.current();
+		return () => {
+			state.active = false;
+			state.epoch++;
+		};
+	}, [client]);
+	(0, react.useEffect)(() => {
+		setSyncError("");
+		let live = true;
+		let stop;
+		try {
+			stop = subscribe?.(() => {
+				if (live) {
+					setSyncError("");
+					refreshCatalog();
+					refreshRef.current();
+				}
+			}, (message) => {
+				if (live) setSyncError(message);
+			});
+		} catch {
+			if (live) setSyncError("Model settings sync service unavailable");
+		}
+		return () => {
+			live = false;
+			try {
+				stop?.();
+			} catch {}
+		};
+	}, [subscribe, refreshCatalog]);
+	const save = (0, react.useCallback)((model) => {
+		const state = operation.current;
+		if (!settings || !state.active || state.writing || state.reading) return;
+		state.writing = true;
+		const epoch = state.epoch;
+		setBusy(true);
+		setNote(false);
+		setError("");
+		callAuxiliaryRpc(client, "defaults.set", {
+			model: model ?? {
+				provider: "",
+				model: ""
+			},
+			expectedRevision: settings.revision
+		}).then((next) => {
+			if (state.active && state.epoch === epoch) {
+				setSettings(next);
+				setNote(true);
+				refreshCatalog();
+			}
+		}).catch((reason) => {
+			if (state.active && state.epoch === epoch) setError(isStaleRejection(reason) ? "stale" : "saveFailed");
+		}).finally(() => {
+			if (!state.active || state.epoch !== epoch) return;
+			state.writing = false;
+			setBusy(false);
+			if (state.pending) refreshRef.current();
+		});
+	}, [
+		client,
+		settings,
+		refreshCatalog
+	]);
+	const locked = busy;
+	if (!settings) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
+		className: "ams-root dsh-ui-card",
+		"data-testid": "auxiliary-model-settings",
+		children: [
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				className: "dsh-ui-heading",
+				children: text.title
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+				className: "dsh-ui-help",
+				children: text.help
+			}),
+			error ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+				role: "alert",
+				className: "dsh-ui-error",
+				children: text[error]
+			}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+				role: "status",
+				className: "dsh-ui-hint",
+				children: text.loading
+			}),
+			syncError && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+				role: "status",
+				className: "dsh-ui-hint",
+				children: text.syncUnavailable
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+				className: "dsh-ui-actions",
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+					variant: "ghost",
+					size: "sm",
+					disabled: locked,
+					onClick: () => refreshRef.current(),
+					children: text.retry
+				})
+			})
+		]
+	});
+	const current = settings.model ?? {
+		provider: "",
+		model: ""
+	};
+	const follow = !current.provider || !current.model;
+	const selected = follow ? void 0 : choices.find((item) => item.provider === current.provider && item.model === current.model);
+	const efforts = follow ? [] : modelMenuEffortOptions(selected, current.reasoningEffort);
+	const currentLabel = follow ? text.modelDefault : selected?.label ?? `${current.provider} / ${current.model}`;
+	const selectedEffort = efforts.find((item) => item.id === (current.reasoningEffort || ""));
+	const effortName = selectedEffort ? modelMenuEffortLabel(selectedEffort, language) : void 0;
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
+		className: "ams-root dsh-ui-card",
+		"data-testid": "auxiliary-model-settings",
+		children: [
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				className: "dsh-ui-heading",
+				children: text.title
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+				className: "dsh-ui-help",
+				children: text.help
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "dsh-ui-field",
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-ui-label",
+						children: text.model
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ModelCatalogStatus, {
+						state: catalogState,
+						locale: language
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ModelMenu, {
+						locale: language,
+						open: menuOpen && !locked,
+						onOpenChange: (next) => setMenuOpen(next && !locked),
+						listClassName: "ams-root ams-menu-portal",
+						anchor: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+							type: "button",
+							className: "dsh-model-menu-trigger",
+							disabled: locked,
+							"aria-label": `${text.model}: ${currentLabel}`,
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: "dsh-model-menu-triggerLabel",
+									children: currentLabel
+								}),
+								!follow && efforts.length ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: "dsh-model-menu-triggerEffort",
+									children: effortName ?? text.effortDefault
+								}) : null,
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutlineRegular, { className: `dsh-model-menu-chevron${menuOpen && !locked ? " dsh-model-menu-chevronOpen" : ""}` })
+							]
+						}),
+						choices,
+						selected: follow ? void 0 : {
+							provider: current.provider,
+							model: current.model
+						},
+						onPick: (picked) => save({
+							provider: picked.provider,
+							model: picked.model
+						}),
+						leading: [{
+							id: "default",
+							label: text.modelDefault,
+							selected: follow
+						}],
+						onPickLeading: () => save(null),
+						efforts,
+						selectedEffort: current.reasoningEffort || "",
+						onPickEffort: (effort) => save(follow ? null : {
+							provider: current.provider,
+							model: current.model,
+							...effort ? { reasoningEffort: effort } : {}
+						}),
+						modelLabel: text.model,
+						modelValue: currentLabel,
+						defaultEffortLabel: text.effortDefault
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-ui-hint",
+						children: text.modelHint
+					})
+				]
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "ams-row",
+				children: [
+					syncError && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						role: "status",
+						className: "dsh-ui-hint",
+						children: text.syncUnavailable
+					}),
+					error && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						role: "alert",
+						className: "dsh-ui-error",
+						children: text[error]
+					}),
+					note && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						role: "status",
+						className: "dsh-ui-notice",
+						children: text.saved
+					}),
+					error || syncError ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+						variant: "ghost",
+						size: "sm",
+						disabled: locked,
+						onClick: () => refreshRef.current(),
+						children: text.refresh
+					}) : null
+				]
+			})
+		]
+	});
+}
+const AUXILIARY_MODEL_WATCH_COORDINATOR = "dshAuxiliaryModelWatchCoordinator";
+function acquireWatchCoordinator(root) {
+	const existing = root.get(AUXILIARY_MODEL_WATCH_COORDINATOR, false);
+	if (existing) return existing;
+	let unprovide;
+	const coordinator = {
+		tail: Promise.resolve(),
+		active: 0,
+		mount() {
+			coordinator.active += 1;
+			const previousTail = coordinator.tail;
+			const lease = {
+				closed: false,
+				done() {
+					if (lease.closed) return;
+					lease.closed = true;
+					coordinator.active -= 1;
+					const owned = lease.fiber;
+					lease.fiber = void 0;
+					coordinator.tail = coordinator.tail.then(() => Promise.resolve(owned?.dispose()).catch(() => {}));
+					coordinator.tail.then(() => {
+						if (coordinator.active > 0) return;
+						try {
+							if (root.get(AUXILIARY_MODEL_WATCH_COORDINATOR, false) === coordinator) Promise.resolve(unprovide?.()).catch(() => {});
+						} catch {}
+					});
+				},
+				fiber: void 0
+			};
+			previousTail.then(() => {
+				if (lease.closed) return;
+				try {
+					lease.fiber = root.inject(["remote"], (injected) => {
+						const scope = injected;
+						const mounting = scope.remote.$mount(modelSettingsChangesRemote(AUXILIARY_MODEL_PACKAGE, AUXILIARY_MODEL_CHANGES_IDENTITY));
+						mounting.catch(() => {});
+						scope.effect(() => async () => {
+							await (await mounting.catch(() => void 0))?.();
+						});
+					});
+				} catch {}
+			});
+			return lease;
+		}
+	};
+	unprovide = root.provide(AUXILIARY_MODEL_WATCH_COORDINATOR, coordinator);
+	return coordinator;
+}
+/**
+* Acquire the root-owned card service, creating it on first use. One counter
+* covers participants, the seat wait and the change-stream mount: the last
+* release removes the wait, then the watch contribution, then the provider
+* itself synchronously (Cordis deletes the impl before its async disposer
+* awaits), so a later acquire sees a clean get() miss and can re-establish.
+*/
+function acquireAuxiliaryModelCard(root, ctx) {
+	const existing = root.get(AUXILIARY_MODEL_CARD_SERVICE, false);
+	if (existing) return existing;
+	let users = 0;
+	let styleElement;
+	let stopItem;
+	let unprovide;
+	const watchLease = acquireWatchCoordinator(root).mount();
+	const subscriber = createModelSettingsSubscriber(ctx.root, AUXILIARY_MODEL_PACKAGE, AUXILIARY_MODEL_CHANGES_IDENTITY, (ns) => ns === AUXILIARY_MODEL_NS);
+	const render = () => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AuxiliaryModelCard, {
+		client: root,
+		subscribe: subscriber.subscribe
+	});
+	const service = {
+		retain() {
+			users += 1;
+			if (styleElement === void 0 && typeof document !== "undefined") {
+				styleElement = document.createElement("style");
+				styleElement.setAttribute("data-plugin", "dsh-auxiliary-model-shared");
+				styleElement.textContent = auxiliaryModelCss;
+				document.head.appendChild(styleElement);
+			}
+			if (!stopItem) stopItem = registerSessionSettingsItem(ctx.root, {
+				id: AUXILIARY_MODEL_SEAT_ID,
+				order: 55
+			}, render);
+		},
+		release() {
+			if (users <= 0) return;
+			users -= 1;
+			if (users > 0) return;
+			stopItem?.();
+			stopItem = void 0;
+			styleElement?.remove();
+			styleElement = void 0;
+			watchLease.done();
+			try {
+				Promise.resolve(unprovide?.()).catch(() => {});
+			} catch {}
+			unprovide = void 0;
+		}
+	};
+	unprovide = root.provide(AUXILIARY_MODEL_CARD_SERVICE, service);
+	return service;
+}
+/**
+* Show the shared "default auxiliary model" card while the calling plugin is
+* enabled.
+*
+* `ctx` is the plugin's own client context: the card itself is retained on the
+* shared root context for as long as any participant lives, so an arbitrary
+* subset of enabled plugins yields the same single card. The mount's slot wait
+* and the change-stream contribution are owned by the root service — the first
+* participant's unload cannot take the card down. Returns a disposer; it may
+* be invoked by both ctx.effect and an explicit caller and releases at most
+* once, so a double call cannot unbalance the shared refcount.
+*/
+function registerAuxiliaryModelSettings(ctx) {
+	const root = ctx.root;
+	const service = acquireAuxiliaryModelCard(root, ctx);
+	try {
+		service.retain();
+	} catch (error) {
+		service.release();
+		throw error;
+	}
+	let disposed = false;
+	return () => {
+		if (disposed) return;
+		disposed = true;
+		service.release();
+	};
+}
+//#endregion
 //#region src/contracts.ts
 const PLUGIN_NAME = "@klarkxy/dsh-git-commit";
 const RPC_CHANNEL = "/dsh-git-commit";
@@ -1565,12 +2230,11 @@ const zh = {
 	commitAction: "分次提交全部工作区修改",
 	files: "个文件",
 	model: "模型",
-	modelDefault: "默认模型",
-	modelCustom: "插件设置",
 	filesCount: "（{n} 个文件）",
 	confirmPrompt: "将把 {n} 个文件的全部修改分次提交到当前分支。",
 	confirm: "确认提交",
 	cancel: "取消",
+	commitBlocked: "正在保存模型设置或上次保存未生效，恢复后才可提交",
 	loading: "正在读取仓库状态…",
 	running: "正在整理修改并分次提交…",
 	done: "已创建提交",
@@ -1596,7 +2260,7 @@ const zh = {
 	workspaceChanged: "工作区或分支已变更，请刷新后重试提交",
 	settingsUnavailable: "无法读取提交设置，请重新加载插件后重试",
 	invalidRequest: "提交请求无效，请刷新后重试",
-	planUnavailable: "模型没有给出可用的提交方案，已取消本次提交，工作区没有被改动。换一个模型重试，或在插件设置里开启兜底提交。",
+	planUnavailable: "模型没有给出可用的提交方案，已取消本次提交，工作区没有被改动。换一个模型重试，或开启下方「模型不可用时仍然提交」。",
 	close: "关闭"
 };
 const en = {
@@ -1605,12 +2269,11 @@ const en = {
 	commitAction: "Commit all workspace changes",
 	files: "files",
 	model: "Model",
-	modelDefault: "default model",
-	modelCustom: "Plugin settings",
 	filesCount: " ({n} files)",
 	confirmPrompt: "All changes in {n} files will be committed to the current branch in one or more commits.",
 	confirm: "Commit now",
 	cancel: "Cancel",
+	commitBlocked: "A settings write is pending or unrecovered; commits unlock once it settles",
 	loading: "Reading repository status…",
 	running: "Organizing changes into commits…",
 	done: "Commits created",
@@ -1636,7 +2299,7 @@ const en = {
 	workspaceChanged: "The workspace or branch changed; refresh and retry the commit",
 	settingsUnavailable: "Could not read commit settings; reload the plugin and retry",
 	invalidRequest: "Invalid commit request; refresh and retry",
-	planUnavailable: "The model returned no usable commit plan, so the run was cancelled and your workspace is untouched. Try another model, or turn on the fallback in plugin settings.",
+	planUnavailable: "The model returned no usable commit plan, so the run was cancelled and your workspace is untouched. Try another model, or enable “Commit even without a model plan” below.",
 	close: "Close"
 };
 /** A failed RPC keeps its code so the panel can explain a rejection in its own words. */
@@ -1740,7 +2403,7 @@ function GitBranchIcon() {
 		]
 	});
 }
-function GitCommitAction({ sessionId, useSession, call, t }) {
+function GitCommitAction({ sessionId, useSession, call, t, client, subscribeSettings }) {
 	const [open, setOpen] = (0, react.useState)(false);
 	const [status, setStatus] = (0, react.useState)();
 	const [loading, setLoading] = (0, react.useState)(false);
@@ -1748,6 +2411,29 @@ function GitCommitAction({ sessionId, useSession, call, t }) {
 	const [result, setResult] = (0, react.useState)(null);
 	const [error, setError] = (0, react.useState)(null);
 	const [confirming, setConfirming] = (0, react.useState)(false);
+	const pendingWrites = (0, react.useRef)(0);
+	const writeFailed = (0, react.useRef)(false);
+	const settingsDirty = (0, react.useRef)(false);
+	const [settingsPending, setSettingsPending] = (0, react.useState)(false);
+	const [settingsSeen, setSettingsSeen] = (0, react.useState)(false);
+	const syncLock = (0, react.useCallback)(() => {
+		const locked = pendingWrites.current > 0 || writeFailed.current;
+		settingsDirty.current = locked;
+		setSettingsPending(locked);
+	}, []);
+	const markWrite = (0, react.useCallback)((active) => {
+		pendingWrites.current = Math.max(0, pendingWrites.current + (active ? 1 : -1));
+		syncLock();
+	}, [syncLock]);
+	const markWriteFailed = (0, react.useCallback)(() => {
+		writeFailed.current = true;
+		syncLock();
+	}, [syncLock]);
+	const markSeen = (0, react.useCallback)(() => {
+		writeFailed.current = false;
+		setSettingsSeen(true);
+		syncLock();
+	}, [syncLock]);
 	const rootRef = (0, react.useRef)(null);
 	const triggerRef = (0, react.useRef)(null);
 	const panelRef = (0, react.useRef)(null);
@@ -1760,19 +2446,26 @@ function GitCommitAction({ sessionId, useSession, call, t }) {
 		margin: 16
 	});
 	const sessionRunning = useSession((snapshot) => snapshot.running === true);
+	const panelPortalRef = (0, react.useMemo)(() => ({ get current() {
+		const panel = panelRef.current;
+		if (!panel) return null;
+		return { contains: (node) => panel.contains(node) || [...document.querySelectorAll(".gcm-menu-portal")].some((menu) => menu.contains(node)) };
+	} }), []);
 	const changeOpen = (0, react.useCallback)((next) => {
+		if (!next && pendingWrites.current > 0) return;
 		setOpen(next);
 		setConfirming(false);
 		if (next) {
 			setResult(null);
 			setError(null);
+			setSettingsSeen(false);
 		}
 	}, []);
 	const positioned = Boolean(position);
 	(0, react.useEffect)(() => {
 		if (open && positioned) panelRef.current?.focus();
 	}, [open, positioned]);
-	(0, _deepseek_ai_dsh_client_ui_primitives.useDismissOnOutsidePointer)(rootRef, open, changeOpen, panelRef);
+	(0, _deepseek_ai_dsh_client_ui_primitives.useDismissOnOutsidePointer)(rootRef, open, changeOpen, panelPortalRef);
 	(0, react.useEffect)(() => {
 		generationRef.current += 1;
 		setOpen(false);
@@ -1780,6 +2473,11 @@ function GitCommitAction({ sessionId, useSession, call, t }) {
 		setResult(null);
 		setError(null);
 		setRunning(false);
+		pendingWrites.current = 0;
+		writeFailed.current = false;
+		settingsDirty.current = false;
+		setSettingsPending(false);
+		setSettingsSeen(false);
 	}, [sessionId]);
 	const loadStatus = (0, react.useCallback)(async () => {
 		const generation = generationRef.current;
@@ -1814,6 +2512,10 @@ function GitCommitAction({ sessionId, useSession, call, t }) {
 	}, [open, changeOpen]);
 	const runCommit = (0, react.useCallback)(async () => {
 		const generation = generationRef.current;
+		if (settingsDirty.current || client && !settingsSeen) {
+			setConfirming(false);
+			return;
+		}
 		setConfirming(false);
 		setRunning(true);
 		setResult(null);
@@ -1835,10 +2537,15 @@ function GitCommitAction({ sessionId, useSession, call, t }) {
 				}
 			}
 		}
-	}, [call, sessionId]);
+	}, [
+		call,
+		sessionId,
+		client,
+		settingsSeen
+	]);
 	const available = status?.available === true;
 	const workspaceCount = status?.workspace.files ?? 0;
-	const canCommit = available && !running && !sessionRunning && workspaceCount > 0;
+	const canCommit = available && !running && !sessionRunning && workspaceCount > 0 && !settingsPending && (!client || settingsSeen);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		ref: rootRef,
 		className: "gcm-root",
@@ -1908,33 +2615,21 @@ function GitCommitAction({ sessionId, useSession, call, t }) {
 						role: "alert",
 						children: errorText(t, error)
 					}),
+					client ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(GitCommitSettingsPanel, {
+						client,
+						subscribeSettings,
+						disabled: running,
+						onSaving: markWrite,
+						onWriteFailed: markWriteFailed,
+						onReady: markSeen,
+						onSaved: () => void loadStatus()
+					}) : null,
 					status && !available && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 						className: "dsh-ui-meta",
 						role: "status",
 						children: reasonText(t, status)
 					}),
 					available && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-						status?.model ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
-							className: "gcm-model",
-							children: [
-								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									className: "dsh-ui-hint",
-									children: t("model")
-								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-									className: "dsh-ui-truncate",
-									children: [
-										status.model.provider,
-										"/",
-										status.model.model
-									]
-								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tag, {
-									tone: status.model.source === "page" ? "info" : "neutral",
-									children: status.model.source === "page" ? t("modelCustom") : t("modelDefault")
-								})
-							]
-						}) : null,
 						confirming && canCommit ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							className: "dsh-ui-stack",
 							role: "group",
@@ -1970,6 +2665,11 @@ function GitCommitAction({ sessionId, useSession, call, t }) {
 						sessionRunning && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 							className: "dsh-ui-hint",
 							children: t("sessionRunning")
+						}),
+						settingsPending && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+							className: "dsh-ui-hint",
+							role: "status",
+							children: t("commitBlocked")
 						})
 					] }),
 					running && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
@@ -2045,11 +2745,9 @@ const clientCss = `${officialUiCss("gcm-root")}${modelMenuCss}
  * of at the trigger. Naming both classes puts this rule at the same weight,
  * later in the sheet, so it wins. */
 .gcm-root.gcm-panel { position: fixed; width: min(360px, calc(100vw - 32px)); max-height: min(560px, calc(100vh - 32px)); overflow: auto; }
-.gcm-model { display: flex; align-items: center; gap: 6px; min-width: 0; margin: 0; font-size: 12px; line-height: 18px; color: var(--dsw-alias-label-primary); }
-.gcm-commits { margin: 0; padding-inline-start: 18px; display: grid; gap: 2px; font-size: 12px; line-height: 18px; overflow-wrap: anywhere; }
-.gcm-commits code { font-size: 12px; background: var(--dsw-alias-bg-layer-2); padding: 0 4px; border-radius: var(--dsw-radius-sm); }
-.gcm-settings { display: flex; flex-direction: column; gap: 12px; min-width: 0; }
-.gcm-settings-status { display: flex; flex-direction: column; gap: 4px; }
+.gcm-root .gcm-commits { margin: 0; padding-inline-start: 18px; display: grid; gap: 2px; font-size: 12px; line-height: 18px; overflow-wrap: anywhere; }
+.gcm-root .gcm-commits code { font-size: 12px; background: var(--dsw-alias-bg-layer-2); padding: 0 4px; border-radius: var(--dsw-radius-sm); }
+.gcm-root .gcm-settings-status { display: flex; flex-direction: column; gap: 4px; }
 `;
 /** Host UI language, following live switches with the host's English fallback. */
 function useHostLocale(client) {
@@ -2058,31 +2756,31 @@ function useHostLocale(client) {
 	return (0, react.useSyncExternalStore)(subscribe, snapshot, snapshot);
 }
 const settingsZh = {
-	pageTitle: "Git 提交",
 	model: "提交规划模型",
-	modelDefault: "默认模型",
-	modelHint: "留空则使用当前会话模型，再回落到宿主默认对话模型。",
+	modelDefault: "默认辅助模型",
+	modelHint: "留空使用全局默认辅助模型；未设置时跟随当前会话模型，再回落到宿主默认对话模型。",
 	fallback: "模型不可用时仍然提交",
 	fallbackHint: "默认关闭：模型规划失败会取消本次提交，工作区不变。开启后全部改动会合并成一个提交，由插件代写提交信息。",
 	loading: "正在读取设置…",
 	saved: "已保存。",
 	stale: "设置已更新，请刷新后重试。",
 	failed: "无法读取提交设置。",
+	saveFailed: "设置未能保存，已显示的选择未生效。请重试。",
 	retry: "重试",
 	refresh: "刷新设置",
 	syncUnavailable: "自动刷新不可用，请手动刷新设置。"
 };
 const settingsEn = {
-	pageTitle: "Git Commit",
 	model: "Commit planning model",
-	modelDefault: "Default model",
-	modelHint: "Leave empty to use the current session model, then the host default chat model.",
+	modelDefault: "Default auxiliary model",
+	modelHint: "Leave empty to use the global default auxiliary model; when none is set, the current conversation model, then the host default chat model.",
 	fallback: "Commit even without a model plan",
 	fallbackHint: "Off by default: a failed plan cancels the run and leaves the workspace untouched. When on, every change lands in one commit with a plugin-written message.",
 	loading: "Loading settings…",
 	saved: "Saved.",
 	stale: "Settings changed; refresh and retry.",
 	failed: "Could not load commit settings.",
+	saveFailed: "The change could not be saved, so the shown selection did not take effect. Try again.",
 	retry: "Retry",
 	refresh: "Refresh settings",
 	syncUnavailable: "Automatic refresh unavailable; refresh settings manually."
@@ -2090,7 +2788,8 @@ const settingsEn = {
 function settingsCopy(locale) {
 	return String(locale).startsWith("zh") ? settingsZh : settingsEn;
 }
-/** Plugin-page settings row: pick the model this plugin's planning call uses. */
+/** Model/fallback block embedded in the commit popover; picks persist as the
+* plugin's saved defaults and sync through the model-settings change channel. */
 function GitCommitSettingsPanel(props) {
 	const hostLocale = useHostLocale(props.client);
 	const text = settingsCopy(props.locale ?? hostLocale);
@@ -2128,6 +2827,7 @@ function GitCommitSettingsPanel(props) {
 			if (state.active && state.epoch === epoch && !state.pending) {
 				setSettings(next);
 				setError("");
+				props.onReady?.();
 			}
 		}).catch(() => {
 			if (state.active && state.epoch === epoch && !state.pending) setError("failed");
@@ -2177,14 +2877,16 @@ function GitCommitSettingsPanel(props) {
 		props.client,
 		refreshCatalog
 	]);
+	const controlsLocked = props.disabled === true;
 	const save = (0, react.useCallback)((patch) => {
 		const state = operation.current;
-		if (!settings || !state.active || state.writing || state.reading) return;
+		if (!settings || !state.active || state.writing || state.reading || props.disabled) return;
 		state.writing = true;
 		const epoch = state.epoch;
 		setBusy(true);
 		setNote(false);
 		setError("");
+		props.onSaving?.(true);
 		rpc(call, "settings.update", {
 			settings: {
 				model: patch.model ?? settings.model,
@@ -2195,10 +2897,16 @@ function GitCommitSettingsPanel(props) {
 			if (state.active && state.epoch === epoch) {
 				setSettings(next);
 				setNote(true);
+				props.onReady?.();
+				props.onSaved?.(next);
+			}
+		}).catch((reason) => {
+			if (state.active && state.epoch === epoch) {
+				props.onWriteFailed?.();
+				setError(reason instanceof RpcError && reason.code === "stale" ? "stale" : "saveFailed");
 			}
-		}).catch(() => {
-			if (state.active && state.epoch === epoch) setError("stale");
 		}).finally(() => {
+			props.onSaving?.(false);
 			if (!state.active || state.epoch !== epoch) return;
 			state.writing = false;
 			setBusy(false);
@@ -2207,11 +2915,12 @@ function GitCommitSettingsPanel(props) {
 	}, [
 		call,
 		settings,
-		text.saved,
-		text.stale
+		text.stale,
+		props.disabled
 	]);
+	const locked = busy || controlsLocked;
 	if (!settings) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
-		className: "gcm-root gcm-settings",
+		className: "gcm-root gcm-settings dsh-ui-stack",
 		children: [
 			error ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 				role: "alert",
@@ -2230,7 +2939,7 @@ function GitCommitSettingsPanel(props) {
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 				variant: "ghost",
 				size: "sm",
-				disabled: busy,
+				disabled: locked,
 				onClick: () => refreshRef.current(),
 				children: text.retry
 			})
@@ -2244,36 +2953,9 @@ function GitCommitSettingsPanel(props) {
 	const selectedEffort = efforts.find((item) => item.id === (current.reasoningEffort || ""));
 	const effortName = selectedEffort ? modelMenuEffortLabel(selectedEffort, language) : void 0;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
-		className: "gcm-root gcm-settings",
+		className: "gcm-root gcm-settings dsh-ui-stack",
 		"data-testid": "git-commit-settings",
 		children: [
-			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-				className: "gcm-settings-status",
-				children: [
-					syncError && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-						role: "status",
-						className: "dsh-ui-hint",
-						children: text.syncUnavailable
-					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-						variant: "ghost",
-						size: "sm",
-						disabled: busy,
-						onClick: () => refreshRef.current(),
-						children: text.refresh
-					}),
-					error && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-						role: "alert",
-						className: "dsh-ui-error",
-						children: text[error]
-					}),
-					note && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-						role: "status",
-						className: "dsh-ui-notice",
-						children: text.saved
-					})
-				]
-			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "dsh-ui-field",
 				children: [
@@ -2287,13 +2969,13 @@ function GitCommitSettingsPanel(props) {
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ModelMenu, {
 						locale: language,
-						open: menuOpen && !busy,
-						onOpenChange: (next) => setMenuOpen(next && !busy),
-						listClassName: "gcm-root",
+						open: menuOpen && !locked,
+						onOpenChange: (next) => setMenuOpen(next && !locked),
+						listClassName: "gcm-root gcm-menu-portal",
 						anchor: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 							type: "button",
 							className: "dsh-model-menu-trigger",
-							disabled: busy,
+							disabled: locked,
 							"aria-label": `${text.model}: ${currentLabel}`,
 							children: [
 								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
@@ -2304,7 +2986,7 @@ function GitCommitSettingsPanel(props) {
 									className: "dsh-model-menu-triggerEffort",
 									children: effortName ?? text.modelDefault
 								}) : null,
-								/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutlineRegular, { className: `dsh-model-menu-chevron${menuOpen && !busy ? " dsh-model-menu-chevronOpen" : ""}` })
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutlineRegular, { className: `dsh-model-menu-chevron${menuOpen && !locked ? " dsh-model-menu-chevronOpen" : ""}` })
 							]
 						}),
 						choices,
@@ -2345,6 +3027,33 @@ function GitCommitSettingsPanel(props) {
 				className: "dsh-ui-meta",
 				children: text.modelHint
 			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "gcm-settings-status",
+				children: [
+					syncError && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						role: "status",
+						className: "dsh-ui-hint",
+						children: text.syncUnavailable
+					}),
+					error && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						role: "alert",
+						className: "dsh-ui-error",
+						children: text[error]
+					}),
+					note && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						role: "status",
+						className: "dsh-ui-notice",
+						children: text.saved
+					}),
+					error || syncError ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+						variant: "ghost",
+						size: "sm",
+						disabled: locked,
+						onClick: () => refreshRef.current(),
+						children: text.refresh
+					}) : null
+				]
+			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("article", {
 				className: "gcm-root dsh-ui-card",
 				children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("header", {
@@ -2361,7 +3070,7 @@ function GitCommitSettingsPanel(props) {
 					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Switch, {
 						checked: settings.allowFallback,
 						label: text.fallback,
-						disabled: busy,
+						disabled: locked,
 						onChange: (next) => save({ allowFallback: next })
 					})]
 				})
@@ -2375,6 +3084,7 @@ function apply(ctx) {
 	const settingsSubscriber = createModelSettingsSubscriber(ctx, PLUGIN_NAME);
 	const subscribeSettings = (change, error) => settingsSubscriber.subscribe(change, error);
 	ctx.provide(GIT_COMMIT_CLIENT_SERVICE, { active: true });
+	ctx.effect(() => registerAuxiliaryModelSettings(ctx), "git-commit.auxiliary-model");
 	ctx.effect(() => client.locale.register(NS, {
 		zh: { ...zh },
 		en: { ...en }
@@ -2387,19 +3097,16 @@ function apply(ctx) {
 		document.head.appendChild(style);
 		return () => style.remove();
 	}, "git-commit.styles");
-	ctx.effect(() => client.slots.inject("plugins.bundle.config", () => client.slots.register({
-		name: "plugins.bundle.config",
-		key: PLUGIN_NAME
-	}, () => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(GitCommitSettingsPanel, {
-		client,
-		subscribeSettings
-	}))), "git-commit.settings");
 	ctx.effect(() => client.slots.inject("conversation.session.header.actions", () => client.slots.register({
 		name: "conversation.session.header.actions",
 		id: "git-commit",
 		order: 10,
 		locale: NS,
-		inject: () => ({ call: (endpoint, payload) => client.connection.rpc.call(RPC_CHANNEL, endpoint, payload) })
+		inject: () => ({
+			call: (endpoint, payload) => client.connection.rpc.call(RPC_CHANNEL, endpoint, payload),
+			client,
+			subscribeSettings
+		})
 	}, GitCommitAction)), "git-commit.slot");
 }
 //#endregion