dsh-plugin-effort-declare 0.1.1 → 0.1.2

package/CONTRIBUTING.en.md

@@ -17,6 +17,8 @@ Write `llm-pi-ai` settings only:
 - No fork of the official Models page
 - No parallel effort table
 - No per-model `reasoningEfforts` in the bundle layer (settings dict merge has no delete semantics)
+- Do not auto-write efforts onto undeclared models at Host start (dict merge cannot delete; it would mutate models the user never saved)
+- Do not hook `agent/request` to fill a default effort for subagents
 - Do not set route-level `reasoning` to `high`
 
 Any new model-visible input must land in a session-log-rebuildable mechanism. This plugin does not inject prompt text.
@@ -38,7 +40,7 @@ pnpm build
 
 Before sending a change, say whether it is a bugfix, UI improvement, or an alignment with a newer DSH / pi-ai schema. Update zh and en docs together. The root README and [INSTALL.en.md](./INSTALL.en.md) are for users; this file and the READMEs under `src/` and `tests/` are for people changing code.
 
-Canonical level names and `thinkingFormat` enums come from the installed `llm-pi-ai` schema / catalog. The repo keeps a whitelist pinned by tests; if the schema drifts, update the tests first, then UI copy. Do not offer that list as writable dropdown choices.
+Canonical level names and `thinkingFormat` enums come from the installed `llm-pi-ai` schema / catalog. The live `thinkingFormat` schema contract is [`tests/fixtures/pi-ai-thinking-format-union.ts`](./tests/fixtures/pi-ai-thinking-format-union.ts). When upgrading DSH, refresh that fixture from `dsh --dump-config` or the settings describe schema, then update `src/core/catalog.ts` and UI copy. Do not value-import `@deepseek-ai/dsh-llm-pi-ai` into the client bundle. Effort keys stay a locally pinned whitelist; if the schema drifts, change the fixture / tests first. Do not offer that list as writable dropdown choices.
 
 ## Publishing to npm
 

package/CONTRIBUTING.md

@@ -17,6 +17,8 @@
 - 不要 fork 官方模型页
 - 不要平行再存一份档位表
 - 不要在 bundle 层预置 per-model `reasoningEfforts`（settings 字典合并没有删除语义）
+- 不要在 Host 启动时给未声明的模型自动写入档位（字典合并删不掉，会改用户没保存过的模型）
+- 不要挂 `agent/request` 给 subagent 填默认档
 - 不要把路由级 `reasoning` 写成 `high`
 
 新增任何模型可见输入，必须走会话日志可重建的机制。本插件不向模型注入提示词。
@@ -38,7 +40,7 @@ pnpm build
 
 提交前请说明改动是修 bug、增强 UI，还是对齐新的 DSH / pi-ai schema。中英文档一起改。根 README 和 [INSTALL.md](./INSTALL.md) 面向使用者；本文件与 `src/`、`tests/` 的 README 面向改代码的人。
 
-上游档位名与 `thinkingFormat` 枚举以 DSH 安装里 `llm-pi-ai` 的 schema / catalog 为准。仓库内有一份测试钉白名单；schema 漂移时应先改测试再改 UI 文案。不要把这份名单当作可写入下拉选项。
+上游档位名与 `thinkingFormat` 枚举以 DSH 安装里 `llm-pi-ai` 的 schema / catalog 为准。`thinkingFormat` 的现场 schema 契约在 [`tests/fixtures/pi-ai-thinking-format-union.ts`](./tests/fixtures/pi-ai-thinking-format-union.ts)。升 DSH 时用 `dsh --dump-config` 或设置 describe 的 schema 更新该 fixture，再改 `src/core/catalog.ts` 与 UI。不要把 `@deepseek-ai/dsh-llm-pi-ai` 打进 client bundle。档位键仍由测试钉本地白名单；schema 漂移时应先改 fixture / 测试再改 UI。不要把这份名单当作可写入下拉选项。
 
 ## 发布到 npm
 

package/README.en.md

@@ -8,16 +8,16 @@
 </p>
 
 <p align="center">
-  <a href="https://www.npmjs.com/package/dsh-plugin-effort-declare"><img alt="npm" src="https://img.shields.io/npm/v/dsh-plugin-effort-declare"></a>
-  <a href="https://github.com/zimodzh/dsh-plugin-effort-declare/commits/master"><img alt="last commit" src="https://img.shields.io/github/last-commit/zimodzh/dsh-plugin-effort-declare"></a>
-  <a href="https://github.com/zimodzh/dsh-plugin-effort-declare"><img alt="repo size" src="https://img.shields.io/github/repo-size/zimodzh/dsh-plugin-effort-declare"></a>
-  <a href="./LICENSE"><img alt="license" src="https://img.shields.io/github/license/zimodzh/dsh-plugin-effort-declare"></a>
-  <a href="https://github.com/deepseek-ai/deepseek-harness"><img alt="Agent" src="https://img.shields.io/badge/Agent-Deepseek%20Harness-000000"></a>
+  <a href="https://www.npmjs.com/package/dsh-plugin-effort-declare" target="_blank" rel="noopener noreferrer"><img alt="npm" src="https://img.shields.io/npm/v/dsh-plugin-effort-declare"></a>
+  <a href="https://github.com/zimodzh/dsh-plugin-effort-declare/commits/master" target="_blank" rel="noopener noreferrer"><img alt="last commit" src="https://img.shields.io/github/last-commit/zimodzh/dsh-plugin-effort-declare"></a>
+  <a href="https://github.com/zimodzh/dsh-plugin-effort-declare" target="_blank" rel="noopener noreferrer"><img alt="repo size" src="https://img.shields.io/github/repo-size/zimodzh/dsh-plugin-effort-declare"></a>
+  <a href="./LICENSE" target="_blank" rel="noopener noreferrer"><img alt="license" src="https://img.shields.io/github/license/zimodzh/dsh-plugin-effort-declare"></a>
+  <a href="https://github.com/deepseek-ai/deepseek-harness" target="_blank" rel="noopener noreferrer"><img alt="Agent" src="https://img.shields.io/badge/Agent-Deepseek%20Harness-000000"></a>
 </p>
 
 Add reasoning-effort options to OpenAI-compatible models you added yourself, so the Effort row shows up in the composer.
 
-> This is a community plugin. It is not an official DeepSeek project and is not endorsed by DeepSeek. Requires DeepSeek Harness **0.1.0-rc.8 or later**.
+> This is a community-maintained third-party plugin. It is not an official DeepSeek project and is not endorsed by DeepSeek. Requires **DeepSeek Harness 0.1.0-rc.8** or later. Versions before **DeepSeek Harness 0.1.0-rc.8** have not been tested and are not guaranteed to work.
 
 ## Why
 

package/README.md

@@ -8,16 +8,16 @@
 </p>
 
 <p align="center">
-  <a href="https://www.npmjs.com/package/dsh-plugin-effort-declare"><img alt="npm" src="https://img.shields.io/npm/v/dsh-plugin-effort-declare"></a>
-  <a href="https://github.com/zimodzh/dsh-plugin-effort-declare/commits/master"><img alt="last commit" src="https://img.shields.io/github/last-commit/zimodzh/dsh-plugin-effort-declare"></a>
-  <a href="https://github.com/zimodzh/dsh-plugin-effort-declare"><img alt="repo size" src="https://img.shields.io/github/repo-size/zimodzh/dsh-plugin-effort-declare"></a>
-  <a href="./LICENSE"><img alt="license" src="https://img.shields.io/github/license/zimodzh/dsh-plugin-effort-declare"></a>
-  <a href="https://github.com/deepseek-ai/deepseek-harness"><img alt="Agent" src="https://img.shields.io/badge/Agent-Deepseek%20Harness-000000"></a>
+  <a href="https://www.npmjs.com/package/dsh-plugin-effort-declare" target="_blank" rel="noopener noreferrer"><img alt="npm" src="https://img.shields.io/npm/v/dsh-plugin-effort-declare"></a>
+  <a href="https://github.com/zimodzh/dsh-plugin-effort-declare/commits/master" target="_blank" rel="noopener noreferrer"><img alt="last commit" src="https://img.shields.io/github/last-commit/zimodzh/dsh-plugin-effort-declare"></a>
+  <a href="https://github.com/zimodzh/dsh-plugin-effort-declare" target="_blank" rel="noopener noreferrer"><img alt="repo size" src="https://img.shields.io/github/repo-size/zimodzh/dsh-plugin-effort-declare"></a>
+  <a href="./LICENSE" target="_blank" rel="noopener noreferrer"><img alt="license" src="https://img.shields.io/github/license/zimodzh/dsh-plugin-effort-declare"></a>
+  <a href="https://github.com/deepseek-ai/deepseek-harness" target="_blank" rel="noopener noreferrer"><img alt="Agent" src="https://img.shields.io/badge/Agent-Deepseek%20Harness-000000"></a>
 </p>
 
 给自己添加的 OpenAI 兼容模型补上「推理强度」选项，对话里的 Effort 行就会出现。
 
-> 这是社区插件，不是 DeepSeek 官方项目，也未获官方背书。需要 DeepSeek Harness **0.1.0-rc.8 及以上**。
+> 这是社区维护的第三方插件，不是 DeepSeek 官方项目，也未获官方背书。需要 **DeepSeek Harness 0.1.0-rc.8** 及以上， **DeepSeek Harness 0.1.0-rc.8** 之前的版本没测试过，不保证可用。
 
 ## 它解决什么
 

package/lib/client.js

@@ -12,9 +12,11 @@ window.__ModuleLoader__.load({
 		*
 		* Levels match `@deepseek-ai/dsh-llm-pi-ai` catalog.ts `THINKING_LEVELS`.
 		* Formats match `SUPPORTED_THINKING_FORMATS` in the same file (rc.8).
-		* Tests pin these lists against llm-pi-ai. The settings page never offers
-		* the handwritten thinkingFormat list as writable choices — only the live
-		* schema union, plus a stored value that the union omitted.
+		* Tests pin these lists against a checked-in schema fixture
+		* (`tests/fixtures/pi-ai-thinking-format-union.ts`) and the local level
+		* whitelist. The settings page never offers the handwritten thinkingFormat
+		* list as writable choices — only the live schema union, plus a stored
+		* value that the union omitted.
 		*/
 		/** Selectable reasoning levels, in pi-ai escalation order. */
 		const THINKING_LEVELS = [
@@ -156,6 +158,14 @@ window.__ModuleLoader__.load({
 		* Route-card draft merge: user-layer slices, namespace revision, dirty preserve.
 		* No React — settings UI and tests share these helpers.
 		*/
+		/** JSON-stable equality matching pathOps (key order included). */
+		function sliceEqual(left, right) {
+			return JSON.stringify(left) === JSON.stringify(right);
+		}
+		/** Whether two settings slices differ. */
+		function sliceChanged(before, after) {
+			return !sliceEqual(before, after);
+		}
 		/** Build a draft from the stored user subtree (never from effective `value`). */
 		function routeDraftFromUserProfile(args) {
 			const { provider, displayName, settingsPath, revision, userProfile } = args;
@@ -210,9 +220,103 @@ window.__ModuleLoader__.load({
 				});
 			});
 		}
+		function modelRowId(row) {
+			return String(row.id);
+		}
+		function indexById(rows) {
+			const map = /* @__PURE__ */ new Map();
+			for (const row of rows) {
+				const id = modelRowId(row);
+				if (!map.has(id)) map.set(id, row);
+			}
+			return map;
+		}
+		function effortsPresence(row) {
+			if (row === void 0 || !Object.hasOwn(row, "reasoningEfforts")) return {
+				present: false,
+				value: void 0
+			};
+			return {
+				present: true,
+				value: row.reasoningEfforts
+			};
+		}
+		function effortsEqual(left, right) {
+			if (left.present !== right.present) return false;
+			if (!left.present) return true;
+			return sliceEqual(left.value, right.value);
+		}
+		function overlayLocalEfforts(incomingRow, prevRow) {
+			const next = structuredClone(incomingRow);
+			if (Object.hasOwn(prevRow, "reasoningEfforts")) next.reasoningEfforts = structuredClone(prevRow.reasoningEfforts);
+			else delete next.reasoningEfforts;
+			return next;
+		}
+		function objectKeyChanged(left, right, key) {
+			const leftHas = Object.hasOwn(left, key);
+			if (leftHas !== Object.hasOwn(right, key)) return true;
+			if (!leftHas) return false;
+			return sliceChanged(left[key], right[key]);
+		}
+		/**
+		* Membership follows the latest user-layer models list (Models page add/delete).
+		* Local unsaved `reasoningEfforts` (including a cleared key) overlay by id.
+		*/
+		function mergeModelsById(args) {
+			const prevById = indexById(args.prevModels);
+			const prevOrigById = indexById(args.prevOriginal);
+			const incomingOrigById = indexById(args.incomingOriginal);
+			const incomingIds = new Set(args.incomingModels.map(modelRowId));
+			let conflicted = false;
+			const models = args.incomingModels.map((incomingRow) => {
+				const id = modelRowId(incomingRow);
+				const prevRow = prevById.get(id);
+				if (prevRow === void 0) return structuredClone(incomingRow);
+				const prevOrig = prevOrigById.get(id);
+				if (!!effortsEqual(effortsPresence(prevRow), effortsPresence(prevOrig))) return structuredClone(incomingRow);
+				const incomingOrig = incomingOrigById.get(id);
+				if (!effortsEqual(effortsPresence(prevOrig), effortsPresence(incomingOrig))) conflicted = true;
+				return overlayLocalEfforts(incomingRow, prevRow);
+			});
+			for (const [id, prevRow] of prevById) {
+				if (incomingIds.has(id)) continue;
+				const prevOrig = prevOrigById.get(id);
+				if (effortsEqual(effortsPresence(prevRow), effortsPresence(prevOrig))) continue;
+				if (!effortsEqual(effortsPresence(prevOrig), effortsPresence(incomingOrigById.get(id)))) conflicted = true;
+			}
+			return {
+				models,
+				conflicted
+			};
+		}
 		/**
-		* Apply a freshly loaded table. Dirty cards keep models/compat; originals and
-		* revision follow the incoming snapshot so a later save is against the new user layer.
+		* Three-way compat merge: locally changed keys stay local; everything else
+		* follows incoming. Conflict only when a locally dirty key also moved in originals.
+		*/
+		function mergeCompat(args) {
+			if (!sliceChanged(args.prev, args.prevOriginal)) return {
+				compat: cloneObject(args.incoming),
+				conflicted: false
+			};
+			const compat = cloneObject(args.incoming);
+			let conflicted = false;
+			const keys = /* @__PURE__ */ new Set([...Object.keys(args.prev), ...Object.keys(args.prevOriginal)]);
+			for (const key of keys) {
+				if (!objectKeyChanged(args.prev, args.prevOriginal, key)) continue;
+				if (objectKeyChanged(args.prevOriginal, args.incomingOriginal, key)) conflicted = true;
+				if (Object.hasOwn(args.prev, key)) compat[key] = structuredClone(args.prev[key]);
+				else delete compat[key];
+			}
+			return {
+				compat,
+				conflicted
+			};
+		}
+		/**
+		* Apply a freshly loaded table. Membership and metadata follow incoming;
+		* unsaved reasoningEfforts / dirty compat keys overlay by id. Conflict only
+		* when a locally dirty field also changed in originals (revision-only bumps
+		* and sibling-card saves do not warn).
 		*/
 		function mergeLoadedDrafts(current, incoming, options) {
 			const currentByProvider = new Map(current.map((draft) => [draft.provider, draft]));
@@ -221,13 +325,27 @@ window.__ModuleLoader__.load({
 				drafts: incoming.map((next) => {
 					const prev = currentByProvider.get(next.provider);
 					if (prev === void 0 || !options.preserveDirty || !draftDirty(prev)) return next;
-					conflicted.push(next.provider);
+					const modelsMerge = mergeModelsById({
+						prevModels: prev.models,
+						prevOriginal: prev.originalModels,
+						incomingModels: next.models,
+						incomingOriginal: next.originalModels
+					});
+					const compatMerge = mergeCompat({
+						prev: prev.compat,
+						prevOriginal: prev.originalCompat,
+						incoming: next.compat,
+						incomingOriginal: next.originalCompat
+					});
+					if (modelsMerge.conflicted || compatMerge.conflicted) conflicted.push(next.provider);
 					return {
-						...prev,
+						provider: next.provider,
 						displayName: next.displayName,
 						settingsPath: next.settingsPath,
 						revision: next.revision,
+						models: modelsMerge.models,
 						originalModels: cloneModels(next.originalModels),
+						compat: compatMerge.compat,
 						originalCompat: cloneObject(next.originalCompat),
 						compatPresent: next.compatPresent
 					};
@@ -670,10 +788,10 @@ window.__ModuleLoader__.load({
 			});
 		}
 		function RouteCard(props) {
-			const { draft, writable, busy, reloading, t, onChange } = props;
+			const { draft, writable, busy, saveLocked, t, onChange } = props;
 			const noModels = draft.models.length === 0;
 			const editDisabled = !writable || busy || noModels;
-			const saveLocked = editDisabled || reloading;
+			const saveDisabled = saveLocked || noModels;
 			const formats = thinkingFormatChoices(props.formats, draft.compat.thinkingFormat);
 			const summary = compatSummary(draft.compat);
 			const sameWire = draft.compat.supportsReasoningEffort === false;
@@ -857,7 +975,7 @@ window.__ModuleLoader__.load({
 						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 							type: "button",
 							className: effort_declare_module_css_default.primaryButton,
-							disabled: saveLocked || !dirty || clientError !== void 0,
+							disabled: saveDisabled || !dirty || clientError !== void 0,
 							onClick: () => {
 								props.onSave(draft);
 							},
@@ -889,7 +1007,7 @@ window.__ModuleLoader__.load({
 					return;
 				}
 				const generation = nextGeneration(generationRef);
-				setStatus("loading");
+				if (draftsRef.current.length === 0) setStatus("loading");
 				setError("");
 				loadDrafts(api, describe, schema).then((result) => {
 					if (!generationIsCurrent(generationRef, generation)) return;
@@ -928,9 +1046,18 @@ window.__ModuleLoader__.load({
 			(0, react.useEffect)(() => {
 				if (props.subscribeInvalidate === void 0) return void 0;
 				return props.subscribeInvalidate((source) => {
+					if (source === "writable") {
+						const view = describe?.getSnapshot().view;
+						if (view !== void 0) setWritable(view.writable);
+						return;
+					}
 					if (source === "settings" || source === "directory") reload(true);
 				});
-			}, [props.subscribeInvalidate, reload]);
+			}, [
+				describe,
+				props.subscribeInvalidate,
+				reload
+			]);
 			const patchNotice = (provider, notice) => {
 				setNotices((current) => {
 					const copy = { ...current };
@@ -941,7 +1068,13 @@ window.__ModuleLoader__.load({
 			};
 			const save = async (draft) => {
 				if (api === void 0 || describe === void 0 || schema === void 0) return;
-				if (status === "loading" || busyRoute !== null) return;
+				if (status === "loading" || busyRoute !== null) {
+					patchNotice(draft.provider, {
+						kind: "error",
+						text: t("saveBusy")
+					});
+					return;
+				}
 				const blocking = draft.models.map((row) => errorText(modelEffortError(row), t)).find((text) => text !== void 0);
 				if (blocking !== void 0) {
 					patchNotice(draft.provider, {
@@ -1067,7 +1200,7 @@ window.__ModuleLoader__.load({
 							formats: formats.length > 0 ? formats : [],
 							writable,
 							busy: busyRoute === draft.provider,
-							reloading: status === "loading",
+							saveLocked: !writable || busyRoute !== null || status === "loading",
 							notice: notices[draft.provider],
 							t,
 							onChange: (next) => {
@@ -1104,6 +1237,7 @@ window.__ModuleLoader__.load({
 			readOnly: "当前设置为只读，无法保存。",
 			save: "保存",
 			saving: "保存中…",
+			saveBusy: "另有路由正在保存，请稍候。",
 			cancel: "取消",
 			saved: "已保存。对话选择器会按新的能力声明显示 Effort 行。",
 			conflict: "设置已被其他地方改过，请重新加载后再保存。",
@@ -1146,6 +1280,7 @@ window.__ModuleLoader__.load({
 			readOnly: "Settings are read-only; saving is disabled.",
 			save: "Save",
 			saving: "Saving…",
+			saveBusy: "Another route is saving. Wait, then save this card.",
 			cancel: "Cancel",
 			saved: "Saved. The composer Effort row follows this capability declaration.",
 			conflict: "Settings changed elsewhere. Reload, then save again.",
@@ -1227,7 +1362,7 @@ window.__ModuleLoader__.load({
 				};
 				const disposers = [
 					describe.subscribe(() => {
-						emit("settings");
+						emit("writable");
 					}),
 					ctx.remote.$on("settings/document-updated", (ns) => {
 						if (ns !== "llm-pi-ai") return;