@xiaoso/dsh-tool-plus 0.1.9 → 0.1.10-beta.2

package/lib/client.js

@@ -6,8 +6,8 @@ window.__ModuleLoader__.load({
 		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 		let react = require("react");
 		let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
-		let react_jsx_runtime = require("react/jsx-runtime");
 		let _deepseek_ai_dsh_client_connection_client = require("@deepseek-ai/dsh-client-connection/client");
+		let react_jsx_runtime = require("react/jsx-runtime");
 		let react_dom = require("react-dom");
 		//#region src/config/fields.ts
 		/** Field group ids -> locale key of the group heading. */
@@ -783,15 +783,133 @@ window.__ModuleLoader__.load({
 				fields: TOOL_PLUS_FIELDS.filter((f) => f.tool === "astEdit").map((f) => f.name)
 			}
 		];
-		/** Look up one field definition by its schema key. */
-		function toolPlusField(name) {
-			return TOOL_PLUS_FIELDS.find((field) => field.name === name);
+		TOOL_PLUS_FIELDS.map((field) => field.name);
+		//#endregion
+		//#region src/tools/shared/browser-rpc-channel.ts
+		/**
+		* Shared RPC channel constants for the browser-detection round trip between
+		* the settings panel (client half) and the host. Both halves import this
+		* module so the channel/endpoint never drift.
+		*
+		* The channel rides the official `@deepseek-ai/dsh-client-connection` generic
+		* RPC transport (host registers with `ctx.connection.rpc.handle`; the client
+		* calls via `createWebConnectionRpc().call`). Channel names must match
+		* `/^\/[A-Za-z0-9._~-]+$/` and `/api` is reserved — `/tool-plus` is ours.
+		* @module @xiaoso/dsh-tool-plus/browser-rpc-channel
+		*/
+		/** Logical RPC channel registered by the host half of this plugin. */
+		const TOOL_PLUS_RPC_CHANNEL = "/tool-plus";
+		/** Endpoint that reports the rmSafe injection status (query = ensure + verify). */
+		const RM_SAFE_STATUS_ENDPOINT = "rmSafe/status";
+		/** Endpoint that lists agent presets with their status (roster + conflicts + template diff). */
+		const PRESET_STATUS_ENDPOINT = "presets/status";
+		/**
+		* The preset ids this plugin **declares**. Single source of truth for both
+		* halves: the host picks its own declarations out of the profile's composed
+		* configuration, and the panel uses the list to tell "ours" from everything else.
+		*
+		* They ship as `@deepseek-ai/dsh-agent-preset` declaration rows in this
+		* package's own bundle patches (`presets/<id>.patch.yml`), so installing the
+		* plugin as a profile bundle declares them: no install step, no file copy, and
+		* nothing written at startup.
+		*/
+		const BUNDLED_PRESET_IDS = ["tool-plus-standard", "tool-plus-ptc"];
+		/** Endpoint that applies one preset action to the active profile. */
+		const PRESET_ACTION_ENDPOINT = "presets/apply";
+		/** Endpoint that compares one preset against one of our declarations (read-only). */
+		const PRESET_COMPARE_ENDPOINT = "presets/compare";
+		//#endregion
+		//#region src/client/web-connection-rpc.ts
+		/**
+		* Browser caller for the plugin's Connection RPC channel.
+		*
+		* The official `@deepseek-ai/dsh-client-connection/client` package ships the
+		* protocol primitives as types (`RpcFetch`, `ClientConnectionRpc`, `RpcResult`)
+		* and the `RpcId` brand, but its published `createWebConnectionRpc` factory is
+		* internal to the bundle — not re-exported. This module re-implements that
+		* factory against the same public wire contract (docs/api-gateway.md, the
+		* client `rpc.ts` source): a `POST {origin}/{channel}/{endpoint}` with a
+		* `client-request` JSON envelope, answered by a `server-response` envelope
+		* echoing the rpcId. Host-side registration uses the official
+		* `ctx.connection.rpc.handle` — this file only mirrors the caller half.
+		* @module @xiaoso/dsh-tool-plus/client/web-connection-rpc
+		*/
+		const INTERNAL_BASE = "http://dsh.internal";
+		const CHANNEL_PATTERN = /^\/[A-Za-z0-9._~-]+$/;
+		const ENDPOINT_SEGMENT_PATTERN = /^[A-Za-z0-9_$.-]+$/;
+		function randomUuid() {
+			const g = globalThis;
+			if (g.crypto?.randomUUID !== void 0) return g.crypto.randomUUID();
+			return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
+				const r = Math.random() * 16 | 0;
+				return (c === "x" ? r : r & 3 | 8).toString(16);
+			});
 		}
-		/** Fields of one tool tab, in table order. */
-		function toolPlusFieldsOf(tool) {
-			return TOOL_PLUS_FIELDS.filter((field) => field.tool === tool);
+		function isRecord$4(value) {
+			return typeof value === "object" && value !== null && !Array.isArray(value);
+		}
+		function parseConnectionResponse(value) {
+			if (!isRecord$4(value) || value.type !== "server-response" || typeof value.rpcId !== "string") throw new TypeError("connection: invalid server-response envelope");
+			const result = value.result;
+			if (!isRecord$4(result)) throw new TypeError("connection: invalid server-response result");
+			if (result.ok === true) return {
+				rpcId: value.rpcId,
+				result: {
+					ok: true,
+					value: result.value
+				}
+			};
+			if (result.ok !== false || !isRecord$4(result.error)) throw new TypeError("connection: invalid server-response result");
+			const error = result.error;
+			if (typeof error.code !== "string" || typeof error.message !== "string" || !isRecord$4(error.details)) throw new TypeError("connection: invalid server-response failure");
+			return {
+				rpcId: value.rpcId,
+				result: {
+					ok: false,
+					error: {
+						code: error.code,
+						message: error.message,
+						details: error.details
+					}
+				}
+			};
+		}
+		function resolveBase() {
+			const location = globalThis.location;
+			return location?.origin !== void 0 && location.origin !== "null" ? location.origin : INTERNAL_BASE;
+		}
+		function assertTarget(channel, endpoint) {
+			const segments = endpoint.split("/");
+			if (!CHANNEL_PATTERN.test(channel) || segments.some((segment) => segment === "" || segment === "." || segment === ".." || !ENDPOINT_SEGMENT_PATTERN.test(segment))) throw new Error(`connection: invalid RPC target ${JSON.stringify(`${channel}/${endpoint}`)}`);
+		}
+		/**
+		* Create the browser-backed generic RPC caller for the plugin's channel
+		* (the `/tool-plus` host registration). Wire-compatible with the official
+		* ClientConnectionRpc contract; only the transport override differs.
+		* @param doFetch - transport override; defaults to the page's global fetch.
+		*/
+		function createWebConnectionRpc(doFetch) {
+			const send = doFetch ?? ((input, init) => globalThis.fetch(input, init));
+			return { async call(channel, endpoint, payload, signal) {
+				assertTarget(channel, endpoint);
+				const rpcId = (0, _deepseek_ai_dsh_client_connection_client.RpcId)(randomUuid());
+				const response = await send(new URL(`${channel}/${endpoint}`, resolveBase()), {
+					method: "POST",
+					headers: { "content-type": "application/json" },
+					body: JSON.stringify({
+						type: "client-request",
+						rpcId,
+						method: endpoint,
+						payload
+					}),
+					...signal === void 0 ? {} : { signal }
+				});
+				if (!response.ok) throw new Error(`transport failure for ${channel}/${endpoint}: HTTP ${response.status}`);
+				const full = parseConnectionResponse(await response.json());
+				if (full.rpcId !== rpcId) throw new Error(`rpcId mismatch for ${endpoint}: sent ${rpcId}, got ${full.rpcId}`);
+				return full.result;
+			} };
 		}
-		TOOL_PLUS_FIELDS.map((field) => field.name);
 		//#endregion
 		//#region src/client/rows.tsx
 		/**
@@ -992,7 +1110,7 @@ window.__ModuleLoader__.load({
 							"aria-expanded": open,
 							disabled,
 							onClick: () => onOpenChange(open ? null : control.field),
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: current ? t(current.labelKey) : control.value }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, { className: "tp-selectChevron" })]
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: current ? t(current.labelKey) : control.value }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutlineRegular, { className: "tp-selectChevron" })]
 						})
 					})
 				]
@@ -1081,731 +1199,6 @@ window.__ModuleLoader__.load({
 			});
 		}
 		//#endregion
-		//#region src/client/BashPlusCard.tsx
-		/**
-		* The tool-plus settings card — a collapsible disclosure card in the Plugins
-		* settings tab styled against the app's `--dsw-alias-*` design tokens and the
-		* official card interaction (header button with unsaved badge + rotating
-		* chevron, smooth expand/collapse respecting reduced-motion, staged edits that
-		* survive collapsing, one Save write, nothing rendered while the namespace is
-		* unavailable). Copy is fully localized through the slot-injected `t` seat
-		* (`locale: 'tool-plus'`), which re-renders on a locale switch.
-		*
-		* The card edits the FLAT settings surface (OMP `bash*`-style scalar keys) —
-		* the client scope only writes scalar fields — grouped as timeouts,
-		* backgrounding, output, completion truncation (subdivided into byte and line
-		* settings), and behavior. Field definitions, defaults, and copy keys come
-		* from the single-source field table (`src/config/fields.ts`), shared with
-		* the Tool Plus settings section.
-		* @module @xiaoso/dsh-tool-plus/client
-		*/
-		/** Bash fields derived from the single-source table, split by subgroup. */
-		const BASH_FIELDS = toolPlusFieldsOf("bash");
-		const TIMING_FIELDS = BASH_FIELDS.filter((f) => f.group === "timing").map((f) => ({
-			field: f.name,
-			labelKey: f.labelKey,
-			hintKey: f.hintKey
-		}));
-		const OUTPUT_FIELDS = BASH_FIELDS.filter((f) => f.group === "output").map((f) => ({
-			field: f.name,
-			labelKey: f.labelKey,
-			hintKey: f.hintKey
-		}));
-		const TRUNCATION_FIELDS = BASH_FIELDS.filter((f) => f.group === "truncation");
-		const STRATEGY_SELECT = {
-			field: "outputTruncateStrategy",
-			labelKey: "outputTruncateStrategy",
-			hintKey: "outputTruncateStrategyHint",
-			options: toolPlusField("outputTruncateStrategy")?.options ?? []
-		};
-		const BYTE_SELECT = {
-			field: "outputTruncateByteMode",
-			labelKey: "outputTruncateByteMode",
-			hintKey: "outputTruncateByteModeHint",
-			options: toolPlusField("outputTruncateByteMode")?.options ?? []
-		};
-		const BYTE_NUMBER_FIELDS = TRUNCATION_FIELDS.filter((f) => f.name.startsWith("outputTruncateByte") && f.name !== "outputTruncateByteMode").map((f) => ({
-			field: f.name,
-			labelKey: f.labelKey,
-			hintKey: f.hintKey
-		}));
-		const LINE_SELECT = {
-			field: "outputTruncateLineMode",
-			labelKey: "outputTruncateLineMode",
-			hintKey: "outputTruncateLineModeHint",
-			options: toolPlusField("outputTruncateLineMode")?.options ?? []
-		};
-		const LINE_NUMBER_FIELDS = TRUNCATION_FIELDS.filter((f) => f.name.startsWith("outputTruncateLine") && f.name !== "outputTruncateLineMode").map((f) => ({
-			field: f.name,
-			labelKey: f.labelKey,
-			hintKey: f.hintKey
-		}));
-		const TOGGLE_FIELDS = BASH_FIELDS.filter((f) => f.group === "behavior").map((f) => ({
-			field: f.name,
-			labelKey: f.labelKey,
-			hintKey: f.hintKey
-		}));
-		/** Schema defaults sourced from the single-source field table. */
-		const SCHEMA_DEFAULTS = Object.fromEntries(TOOL_PLUS_FIELDS.map((f) => [f.name, f.default]));
-		/** Value a cleared field will revert to: the composition base when present, else the schema default. */
-		function revertValue$1(snap, field) {
-			if (hasOwn(snap.base, field)) return snap.base[field];
-			return SCHEMA_DEFAULTS[field];
-		}
-		/** Card chrome CSS, keyed by `data-plugin-css` and injected once (design-token driven). */
-		const CSS$3 = `
-.tp-card{list-style:none;border:1px solid var(--dsw-alias-border-l2);border-radius:12px;background:var(--dsw-alias-bg-layer-3);transition:border-color .16s,background .16s;margin:0 0 8px}
-.tp-card:hover{border-color:var(--dsw-alias-label-dimmed)}
-.tp-card.tp-open{background:var(--dsw-alias-bg-layer-2);border-color:var(--dsw-alias-label-dimmed)}
-.tp-header{width:100%;appearance:none;border:0;background:none;font:inherit;color:inherit;text-align:left;cursor:pointer;display:flex;align-items:center;gap:12px;padding:14px 16px;border-radius:12px}
-.tp-header:active{background:var(--dsw-alias-bg-layer-2)}
-.tp-header:focus-visible{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:-2px}
-.tp-headText{flex:1;min-width:0;display:flex;flex-direction:column;gap:4px}
-.tp-name{font-size:15px;font-weight:600;line-height:1.4;color:var(--dsw-alias-label-primary)}
-.tp-desc{font-size:13px;line-height:1.5;color:var(--dsw-alias-label-tertiary)}
-.tp-pending{display:inline-flex;align-items:center;gap:6px;flex:none;border-radius:999px;padding:2px 10px;font-size:11px;line-height:17px;font-weight:500;white-space:nowrap;background:var(--dsw-alias-state-business-tertiary);color:var(--dsw-alias-state-business-primary)}
-.tp-pending::before{content:'';flex:none;width:6px;height:6px;border-radius:999px;background:var(--dsw-alias-state-business-primary);animation:tp-pulse 1.8s ease-in-out infinite}
-@keyframes tp-pulse{0%,100%{opacity:.35;transform:scale(.85)}50%{opacity:1;transform:scale(1)}}
-.tp-chevron{flex:none;color:var(--dsw-alias-label-tertiary);transition:transform .16s;display:inline-flex}
-.tp-chevron.tp-open{transform:rotate(180deg)}
-.tp-body{border-top:1px solid var(--dsw-alias-border-l2);margin:0 16px;padding-top:4px;display:grid;grid-template-rows:0fr;opacity:0;transition:grid-template-rows .22s cubic-bezier(.22,.61,.36,1),opacity .16s ease}
-.tp-body.tp-open{grid-template-rows:1fr;opacity:1}
-.tp-bodyInner{overflow:hidden}
-.tp-readOnly{margin:12px 0 0;font-size:12px;line-height:1.5;color:var(--dsw-alias-label-tertiary)}
-.tp-group{display:flex;flex-direction:column;gap:0;padding:12px 0 4px}
-.tp-group+.tp-group{border-top:1px solid var(--dsw-alias-border-l2)}
-.tp-groupTitle{font-size:13px;font-weight:600;line-height:20px;color:var(--dsw-alias-label-primary);margin:0 0 4px}
-.tp-footer{display:flex;align-items:center;justify-content:flex-end;gap:8px;padding:12px 0 4px;border-top:1px solid var(--dsw-alias-border-l2)}
-.tp-failed{flex:1;min-width:0;margin:0;font-size:12px;line-height:1.5;color:var(--dsw-alias-state-error-primary)}
-.tp-applies{flex:1;min-width:0;font-size:12px;line-height:1.5;color:var(--dsw-alias-label-tertiary)}
-.tp-discard,.tp-save{appearance:none;border:1px solid transparent;border-radius:8px;padding:5px 14px;font:inherit;font-size:13px;line-height:1.5;cursor:pointer;transition:transform .1s ease}
-.tp-discard:active:not(:disabled),.tp-save:active:not(:disabled){transform:scale(.97)}
-.tp-discard{border-color:var(--dsw-alias-border-l2);background:none;color:var(--dsw-alias-label-secondary)}
-.tp-discard:hover:not(:disabled){color:var(--dsw-alias-label-primary);border-color:var(--dsw-alias-label-dimmed)}
-.tp-save{background:var(--dsw-alias-label-primary);color:var(--dsw-alias-bg-layer-3)}
-.tp-save:hover:not(:disabled){background:var(--dsw-alias-button-primary-hover)}
-.tp-discard:disabled,.tp-save:disabled{opacity:.4;cursor:default}
-.tp-discard:focus-visible,.tp-save:focus-visible{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:1px}
-@media (prefers-reduced-motion: reduce){
-  .tp-card,.tp-header,.tp-chevron,.tp-body,.tp-thumb,.tp-switchTrack,.tp-discard,.tp-save{transition:none}
-  .tp-pending::before{animation:none}
-}
-`;
-		/** Inject the card stylesheet once per page; the loader removes plugin-owned style tags on unload. */
-		let cssInjected$2 = false;
-		function injectCardCss() {
-			if (cssInjected$2 || typeof document === "undefined") return;
-			cssInjected$2 = true;
-			const id = "tool-plus-card";
-			if (document.querySelector("style[data-plugin-css=\"tool-plus-card\"]") !== null) return;
-			const tag = document.createElement("style");
-			tag.dataset.plugin = "@xiaoso/dsh-tool-plus";
-			tag.dataset.pluginCss = id;
-			tag.textContent = CSS$3;
-			document.head.appendChild(tag);
-		}
-		/** Text of a staged (or resolved) value for the number controls. */
-		function numberText$1(staged, hasStaged, resolved, snap, field) {
-			if (hasStaged) return (staged ?? "").trim() === "" ? String(revertValue$1(snap, field) ?? "") : staged ?? "";
-			return resolved === void 0 || typeof resolved === "boolean" ? "" : String(resolved);
-		}
-		/** Stage card edits over the bound scope; only a Save writes the document. */
-		function useBashPlusForm(scope) {
-			const [snap, setSnap] = (0, react.useState)(() => scope.getSnapshot());
-			const [numbers, setNumbers] = (0, react.useState)({});
-			const [selects, setSelects] = (0, react.useState)({});
-			const [toggles, setToggles] = (0, react.useState)({});
-			const [saving, setSaving] = (0, react.useState)(false);
-			const [failed, setFailed] = (0, react.useState)(false);
-			(0, react.useEffect)(() => scope.subscribe(() => {
-				setSnap(scope.getSnapshot());
-				setFailed(false);
-			}), [scope]);
-			const value = snap.value ?? {};
-			const writable = snap.writable;
-			const timing = (0, react.useMemo)(() => TIMING_FIELDS.map((def) => renderNumber$1(def, numbers, value, snap)), [numbers, snap]);
-			const output = (0, react.useMemo)(() => OUTPUT_FIELDS.map((def) => renderNumber$1(def, numbers, value, snap)), [numbers, snap]);
-			const strategySelect = (0, react.useMemo)(() => renderSelect$1(STRATEGY_SELECT, selects, value, snap), [selects, snap]);
-			const byteSelect = (0, react.useMemo)(() => renderSelect$1(BYTE_SELECT, selects, value, snap), [selects, snap]);
-			const byteNumbers = (0, react.useMemo)(() => BYTE_NUMBER_FIELDS.map((def) => renderNumber$1(def, numbers, value, snap)), [numbers, snap]);
-			const lineSelect = (0, react.useMemo)(() => renderSelect$1(LINE_SELECT, selects, value, snap), [selects, snap]);
-			const lineNumbers = (0, react.useMemo)(() => LINE_NUMBER_FIELDS.map((def) => renderNumber$1(def, numbers, value, snap)), [numbers, snap]);
-			const togglesView = (0, react.useMemo)(() => TOGGLE_FIELDS.map((def) => {
-				const hasStaged = Object.prototype.hasOwnProperty.call(toggles, def.field);
-				const staged = toggles[def.field];
-				const baseVal = Boolean(revertValue$1(snap, def.field));
-				const userStored = hasOwn(snap.user, def.field);
-				snap.user?.[def.field];
-				const effectiveVal = hasStaged ? staged ?? baseVal : Boolean(value[def.field]);
-				let overridden = false;
-				if (hasStaged) {
-					if (staged === null || staged === baseVal) overridden = false;
-					else overridden = true;
-				} else overridden = userStored;
-				return {
-					field: def.field,
-					labelKey: def.labelKey,
-					hintKey: def.hintKey,
-					checked: effectiveVal,
-					overridden
-				};
-			}), [toggles, snap]);
-			const invalid = (0, react.useMemo)(() => [
-				...timing,
-				...output,
-				...byteNumbers,
-				...lineNumbers
-			], [
-				timing,
-				output,
-				byteNumbers,
-				lineNumbers
-			]).some((c) => c.invalid);
-			const isDirty = (0, react.useMemo)(() => {
-				for (const [field, staged] of Object.entries(selects)) {
-					const baseVal = String(revertValue$1(snap, field) ?? "");
-					const userStored = hasOwn(snap.user, field);
-					const userVal = snap.user?.[field];
-					if (staged === null) {
-						if (userStored) return true;
-					} else if (staged === baseVal) {
-						if (userStored) return true;
-					} else if (!userStored || userVal !== staged) return true;
-				}
-				for (const [field, staged] of Object.entries(numbers)) {
-					const baseVal = revertValue$1(snap, field);
-					const userStored = hasOwn(snap.user, field);
-					const userVal = snap.user?.[field];
-					const trimmed = staged.trim();
-					if (trimmed === "") {
-						if (userStored) return true;
-					} else {
-						const num = Number(trimmed);
-						if (Number.isFinite(num)) {
-							if (num === baseVal) {
-								if (userStored) return true;
-							} else if (!userStored || userVal !== num) return true;
-						} else return true;
-					}
-				}
-				for (const [field, staged] of Object.entries(toggles)) {
-					const baseVal = Boolean(revertValue$1(snap, field));
-					const userStored = hasOwn(snap.user, field);
-					const userVal = snap.user?.[field];
-					if (staged === null) {
-						if (userStored) return true;
-					} else if (staged === baseVal) {
-						if (userStored) return true;
-					} else if (!userStored || userVal !== staged) return true;
-				}
-				return false;
-			}, [
-				selects,
-				numbers,
-				toggles,
-				snap
-			]);
-			const edit = (0, react.useCallback)((field, text) => {
-				setFailed(false);
-				setNumbers((prev) => ({
-					...prev,
-					[field]: text
-				}));
-			}, []);
-			const editSelect = (0, react.useCallback)((field, value) => {
-				setFailed(false);
-				setSelects((prev) => ({
-					...prev,
-					[field]: value
-				}));
-			}, []);
-			const onToggle = (0, react.useCallback)((field, checked) => {
-				setFailed(false);
-				setToggles((prev) => ({
-					...prev,
-					[field]: checked
-				}));
-			}, []);
-			const resetField = (0, react.useCallback)((field) => {
-				setFailed(false);
-				setNumbers((prev) => ({
-					...prev,
-					[field]: ""
-				}));
-				setSelects((prev) => ({
-					...prev,
-					[field]: null
-				}));
-				setToggles((prev) => ({
-					...prev,
-					[field]: null
-				}));
-			}, []);
-			const save = (0, react.useCallback)(async () => {
-				if (!writable || invalid) return;
-				setSaving(true);
-				setFailed(false);
-				try {
-					for (const [field, staged] of Object.entries(numbers)) {
-						const baseVal = revertValue$1(snap, field);
-						const trimmed = staged.trim();
-						if (trimmed === "" || Number(trimmed) === baseVal) {
-							if (hasOwn(snap.user, field)) await scope.unset(field);
-						} else await scope.set(field, Number(trimmed));
-					}
-					for (const [field, staged] of Object.entries(selects)) {
-						const baseVal = String(revertValue$1(snap, field) ?? "");
-						if (staged === null || staged === baseVal) {
-							if (hasOwn(snap.user, field)) await scope.unset(field);
-						} else await scope.set(field, staged);
-					}
-					for (const [field, staged] of Object.entries(toggles)) {
-						const baseVal = Boolean(revertValue$1(snap, field));
-						if (staged === null || staged === baseVal) {
-							if (hasOwn(snap.user, field)) await scope.unset(field);
-						} else await scope.set(field, staged);
-					}
-				} catch {
-					setFailed(true);
-				} finally {
-					setSaving(false);
-					setNumbers({});
-					setSelects({});
-					setToggles({});
-				}
-			}, [
-				scope,
-				writable,
-				invalid,
-				numbers,
-				selects,
-				toggles,
-				snap
-			]);
-			const discard = (0, react.useCallback)(() => {
-				setFailed(false);
-				setNumbers({});
-				setSelects({});
-				setToggles({});
-			}, []);
-			return {
-				shell: {
-					available: snap.status === "ready",
-					writable,
-					dirty: isDirty,
-					invalid,
-					saving,
-					failed
-				},
-				timing,
-				output,
-				strategySelect,
-				byteSelect,
-				byteNumbers,
-				lineSelect,
-				lineNumbers,
-				toggles: togglesView,
-				actions: {
-					edit,
-					resetField,
-					save,
-					discard
-				},
-				editSelect,
-				onToggle
-			};
-		}
-		function renderNumber$1(def, numbers, value, snap) {
-			const hasStaged = Object.prototype.hasOwnProperty.call(numbers, def.field);
-			const staged = numbers[def.field];
-			const resolved = value[def.field];
-			const text = numberText$1(staged, hasStaged, typeof resolved === "boolean" ? void 0 : resolved, snap, def.field);
-			const baseVal = revertValue$1(snap, def.field);
-			const userStored = hasOwn(snap.user, def.field);
-			let overridden = false;
-			let invalid = false;
-			if (hasStaged) {
-				const trimmed = (staged ?? "").trim();
-				if (trimmed === "") overridden = false;
-				else {
-					const num = Number(trimmed);
-					if (Number.isFinite(num)) overridden = num !== baseVal;
-					else invalid = true;
-				}
-			} else overridden = userStored;
-			return {
-				field: def.field,
-				labelKey: def.labelKey,
-				hintKey: def.hintKey,
-				text,
-				overridden,
-				invalid
-			};
-		}
-		function renderSelect$1(def, selects, value, snap) {
-			const hasStaged = Object.prototype.hasOwnProperty.call(selects, def.field);
-			const staged = selects[def.field];
-			const resolved = value[def.field];
-			const baseVal = String(revertValue$1(snap, def.field) ?? "");
-			const v = hasStaged ? staged ?? baseVal : typeof resolved === "string" ? resolved : baseVal;
-			const userStored = hasOwn(snap.user, def.field);
-			let overridden = false;
-			if (hasStaged) {
-				if (staged === null || staged === baseVal) overridden = false;
-				else overridden = true;
-			} else overridden = userStored;
-			return {
-				field: def.field,
-				labelKey: def.labelKey,
-				hintKey: def.hintKey,
-				options: def.options,
-				value: v,
-				overridden
-			};
-		}
-		function BashPlusCard(props) {
-			const { t, scope } = props;
-			const form = useBashPlusForm(scope);
-			const [open, setOpen] = (0, react.useState)(false);
-			const [openSelect, setOpenSelect] = (0, react.useState)(null);
-			(0, react.useEffect)(() => {
-				injectCardCss();
-				injectSettingsRowsCss();
-			}, []);
-			if (!form.shell.available) return null;
-			const blocked = !form.shell.dirty || form.shell.invalid || form.shell.saving;
-			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", {
-				"data-plugin-settings": "tool-plus",
-				className: "tp-card" + (open ? " tp-open" : ""),
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
-					type: "button",
-					className: "tp-header",
-					"aria-expanded": open,
-					"aria-label": `${t(open ? "collapse" : "expand")}: ${t("title")}`,
-					onClick: () => setOpen((o) => !o),
-					children: [
-						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-							className: "tp-headText",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-								className: "tp-name",
-								children: t("title")
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-								className: "tp-desc",
-								children: t("description")
-							})]
-						}),
-						form.shell.dirty ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							className: "tp-pending",
-							role: "status",
-							children: t("unsaved")
-						}) : null,
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							"aria-hidden": "true",
-							className: "tp-chevron" + (open ? " tp-open" : ""),
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("svg", {
-								width: "14",
-								height: "14",
-								viewBox: "0 0 14 14",
-								fill: "none",
-								"aria-hidden": "true",
-								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", {
-									d: "M3.5 5.25 L7 8.75 L10.5 5.25",
-									stroke: "currentColor",
-									strokeWidth: "1.5",
-									strokeLinecap: "round",
-									strokeLinejoin: "round"
-								})
-							})
-						})
-					]
-				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-					className: "tp-body" + (open ? " tp-open" : ""),
-					"aria-hidden": !open,
-					children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-						className: "tp-bodyInner",
-						children: [
-							!form.shell.writable ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-								className: "tp-readOnly",
-								role: "status",
-								children: t("readOnly")
-							}) : null,
-							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
-								className: "tp-group",
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h4", {
-									className: "tp-groupTitle",
-									children: t("groupBehavior")
-								}), form.toggles.map((c) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ToggleRow, {
-									t,
-									control: c,
-									disabled: !form.shell.writable,
-									onToggle: form.onToggle,
-									onReset: form.actions.resetField
-								}, c.field))]
-							}),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
-								className: "tp-group",
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h4", {
-									className: "tp-groupTitle",
-									children: t("groupTiming")
-								}), form.timing.map((c) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(NumberRow, {
-									t,
-									control: c,
-									disabled: !form.shell.writable,
-									onEdit: form.actions.edit,
-									onReset: form.actions.resetField
-								}, c.field))]
-							}),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
-								className: "tp-group",
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h4", {
-									className: "tp-groupTitle",
-									children: t("groupOutput")
-								}), form.output.map((c) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(NumberRow, {
-									t,
-									control: c,
-									disabled: !form.shell.writable,
-									onEdit: form.actions.edit,
-									onReset: form.actions.resetField
-								}, c.field))]
-							}),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
-								className: "tp-group",
-								children: [
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h4", {
-										className: "tp-groupTitle",
-										children: t("groupTruncation")
-									}),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SelectRow, {
-										t,
-										control: form.strategySelect,
-										disabled: !form.shell.writable,
-										open: openSelect === form.strategySelect.field,
-										onOpenChange: setOpenSelect,
-										onEdit: form.editSelect,
-										onReset: form.actions.resetField
-									}),
-									form.strategySelect.value !== "lines" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)(NumberRow, {
-											t,
-											control: form.byteNumbers[0],
-											disabled: !form.shell.writable,
-											onEdit: form.actions.edit,
-											onReset: form.actions.resetField
-										}),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SelectRow, {
-											t,
-											control: form.byteSelect,
-											disabled: !form.shell.writable,
-											open: openSelect === form.byteSelect.field,
-											onOpenChange: setOpenSelect,
-											onEdit: form.editSelect,
-											onReset: form.actions.resetField
-										}),
-										form.byteSelect.value !== "tail" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(NumberRow, {
-											t,
-											control: form.byteNumbers[1],
-											disabled: !form.shell.writable,
-											onEdit: form.actions.edit,
-											onReset: form.actions.resetField
-										}) : null,
-										form.byteSelect.value !== "head" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(NumberRow, {
-											t,
-											control: form.byteNumbers[2],
-											disabled: !form.shell.writable,
-											onEdit: form.actions.edit,
-											onReset: form.actions.resetField
-										}) : null
-									] }) : null,
-									form.strategySelect.value === "lines" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)(NumberRow, {
-											t,
-											control: form.lineNumbers[0],
-											disabled: !form.shell.writable,
-											onEdit: form.actions.edit,
-											onReset: form.actions.resetField
-										}),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SelectRow, {
-											t,
-											control: form.lineSelect,
-											disabled: !form.shell.writable,
-											open: openSelect === form.lineSelect.field,
-											onOpenChange: setOpenSelect,
-											onEdit: form.editSelect,
-											onReset: form.actions.resetField
-										}),
-										form.lineSelect.value !== "tail" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(NumberRow, {
-											t,
-											control: form.lineNumbers[1],
-											disabled: !form.shell.writable,
-											onEdit: form.actions.edit,
-											onReset: form.actions.resetField
-										}) : null,
-										form.lineSelect.value !== "head" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(NumberRow, {
-											t,
-											control: form.lineNumbers[2],
-											disabled: !form.shell.writable,
-											onEdit: form.actions.edit,
-											onReset: form.actions.resetField
-										}) : null
-									] }) : null
-								]
-							}),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-								className: "tp-footer",
-								children: [
-									form.shell.failed ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-										className: "tp-failed",
-										role: "status",
-										children: t("saveFailed")
-									}) : null,
-									!form.shell.failed ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "tp-applies",
-										children: t("appliesTo")
-									}) : null,
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-										type: "button",
-										className: "tp-discard",
-										disabled: !form.shell.dirty || form.shell.saving,
-										onClick: form.actions.discard,
-										children: t("discard")
-									}),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-										type: "button",
-										className: "tp-save",
-										disabled: blocked,
-										onClick: () => void form.actions.save(),
-										children: form.shell.saving ? t("saving") : t("save")
-									})
-								]
-							})
-						]
-					})
-				})]
-			});
-		}
-		//#endregion
-		//#region src/tools/shared/browser-rpc-channel.ts
-		/**
-		* Shared RPC channel constants for the browser-detection round trip between
-		* the settings panel (client half) and the host. Both halves import this
-		* module so the channel/endpoint never drift.
-		*
-		* The channel rides the official `@deepseek-ai/dsh-client-connection` generic
-		* RPC transport (host registers with `ctx.connection.rpc.handle`; the client
-		* calls via `createWebConnectionRpc().call`). Channel names must match
-		* `/^\/[A-Za-z0-9._~-]+$/` and `/api` is reserved — `/tool-plus` is ours.
-		* @module @xiaoso/dsh-tool-plus/browser-rpc-channel
-		*/
-		/** Logical RPC channel registered by the host half of this plugin. */
-		const TOOL_PLUS_RPC_CHANNEL = "/tool-plus";
-		/** Endpoint that reports the rmSafe injection status (query = ensure + verify). */
-		const RM_SAFE_STATUS_ENDPOINT = "rmSafe/status";
-		/** Endpoint that lists agent presets with their status (roster + conflicts + template diff). */
-		const PRESET_STATUS_ENDPOINT = "presets/status";
-		/**
-		* The preset ids this plugin ships a template for. Single source of truth for
-		* both halves: the host uses it for the startup bootstrap and the template
-		* lookup, the panel uses it to synthesize the "not installed" rows for a
-		* deployment whose roster does not carry them yet.
-		*/
-		const BUNDLED_PRESET_IDS = ["tool-plus-standard", "tool-plus-ptc"];
-		/** Endpoint that applies one preset action to a user-root preset. */
-		const PRESET_ACTION_ENDPOINT = "presets/apply";
-		/** Endpoint that compares one preset against one of our templates (read-only). */
-		const PRESET_COMPARE_ENDPOINT = "presets/compare";
-		//#endregion
-		//#region src/client/web-connection-rpc.ts
-		/**
-		* Browser caller for the plugin's Connection RPC channel.
-		*
-		* The official `@deepseek-ai/dsh-client-connection/client` package ships the
-		* protocol primitives as types (`RpcFetch`, `ClientConnectionRpc`, `RpcResult`)
-		* and the `RpcId` brand, but its published `createWebConnectionRpc` factory is
-		* internal to the bundle — not re-exported. This module re-implements that
-		* factory against the same public wire contract (docs/api-gateway.md, the
-		* client `rpc.ts` source): a `POST {origin}/{channel}/{endpoint}` with a
-		* `client-request` JSON envelope, answered by a `server-response` envelope
-		* echoing the rpcId. Host-side registration uses the official
-		* `ctx.connection.rpc.handle` — this file only mirrors the caller half.
-		* @module @xiaoso/dsh-tool-plus/client/web-connection-rpc
-		*/
-		const INTERNAL_BASE = "http://dsh.internal";
-		const CHANNEL_PATTERN = /^\/[A-Za-z0-9._~-]+$/;
-		const ENDPOINT_SEGMENT_PATTERN = /^[A-Za-z0-9_$.-]+$/;
-		function randomUuid() {
-			const g = globalThis;
-			if (g.crypto?.randomUUID !== void 0) return g.crypto.randomUUID();
-			return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
-				const r = Math.random() * 16 | 0;
-				return (c === "x" ? r : r & 3 | 8).toString(16);
-			});
-		}
-		function isRecord$4(value) {
-			return typeof value === "object" && value !== null && !Array.isArray(value);
-		}
-		function parseConnectionResponse(value) {
-			if (!isRecord$4(value) || value.type !== "server-response" || typeof value.rpcId !== "string") throw new TypeError("connection: invalid server-response envelope");
-			const result = value.result;
-			if (!isRecord$4(result)) throw new TypeError("connection: invalid server-response result");
-			if (result.ok === true) return {
-				rpcId: value.rpcId,
-				result: {
-					ok: true,
-					value: result.value
-				}
-			};
-			if (result.ok !== false || !isRecord$4(result.error)) throw new TypeError("connection: invalid server-response result");
-			const error = result.error;
-			if (typeof error.code !== "string" || typeof error.message !== "string" || !isRecord$4(error.details)) throw new TypeError("connection: invalid server-response failure");
-			return {
-				rpcId: value.rpcId,
-				result: {
-					ok: false,
-					error: {
-						code: error.code,
-						message: error.message,
-						details: error.details
-					}
-				}
-			};
-		}
-		function resolveBase() {
-			const location = globalThis.location;
-			return location?.origin !== void 0 && location.origin !== "null" ? location.origin : INTERNAL_BASE;
-		}
-		function assertTarget(channel, endpoint) {
-			const segments = endpoint.split("/");
-			if (!CHANNEL_PATTERN.test(channel) || segments.some((segment) => segment === "" || segment === "." || segment === ".." || !ENDPOINT_SEGMENT_PATTERN.test(segment))) throw new Error(`connection: invalid RPC target ${JSON.stringify(`${channel}/${endpoint}`)}`);
-		}
-		/**
-		* Create the browser-backed generic RPC caller for the plugin's channel
-		* (the `/tool-plus` host registration). Wire-compatible with the official
-		* ClientConnectionRpc contract; only the transport override differs.
-		* @param doFetch - transport override; defaults to the page's global fetch.
-		*/
-		function createWebConnectionRpc(doFetch) {
-			const send = doFetch ?? ((input, init) => globalThis.fetch(input, init));
-			return { async call(channel, endpoint, payload, signal) {
-				assertTarget(channel, endpoint);
-				const rpcId = (0, _deepseek_ai_dsh_client_connection_client.RpcId)(randomUuid());
-				const response = await send(new URL(`${channel}/${endpoint}`, resolveBase()), {
-					method: "POST",
-					headers: { "content-type": "application/json" },
-					body: JSON.stringify({
-						type: "client-request",
-						rpcId,
-						method: endpoint,
-						payload
-					}),
-					...signal === void 0 ? {} : { signal }
-				});
-				if (!response.ok) throw new Error(`transport failure for ${channel}/${endpoint}: HTTP ${response.status}`);
-				const full = parseConnectionResponse(await response.json());
-				if (full.rpcId !== rpcId) throw new Error(`rpcId mismatch for ${endpoint}: sent ${rpcId}, got ${full.rpcId}`);
-				return full.result;
-			} };
-		}
-		//#endregion
 		//#region src/client/forms.ts
 		/**
 		* Generic staged-form model over the plugin's flat settings namespace,
@@ -1940,8 +1333,8 @@ window.__ModuleLoader__.load({
 			return false;
 		}
 		/**
-		* Stage edits over the bound scope; only a Save writes the document.
-		* @param scope - bound settings scope for the `tool-plus` namespace.
+		* Stage edits over the shared configuration form; only a Save writes the document.
+		* @param scope - the `tool-plus` entry's shared configuration form (`ctx.configForms`).
 		* @param fields - the fields this surface edits (single-source table slice).
 		* @returns the form state and its write actions.
 		*/
@@ -2123,11 +1516,18 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/preset-panel.ts
 		/**
-		* 预设面板的纯映射层：把 `presets/status` / `presets/apply` 的返回值翻成本地化
-		* 文案、可用动作与差异摘要。零 React、零 DOM、零 I/O —— 由
-		* `tests/unit/preset-panel.spec.ts` 单独覆盖，UI（`PresetPanel.tsx`）只做渲染。
+		* 预设面板的纯映射层：把 `presets/status` / `presets/apply` / `presets/compare`
+		* 的返回值翻成本地化文案、可用动作与差异摘要。零 React、零 DOM、零 I/O ——
+		* 由 `tests/unit/preset-panel.spec.ts` 单独覆盖，UI（`PresetPanel.tsx`）只做渲染。
+		*
+		* 语义基线（dsh 0.1.7 起，别再按旧目录机制理解）：
+		* - 预设是 profile 配置里的一条 `@deepseek-ai/dsh-agent-preset` 声明行；
+		* - "没被改动过" = 这一行在 profile 补丁里**没有** `config`（`customized === false`）；
+		* - 三个动作：`upgrade` 只禁冲突行、`align` 用所选模板整份替换 plugins、
+		*   `revert` 删掉覆盖回落到随包声明；
+		* - 本插件只**声明**两个预设（{@link BUNDLED_PRESET_IDS}）；别的 preset 归别人，
+		*   面板最多替它修冲突行，不改它的内容。
 		*
-		* 契约来源：`docs/superpowers/specs/2026-09-17-preset-upgrade-design.md` §4.2/§7。
 		* 类型与端点名直接取自共享契约模块 `src/tools/shared/browser-rpc-channel.ts`
 		* （两半同一个来源，客户端这一侧不复制一份会漂移的定义）。
 		* @module @xiaoso/dsh-tool-plus/client/preset-panel
@@ -2143,33 +1543,6 @@ window.__ModuleLoader__.load({
 			"tool-fs-search": "presetEntrySearch"
 		};
 		/**
-		* 组合文件读不到但形状没问题：`conflicts` 为空、`clean` 为假，且既没被 roster
-		* 标 `broken` 也不是形状无法识别 —— 唯一解释是文件不存在/读不了（例如目录在、
-		* `agent.cordis.yml` 缺）。这不是"与模板一致"，要对用户说「未安装」。
-		*/
-		function compositionUnreadable(status) {
-			return status.broken === void 0 && !status.unrecognized && !status.clean && status.conflicts.length === 0;
-		}
-		/**
-		* roster 缺席我们随包的两份时补出「未安装」行（不改变 roster 原有顺序，
-		* 补出的行按 {@link BUNDLED_PRESET_IDS} 顺序排在前面）。
-		*/
-		function mergeBundledPresets(presets) {
-			const present = new Set(presets.map((preset) => preset.id));
-			const missing = BUNDLED_PRESET_IDS.filter((id) => !present.has(id)).map((id) => ({
-				id,
-				source: "ours",
-				path: "",
-				conflicts: [],
-				clean: false,
-				unrecognized: false,
-				installed: false,
-				templatePresent: true,
-				templateDiffers: false
-			}));
-			return missing.length === 0 ? [...presets] : [...missing, ...presets];
-		}
-		/**
 		* 下拉里一次只看一个预设时的默认选中项：随包的那份（{@link BUNDLED_PRESET_IDS}
 		* 的第一项）在场就选它，否则退清单第一项；空清单返回 undefined。
 		*/
@@ -2177,14 +1550,14 @@ window.__ModuleLoader__.load({
 			return BUNDLED_PRESET_IDS.find((id) => presets.some((preset) => preset.id === id)) ?? presets[0]?.id;
 		}
 		/**
-		* 当前选中项在重拉状态后可能已经消失（预设被删、改名、roster 变化）：仍在场就
-		* 保留，否则回落到 {@link initialPresetId}，避免下拉指向一个不存在的选项。
+		* 当前选中项在重拉状态后可能已经消失（声明被移除、roster 变化）：仍在场就保留，
+		* 否则回落到 {@link initialPresetId}，避免下拉指向一个不存在的选项。
 		*/
 		function resolveSelectedPresetId(presets, current) {
 			if (current !== void 0 && presets.some((preset) => preset.id === current)) return current;
 			return initialPresetId(presets);
 		}
-		/** 下拉选项文案：优先展示 name（preset.yml 的显示名），缺了就退 id。 */
+		/** 下拉选项文案：优先展示 name（声明里的显示名），缺了就退 id。 */
 		function presetOptionLabel(preset) {
 			return preset.name !== void 0 && preset.name !== "" ? preset.name : preset.id;
 		}
@@ -2215,7 +1588,7 @@ window.__ModuleLoader__.load({
 		}
 		/**
 		* 状态点 ②（完整比较）：这份预设的内容与我们选中的模板差多少 ——
-		* 不只是工具开关，整份组合文件都算。
+		* 不只是工具开关，整份插件行列表都算。
 		* @param t - 文案表。
 		* @param compare - 当前比较结果；尚未返回时给"正在比较"的黄点。
 		* @returns 状态点。
@@ -2239,7 +1612,7 @@ window.__ModuleLoader__.load({
 			};
 		}
 		/**
-		* 差异弹窗的行：把比较结果翻成"路径 / 两份预设各自的值"三列。
+		* 差异弹窗的行：把比较结果翻成"路径 / 两份各自的值"三列。
 		* 值缺失或整行差异都给出占位词，让用户一眼看出哪边没有。
 		* @param t - 文案表。
 		* @param compare - 当前比较结果。
@@ -2285,10 +1658,10 @@ window.__ModuleLoader__.load({
 			return template.name !== void 0 && template.name !== "" ? template.name : template.id;
 		}
 		/**
-		* 选中的模板：①选中的预设自己有同名模板就用它（`tool-plus-ptc` 就该比
-		* `tool-plus-ptc`）；②否则退随包的第一份模板（`BUNDLED_PRESET_IDS[0]`，即
-		* `tool-plus-standard`，别按目录名排序撞上 ptc）；③再不行才退清单第一项。
-		* 清单为空返回 undefined。
+		* 选中的模板：①手动选过且仍在场就用它；②否则选与当前预设**同名**的那份
+		* （`tool-plus-ptc` 就该比 `tool-plus-ptc`）；③再退随包的第一份
+		* （`BUNDLED_PRESET_IDS[0]`，即 `tool-plus-standard`，别按目录名排序撞上 ptc）；
+		* ④最后退清单第一项。清单为空返回 undefined。
 		* @param templates - 可选模板清单。
 		* @param current - 当前选中的模板 id。
 		* @param presetId - 当前选中的预设 id（同名模板优先）。
@@ -2300,35 +1673,54 @@ window.__ModuleLoader__.load({
 			return BUNDLED_PRESET_IDS.find((id) => templates.some((template) => template.id === id)) ?? templates[0]?.id;
 		}
 		/**
-		* 补充说明行：读取失败原因、无法识别的内容。差异不再在这里铺开 ——
-		* 它进了「查看差异」弹窗，正文只留两个状态点。
+		* 补充说明行：为什么读不到、这个 preset 归谁、以及"你改过它"这件事。
+		* 差异不在这里铺开 —— 它进了「查看差异」弹窗，正文只留状态点与必要解释。
 		* @param t - 文案表。
 		* @param status - 该预设的状态。
+		* @param writable - 本部署有没有可编辑的 profile。
 		* @returns 要渲染的说明行（可能为空）。
 		*/
-		function presetNotes(t, status) {
+		function presetNotes(t, status, writable = true) {
 			const notes = [];
+			if (!writable) notes.push(t("presetNoteNoProfile"));
 			if (status.broken !== void 0) notes.push(t("presetNoteBroken").replace("{reason}", status.broken));
 			else if (status.unrecognized) notes.push(t("presetNoteUnrecognized"));
+			if (status.source === "ours" && writable && status.entryId === void 0) notes.push(t("presetNoteNoRow"));
+			if (status.source === "other") notes.push(t("presetNoteOther"));
+			else if (status.customized) notes.push(t("presetNoteCustomized"));
 			return notes;
 		}
 		/**
 		* 该预设可执行的动作，按渲染顺序。
 		*
-		* - 官方随附预设一律无动作（写不了，它的只读语义由"没有按钮"表达，不再用徽标）；
-		* - 其余预设都给两个动作：`upgrade`（最小更新：只禁用冲突行）与 `reset`
-		*   （用**所选模板**整份覆盖）；
-		* - 读不了、无法识别时只剩 `reset` —— 整份覆盖是唯一能修的办法，最小更新会拒绝。
+		* - 本部署没有可编辑 profile（`writable === false`）→ 一个动作都不给；
+		* - 这一行不可寻址（`entryId` 缺席）→ 一个动作都不给（写了也没地方落）；
+		* - **别人的** preset → 只给 `upgrade`（我们只该修冲突行，不该替别人重写内容）；
+		* - **我们的** preset → `upgrade` + `align`；有覆盖时再加 `revert`；
+		* - 内容不可识别时 `upgrade` 没有意义（它要逐行判定），只给 `align` / `revert`。
 		* @param status - 该预设的状态。
+		* @param writable - 本部署有没有可编辑的 profile。
 		* @returns 动作清单。
 		*/
-		function presetActions(status) {
-			if (status.source === "shipped") return [];
-			return status.broken !== void 0 || status.unrecognized || !status.installed || compositionUnreadable(status) ? ["reset"] : ["upgrade", "reset"];
-		}
-		/** 动作按钮文案：两个动作都面向所有可写预设，文案不再区分来源。 */
+		function presetActions(status, writable = true) {
+			if (!writable || status.entryId === void 0) return [];
+			if (status.source === "other") return status.unrecognized ? [] : ["upgrade"];
+			if (status.unrecognized) return status.customized ? ["align", "revert"] : ["align"];
+			return status.customized ? [
+				"upgrade",
+				"align",
+				"revert"
+			] : ["upgrade", "align"];
+		}
+		/** 动作按钮文案。 */
 		function presetActionText(t, action) {
-			return action === "reset" ? t("presetActionReset") : t("presetActionUpdate");
+			if (action === "align") return t("presetActionAlign");
+			if (action === "revert") return t("presetActionRevert");
+			return t("presetActionUpdate");
+		}
+		/** 需要二次确认的动作：两个会动到用户已有内容的动作。 */
+		function presetActionNeedsConfirm(action) {
+			return action === "align" || action === "revert";
 		}
 		/**
 		* 动作按钮的悬浮说明：讲清这个按钮**具体会做什么**，以及当前状态下有没有意义。
@@ -2336,7 +1728,7 @@ window.__ModuleLoader__.load({
 		* @param t - 文案表。
 		* @param action - 该按钮的动作。
 		* @param status - 该预设状态（决定"要不要更新"）。
-		* @param templateLabel - 当前所选模板的显示名（重置提示里点名它是哪份）。
+		* @param templateLabel - 当前所选模板的显示名（对齐提示里点名它是哪份）。
 		* @returns 悬浮提示文案。
 		*/
 		function presetActionHint(t, action, status, templateLabel) {
@@ -2345,7 +1737,8 @@ window.__ModuleLoader__.load({
 				for (const [name, value] of Object.entries(values)) text = text.replaceAll(`{${name}}`, value);
 				return text;
 			};
-			if (action === "reset") return fill("presetActionResetHint", { template: templateLabel });
+			if (action === "align") return fill("presetActionAlignHint", { template: templateLabel });
+			if (action === "revert") return t("presetActionRevertHint");
 			if (status.conflicts.length === 0) return t("presetActionUpdateNothing");
 			return fill("presetActionUpdateHint", {
 				count: String(status.conflicts.length),
@@ -2360,54 +1753,59 @@ window.__ModuleLoader__.load({
 			});
 		}
 		/**
-		* 重置的二次确认文案。还没安装（含 roster 缺席补出的行）时没有本地改动可丢，
-		* 不能拿"会覆盖本地改动"吓人；其余情况按覆盖风险如实提示。两种情况都点名
-		* 用的是**哪份模板**：重置的来源是用户在「对比模板」里选的那份。
+		* 二次确认文案。两个动作都会动到用户可能已经改过的内容，所以必须说清后果，
+		* 并且**点名写入位置**——这是本插件唯一会改用户 profile 配置的地方。
 		* @param t - 文案表。
 		* @param status - 该预设状态。
+		* @param action - 待确认的动作。
 		* @param templateLabel - 所选模板的显示名。
 		* @returns 确认文案。
 		*/
-		function presetConfirmText(t, status, templateLabel) {
-			if (!status.installed || compositionUnreadable(status)) return t("presetConfirmInstall").replace("{template}", templateLabel);
-			return t("presetConfirmReset").replace("{template}", templateLabel);
+		function presetConfirmText(t, status, action, templateLabel) {
+			if (action === "revert") return t("presetConfirmRevert");
+			const lines = [t("presetConfirmAlign").replace("{template}", templateLabel)];
+			if (status.customized) lines.push(t("presetConfirmAlignEdits"));
+			return lines.join("\n");
 		}
 		/**
-		* 执行前摘要：将要改哪几行 / 将写入什么。**没事可做时返回 null**（不渲染这一行）——
-		* 用户明确要求去掉「工具行都已禁用，无需调整。」这种"没有信息量的状态句"。
+		* 执行前摘要：**当前状态**下有什么需要处理的。没事可做时返回 null
+		* （不渲染这一行）——用户明确要求去掉"工具行都已禁用，无需调整。"这种没有
+		* 信息量的状态句。
 		* @param t - 文案表。
 		* @param status - 该预设状态。
 		* @returns 摘要文案，或 null（无需渲染）。
 		*/
 		function presetPendingText(t, status) {
-			if (presetActions(status).length === 0) return null;
-			if (status.broken !== void 0 || status.unrecognized) return t("presetPendingReset");
-			if (!status.installed || compositionUnreadable(status)) return t("presetPendingInstall");
+			if (status.source === "ours" && status.entryId === void 0) return null;
+			if (status.unrecognized) return t("presetPendingBroken");
 			if (status.conflicts.length === 0) return null;
 			const names = presetConflictNames(t, status.conflicts);
 			return t("presetPendingRows").replace("{count}", String(status.conflicts.length)).replace("{rows}", names.join(t("presetListSeparator")));
 		}
 		/**
-		* 执行后结果：成功（改了几处、改了哪几处、是否留了备份）/ 无变化 / 失败原因。
+		* 执行后结果：成功（改了几处、改了哪几处）/ 无变化 / 失败原因。
 		* 多行文本，`\n` 分段；调用方的结果行按 `white-space: pre-wrap` 渲染。
 		*
-		* `action` 必须传：宿主只在 `upgrade` 时返回逐行改动（`reset` 是整份覆盖，
-		* `changes` 恒为空），所以重置不能套用"调整了 N 行"的句式 —— 否则会渲染成
-		* "调整了 0 处"这种假话。
+		* `action` 必须传：宿主只在 `upgrade` 时返回逐行改动（`align` 是整份替换、
+		* `revert` 是删覆盖，两者的 `changes` 恒为空），所以它们不能套用"调整了 N 行"
+		* 的句式 —— 否则会渲染成"调整了 0 处"这种假话。
+		* @param t - 文案表。
+		* @param result - 宿主返回的执行结果。
+		* @param action - 刚执行的动作。
+		* @returns 结果文案。
 		*/
 		function presetResultText(t, result, action) {
 			if (!result.ok) return t("presetResultFailed").replace("{reason}", result.reason ?? t("presetFailUnknown"));
-			if (action === "reset") {
-				if (!result.changed) return t("presetResultResetNoChange");
-				const lines = [t("presetResultResetDone")];
-				if (result.backupPath !== void 0) lines.push(t("presetResultBackup"));
-				return lines.join("\n");
-			}
-			if (!result.changed) return t("presetResultNoChange");
-			const lines = [t("presetResultDone").replace("{count}", String(result.changes.length))];
-			if (result.changes.length > 0) {
-				const names = presetConflictNames(t, result.changes.map((change) => change.id));
-				lines.push(t("presetResultRows").replace("{rows}", names.join(t("presetListSeparator"))));
+			const lines = [];
+			if (action === "align") lines.push(result.changed ? t("presetResultAlignDone") : t("presetResultAlignNoChange"));
+			else if (action === "revert") lines.push(result.changed ? t("presetResultRevertDone") : t("presetResultRevertNoChange"));
+			else if (!result.changed) lines.push(t("presetResultNoChange"));
+			else {
+				lines.push(t("presetResultDone").replace("{count}", String(result.changes.length)));
+				if (result.changes.length > 0) {
+					const names = presetConflictNames(t, result.changes.map((change) => change.id));
+					lines.push(t("presetResultRows").replace("{rows}", names.join(t("presetListSeparator"))));
+				}
 			}
 			if (result.backupPath !== void 0) lines.push(t("presetResultBackup"));
 			return lines.join("\n");
@@ -2496,6 +1894,16 @@ window.__ModuleLoader__.load({
 			const [phase, setPhase] = (0, react.useState)("loading");
 			const [presets, setPresets] = (0, react.useState)([]);
 			const [templates, setTemplates] = (0, react.useState)([]);
+			/**
+			* 本部署有没有可编辑的 profile（宿主 `configEditor` 是否在场）。没有时面板
+			* 只读 —— 一个动作都不给，说明行会讲清原因。
+			*/
+			const [writable, setWritable] = (0, react.useState)(true);
+			/**
+			* 旧版目录机制留下的 `~/.dsh/.agent-presets`（0.1.7 起没有任何代码读它）。
+			* 只作为"可以安全删除"的提示展示，不参与任何读写。
+			*/
+			const [legacyRoot, setLegacyRoot] = (0, react.useState)(void 0);
 			const [presetId, setPresetId] = (0, react.useState)(void 0);
 			const [templateId, setTemplateId] = (0, react.useState)(void 0);
 			/** 用户手动挑过模板之后就不再自动跟随预设（否则他刚选的会被覆盖掉）。 */
@@ -2505,7 +1913,8 @@ window.__ModuleLoader__.load({
 			const [openPicker, setOpenPicker] = (0, react.useState)(null);
 			const [busyId, setBusyId] = (0, react.useState)(null);
 			const [results, setResults] = (0, react.useState)({});
-			const [confirmingId, setConfirmingId] = (0, react.useState)(null);
+			/** 待二次确认的动作（动作 + 目标预设）；`align` / `revert` 会动到已有内容。 */
+			const [confirming, setConfirming] = (0, react.useState)(null);
 			/**
 			* 悬浮说明：portal 到 body 的 fixed 浮层 + 按按钮实时矩形算出的坐标。
 			* 位置不能像之前那样用绝对定位挂在卡片里：设置面板的滚动容器是 `overflow-y:auto`，
@@ -2539,8 +1948,10 @@ window.__ModuleLoader__.load({
 						setPhase("unavailable");
 						return;
 					}
-					setPresets(mergeBundledPresets(value.presets));
+					setPresets(value.presets);
 					setTemplates(Array.isArray(value.templates) ? value.templates : []);
+					setWritable(value.writable !== false);
+					setLegacyRoot(typeof value.legacyPresetRoot === "string" && value.legacyPresetRoot.length > 0 ? value.legacyPresetRoot : void 0);
 					setPhase("ready");
 				} catch {
 					setPhase("unavailable");
@@ -2588,7 +1999,7 @@ window.__ModuleLoader__.load({
 			]);
 			/** 执行一个动作；成功后重新拉状态与比较（结果行保留，直到下一次动作）。 */
 			const runAction = (0, react.useCallback)((preset, action) => {
-				setConfirmingId(null);
+				setConfirming(null);
 				setBusyId(preset.id);
 				setResults((prev) => ({
 					...prev,
@@ -2679,14 +2090,14 @@ window.__ModuleLoader__.load({
 						"aria-haspopup": "menu",
 						"aria-expanded": openPicker === key,
 						onClick: () => setOpenPicker((open) => open === key ? null : key),
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: current }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, { className: "tp-selectChevron" })]
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: current }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutlineRegular, { className: "tp-selectChevron" })]
 					})
 				})]
 			});
 			/** 选中那份的详情：名称/来源 → 动作 → 说明 → 待改 → 二次确认 → 结果。 */
 			const detail = (preset) => {
-				const notes = presetNotes(t, preset);
-				const actions = presetActions(preset);
+				const notes = presetNotes(t, preset, writable);
+				const actions = presetActions(preset, writable);
 				const pending = presetPendingText(t, preset);
 				const result = results[preset.id] ?? null;
 				const running = busyId === preset.id;
@@ -2710,20 +2121,20 @@ window.__ModuleLoader__.load({
 								onMouseLeave: () => setHinted(null),
 								children: actions.map((action) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 									type: "button",
-									className: "tp-actionButton tpp-actionButton" + (action === "reset" ? " tpp-danger" : ""),
+									className: "tp-actionButton tpp-actionButton" + (action === "align" ? " tpp-danger" : ""),
 									disabled: running,
 									"aria-description": presetActionHint(t, action, preset, templateLabel),
 									onMouseEnter: (event) => showHint(action, event.currentTarget),
 									onFocus: (event) => showHint(action, event.currentTarget),
 									onBlur: () => setHinted(null),
 									onClick: () => {
-										if (action === "reset") setConfirmingId(preset.id);
+										if (presetActionNeedsConfirm(action)) setConfirming({
+											id: preset.id,
+											action
+										});
 										else runAction(preset, action);
 									},
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: running ? t("presetActionWorking") : presetActionText(t, action) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconQuestionOutline14, {
-										className: "tpp-helpIcon",
-										"aria-hidden": "true"
-									})]
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: running ? t("presetActionWorking") : presetActionText(t, action) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconQuestionOutlineRegular, { className: "tpp-helpIcon" })]
 								}, action))
 							}) : null]
 						}),
@@ -2741,24 +2152,24 @@ window.__ModuleLoader__.load({
 							className: "tpp-state",
 							children: pending
 						}) : null,
-						confirmingId === preset.id ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						confirming !== null && confirming.id === preset.id ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							className: "tpp-confirm",
 							role: "group",
-							"aria-label": t("presetActionReset"),
+							"aria-label": t("presetConfirmTitle"),
 							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 								className: "tpp-confirmText",
-								children: presetConfirmText(t, preset, selectedTemplateLabel)
+								children: presetConfirmText(t, preset, confirming.action, selectedTemplateLabel)
 							}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 								className: "tpp-confirmActions",
 								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 									type: "button",
 									className: "tp-actionButton tpp-danger",
-									onClick: () => runAction(preset, "reset"),
+									onClick: () => runAction(preset, confirming.action),
 									children: t("presetConfirmYes")
 								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 									type: "button",
 									className: "tp-actionButton",
-									onClick: () => setConfirmingId(null),
+									onClick: () => setConfirming(null),
 									children: t("presetConfirmNo")
 								})]
 							})]
@@ -2805,7 +2216,7 @@ window.__ModuleLoader__.load({
 									label: presetOptionLabel(preset)
 								})), (id) => {
 									setPresetId(id);
-									setConfirmingId(null);
+									setConfirming(null);
 									setDiffOpen(false);
 								}),
 								templates.length > 0 ? picker("template", t("presetPickTemplate"), selectedTemplate === void 0 ? t("presetEmpty") : presetTemplateLabel(selectedTemplate), templates.map((template) => ({
@@ -2845,7 +2256,11 @@ window.__ModuleLoader__.load({
 										}) : null
 									]
 								}),
-								selected !== void 0 ? detail(selected) : null
+								selected !== void 0 ? detail(selected) : null,
+								legacyRoot !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+									className: "tpp-state",
+									children: t("presetNoteLegacy").replace("{path}", legacyRoot)
+								}) : null
 							] }) : null
 						]
 					}),
@@ -3118,8 +2533,8 @@ window.__ModuleLoader__.load({
 		}
 		/** Render the Tool Plus settings section. */
 		function ToolPlusSection(props) {
-			const { t, scope } = props;
-			const form = useToolForm(scope, ALL_FIELDS);
+			const { t, form: configForm } = props;
+			const form = useToolForm(configForm, ALL_FIELDS);
 			const sectionRef = (0, react.useRef)(null);
 			const tabsId = (0, react.useRef)(`tps-${Math.random().toString(36).slice(2, 8)}`);
 			const tabRefs = (0, react.useRef)([]);
@@ -3129,9 +2544,9 @@ window.__ModuleLoader__.load({
 			const [actionResults, setActionResults] = (0, react.useState)({});
 			const [rmSafeToast, setRmSafeToast] = (0, react.useState)(null);
 			const handleSave = (0, react.useCallback)(async () => {
-				const before = Boolean(scope.getSnapshot().value?.rmSafe ?? true);
+				const before = Boolean(configForm.getSnapshot().value?.rmSafe ?? true);
 				await form.actions.save();
-				const after = Boolean(scope.getSnapshot().value?.rmSafe ?? true);
+				const after = Boolean(configForm.getSnapshot().value?.rmSafe ?? true);
 				if (before === after || !after) return;
 				try {
 					const result = await createWebConnectionRpc().call(TOOL_PLUS_RPC_CHANNEL, RM_SAFE_STATUS_ENDPOINT, {});
@@ -3144,7 +2559,7 @@ window.__ModuleLoader__.load({
 					});
 				} catch {}
 			}, [
-				scope,
+				configForm,
 				form,
 				t
 			]);
@@ -3403,7 +2818,7 @@ window.__ModuleLoader__.load({
 					}),
 					rmSafeToast !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Toast, {
 						text: rmSafeToast.text,
-						icon: rmSafeToast.ok ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCheckOutline16, {}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconWarningOutline16, {}),
+						icon: rmSafeToast.ok ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCheckOutlineRegular, {}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconWarningOutlineRegular, {}),
 						onDone: () => {
 							setRmSafeToast(null);
 						}
@@ -3607,13 +3022,18 @@ window.__ModuleLoader__.load({
 			invalidNumber: "请填写数字；留空表示使用默认值。",
 			appliesTo: "保存后对新调用生效。",
 			groupPresets: "预设",
-			presetNoteBroken: "读取失败：{reason}",
-			presetNoteUnrecognized: "无法识别内容，未做任何改动。",
+			presetNoteBroken: "无法挂载：{reason}",
+			presetNoteUnrecognized: "插件行列表读不出来，未做任何改动。",
+			presetNoteNoRow: "这个 profile 里没有本插件的声明行——插件不是以 profile bundle 装的。",
+			presetNoteOther: "这个预设由别处声明，本面板只替它修冲突的工具行。",
+			presetNoteCustomized: "这一行在你的 profile 配置里有覆盖；「恢复随包」可撤销。",
+			presetNoteNoProfile: "本部署没有可编辑的 profile，只能查看。",
+			presetNoteLegacy: "检测到旧版预设目录 {path}：0.1.7 起没有任何代码读它，可以安全删除。",
 			presetPickPreset: "预设",
 			presetPickTemplate: "对比模板",
 			presetToolOk: "已接入本插件工具",
 			presetToolWarn: "还有 {count} 个工具行未处理",
-			presetToolError: "读不到这份预设",
+			presetToolError: "读不到这份预设的插件行",
 			presetToolLoading: "正在检查…",
 			presetCompareOk: "与所选模板一致",
 			presetCompareWarn: "与所选模板有 {count} 处不同",
@@ -3630,25 +3050,30 @@ window.__ModuleLoader__.load({
 			presetDiffWholeRow: "（整行）",
 			presetDiffEmpty: "内容一致，没有可显示的差异。",
 			presetActionUpdate: "最小更新",
-			presetActionUpdateHint: "只禁用这 {count} 个工具行（{rows}），其他内容保持不动。",
-			presetActionUpdateNothing: "当前没有需要更新的工具行。",
-			presetActionReset: "重置为对比模板",
-			presetActionResetHint: "用所选模板「{template}」整份覆盖这份预设。原文件会先备份，本地改动会丢失。",
+			presetActionUpdateHint: "只把这 {count} 个工具行（{rows}）关掉，其他内容一个字节都不动。",
+			presetActionUpdateNothing: "当前没有需要关掉的工具行。",
+			presetActionAlign: "对齐模板",
+			presetActionAlignHint: "用所选模板「{template}」整份替换这一行的插件列表。",
+			presetActionRevert: "恢复随包",
+			presetActionRevertHint: "删掉你写在本 profile 配置里的这份预设的覆盖，回落到随包声明。",
 			presetActionWorking: "处理中…",
-			presetPendingReset: "将用所选模板整份覆盖这份预设，本地改动会被覆盖。",
-			presetPendingInstall: "将写入这份预设：它当前尚未安装。",
 			presetPendingRows: "工具行将调整这 {count} 处：{rows}",
-			presetConfirmReset: "用模板「{template}」整份覆盖会丢掉本地改动（原文件会先备份一份）。确认重置？",
-			presetConfirmInstall: "将从模板「{template}」写入这份预设；当前没有会被覆盖的内容。",
-			presetConfirmYes: "确认重置",
+			presetPendingBroken: "插件行列表读不出来；「对齐模板」可以整份修好它。",
+			presetConfirmTitle: "确认动作",
+			presetConfirmAlign: "将用模板「{template}」整份替换这份预设的插件列表，并写入本 profile 的配置（cordis.patch.yml）。",
+			presetConfirmAlignEdits: "你在这一行上的改动会被覆盖。",
+			presetConfirmRevert: "将删掉你写在本 profile 配置里的这份预设的覆盖，回落到随包声明。你的改动会丢失。",
+			presetConfirmYes: "确认",
 			presetConfirmNo: "取消",
 			presetResultDone: "已调整 {count} 处。",
 			presetResultRows: "涉及：{rows}",
 			presetResultNoChange: "没有需要改动的行。",
-			presetResultResetDone: "已重置为所选模板。",
-			presetResultResetNoChange: "已经与所选模板一致，没有改动。",
+			presetResultAlignDone: "已按所选模板对齐，并写入本 profile 的配置。",
+			presetResultAlignNoChange: "已经与所选模板一致，没有改动。",
+			presetResultRevertDone: "已删掉覆盖，回落到随包声明。",
+			presetResultRevertNoChange: "这一行本来就没有覆盖，没有改动。",
+			presetResultBackup: "改动前的内容已备份（与本 profile 的补丁同目录，.bak-<版本>）。",
 			presetResultFailed: "操作失败：{reason}",
-			presetResultBackup: "原文件已备份。",
 			presetFailUnknown: "未知原因",
 			presetEntryCommand: "命令执行",
 			presetEntryPwsh: "PowerShell",
@@ -3853,13 +3278,18 @@ window.__ModuleLoader__.load({
 			invalidNumber: "Enter a number, or leave blank to use the default.",
 			appliesTo: "Values apply to new calls.",
 			groupPresets: "Presets",
-			presetNoteBroken: "Could not be read: {reason}",
-			presetNoteUnrecognized: "Content not recognized; nothing was changed.",
+			presetNoteBroken: "Cannot be mounted: {reason}",
+			presetNoteUnrecognized: "The plugin row list cannot be read; nothing was changed.",
+			presetNoteNoRow: "This profile has no declaration row for the plugin — it is not installed as a profile bundle.",
+			presetNoteOther: "Another bundle declares this preset; this panel only fixes its conflicting tool rows.",
+			presetNoteCustomized: "This row carries an override in your profile configuration; \"Revert to bundled\" removes it.",
+			presetNoteNoProfile: "This deployment has no editable profile, so the panel is read-only.",
+			presetNoteLegacy: "A legacy preset directory was found at {path}: nothing reads it since 0.1.7, so it is safe to delete.",
 			presetPickPreset: "Preset",
 			presetPickTemplate: "Compare with template",
 			presetToolOk: "Plugin tools wired in",
 			presetToolWarn: "{count} tool rows left",
-			presetToolError: "This preset cannot be read",
+			presetToolError: "Plugin rows for this preset cannot be read",
 			presetToolLoading: "Checking…",
 			presetCompareOk: "Matches the selected template",
 			presetCompareWarn: "{count} differences vs the selected template",
@@ -3876,25 +3306,30 @@ window.__ModuleLoader__.load({
 			presetDiffWholeRow: "(whole row)",
 			presetDiffEmpty: "Content matches; nothing to show.",
 			presetActionUpdate: "Minimal update",
-			presetActionUpdateHint: "Disables only these {count} tool rows ({rows}); everything else stays as it is.",
-			presetActionUpdateNothing: "No tool rows need updating.",
-			presetActionReset: "Reset to the compared template",
-			presetActionResetHint: "Overwrites this preset with the selected template \"{template}\". The original is backed up first and local edits are lost.",
+			presetActionUpdateHint: "Disables only these {count} tool rows ({rows}); nothing else changes at all.",
+			presetActionUpdateNothing: "No tool rows need disabling.",
+			presetActionAlign: "Align to template",
+			presetActionAlignHint: "Replaces this row whole plugin list with the selected template \"{template}\".",
+			presetActionRevert: "Revert to bundled",
+			presetActionRevertHint: "Deletes the override written in this profile configuration, falling back to the bundled declaration.",
 			presetActionWorking: "Working…",
-			presetPendingReset: "The whole preset will be replaced with the selected template; local changes will be lost.",
-			presetPendingInstall: "This preset will be written: it is not installed yet.",
 			presetPendingRows: "Tool rows to adjust: {count} ({rows})",
-			presetConfirmReset: "Overwriting with template \"{template}\" discards local changes (the original file is backed up first). Reset?",
-			presetConfirmInstall: "This preset will be written from template \"{template}\"; nothing will be overwritten.",
-			presetConfirmYes: "Reset",
+			presetPendingBroken: "The plugin row list cannot be read; \"Align to template\" replaces it with a good one.",
+			presetConfirmTitle: "Confirm action",
+			presetConfirmAlign: "The whole plugin list will be replaced with template \"{template}\" and written to this profile configuration (cordis.patch.yml).",
+			presetConfirmAlignEdits: "Your edits to this row will be overwritten.",
+			presetConfirmRevert: "The override written in this profile configuration will be deleted, falling back to the bundled declaration. Your edits will be lost.",
+			presetConfirmYes: "Confirm",
 			presetConfirmNo: "Cancel",
 			presetResultDone: "Adjusted {count} entries.",
 			presetResultRows: "Entries: {rows}",
 			presetResultNoChange: "Nothing needed changing.",
-			presetResultResetDone: "Reset to the selected template.",
-			presetResultResetNoChange: "Already matches the selected template; nothing changed.",
+			presetResultAlignDone: "Aligned to the selected template and written to this profile configuration.",
+			presetResultAlignNoChange: "Already matches the selected template; nothing changed.",
+			presetResultRevertDone: "Override removed; the preset falls back to its bundled declaration.",
+			presetResultRevertNoChange: "This row carried no override; nothing changed.",
+			presetResultBackup: "The previous content was backed up beside this profile patch (.bak-<version>).",
 			presetResultFailed: "Action failed: {reason}",
-			presetResultBackup: "The original file was backed up.",
 			presetFailUnknown: "unknown reason",
 			presetEntryCommand: "Command execution",
 			presetEntryPwsh: "PowerShell",
@@ -4237,6 +3672,9 @@ window.__ModuleLoader__.load({
 				expandRest: "… 其余 {count} 行",
 				"files.one": "{count} 个文件",
 				"files.other": "{count} 个文件",
+				"codeBlock.title": "代码块",
+				"codeBlock.wrap": "自动换行",
+				"codeBlock.unwrap": "取消自动换行",
 				running: "运行中",
 				done: "完成",
 				failed: "失败",
@@ -4278,6 +3716,7 @@ window.__ModuleLoader__.load({
 				"terminal.failed": "失败",
 				"terminal.done": "已完成",
 				"terminal.noOutput": "无输出",
+				"terminal.noExitCode": "未正常退出",
 				"bash.background": "后台任务 {jobId}",
 				"image.loading": "加载中",
 				"image.loadFailed": "加载失败",
@@ -4301,6 +3740,9 @@ window.__ModuleLoader__.load({
 				expandRest: "… {count} more lines",
 				"files.one": "{count} file",
 				"files.other": "{count} files",
+				"codeBlock.title": "Code block",
+				"codeBlock.wrap": "Wrap lines",
+				"codeBlock.unwrap": "Do not wrap lines",
 				running: "Running",
 				done: "Done",
 				failed: "Failed",
@@ -4342,6 +3784,7 @@ window.__ModuleLoader__.load({
 				"terminal.failed": "Failed",
 				"terminal.done": "Done",
 				"terminal.noOutput": "No output",
+				"terminal.noExitCode": "no exit code",
 				"bash.background": "Background job {jobId}",
 				"image.loading": "Loading",
 				"image.loadFailed": "Load failed",
@@ -4372,6 +3815,22 @@ window.__ModuleLoader__.load({
 			return block.kind === "tool-result";
 		}
 		/**
+		* Whether a call already landed as a failed result.
+		*
+		* Only a settled result can be wrong about its work: the union's error state is
+		* `ToolResultNode.isError` alone, and the shipped row model reads it the same
+		* way — settle on the `kind` discriminant (`'kind' in block`) and only then look
+		* at `error`, `isError`. A preparing or dispatched call has no result yet, so it
+		* is never an error; the rows that fall back to the generic shell keep exactly
+		* the criterion they have always had (`isError === true`), stated where the
+		* union still allows it.
+		* @param block - the frozen running-or-settled call node.
+		* @returns whether the call settled as a failure.
+		*/
+		function isErrorResult(block) {
+			return isSettled(block) && block.isError === true;
+		}
+		/**
 		* The call head paired with a block: a running call is its own head; a settled
 		* result carries the head backfilled from the in-window `tool/call`, which is
 		* `null` when window truncation left that event outside.
@@ -4444,7 +3903,7 @@ window.__ModuleLoader__.load({
 		function cardState(block) {
 			if (!isSettled(block)) return "running";
 			if (isRecord$2(block.error) && block.error.code === "interrupted") return "warning";
-			if (block.isError === true) return "error";
+			if (isErrorResult(block)) return "error";
 			const terminal = narrowTerminalCardMeta(cardMeta(block));
 			if (terminal !== null && terminal.mode === "foreground" && (terminal.timedOut || terminal.aborted)) return "warning";
 			return "ok";
@@ -4626,21 +4085,39 @@ window.__ModuleLoader__.load({
 				timedOut
 			};
 		}
+		/**
+		* Bind the card dictionary to the shared code-card toolbar labels.
+		*
+		* The toolbar rides every code surface the primitives draw (the diff block, the
+		* read block), and the host's own adapter for it reads the base locale's
+		* `codeBlock.*` wording; this dictionary carries the same three strings, so a
+		* takeover's code cards read exactly as the shipped ones do.
+		* @param t - the card translate seat.
+		* @returns the language fallback and wrapping actions.
+		*/
+		function codeToolbarLabels(t) {
+			return {
+				codeLabel: t("codeBlock.title"),
+				wrapLabel: t("codeBlock.wrap"),
+				unwrapLabel: t("codeBlock.unwrap")
+			};
+		}
 		/** Bind the card dictionary to the diff primitive's chrome labels. */
 		function diffBlockLabels(t) {
 			return {
+				...codeToolbarLabels(t),
 				copy: t("copy"),
 				copied: t("copied"),
 				collapseAria: t("collapseAria"),
 				expandAria: (count) => t("expandAria", { count }),
 				collapse: t("collapse"),
-				expand: (count) => t("expandRest", { count }),
-				files: (count) => t(count === 1 ? "files.one" : "files.other", { count })
+				expand: (count) => t("expandRest", { count })
 			};
 		}
 		/** Bind the card dictionary to the read primitive's chrome labels. */
 		function readBlockLabels(t) {
 			return {
+				...codeToolbarLabels(t),
 				window: (shown, total) => t("read.window", {
 					shown,
 					total
@@ -4679,6 +4156,7 @@ window.__ModuleLoader__.load({
 			return {
 				signal: (signal) => t("terminal.signal", { signal }),
 				exitCode: (exitCode) => t("terminal.exitCode", { code: exitCode }),
+				noExitCode: t("terminal.noExitCode"),
 				running: t("terminal.running"),
 				failed: t("terminal.failed"),
 				done: t("terminal.done"),
@@ -5038,11 +4516,11 @@ window.__ModuleLoader__.load({
 		*/
 		/** Leading glyphs (the shipped table): every glyph renders at 14 inside the 16px leading box. */
 		const LEADING_GLYPHS = {
-			bash: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconApiOutline14, { size: 14 }),
-			read: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBrowseOutline16, { size: 14 }),
-			edit: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconEditOutline16, { size: 14 }),
-			search: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconSearchOutline16, { size: 14 }),
-			others: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconSparkle16, { size: 14 })
+			bash: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconApiOutlineRegular, { size: 14 }),
+			read: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBrowseOutlineRegular, { size: 14 }),
+			edit: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconEditOutlineRegular, { size: 14 }),
+			search: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconSearchOutlineRegular, { size: 14 }),
+			others: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconSparkleRegular, { size: 14 })
 		};
 		/**
 		* The leading mark of one row: the tool's glyph while the call is clean or
@@ -5363,7 +4841,7 @@ window.__ModuleLoader__.load({
 			const { t, block, cwd, inspect, openFile, title, toolName } = props;
 			const args = parseCardArgs(block);
 			const meta = narrowAstEditCardMeta(cardMeta(block));
-			if (isSubCall(block) || block.isError === true || meta === null || meta.preview === "") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(GenericCard, {
+			if (isSubCall(block) || isErrorResult(block) || meta === null || meta.preview === "") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(GenericCard, {
 				t,
 				title,
 				block,
@@ -5450,7 +4928,7 @@ window.__ModuleLoader__.load({
 			const args = parseCardArgs(block);
 			const meta = narrowEditCardMeta(cardMeta(block));
 			const replaceForm = replaceHunks(args);
-			if (isSubCall(block) || block.isError === true || meta === null && replaceForm === null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(GenericCard, {
+			if (isSubCall(block) || isErrorResult(block) || meta === null && replaceForm === null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(GenericCard, {
 				t,
 				title,
 				block,
@@ -5665,7 +5143,7 @@ window.__ModuleLoader__.load({
 			const args = parseCardArgs(block);
 			const meta = narrowReadCardMeta(cardMeta(block));
 			const material = (0, react.useMemo)(() => imageCardMaterial(block, cwd), [block, cwd]);
-			if (isSubCall(block) || block.isError === true) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(GenericCard, {
+			if (isSubCall(block) || isErrorResult(block)) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(GenericCard, {
 				t,
 				title,
 				block,
@@ -5948,7 +5426,7 @@ window.__ModuleLoader__.load({
 						className: "twc-lightboxClose",
 						"aria-label": t("image.close"),
 						onClick: onClose,
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCloseOutline16, { size: 16 })
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCloseOutlineRegular, { size: 16 })
 					})
 				]
 			}), document.body);
@@ -6030,7 +5508,7 @@ window.__ModuleLoader__.load({
 			const { t, block, cwd, inspect, title, toolName } = props;
 			const args = parseCardArgs(block);
 			const meta = narrowSearchCardMeta(cardMeta(block));
-			if (isSubCall(block) || block.isError === true || meta === null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(GenericCard, {
+			if (isSubCall(block) || isErrorResult(block) || meta === null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(GenericCard, {
 				t,
 				title,
 				block,
@@ -6109,7 +5587,7 @@ window.__ModuleLoader__.load({
 			const meta = narrowTerminalCardMeta(cardMeta(block));
 			const command = argText(args, "command");
 			const state = cardState(block);
-			if (block.isError === true || command === null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(GenericCard, {
+			if (isErrorResult(block) || command === null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(GenericCard, {
 				t,
 				title,
 				block,
@@ -6197,7 +5675,7 @@ window.__ModuleLoader__.load({
 			const meta = narrowWriteCardMeta(cardMeta(block));
 			const content = argText(args, "content");
 			const path = meta?.path ?? argText(args, "path");
-			if (isSubCall(block) || block.isError === true || content === null || path === null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(GenericCard, {
+			if (isSubCall(block) || isErrorResult(block) || content === null || path === null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(GenericCard, {
 				t,
 				title,
 				block,
@@ -6323,13 +5801,13 @@ window.__ModuleLoader__.load({
 				disposeEntries?.();
 				disposeEntries = void 0;
 			};
-			const scope = ctx.settingsScope.bind({ namespace: SETTINGS_NS });
+			const form = ctx.configForms.get(SETTINGS_NS);
 			ctx.effect(() => {
 				const sync = () => {
-					if (cardsEnabled(scope.getSnapshot().value)) install();
+					if (cardsEnabled(form.getSnapshot().value)) install();
 					else uninstall();
 				};
-				const stop = scope.subscribe(sync);
+				const stop = form.subscribe(sync);
 				sync();
 				return stop;
 			}, "tool-plus: web card switch");
@@ -6383,40 +5861,33 @@ window.__ModuleLoader__.load({
 		* spells the same value the Host plugin registers (src/config/settings.ts).
 		*/
 		const BASH_PLUS_CLIENT_NS = "tool-plus";
-		/** Locale dictionary namespace of this package's card copy. */
+		/** Locale dictionary namespace of this package's page copy. */
 		const BASH_PLUS_LOCALE_NS = "tool-plus";
-		/** Required services (cordis fiber inject): slots + locale + the settings scope binder. */
+		/** Required services (cordis fiber inject): slots + locale + the shared configuration forms. */
 		const inject = [
 			"slots",
 			"locale",
-			"settingsScope"
+			"configForms"
 		];
 		/**
-		* Mount the tool-plus settings card.
+		* Mount the tool-plus settings page.
 		* @param ctx - the browser plugin context.
 		*/
 		function apply(ctx) {
 			ctx.effect(() => ctx.locale.register(BASH_PLUS_LOCALE_NS, {
 				zh: zh$1,
 				en: en$1
-			}), "tool-plus: card dictionaries");
-			const scope = ctx.settingsScope.bind({ namespace: BASH_PLUS_CLIENT_NS });
-			ctx.slots.inject("settings.plugin.item", () => ctx.slots.register({
-				name: "settings.plugin.item",
-				key: BASH_PLUS_CLIENT_NS,
-				locale: BASH_PLUS_LOCALE_NS,
-				inject: () => ({ scope })
-			}, BashPlusCard));
+			}), "tool-plus: page dictionaries");
+			const form = ctx.configForms.get(BASH_PLUS_CLIENT_NS);
 			registerToolCards(ctx);
-			const sectionScope = ctx.settingsScope.bind({ namespace: BASH_PLUS_CLIENT_NS });
-			ctx.slots.inject("settings.section", () => ctx.slots.register({
+			ctx.effect(() => ctx.configForms.whileServed([BASH_PLUS_CLIENT_NS], () => ctx.slots.inject("settings.section", () => ctx.slots.register({
 				name: "settings.section",
 				id: "tool-plus",
 				order: 16,
 				label: () => ctx.locale.bind(BASH_PLUS_LOCALE_NS)("nav"),
 				locale: BASH_PLUS_LOCALE_NS,
-				inject: () => ({ scope: sectionScope })
-			}, ToolPlusSection));
+				inject: () => ({ form })
+			}, ToolPlusSection))), "tool-plus: settings page");
 		}
 		//#endregion
 		exports.BASH_PLUS_CLIENT_NS = BASH_PLUS_CLIENT_NS;