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

package/lib/client.js

@@ -992,7 +992,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" })]
 						})
 					})
 				]
@@ -1092,7 +1092,7 @@ window.__ModuleLoader__.load({
 		* (`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,
+		* the client form 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
@@ -1209,7 +1209,7 @@ window.__ModuleLoader__.load({
 			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. */
+		/** Stage card edits over the shared configuration form; only a Save writes the document. */
 		function useBashPlusForm(scope) {
 			const [snap, setSnap] = (0, react.useState)(() => scope.getSnapshot());
 			const [numbers, setNumbers] = (0, react.useState)({});
@@ -1464,8 +1464,8 @@ window.__ModuleLoader__.load({
 			};
 		}
 		function BashPlusCard(props) {
-			const { t, scope } = props;
-			const form = useBashPlusForm(scope);
+			const { t, form: configForm } = props;
+			const form = useBashPlusForm(configForm);
 			const [open, setOpen] = (0, react.useState)(false);
 			const [openSelect, setOpenSelect] = (0, react.useState)(null);
 			(0, react.useEffect)(() => {
@@ -1474,7 +1474,7 @@ window.__ModuleLoader__.load({
 			}, []);
 			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", {
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				"data-plugin-settings": "tool-plus",
 				className: "tp-card" + (open ? " tp-open" : ""),
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
@@ -1703,15 +1703,19 @@ window.__ModuleLoader__.load({
 		/** 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.
+		* 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 a user-root preset. */
+		/** 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 templates (read-only). */
+		/** 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
@@ -1940,8 +1944,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 +2127,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 +2154,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 +2161,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 +2199,7 @@ window.__ModuleLoader__.load({
 		}
 		/**
 		* 状态点 ②（完整比较）：这份预设的内容与我们选中的模板差多少 ——
-		* 不只是工具开关，整份组合文件都算。
+		* 不只是工具开关，整份插件行列表都算。
 		* @param t - 文案表。
 		* @param compare - 当前比较结果；尚未返回时给"正在比较"的黄点。
 		* @returns 状态点。
@@ -2239,7 +2223,7 @@ window.__ModuleLoader__.load({
 			};
 		}
 		/**
-		* 差异弹窗的行：把比较结果翻成"路径 / 两份预设各自的值"三列。
+		* 差异弹窗的行：把比较结果翻成"路径 / 两份各自的值"三列。
 		* 值缺失或整行差异都给出占位词，让用户一眼看出哪边没有。
 		* @param t - 文案表。
 		* @param compare - 当前比较结果。
@@ -2285,10 +2269,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 +2284,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 +2339,7 @@ window.__ModuleLoader__.load({
 		* @param t - 文案表。
 		* @param action - 该按钮的动作。
 		* @param status - 该预设状态（决定"要不要更新"）。
-		* @param templateLabel - 当前所选模板的显示名（重置提示里点名它是哪份）。
+		* @param templateLabel - 当前所选模板的显示名（对齐提示里点名它是哪份）。
 		* @returns 悬浮提示文案。
 		*/
 		function presetActionHint(t, action, status, templateLabel) {
@@ -2345,7 +2348,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 +2364,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 +2505,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 +2524,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 +2559,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 +2610,7 @@ window.__ModuleLoader__.load({
 			]);
 			/** 执行一个动作；成功后重新拉状态与比较（结果行保留，直到下一次动作）。 */
 			const runAction = (0, react.useCallback)((preset, action) => {
-				setConfirmingId(null);
+				setConfirming(null);
 				setBusyId(preset.id);
 				setResults((prev) => ({
 					...prev,
@@ -2679,14 +2701,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 +2732,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 +2763,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 +2827,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 +2867,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 +3144,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 +3155,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 +3170,7 @@ window.__ModuleLoader__.load({
 					});
 				} catch {}
 			}, [
-				scope,
+				configForm,
 				form,
 				t
 			]);
@@ -3403,7 +3429,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 +3633,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 +3661,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 +3889,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 +3917,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 +4283,9 @@ window.__ModuleLoader__.load({
 				expandRest: "… 其余 {count} 行",
 				"files.one": "{count} 个文件",
 				"files.other": "{count} 个文件",
+				"codeBlock.title": "代码块",
+				"codeBlock.wrap": "自动换行",
+				"codeBlock.unwrap": "取消自动换行",
 				running: "运行中",
 				done: "完成",
 				failed: "失败",
@@ -4278,6 +4327,7 @@ window.__ModuleLoader__.load({
 				"terminal.failed": "失败",
 				"terminal.done": "已完成",
 				"terminal.noOutput": "无输出",
+				"terminal.noExitCode": "未正常退出",
 				"bash.background": "后台任务 {jobId}",
 				"image.loading": "加载中",
 				"image.loadFailed": "加载失败",
@@ -4301,6 +4351,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 +4395,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 +4426,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 +4514,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 +4696,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 +4767,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 +5127,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 +5452,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 +5539,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 +5754,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 +6037,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 +6119,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 +6198,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 +6286,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 +6412,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");
@@ -6385,14 +6474,14 @@ window.__ModuleLoader__.load({
 		const BASH_PLUS_CLIENT_NS = "tool-plus";
 		/** Locale dictionary namespace of this package's card 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 surfaces.
 		* @param ctx - the browser plugin context.
 		*/
 		function apply(ctx) {
@@ -6400,23 +6489,25 @@ window.__ModuleLoader__.load({
 				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,
+			const cardForm = ctx.configForms.get(BASH_PLUS_CLIENT_NS);
+			const sectionForm = ctx.configForms.get(BASH_PLUS_CLIENT_NS);
+			ctx.effect(() => ctx.configForms.whileServed([BASH_PLUS_CLIENT_NS], () => ctx.slots.inject("settings.plugins.tab", () => ctx.slots.register({
+				name: "settings.plugins.tab",
+				id: BASH_PLUS_CLIENT_NS,
+				order: 20,
+				label: () => ctx.locale.bind(BASH_PLUS_LOCALE_NS)("title"),
 				locale: BASH_PLUS_LOCALE_NS,
-				inject: () => ({ scope })
-			}, BashPlusCard));
+				inject: () => ({ form: cardForm })
+			}, BashPlusCard))), "tool-plus: plugins page");
 			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: sectionForm })
+			}, ToolPlusSection))), "tool-plus: settings page");
 		}
 		//#endregion
 		exports.BASH_PLUS_CLIENT_NS = BASH_PLUS_CLIENT_NS;