dsh-prompt-customizer 0.4.0 → 0.4.2

package/client/client.js

@@ -65,6 +65,8 @@ window.__ModuleLoader__.load({
 				importInvalid: "无效的配置文件",
 				targetGlobal: "目标：全局默认",
 				targetHint: "选择编辑目标 —— 选中某个 agent 预设后，改动只对该预设生效（字段级覆盖）。",
+				syncAllPhases: "三态同步",
+				syncAllPhasesHint: "勾选后，屏蔽 / 解除屏蔽对三个阶段一起生效（只作用于同名的那一个工具或提示词段）。默认关闭：三个阶段需逐一处理。",
 				broken: "损坏",
 				brokenPreset: "该 agent 预设当前无法挂载，仍可编辑其定制（修复预设后自动生效）。",
 				phaseBootstrap: "仅引导阶段",
@@ -192,6 +194,8 @@ window.__ModuleLoader__.load({
 				importInvalid: "Invalid preset file",
 				targetGlobal: "Target: global default",
 				targetHint: "Pick an edit target — changes apply only to the chosen agent preset (field-level override).",
+				syncAllPhases: "Sync phases",
+				syncAllPhasesHint: "When checked, blocking / unblocking applies to the same-named tool or section across all three phases at once. Unchecked (default): handle each phase separately.",
 				broken: "broken",
 				brokenPreset: "This agent preset cannot mount right now; its customization is still editable and applies once fixed.",
 				phaseBootstrap: "Bootstrap only",
@@ -703,7 +707,7 @@ window.__ModuleLoader__.load({
 		/**
 		* 计算应用预设时的配置补丁：
 		*  - 同名段被覆盖（顺序列表在运行时驱动这一行为）
-		*  - 预设中有、当前提示词中没有的段被添加
+		*  - 预设中有、当前系统里匹配不上的段默认跳过（跨系统导入不凭空建段）
 		*  - 当前有、但不在预设有序列表中的段默认被屏蔽
 		*  - 只有预设的「激活段」（在 order 列表且不在其屏蔽名单中）被解除屏蔽；
 		*    预设自己屏蔽的段保持屏蔽。
@@ -715,8 +719,8 @@ window.__ModuleLoader__.load({
 		function applyPresetData(data, cfg, currentNames) {
 			const presetOrder = data.order ?? [];
 			const presetNames = new Set(presetOrder.map((x) => x.name));
-			const blocked = new Set(data.sections ?? []);
-			const inject = resolveOrder(presetOrder);
+			const blocked = new Set((data.sections ?? []).filter((n) => currentNames.has(n)));
+			const inject = resolveOrder(presetOrder.filter((x) => currentNames.has(x.name)));
 			const kept = new Set(inject.map((x) => x.name));
 			let order = inject.length;
 			for (const item of cfg.inject ?? []) {
@@ -914,11 +918,11 @@ window.__ModuleLoader__.load({
 			if (phase === "always") return true;
 			return phase === key;
 		}
-		/** 该阶段生效的屏蔽名单（全局 + 阶段独立 的 union）。 */
+		/** 该阶段自己的屏蔽名单（三态互相独立：引导期 sectionsBootstrap /
+		*  压缩受控期 sectionsCompaction / 常驻期 sections，互不继承、互不影响）。 */
 		function deniedNames(cfg, key) {
 			const list = sectionListOf(key);
-			const phase = list === "bootstrap" ? cfg.sectionsBootstrap ?? [] : list === "compaction" ? cfg.sectionsCompaction ?? [] : [];
-			return [...cfg.sections ?? [], ...phase];
+			return list === "bootstrap" ? cfg.sectionsBootstrap ?? [] : list === "compaction" ? cfg.sectionsCompaction ?? [] : cfg.sections ?? [];
 		}
 		/**
 		* 某个阶段部分当前的注入身份（含未保存草稿）。
@@ -959,48 +963,25 @@ window.__ModuleLoader__.load({
 		}
 		/**
 		* 屏蔽/恢复一个段（当前阶段语义）：返回需要写盘的字段补丁。
-		* - 屏蔽：该阶段名单加入（常驻期直接加入全局 sections）。
-		* - 恢复：从该阶段名单与全局名单同时移除（union 语义 —— 否则仍会被另一
-		*   份名单挡住，恢复不生效）。
+		* 三态名单互相独立：只读写本阶段自己的名单（引导期 → sectionsBootstrap，
+		* 压缩受控期 → sectionsCompaction，常驻期 → sections），屏蔽 / 恢复都绝不
+		* 波及其它阶段的名单 —— 一个阶段的屏蔽不再连带屏蔽另一个阶段。
 		* 名单无变化时不产出字段（空补丁 = 不写盘），避免把继承值冻结成无意义的
 		* 空数组覆盖。
 		*/
 		function blockPatch(cfg, key, name, blocked) {
 			const list = sectionListOf(key);
-			const g = (cfg.sections ?? []).slice();
-			const gi = g.indexOf(name);
-			const patch = {};
-			if (list === "global") {
-				if (blocked) {
-					if (gi < 0) {
-						g.push(name);
-						patch.sections = g;
-					}
-				} else if (gi >= 0) {
-					g.splice(gi, 1);
-					patch.sections = g;
-				}
-				return patch;
-			}
-			const field = list === "bootstrap" ? "sectionsBootstrap" : "sectionsCompaction";
-			const phase = (cfg[field] ?? []).slice();
-			const pi = phase.indexOf(name);
+			const field = list === "bootstrap" ? "sectionsBootstrap" : list === "compaction" ? "sectionsCompaction" : "sections";
+			const cur = (cfg[field] ?? []).slice();
+			const i = cur.indexOf(name);
 			if (blocked) {
-				if (pi < 0) {
-					phase.push(name);
-					patch[field] = phase;
-				}
+				if (i >= 0) return {};
+				cur.push(name);
 			} else {
-				if (pi >= 0) {
-					phase.splice(pi, 1);
-					patch[field] = phase;
-				}
-				if (gi >= 0) {
-					g.splice(gi, 1);
-					patch.sections = g;
-				}
+				if (i < 0) return {};
+				cur.splice(i, 1);
 			}
-			return patch;
+			return { [field]: cur };
 		}
 		/**
 		* 重排/插入一个阶段的有序行列表：把 dragName 从列表中移除后，插入到
@@ -1050,8 +1031,8 @@ window.__ModuleLoader__.load({
 		*  - 被屏蔽的段与普通段一模一样：留在列表原位、一样可操作（拖拽/箭头/替换/
 		*    恢复/删除），随时可互相转换，唯一区别是屏蔽勾选框与「已屏蔽」徽标 ——
 		*    屏蔽只意味着不注入模型，不剥夺任何编辑能力（v1 语义）。屏蔽勾选直接
-		*    绑定当前生效名单（deniedNames = 全局 + 该阶段名单，含未保存草稿），
-		*    点击立即反馈。
+		*    绑定该阶段自己的名单（deniedNames 三态互相独立，含未保存草稿），
+		*    点击立即反馈 —— 屏蔽一个阶段绝不连带屏蔽另一个阶段。
 		*  - 重排（拖入/箭头）走 `persistPhase`：把该阶段全部行重写为连续整数
 		*    虚拟 order（系统段写空文本 = 仅 order 覆盖，服务端保留原文；custom 段
 		*    保留文本）—— UI 行序叠加同一份 order 立即重排，拖动即时可见。
@@ -1067,20 +1048,22 @@ window.__ModuleLoader__.load({
 		*    在目标阶段被屏蔽则同步解除屏蔽 —— 行立即出现）。上三段 → 全部：从该
 		*    阶段移除 —— custom 段删除注入条目；系统段等价于屏蔽该阶段（系统段是
 		*    装配的一部分，无法真正删除）。
-		*  - 解除屏蔽按份额归属分流写入：继承自全局名单的屏蔽直接改全局名单（立即
-		*    写盘通道）—— override 无法表达「比全局更宽松」（空名单回落全局，解除
-		*    会在保存后复现）；override 自报名单与阶段名单的份额走目标草稿。
+		*  - 屏蔽 / 解除屏蔽的写入严格落在当前编辑目标的草稿里（全局默认 → 全局名单；
+		*    agent 预设 → 该预设自己的 override，显式空名单也是接管语义）—— 预设之间
+		*    互相独立：在 A 预设里的任何屏蔽 / 解除屏蔽对 B 预设与全局默认零影响。
 		*  - 每个阶段部分按自己那一阶段的装配结果给出警示：该 scope 有 complete 段
 		*    整段接管最终提示词，或本插件产出的段被下游装配规则丢弃时，明确写出
 		*    「段级定制不会（完全）进入模型看到的提示词」，避免提示词 Tab 与预览 Tab
 		*    各说各话。
+		*  - 「三态同步」勾选（默认关）：屏蔽勾选对三个阶段一起生效，只作用于同名
+		*    的那一段；拖拽 / 排序仍按各自阶段的副本语义只动本阶段。
 		*
 		*  全部阶段状态逻辑来自 lib/sectionOps.mjs（纯函数，node --test 单测直接
 		*  覆盖同一份代码）。
 		*/
 		/** 编辑态的键：段名之外还要带阶段，否则三个部分里同名的行会同时展开编辑器。 */
 		const editKey = (key, name) => `${key}:${name}`;
-		function SectionsTab({ cfg, inv, phases, target, globalSections, ownedSections, t, write, writeGlobalField }) {
+		function SectionsTab({ cfg, inv, phases, syncAll, t, write }) {
 			const [editing, setEditing] = (0, react.useState)(null);
 			const [draft, setDraft] = (0, react.useState)("");
 			const [dragName, setDragName] = (0, react.useState)(null);
@@ -1176,27 +1159,13 @@ window.__ModuleLoader__.load({
 				return rows;
 			};
 			const applyBlock = (key, name, blocked) => {
-				if (blocked || !target) {
-					const patch = blockPatch(cfg, key, name, blocked);
-					for (const [field, value] of Object.entries(patch)) {
-						if (JSON.stringify(value) === JSON.stringify(cfg[field] ?? [])) continue;
-						write(field, value);
-					}
-					return;
-				}
-				const patch = blockPatch(cfg, key, name, false);
-				const effectiveOwned = ownedSections && ownedSections.length > 0 ? ownedSections : void 0;
-				for (const [field, value] of Object.entries(patch)) {
-					if (field === "sections") {
-						if ((globalSections ?? []).includes(name) && (!effectiveOwned || ownedSections.includes(name))) writeGlobalField("sections", (globalSections ?? []).filter((n) => n !== name));
-						if (effectiveOwned?.includes(name)) write("sections", value);
-						continue;
-					}
-					if (JSON.stringify(value) === JSON.stringify(cfg[field] ?? [])) continue;
-					write(field, value);
-				}
+				const patch = blockPatch(cfg, key, name, blocked);
+				for (const [field, value] of Object.entries(patch)) write(field, value);
+			};
+			const toggleBlocked = (key, name) => {
+				const blocked = !deniedNames(cfg, key).includes(name);
+				for (const k of syncAll ? PART_ORDER : [key]) applyBlock(k, name, blocked);
 			};
-			const toggleBlocked = (key, name) => applyBlock(key, name, !deniedNames(cfg, key).includes(name));
 			const inBaseOf = (key, name) => (phases?.[key]?.baseSections ?? []).some((sec) => sec.name === name);
 			const persistPhase = (key, rows) => {
 				write("inject", phaseInjectEntries(cfg, key, rows));
@@ -1277,7 +1246,7 @@ window.__ModuleLoader__.load({
 				});
 			};
 			const carryFor = (key, source, name) => {
-				if (source.kind !== "all" || source.custom) return {
+				if (source.custom) return {
 					text: "",
 					blocked: false
 				};
@@ -1285,7 +1254,7 @@ window.__ModuleLoader__.load({
 					text: "",
 					blocked: false
 				};
-				if (source.text === "") return {
+				if (source.text === "" || source.text.startsWith("<")) return {
 					text: "",
 					blocked: true
 				};
@@ -1312,7 +1281,7 @@ window.__ModuleLoader__.load({
 				};
 				const next = reorderInsert(rows, dragName, targetName, pos, newRow);
 				if (next === null) return;
-				if (dragSource.kind === "all" && inBaseOf(key, dragName) && deniedNames(cfg, key).includes(dragName)) applyBlock(key, dragName, false);
+				if (dragSource.key !== key && inBaseOf(key, dragName) && deniedNames(cfg, key).includes(dragName)) applyBlock(key, dragName, false);
 				persistPhase(key, next);
 			};
 			const rowDrop = (e, key, name) => {
@@ -1342,7 +1311,7 @@ window.__ModuleLoader__.load({
 							override: carry.text,
 							blocked: false
 						});
-						if (dragSource.kind === "all" && inBaseOf(key, dragName) && deniedNames(cfg, key).includes(dragName)) applyBlock(key, dragName, false);
+						if (dragSource.key !== key && inBaseOf(key, dragName) && deniedNames(cfg, key).includes(dragName)) applyBlock(key, dragName, false);
 						persistPhase(key, next);
 					} else setNotice(t("sectionDynamicNoAdd", { name: dragName }));
 				}
@@ -1388,7 +1357,7 @@ window.__ModuleLoader__.load({
 					onDragStart: (e) => startDrag(e, row.name, {
 						kind: "part",
 						key,
-						text: row.custom ? row.override || row.text : "",
+						text: row.override || row.text,
 						custom: row.custom
 					}),
 					onDragOver: (e) => rowDragOver(e, key, row.name),
@@ -1568,8 +1537,10 @@ window.__ModuleLoader__.load({
 		*  - 拖动：全部 → 某阶段 = 让该工具在这一阶段出现；阶段 → 阶段 = 搬移（源阶段
 		*    隐藏 + 目标阶段显示）；上三段 → 全部 = 在该阶段隐藏它。
 		*  - 只有黑名单，没有白名单：每个动作只作用于被拖 / 被点的那一个工具，绝不
-		*    因为「拖进了一个工具」而把该阶段其它工具一起关掉。 */
-		function ToolsTab({ cfg, inv, phases, t, write }) {
+		*    因为「拖进了一个工具」而把该阶段其它工具一起关掉。
+		*  - 「三态同步」勾选（默认关）：勾选 / 取消勾选对三个阶段一起生效，只作用
+		*    于同名的那一个工具；拖拽仍按复制 / 搬移语义只动涉及的阶段。 */
+		function ToolsTab({ cfg, inv, phases, syncAll, t, write }) {
 			const [dragFrom, setDragFrom] = (0, react.useState)(null);
 			const [draggedName, setDraggedName] = (0, react.useState)(null);
 			const [dropHint, setDropHint] = (0, react.useState)(null);
@@ -1617,6 +1588,19 @@ window.__ModuleLoader__.load({
 				return [...catalog, ...added];
 			};
 			const toggleHide = (key, name, currentlyHidden) => {
+				if (syncAll) {
+					let tools = cfg.tools;
+					for (const k of PART_ORDER) {
+						const add = addOf(k);
+						const exclude = excludeOf(k);
+						if (currentlyHidden) tools = withPhaseExclude(tools, k, exclude.filter((x) => x !== name));
+						else if (add.includes(name)) tools = withPhaseAdd(tools, k, add.filter((x) => x !== name));
+						else if (!exclude.includes(name)) tools = withPhaseExclude(tools, k, [...exclude, name]);
+					}
+					write("tools", tools);
+					setNotice(null);
+					return;
+				}
 				if (currentlyHidden) addToPhase(key, name, false);
 				else {
 					let exclude = excludeOf(key);
@@ -2337,6 +2321,7 @@ window.__ModuleLoader__.load({
 			const [error, setError] = (0, react.useState)(null);
 			const [refreshId, setRefreshId] = (0, react.useState)(0);
 			const [target, setTarget] = (0, react.useState)(void 0);
+			const [syncAll, setSyncAll] = (0, react.useState)(false);
 			const [version, setVersion] = (0, react.useState)(0);
 			const [draft, setDraft] = (0, react.useState)(null);
 			const [saving, setSaving] = (0, react.useState)(false);
@@ -2457,7 +2442,6 @@ window.__ModuleLoader__.load({
 				}).catch((e) => setError(String(e instanceof Error ? e.message : e)));
 			};
 			const writeGlobal = writeField;
-			const writeGlobalField = writeField;
 			const resetAll = () => {
 				fetch(CONFIG_RESET_URL, {
 					method: "POST",
@@ -2546,6 +2530,26 @@ window.__ModuleLoader__.load({
 						value: p.id,
 						style: s.option
 					}, `${p.name}${p.broken ? ` (${t("broken")})` : ""}`))]),
+					tab === "sections" || tab === "tools" ? (0, react.createElement)("label", {
+						style: {
+							...s.muted,
+							marginLeft: 6,
+							display: "inline-flex",
+							alignItems: "center",
+							gap: 4,
+							cursor: "pointer",
+							whiteSpace: "nowrap"
+						},
+						title: t("syncAllPhasesHint")
+					}, [(0, react.createElement)("input", {
+						type: "checkbox",
+						checked: syncAll,
+						onChange: (e) => setSyncAll(e.target.checked),
+						style: {
+							margin: 0,
+							cursor: "pointer"
+						}
+					}), t("syncAllPhases")]) : null,
 					(0, react.createElement)("button", {
 						style: draft?.dirty ? s.saveBtnDirty : s.saveBtn,
 						disabled: !draft?.dirty || saving,
@@ -2564,18 +2568,16 @@ window.__ModuleLoader__.load({
 					cfg: view,
 					inv,
 					phases,
-					target,
-					globalSections: cfg.sections,
-					ownedSections: target ? cfg.overrides?.[target]?.sections : void 0,
+					syncAll,
 					t,
-					write: edit,
-					writeGlobalField
+					write: edit
 				}) : tab === "tools" ? (0, react.createElement)(ToolsTab, {
 					cfg: view,
 					inv,
 					phases,
 					t,
-					write: edit
+					write: edit,
+					syncAll
 				}) : tab === "presets" ? (0, react.createElement)(PresetsTab, {
 					cfg: view,
 					inv,