@klarkxy/dsh-git-commit 0.2.0 → 0.2.1

package/README.md

@@ -1,5 +1,8 @@
 # @klarkxy/dsh-git-commit
 
+<!-- release-state-note -->
+The [repository registry](../../README.md#plugin-lifecycle) tracks Draft → Testing → Published, moving forward only. Fixes, testing and version updates keep published packages Published; each update still passes release checks. First publication explicitly selects Testing packages and records Published only after npm archive verification. See the [release guide](../../RELEASING.md).
+
 Commit workspace changes to git without leaving the chat. Every conversation
 thread gets a **Commit** action in its header: click it, check the branch, the
 file count and the model that will be used, then confirm to commit every
@@ -69,6 +72,16 @@ nothing.
 The button is disabled while the session is running. The host checks again
 before committing, and stops the run if the workspace changes during planning.
 
+If a later group fails or the run is cancelled, completed commits stay in place.
+The panel shows those commits, the remaining groups and the stopping reason,
+then refreshes repository status. A commit whose hash could not be read is
+marked explicitly. It never rolls back completed commits or retries them
+automatically. Unloading the plugin cancels in-flight planning and rejects new
+runs while existing cleanup finishes.
+If a rejected Git command leaves HEAD changed or unreadable, its group's outcome
+is marked uncertain without attributing a commit to the plugin. Check Git log
+and status before acting on that group; it is separate from groups not executed.
+
 ## Notes
 
 - Each selected file is committed from its current worktree content. Pre-staged

package/docs/README.zh-CN.md

@@ -1,5 +1,8 @@
 # @klarkxy/dsh-git-commit
 
+<!-- release-state-note -->
+插件生命周期见[仓库状态清单](../../../README.zh-CN.md#插件生命周期)：草稿 → 测试中 → 已发布，只向前推进。已发布插件的修复、测试和升版保持已发布；每次更新仍须通过发布检查。首次发布须明确选择测试中的包，并在 npm 归档验证成功后登记。详见[发布规则](../../../RELEASING.zh-CN.md)。
+
 在对话里直接把工作区修改提交到 git。每个对话线程的右上角都有一个 **提交** 按钮：
 点一下打开弹层，确认分支、文件数量和将使用的模型，再点一下即可把会话工作目录
 所在仓库的全部未提交改动分次提交。
@@ -52,6 +55,13 @@ dsh plugin --profile web remove @klarkxy/dsh-git-commit
 
 会话运行期间按钮不可用。宿主在提交前还会再检查一次，规划期间工作区发生变化时会中止本次提交。
 
+后续分组失败或执行被取消时，已经完成的提交仍然保留。面板显示这些提交、剩余
+分组和停止原因，再刷新仓库状态；已创建但未能读回哈希的提交会明确标注。
+插件不会回滚已完成的提交，也不会自动重试。卸载插件会取消正在进行的规划，
+拒绝新的执行，并等待已有操作完成清理。
+如果 Git 命令报错后 HEAD 已变化或无法读回，对应分组会标为“结果不确定”，不擅自
+归属某个提交。请先检查 Git 日志和状态；这一组与尚未执行的分组分开显示。
+
 ## 说明
 
 - 每个选中文件按当前工作区内容提交。属于其他分组的已暂存修改会保留到对应分组提交。

package/lib/client.inner.cjs

@@ -381,7 +381,7 @@ ${scope} {
   border: 0.5px solid var(--dsw-alias-border-l3);
   border-radius: var(--dsw-radius-md);
   background: var(--dsw-alias-bg-layer-1);
-  font-family: var(--ds-font-family-code, ui-monospace, 'Cascadia Mono', Consolas, monospace);
+  font-family: var(--ds-font-family-code);
   font-size: 12px;
   line-height: 20px;
   color: var(--dsw-alias-label-secondary);
@@ -457,6 +457,162 @@ ${scope} {
 `.replace(/^& (\.dsh-ui-[a-z0-9-]+)(?![+>~])/gm, (_match, className) => `&${className}, & ${className}`);
 }
 //#endregion
+//#region ../dsh-plugin-kit/src/contracts.ts
+/**
+* Remote contribution for model-settings change notifications.
+* Provided by `@klarkxy/dsh-model-hub` (`ModelSettingsChangesController`);
+* subscribers degrade silently when that package is not installed.
+* The stream carries invalidations only — `ready` is never a settings snapshot.
+*/
+const MODEL_SETTINGS_CHANGES_REMOTE = {
+	package: "@klarkxy/dsh-model-hub",
+	descriptors: [{
+		id: "modelSettingsChanges/watch",
+		service: "modelSettingsChangesController",
+		namespace: "modelSettingsChanges",
+		method: "watch",
+		mode: "stream",
+		invocation: { kind: "direct" },
+		parameters: [],
+		cancellation: { parameter: "signal" }
+	}]
+};
+//#endregion
+//#region ../dsh-plugin-kit/src/model-settings-client.ts
+/** This stream carries invalidations only; ready is never a settings snapshot. */
+function parseModelSettingsChangeFrame(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error("Invalid model settings change frame");
+	const frame = value;
+	if (frame.kind === "ready" && Object.keys(frame).length === 1) return { kind: "ready" };
+	if (frame.kind === "changed" && Object.keys(frame).length === 3 && typeof frame.ns === "string" && frame.ns.length > 0 && typeof frame.revision === "number" && Number.isSafeInteger(frame.revision) && frame.revision >= 0) return {
+		kind: "changed",
+		ns: frame.ns,
+		revision: frame.revision
+	};
+	throw new Error("Invalid model settings change frame");
+}
+MODEL_SETTINGS_CHANGES_REMOTE.package, MODEL_SETTINGS_CHANGES_REMOTE.descriptors.map((descriptor) => ({
+	...descriptor,
+	result: {
+		mode: "strict",
+		typeSymbol: "ModelSettings.ChangeFrame",
+		create: () => ({ parse: parseModelSettingsChangeFrame })
+	}
+}));
+/** Native RemoteStream owns carrier reconnects; no timers or browser transport.
+* A factory shares one logical stream while at least one subscriber remains. */
+function createModelSettingsSubscriber(ctx, namespace) {
+	const listeners = /* @__PURE__ */ new Set();
+	let injection;
+	let current;
+	let lifecycle = 0;
+	let failureMessage;
+	const report = (message) => {
+		failureMessage = message;
+		for (const listener of [...listeners]) try {
+			listener.error?.(message);
+		} catch {}
+	};
+	const invalidate = () => {
+		for (const listener of [...listeners]) {
+			if (!listeners.has(listener)) continue;
+			try {
+				listener.change();
+			} catch (error) {
+				try {
+					listener.error?.(error instanceof Error ? error.message : String(error));
+				} catch {}
+			}
+		}
+	};
+	const start = () => {
+		const life = ++lifecycle;
+		injection = ctx.inject(["remote", "remote.modelSettingsChanges"], (injected) => {
+			if (life !== lifecycle || !listeners.size) return;
+			const scope = injected;
+			const stream = scope.remote.$stream({
+				name: "Model settings sync",
+				open: (signal) => scope.remote.modelSettingsChanges.watch(signal),
+				ended: (accepted) => /* @__PURE__ */ new Error(`Model settings sync stream ended ${accepted ? "after" : "before"} ready; refresh or reopen the page`)
+			});
+			const session = {
+				stream,
+				active: true
+			};
+			current = session;
+			scope.effect(() => () => {
+				session.active = false;
+				if (current === session) {
+					current = void 0;
+					if (life === lifecycle && listeners.size) report("Model settings sync service unavailable");
+				}
+				return stream.dispose();
+			});
+			(async () => {
+				let generation;
+				let ready = false;
+				try {
+					for await (const item of stream) {
+						if (!session.active || life !== lifecycle || !listeners.size) break;
+						if (item.signal.aborted) continue;
+						if (generation !== item.generation) {
+							generation = item.generation;
+							ready = false;
+						}
+						const frame = parseModelSettingsChangeFrame(item.value);
+						if (frame.kind === "ready") {
+							ready = true;
+							failureMessage = void 0;
+							item.accept();
+							invalidate();
+						} else {
+							if (!ready) throw new Error("Model settings sync change arrived before ready");
+							if (namespace === "*" || frame.ns === namespace) invalidate();
+						}
+					}
+				} catch (error) {
+					if (session.active && life === lifecycle) report(error instanceof Error ? error.message : String(error));
+				} finally {
+					if (current === session) current = void 0;
+					session.active = false;
+					await stream.dispose().catch(() => {});
+				}
+			})();
+		});
+		queueMicrotask(() => {
+			if (life === lifecycle && listeners.size && !current) report("Model settings sync service unavailable");
+		});
+	};
+	return Object.freeze({ subscribe(onChange, onError) {
+		const listener = {
+			change: onChange,
+			error: onError
+		};
+		listeners.add(listener);
+		if (!injection) start();
+		else if (failureMessage) queueMicrotask(() => {
+			if (listeners.has(listener) && failureMessage) try {
+				listener.error?.(failureMessage);
+			} catch {}
+		});
+		return () => {
+			if (!listeners.delete(listener) || listeners.size) return;
+			lifecycle++;
+			if (current) {
+				current.active = false;
+				current.stream.dispose().catch(() => {});
+			}
+			current = void 0;
+			failureMessage = void 0;
+			const previous = injection;
+			injection = void 0;
+			try {
+				Promise.resolve(previous?.dispose()).catch(() => {});
+			} catch {}
+		};
+	} });
+}
+//#endregion
 //#region src/contracts.ts
 const PLUGIN_NAME = "@klarkxy/dsh-git-commit";
 const RPC_CHANNEL = "/dsh-git-commit";
@@ -487,6 +643,12 @@ const zh = {
 	loading: "正在读取仓库状态…",
 	running: "正在整理修改并分次提交…",
 	done: "已创建提交",
+	partial: "本次提交未全部完成；以下提交已保留",
+	stopped: "本次操作未确认完成",
+	uncertain: "以下提交组的结果不确定。请检查 Git 日志和状态，确认后再操作。",
+	hashUnavailable: "提交已创建，哈希未读取",
+	remaining: "尚未提交：{n} 组",
+	cancelled: "提交操作已取消",
 	fallback: "模型不可用，已合并为单个提交",
 	noWorkspace: "工作区没有修改",
 	unavailable: "不可用",
@@ -497,6 +659,12 @@ const zh = {
 	sessionRunning: "会话正在运行，提交已暂停",
 	refresh: "刷新",
 	failed: "操作失败",
+	disabled: "插件已停用",
+	busy: "已有提交操作正在进行",
+	stale: "设置已更新，请刷新后重试",
+	workspaceChanged: "工作区或分支已变更，请刷新后重试提交",
+	settingsUnavailable: "无法读取提交设置，请重新加载插件后重试",
+	invalidRequest: "提交请求无效，请刷新后重试",
 	planUnavailable: "模型没有给出可用的提交方案，已取消本次提交，工作区没有被改动。换一个模型重试，或在插件设置里开启兜底提交。",
 	close: "关闭"
 };
@@ -515,6 +683,12 @@ const en = {
 	loading: "Reading repository status…",
 	running: "Organizing changes into commits…",
 	done: "Commits created",
+	partial: "This run stopped before completion; these commits were kept",
+	stopped: "This run did not finish with a confirmed result",
+	uncertain: "The outcome of these groups is uncertain. Check Git log and status before taking further action.",
+	hashUnavailable: "Commit created; hash unavailable",
+	remaining: "Groups not committed: {n}",
+	cancelled: "Commit run cancelled",
 	fallback: "Model unavailable; used a single commit",
 	noWorkspace: "No workspace changes",
 	unavailable: "Unavailable",
@@ -525,23 +699,31 @@ const en = {
 	sessionRunning: "Session is running; commits paused",
 	refresh: "Refresh",
 	failed: "Operation failed",
+	disabled: "Plugin disabled",
+	busy: "A commit run is already in progress",
+	stale: "Settings changed; refresh and retry",
+	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.",
 	close: "Close"
 };
 /** A failed RPC keeps its code so the panel can explain a rejection in its own words. */
 var RpcError = class extends Error {
 	code;
-	constructor(code, message) {
+	partial;
+	constructor(code, message, partial) {
 		super(message);
 		this.name = "RpcError";
 		this.code = code;
+		this.partial = partial;
 	}
 };
-async function rpc(call, endpoint, payload = {}, fallback = "Operation failed") {
+async function rpc(call, endpoint, payload = {}, fallback = "") {
 	const result = await call(endpoint, payload);
 	if (!result || result.ok !== true) {
 		const failed = result && "error" in result ? result.error : void 0;
-		throw new RpcError(failed?.code ?? "unknown", failed?.message ? failed.message : fallback);
+		throw new RpcError(failed?.code ?? "unknown", failed?.message ? failed.message : fallback, failed && "partial" in failed ? failed.partial : void 0);
 	}
 	return result.value;
 }
@@ -556,7 +738,25 @@ function reasonText(t, status) {
 }
 /** A refusal the plugin can name gets its own sentence; the rest stay verbatim. */
 function errorText(t, error) {
-	return error.code === "plan-unavailable" ? t("planUnavailable") : error.message;
+	const key = {
+		"plan-unavailable": "planUnavailable",
+		"no-session": "reasonNoSession",
+		"no-cwd": "reasonNoCwd",
+		"no-git": "reasonNoGit",
+		"not-a-repo": "reasonNoRepo",
+		"no-changes": "noWorkspace",
+		"session-running": "sessionRunning",
+		"session-changed": "workspaceChanged",
+		"workspace-changed": "workspaceChanged",
+		busy: "busy",
+		stale: "stale",
+		disposed: "disabled",
+		cancelled: "cancelled",
+		"settings-unavailable": "settingsUnavailable",
+		"bad-request": "invalidRequest",
+		"not-found": "invalidRequest"
+	}[error.code];
+	return key ? t(key) : error.message || t("failed");
 }
 function panelError(reason) {
 	return reason instanceof RpcError ? {
@@ -655,7 +855,7 @@ function GitCommitAction({ sessionId, useSession, call, t }) {
 		setLoading(true);
 		setError(null);
 		try {
-			const next = await rpc(call, "status", { sessionId }, t("failed"));
+			const next = await rpc(call, "status", { sessionId });
 			if (generationRef.current !== generation) return;
 			setStatus(next);
 		} catch (reason) {
@@ -665,11 +865,7 @@ function GitCommitAction({ sessionId, useSession, call, t }) {
 		} finally {
 			if (generationRef.current === generation) setLoading(false);
 		}
-	}, [
-		call,
-		sessionId,
-		t
-	]);
+	}, [call, sessionId]);
 	(0, react.useEffect)(() => {
 		if (!open) return;
 		loadStatus();
@@ -692,23 +888,23 @@ function GitCommitAction({ sessionId, useSession, call, t }) {
 		setResult(null);
 		setError(null);
 		try {
-			const value = await rpc(call, "commit", { sessionId }, t("failed"));
+			const value = await rpc(call, "commit", { sessionId });
 			if (generationRef.current !== generation) return;
 			setResult(value);
-			const next = await rpc(call, "status", { sessionId }).catch(() => void 0);
-			if (generationRef.current !== generation) return;
-			if (next) setStatus(next);
 		} catch (reason) {
 			if (generationRef.current !== generation) return;
+			if (reason instanceof RpcError && reason.partial) setResult(reason.partial);
 			setError(panelError(reason));
 		} finally {
-			if (generationRef.current === generation) setRunning(false);
+			if (generationRef.current === generation) {
+				const next = await rpc(call, "status", { sessionId }).catch(() => void 0);
+				if (generationRef.current === generation) {
+					setStatus(next);
+					setRunning(false);
+				}
+			}
 		}
-	}, [
-		call,
-		sessionId,
-		t
-	]);
+	}, [call, sessionId]);
 	const available = status?.available === true;
 	const workspaceCount = status?.workspace.files ?? 0;
 	const canCommit = available && !running && !sessionRunning && workspaceCount > 0;
@@ -856,23 +1052,48 @@ function GitCommitAction({ sessionId, useSession, call, t }) {
 							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
 								className: "dsh-ui-hint dsh-ui-wrap",
 								children: [
-									t("done"),
+									t("failure" in result ? result.commits.length ? "partial" : "stopped" : "done"),
 									" · ",
 									result.branch
 								]
 							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", {
 								className: "gcm-commits",
-								children: result.commits.map((commit) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", { children: [
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: commit.hash }),
+								children: result.commits.map((commit, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", { children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: commit.hash || t("hashUnavailable") }),
 									" ",
-									commit.message
-								] }, commit.hash || commit.message))
+									commit.message,
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+										className: "dsh-ui-hint",
+										children: commit.files.join(", ")
+									})
+								] }, `${index}:${commit.hash}`))
 							}),
 							result.fallback && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 								className: "dsh-ui-hint",
 								children: t("fallback")
-							})
+							}),
+							"uncertain" in result && result.uncertain?.length ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: "dsh-ui-hint",
+								role: "status",
+								children: t("uncertain")
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", {
+								className: "gcm-commits",
+								children: result.uncertain.map((group, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", { children: [group.message, /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+									className: "dsh-ui-hint",
+									children: group.files.join(", ")
+								})] }, index))
+							})] }) : null,
+							"remaining" in result && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: "dsh-ui-hint",
+								children: t("remaining").replace("{n}", String(result.remaining.length))
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", {
+								className: "gcm-commits",
+								children: result.remaining.map((group, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", { children: [group.message, /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+									className: "dsh-ui-hint",
+									children: group.files.join(", ")
+								})] }, index))
+							})] })
 						]
 					})
 				]
@@ -899,10 +1120,10 @@ const clientCss = `${officialUiCss("gcm-root")}
 .gcm-settings { display: flex; flex-direction: column; gap: 12px; min-width: 0; }
 .gcm-settings-status { display: flex; flex-direction: column; gap: 4px; }
 `;
-/** Host UI language, following live switches; falls back to zh when the service lacks a snapshot. */
+/** Host UI language, following live switches with the host's English fallback. */
 function useHostLocale(client) {
 	const subscribe = (0, react.useCallback)((listener) => client.locale.subscribe?.(listener) ?? (() => {}), [client]);
-	const snapshot = (0, react.useCallback)(() => client.locale.getSnapshot?.().active ?? "zh", [client]);
+	const snapshot = (0, react.useCallback)(() => client.locale.getSnapshot?.().active ?? "en", [client]);
 	return (0, react.useSyncExternalStore)(subscribe, snapshot, snapshot);
 }
 const settingsZh = {
@@ -917,7 +1138,9 @@ const settingsZh = {
 	saved: "已保存。",
 	stale: "设置已更新，请刷新后重试。",
 	failed: "无法读取提交设置。",
-	retry: "重试"
+	retry: "重试",
+	refresh: "刷新设置",
+	syncUnavailable: "自动刷新不可用，请手动刷新设置。"
 };
 const settingsEn = {
 	pageTitle: "Git Commit",
@@ -931,7 +1154,9 @@ const settingsEn = {
 	saved: "Saved.",
 	stale: "Settings changed; refresh and retry.",
 	failed: "Could not load commit settings.",
-	retry: "Retry"
+	retry: "Retry",
+	refresh: "Refresh settings",
+	syncUnavailable: "Automatic refresh unavailable; refresh settings manually."
 };
 function settingsCopy(locale) {
 	return String(locale).startsWith("zh") ? settingsZh : settingsEn;
@@ -943,23 +1168,77 @@ function GitCommitSettingsPanel(props) {
 	const [settings, setSettings] = (0, react.useState)(void 0);
 	const [choices, setChoices] = (0, react.useState)([]);
 	const [error, setError] = (0, react.useState)("");
-	const [note, setNote] = (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 call = (0, react.useCallback)((endpoint, payload = {}) => props.client.connection.rpc.call(RPC_CHANNEL, endpoint, payload), [props.client]);
-	(0, react.useEffect)(() => {
-		let live = true;
+	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;
 		rpc(call, "settings", {}, text.failed).then((next) => {
-			if (live) {
+			if (state.active && state.epoch === epoch && !state.pending) {
 				setSettings(next);
 				setError("");
 			}
 		}).catch(() => {
-			if (live) setError(text.failed);
+			if (state.active && state.epoch === epoch && !state.pending) 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++;
+		};
+	}, [call]);
+	(0, react.useEffect)(() => {
+		setSyncError("");
+		let live = true;
+		const stop = props.subscribeSettings?.(() => {
+			if (live) {
+				setSyncError("");
+				refreshRef.current();
+			}
+		}, (message) => {
+			if (live) setSyncError(message);
 		});
 		return () => {
 			live = false;
+			stop?.();
 		};
-	}, [call, text.failed]);
+	}, [props.subscribeSettings, props.client]);
 	const boundProvider = settings?.model.provider ?? "";
 	const boundModel = settings?.model.model ?? "";
 	(0, react.useEffect)(() => {
@@ -982,9 +1261,12 @@ function GitCommitSettingsPanel(props) {
 		boundModel
 	]);
 	const save = (0, react.useCallback)((patch) => {
-		if (!settings) return;
+		const state = operation.current;
+		if (!settings || !state.active || state.writing || state.reading) return;
+		state.writing = true;
+		const epoch = state.epoch;
 		setBusy(true);
-		setNote("");
+		setNote(false);
 		setError("");
 		rpc(call, "settings.update", {
 			settings: {
@@ -993,12 +1275,17 @@ function GitCommitSettingsPanel(props) {
 			},
 			expectedRevision: settings.revision
 		}, text.stale).then((next) => {
-			setSettings(next);
-			setNote(text.saved);
-			setBusy(false);
+			if (state.active && state.epoch === epoch) {
+				setSettings(next);
+				setNote(true);
+			}
 		}).catch(() => {
-			setError(text.stale);
+			if (state.active && state.epoch === epoch) setError("stale");
+		}).finally(() => {
+			if (!state.active || state.epoch !== epoch) return;
+			state.writing = false;
 			setBusy(false);
+			if (state.pending) refreshRef.current();
 		});
 	}, [
 		call,
@@ -1006,17 +1293,31 @@ function GitCommitSettingsPanel(props) {
 		text.saved,
 		text.stale
 	]);
-	if (!settings) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("section", {
+	if (!settings) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 		className: "gcm-root gcm-settings",
-		children: error ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-			role: "alert",
-			className: "dsh-ui-error",
-			children: error
-		}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-			role: "status",
-			className: "dsh-ui-hint",
-			children: text.loading
-		})
+		children: [
+			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)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+				variant: "ghost",
+				size: "sm",
+				disabled: busy,
+				onClick: () => refreshRef.current(),
+				children: text.retry
+			})
+		]
 	});
 	const current = settings.model;
 	const selected = choices.find((item) => item.provider === current.provider && item.model === current.model);
@@ -1027,15 +1328,30 @@ function GitCommitSettingsPanel(props) {
 		children: [
 			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "gcm-settings-status",
-				children: [error && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-					role: "alert",
-					className: "dsh-ui-error",
-					children: error
-				}), note && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-					role: "status",
-					className: "dsh-ui-notice",
-					children: note
-				})]
+				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)("label", {
 				className: "dsh-ui-field",
@@ -1119,6 +1435,8 @@ function GitCommitSettingsPanel(props) {
 }
 function apply(ctx) {
 	const client = 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(() => client.locale.register(NS, {
 		zh: { ...zh },
@@ -1135,7 +1453,10 @@ function apply(ctx) {
 	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 }))), "git-commit.settings");
+	}, () => /* @__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",