@klarkxy/dsh-git-commit 0.2.5 → 0.3.1

package/README.md

@@ -23,13 +23,14 @@ Replace `web` with your profile name and restart it if DSH asks.
 
 Under **Plugins → Git Commit** you can choose the **Commit planning model** (empty follows the current session model) and turn on **Commit even without a model plan**, which makes one commit when the model is unavailable.
 
-If the model list cannot load, or some providers fail, use **Retry** beside the model picker. Your saved model stays selected.
+If the model list cannot load, or some providers fail, use **Retry** beside the model picker; your saved model stays selected.
 
 ## Good to know
 
-- All uncommitted changes in the repository are included, including new files.
+- The repository follows the conversation's current working directory; changing directories while a commit is being planned stops the run.
+- All uncommitted changes are included, including new files.
 - It only commits; it never pushes.
-- If the run stops partway, finished commits stay and the panel shows what was left. Nothing is rolled back or retried automatically.
+- If the run stops partway, finished commits stay and the panel shows what was left; nothing is rolled back or retried automatically.
 - The button is unavailable while the session is running.
 
 ## License

package/docs/README.zh-CN.md

@@ -21,13 +21,14 @@ dsh plugin --profile web add @klarkxy/dsh-git-commit
 3. 确认分支、文件数和模型后提交。
 4. 面板会列出创建的提交。
 
-在「插件 → Git 提交」里可以选择**提交规划模型**（留空跟随当前会话模型），也可以打开**模型不可用时仍然提交**，这时所有改动合并为一个提交。
+在「插件 → Git 提交」里可以选择**提交规划模型**（留空跟随当前会话模型），也可以打开**模型不可用时仍然提交**，模型不可用时改为只做一次提交。
 
-模型列表加载失败或部分提供商不可用时，可在模型选择器旁点击「重试」。已保存的模型选择会保留。
+模型列表加载失败或部分提供商不可用时，可在模型选择器旁点击「重试」；已保存的模型选择会保留。
 
 ## 注意
 
-- 会提交仓库里的全部未提交改动，包括新文件。
+- 仓库跟随对话当前的工作目录；规划提交期间切换目录会停止本次提交。
+- 会提交仓库里全部未提交的改动，包括新文件。
 - 只提交，不推送。
 - 中途停止时，已完成的提交会保留，面板显示剩余内容；不会自动回滚或重试。
 - 会话运行期间按钮不可用。

package/lib/client.inner.cjs

@@ -262,7 +262,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 ? {
@@ -278,15 +285,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,
 					": ",
@@ -295,20 +304,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
 		]
 	});
@@ -328,7 +344,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`).
@@ -836,7 +853,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; }
@@ -859,12 +877,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);
@@ -890,6 +910,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;
@@ -1137,6 +1159,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; }
@@ -1164,6 +1197,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); }
@@ -1354,29 +1390,22 @@ ${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
-/**
-* 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" }
-	}]
-};
+/** `@klarkxy/dsh-git-commit` becomes `KlarkxyDshGitCommitModelSettingsChanges`. */
+function modelSettingsChangesIdentity(packageName) {
+	const scoped = /^@([^/]+)\/(.+)$/.exec(packageName);
+	const parts = (scoped ? `${scoped[1]}/${scoped[2]}` : packageName).split(/[^A-Za-z0-9]+/).filter(Boolean);
+	if (!parts.length) throw new Error("Model settings package name has no RPC segment");
+	const segment = `${parts.map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join("")}ModelSettingsChanges`;
+	if (!/^[A-Z][A-Za-z0-9]*$/.test(segment)) throw new Error(`Model settings sync name is not an RPC segment: ${segment}`);
+	return {
+		service: segment,
+		namespace: segment
+	};
+}
 //#endregion
 //#region ../dsh-plugin-kit/src/model-settings-client.ts
 /** This stream carries invalidations only; ready is never a settings snapshot. */
@@ -1391,17 +1420,44 @@ function parseModelSettingsChangeFrame(value) {
 	};
 	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 })
-	}
-}));
+/** One owner's contribution. Each package mounts only its own endpoint. */
+function modelSettingsChangesRemote(packageName, identity = modelSettingsChangesIdentity(packageName)) {
+	return {
+		package: packageName,
+		descriptors: [{
+			id: `${identity.namespace}/watch`,
+			service: identity.service,
+			namespace: identity.namespace,
+			method: "watch",
+			mode: "stream",
+			invocation: { kind: "direct" },
+			parameters: [],
+			cancellation: { parameter: "signal" },
+			result: {
+				mode: "strict",
+				typeSymbol: "ModelSettings.ChangeFrame",
+				create: () => ({ parse: parseModelSettingsChangeFrame })
+			}
+		}]
+	};
+}
+/** Mount from a synchronous apply. Disposal waits for an in-flight mount and
+* then withdraws it, so the contribution cannot outlive the plugin. */
+function mountModelSettingsChanges(ctx, packageName) {
+	const contribution = modelSettingsChangesRemote(packageName);
+	ctx.inject(["remote"], (injected) => {
+		const scope = injected;
+		const mounting = scope.remote.$mount(contribution);
+		mounting.catch(() => {});
+		scope.effect(() => async () => {
+			await (await mounting.catch(() => void 0))?.();
+		});
+	});
+}
 /** 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) {
+function createModelSettingsSubscriber(ctx, packageName, identity = modelSettingsChangesIdentity(packageName), accept = (ns) => ns === packageName) {
+	const endpoint = identity;
 	const listeners = /* @__PURE__ */ new Set();
 	let injection;
 	let current;
@@ -1427,12 +1483,18 @@ function createModelSettingsSubscriber(ctx, namespace) {
 	};
 	const start = () => {
 		const life = ++lifecycle;
-		injection = ctx.inject(["remote", "remote.modelSettingsChanges"], (injected) => {
+		injection = ctx.inject(["remote", `remote.${endpoint.namespace}`], (injected) => {
 			if (life !== lifecycle || !listeners.size) return;
 			const scope = injected;
+			const service = scope.remote[endpoint.namespace];
+			if (!service || !("watch" in service) || !service.watch) {
+				report("Model settings sync service unavailable");
+				return;
+			}
+			const watch = service.watch;
 			const stream = scope.remote.$stream({
 				name: "Model settings sync",
-				open: (signal) => scope.remote.modelSettingsChanges.watch(signal),
+				open: (signal) => watch(signal),
 				ended: (accepted) => /* @__PURE__ */ new Error(`Model settings sync stream ended ${accepted ? "after" : "before"} ready; refresh or reopen the page`)
 			});
 			const session = {
@@ -1467,7 +1529,7 @@ function createModelSettingsSubscriber(ctx, namespace) {
 							invalidate();
 						} else {
 							if (!ready) throw new Error("Model settings sync change arrived before ready");
-							if (namespace === "*" || frame.ns === namespace) invalidate();
+							if (accept(frame.ns)) invalidate();
 						}
 					}
 				} catch (error) {
@@ -2013,11 +2075,10 @@ 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-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-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) {
@@ -2179,7 +2240,7 @@ function GitCommitSettingsPanel(props) {
 		text.stale
 	]);
 	if (!settings) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
-		className: "gcm-root gcm-settings",
+		className: "gcm-root gcm-settings dsh-ui-page",
 		children: [
 			error ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 				role: "alert",
@@ -2212,7 +2273,7 @@ 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-page",
 		"data-testid": "git-commit-settings",
 		children: [
 			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -2339,6 +2400,7 @@ function GitCommitSettingsPanel(props) {
 }
 function apply(ctx) {
 	const client = ctx;
+	mountModelSettingsChanges(ctx, PLUGIN_NAME);
 	const settingsSubscriber = createModelSettingsSubscriber(ctx, PLUGIN_NAME);
 	const subscribeSettings = (change, error) => settingsSubscriber.subscribe(change, error);
 	ctx.provide(GIT_COMMIT_CLIENT_SERVICE, { active: true });