@sqdr2/dsh-fusion 0.3.2 → 0.3.4

package/lib/client.js

@@ -51,10 +51,19 @@ window.__ModuleLoader__.load({
 		*/
 		/** The HTTP path the panel's own views and actions are served from. */
 		const FUSION_API_PATH = "/api/fusion";
+		/**
+		* The model ids this provider advertises: `auto` plus one generated
+		* `pair-xxxxxxxx` per additional combo. The browser bundle inlines this module,
+		* so the namespace shape is fixed here rather than read from a settings
+		* document at import time.
+		*/
+		const FUSION_MODEL_PATTERN = /^(?:auto|pair-[a-z0-9]{6,12})$/;
+		/** Whether a model id names a Fusion combo on this provider. */
+		const isFusionModel = (model) => typeof model === "string" && FUSION_MODEL_PATTERN.test(model);
 		/** Whether a provider route belongs to this plugin, under either name. */
 		const isFusionProvider = (provider) => provider === "dsh-fusion" || provider === "dsh-model-fusion";
-		/** Whether a route names the Fusion entry, under either name. */
-		const isFusionSelection = (route) => isFusionProvider(route?.provider) && route?.model === "auto";
+		/** Whether a route names a Fusion combo, under either provider spelling. */
+		const isFusionSelection = (route) => isFusionProvider(route?.provider) && isFusionModel(route?.model);
 		//#endregion
 		//#region src/client/FusionHistory.tsx
 		function formatCompact(tokens) {
@@ -676,6 +685,29 @@ window.__ModuleLoader__.load({
 			});
 		}
 		//#endregion
+		//#region src/host/settings.ts
+		/**
+		* The routes a saved choice still names that the current catalog no longer
+		* offers: a provider that was renamed or removed, or a model that was retired.
+		*
+		* Reading a saved combo tolerates a stale route so the row stays visible and
+		* editable, but saving one does not. Without this, the page can only say that
+		* *some* model is gone, which is unusable when the stale route is not the one
+		* being edited — the user then cannot tell which combo to fix.
+		*/
+		function missingRoutes(value, catalog) {
+			if (!value) return [];
+			const stale = (role, route) => route !== void 0 && !catalog.groups.find((group) => group.id === route.provider)?.models.find((model) => model.id === route.model) ? [{
+				role,
+				route
+			}] : [];
+			return [
+				...stale("lead", value.lead),
+				...stale("worker", value.worker),
+				...stale("compactor", value.compactor?.route)
+			];
+		}
+		//#endregion
 		//#region src/client/settings-events.ts
 		const listeners = /* @__PURE__ */ new Set();
 		const onSettingsChanged = (listener) => {
@@ -689,7 +721,7 @@ window.__ModuleLoader__.load({
 		};
 		//#endregion
 		//#region src/client/FusionSettings.tsx
-		const styles$1 = `
+		const styles$2 = `
 .fusion-page{box-sizing:border-box;width:100%;height:100%;min-width:0;min-height:0;flex:1 1 auto;overflow:auto;display:flex;flex-direction:column;align-items:center;scrollbar-gutter:stable;padding:0 clamp(24px,4vw,48px) 48px;--dsh-scrollbar-width:9px;--dsh-scrollbar-thumb-border:2px}
 .fusion-settings{box-sizing:border-box;width:100%;max-width:680px;margin:0 auto;color:var(--dsw-alias-label-primary);display:flex;flex-direction:column;gap:18px}
 .fusion-settings h2{margin:0;font-size:22px;line-height:30px;font-weight:600}
@@ -710,8 +742,28 @@ window.__ModuleLoader__.load({
 .fusion-settings details{font-size:13px;line-height:21px}
 .fusion-settings summary{cursor:pointer;font-weight:500}
 .fusion-settings .fusion-limits{display:flex;flex-direction:column;gap:12px;padding-top:14px}
-.fusion-settings input[type=number]{min-width:0;width:100%;box-sizing:border-box;background-color:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-primary);border:1px solid var(--dsw-alias-border-l2);border-radius:7px;padding:8px;font:inherit}
+.fusion-settings :is(input[type=number],input[type=text]){min-width:0;width:100%;box-sizing:border-box;background-color:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-primary);border:1px solid var(--dsw-alias-border-l2);border-radius:7px;padding:8px;font:inherit}
 .fusion-settings .fusion-consent{display:flex;align-items:flex-start;gap:8px;font-size:12px;line-height:18px}
+.fusion-combos{display:flex;flex-direction:column;gap:8px}
+.fusion-settings .fusion-combo{display:flex;align-items:stretch;padding:0;border:1px solid var(--dsw-alias-border-l2);border-radius:10px;background-color:var(--dsw-alias-bg-layer-1);font-size:13px;overflow:hidden;transition:border-color .15s ease,background-color .15s ease}
+.fusion-settings .fusion-combo:hover{background-color:var(--dsw-alias-interactive-bg-hover)}
+.fusion-settings .fusion-combo[data-active=true]{border-color:var(--dsw-alias-brand-primary);background-color:var(--dsw-alias-interactive-bg-hover-accent)}
+.fusion-settings .fusion-combo-main{flex:1 1 auto;display:flex;align-items:center;gap:10px;min-width:0;padding:11px 12px;background:none;border:0;border-radius:0;color:inherit;font:inherit;text-align:left;cursor:pointer}
+.fusion-settings .fusion-combo-main:hover{background:none}
+.fusion-settings .fusion-combo :is(.fusion-combo-main,.fusion-combo-actions):focus-visible{outline:2px solid var(--dsw-alias-brand-primary);outline-offset:-2px}
+.fusion-settings .fusion-combo-check{position:relative;flex:none;width:14px;height:14px;border:1.5px solid var(--dsw-alias-border-l2);border-radius:50%;transition:border-color .15s ease}
+.fusion-settings .fusion-combo:hover .fusion-combo-check{border-color:var(--dsw-alias-label-tertiary)}
+.fusion-settings .fusion-combo[data-active=true] .fusion-combo-check{border-color:var(--dsw-alias-brand-primary)}
+.fusion-settings .fusion-combo[data-active=true] .fusion-combo-check::after{content:'';position:absolute;inset:2.5px;border-radius:50%;background:var(--dsw-alias-brand-primary)}
+.fusion-settings .fusion-combo-text{display:flex;flex-direction:column;gap:2px;min-width:0}
+.fusion-settings .fusion-combo-name{font-weight:600;overflow-wrap:anywhere}
+.fusion-settings .fusion-combo-routes{color:var(--dsw-alias-label-secondary);font-size:12px;overflow-wrap:anywhere}
+.fusion-settings .fusion-combo-stale{color:var(--dsw-alias-state-error-primary);font-size:12px;overflow-wrap:anywhere}
+.fusion-settings .fusion-combo-actions{flex:none;align-self:stretch;display:flex;align-items:center;padding:0 14px;border:0;border-left:1px solid var(--dsw-alias-border-l1);border-radius:0;background:none;color:var(--dsw-alias-label-secondary);font:inherit;font-size:12px;cursor:pointer;transition:color .15s ease,background-color .15s ease}
+.fusion-settings .fusion-combo-actions:hover:not(:disabled){color:var(--dsw-alias-state-error-primary);background-color:var(--dsw-alias-interactive-bg-hover-danger)}
+.fusion-settings .fusion-combo-actions:disabled{opacity:.4;cursor:default}
+.fusion-settings .fusion-combo-add{align-self:flex-start;padding:8px 16px;border:1px solid var(--dsw-alias-border-l2);border-radius:9px;background:none;color:var(--dsw-alias-label-secondary);font-size:13px}
+.fusion-settings .fusion-combo-add:hover:not(:disabled){background-color:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}
 .fusion-cache{box-sizing:border-box;width:100%;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;background:var(--dsw-alias-bg-module-platform);padding:16px;display:flex;flex-direction:column;gap:12px}
 .fusion-cache h3{margin:0}
 .fusion-cache-summary{cursor:pointer;font-weight:600;font-size:14px;display:flex;align-items:center;justify-content:space-between;list-style:none;user-select:none;padding:2px 0}
@@ -773,6 +825,7 @@ window.__ModuleLoader__.load({
 			const lang = useLang();
 			const name = role === "compactor" ? tr(lang, "压缩", "Compaction") : role;
 			const model = catalog.groups.find((group) => group.id === route?.provider)?.models.find((model) => model.id === route?.model);
+			const stale = route !== void 0 && model === void 0;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("fieldset", { children: [
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("legend", { children: name }),
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: role === "Lead" ? tr(lang, "回答问题、制定方案并审查结果。", "Answers, plans and reviews.") : role === "Sidekick" ? tr(lang, "执行命令和修改，接收反馈后继续。", "Runs commands and makes changes, then continues with feedback.") : tr(lang, "整理较早的上下文，供 Lead 或 Worker 继续工作。", "Summarises older context so the Lead or Sidekick can continue.") }),
@@ -790,21 +843,33 @@ window.__ModuleLoader__.load({
 							model
 						});
 					},
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-						value: "",
-						disabled: role !== "compactor",
-						children: role === "compactor" ? tr(lang, "使用当前角色模型", "Use the role's own model") : tr(lang, "选择已连接的模型", "Choose a connected model")
-					}), catalog.groups.map((group) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("optgroup", {
-						label: group.name,
-						children: group.models.map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-							value: key({
-								provider: group.id,
-								model: model.id
-							}),
-							children: model.name
-						}, model.id))
-					}, group.id))]
+					children: [
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+							value: "",
+							disabled: role !== "compactor",
+							children: role === "compactor" ? tr(lang, "使用当前角色模型", "Use the role's own model") : tr(lang, "选择已连接的模型", "Choose a connected model")
+						}),
+						stale && route && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+							value: key(route),
+							disabled: true,
+							children: tr(lang, `已不可用：${route.provider}/${route.model}`, `No longer available: ${route.provider}/${route.model}`)
+						}),
+						catalog.groups.map((group) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("optgroup", {
+							label: group.name,
+							children: group.models.map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+								value: key({
+									provider: group.id,
+									model: model.id
+								}),
+								children: model.name
+							}, model.id))
+						}, group.id))
+					]
 				})] }),
+				stale && route && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+					role: "alert",
+					children: tr(lang, `这个角色保存的模型 ${route.provider}/${route.model} 已不可用，请重新选择。`, `This role's saved model ${route.provider}/${route.model} is no longer available; choose another.`)
+				}),
 				model?.reasoning && route && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [tr(lang, "推理强度", "Reasoning"), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
 					"aria-label": tr(lang, `${name} 推理强度`, `${name} reasoning`),
 					value: route.reasoningEffort ?? "",
@@ -825,20 +890,35 @@ window.__ModuleLoader__.load({
 				})] })
 			] });
 		}
+		let draftKeys = 0;
+		const toDraft = (pairs) => pairs.map(({ id, name, pair }) => ({
+			key: id,
+			id,
+			name,
+			pair
+		}));
 		function FusionSettings() {
 			const lang = useLang();
 			const [state, setState] = (0, react.useState)();
-			const [draft, setDraft] = (0, react.useState)({});
+			const [draft, setDraft] = (0, react.useState)([]);
+			const [active, setActive] = (0, react.useState)(0);
 			const [error, setError] = (0, react.useState)();
 			const [notice, setNotice] = (0, react.useState)();
 			const [saving, setSaving] = (0, react.useState)(false);
-			const chooseModel = (role, route) => setDraft((value) => ({
-				...value,
-				[role]: route,
-				...value.cacheKeepalive ? { cacheKeepalive: {
-					...value.cacheKeepalive,
-					[role]: role === "lead" ? "auto" : false
-				} } : {}
+			const current = draft[Math.min(active, draft.length - 1)];
+			const routeName = (route) => route ? state?.catalog.groups.find((group) => group.id === route.provider)?.models.find((model) => model.id === route.model)?.name ?? `${route.provider}/${route.model}` : "—";
+			const roleLabel = (role) => role === "lead" ? tr(lang, "Lead", "Lead") : role === "worker" ? tr(lang, "Sidekick", "Sidekick") : tr(lang, "压缩模型", "Compaction model");
+			const update = (change) => setDraft((value) => value.map((combo, index) => combo.key === current?.key ? change(combo) : combo));
+			const chooseModel = (role, route) => update((combo) => ({
+				...combo,
+				pair: {
+					...combo.pair,
+					[role]: route,
+					...combo.pair.cacheKeepalive ? { cacheKeepalive: {
+						...combo.pair.cacheKeepalive,
+						[role]: role === "lead" ? "auto" : false
+					} } : {}
+				}
 			}));
 			(0, react.useEffect)(() => {
 				const abort = new AbortController();
@@ -851,24 +931,54 @@ window.__ModuleLoader__.load({
 					return response.json();
 				}).then((value) => {
 					setState(value);
-					setDraft(value.pair ?? {});
+					setDraft(toDraft(value.pairs));
+					setActive(0);
 				}).catch((error) => {
 					if (!abort.signal.aborted) setError(String(error));
 				});
 				return () => abort.abort();
 			}, []);
+			const addCombo = () => {
+				draftKeys += 1;
+				setDraft((value) => [...value, {
+					key: `new-${draftKeys}`,
+					name: tr(lang, `组合 ${value.length + 1}`, `Combo ${value.length + 1}`),
+					pair: {}
+				}]);
+				setActive(draft.length);
+			};
+			const removeCombo = (index) => {
+				setDraft((value) => value.filter((_, position) => position !== index));
+				setActive(Math.max(0, Math.min(active > index ? active - 1 : active, draft.length - 2)));
+			};
 			const save = async () => {
-				if (!state || !draft.lead || !draft.worker) return;
+				if (!state) return;
+				const invalid = draft.findIndex((combo) => !combo.pair.lead || !combo.pair.worker || !combo.name.trim());
+				if (invalid >= 0) {
+					setError(tr(lang, `第 ${invalid + 1} 个组合还不完整：需要名称、Lead 和 Sidekick。`, `Combo ${invalid + 1} is incomplete: it needs a name, a Lead and a Sidekick.`));
+					return;
+				}
+				const stale = draft.flatMap((combo, index) => missingRoutes(combo.pair, state.catalog).map(({ role, route }) => tr(lang, `第 ${index + 1} 个组合「${combo.name.trim() || tr(lang, "未命名组合", "Untitled combo")}」的 ${roleLabel(role)} 模型已不可用：${route.provider}/${route.model}。请为该角色重新选择模型。`, `Combo ${index + 1} "${combo.name.trim() || "Untitled combo"}" still names a ${roleLabel(role)} model that is no longer available: ${route.provider}/${route.model}. Choose a model for that role again.`)));
+				if (stale.length) {
+					setError(stale.join(tr(lang, " ", " ")));
+					return;
+				}
 				setSaving(true);
 				setError(void 0);
 				setNotice(void 0);
 				try {
-					const { outputTokens, ...rest } = draft;
-					const limits = Object.fromEntries(Object.entries(outputTokens ?? {}).filter(([, tokens]) => Number.isSafeInteger(tokens) && Number(tokens) > 0));
-					const pair = {
-						...rest,
-						...Object.keys(limits).length ? { outputTokens: limits } : {}
-					};
+					const pairs = draft.map(({ id, name, pair }) => {
+						const { outputTokens, ...rest } = pair;
+						const limits = Object.fromEntries(Object.entries(outputTokens ?? {}).filter(([, tokens]) => Number.isSafeInteger(tokens) && Number(tokens) > 0));
+						return {
+							...id ? { id } : {},
+							name: name.trim(),
+							pair: {
+								...rest,
+								...Object.keys(limits).length ? { outputTokens: limits } : {}
+							}
+						};
+					});
 					const response = await fetch(FUSION_API_PATH, {
 						method: "POST",
 						credentials: "same-origin",
@@ -876,37 +986,49 @@ window.__ModuleLoader__.load({
 						body: JSON.stringify({
 							action: "configure",
 							revision: state.revision,
-							pair
+							pairs
 						})
 					});
 					const result = await response.json();
 					if (!response.ok) throw new Error(result.error ?? tr(lang, "保存失败，请刷新后重试", "Save failed; refresh and try again"));
-					const current = await fetch(`${FUSION_API_PATH}?view=settings`, {
+					const confirmed = await fetch(`${FUSION_API_PATH}?view=settings`, {
 						credentials: "same-origin",
 						cache: "no-store"
 					});
-					if (!current.ok) throw new Error(tr(lang, "配置已提交，但暂时无法确认，请刷新", "Saved, but not confirmed yet; refresh"));
-					const confirmed = await current.json();
-					setState(confirmed);
-					setDraft(confirmed.pair ?? {});
+					if (!confirmed.ok) throw new Error(tr(lang, "配置已提交，但暂时无法确认，请刷新", "Saved, but not confirmed yet; refresh"));
+					const next = await confirmed.json();
+					setState(next);
+					setDraft(toDraft(next.pairs));
+					setActive(0);
 					settingsChanged();
-					setNotice(tr(lang, "组合已保存并启用。可以在模型菜单中选择 Fusion · 自动。", "Pair saved and enabled. Choose Fusion · auto in the model menu."));
+					setNotice(tr(lang, "组合已保存。模型菜单中每个组合各占一项，不同会话可以同时使用不同组合。", "Combos saved. Each one is its own model-menu entry, so different conversations can use different combos at the same time."));
 				} catch (error) {
 					setError(error instanceof Error ? error.message : String(error));
 				} finally {
 					setSaving(false);
 				}
 			};
+			const dirty = state ? JSON.stringify(draft.map(({ id, name, pair }) => ({
+				id,
+				name,
+				pair
+			}))) !== JSON.stringify(state.pairs.map(({ id, name, pair }) => ({
+				id,
+				name,
+				pair
+			}))) : false;
+			const blocked = state?.pairs.filter((pair) => !pair.authorized) ?? [];
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "fusion-page",
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("style", { children: styles$1 }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("style", { children: styles$2 }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: "fusion-settings",
 					children: [
 						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("header", {
 							"data-window-drag": true,
 							children: [
 								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h2", { children: "Fusion" }),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: tr(lang, "选择 Lead 和 Sidekick。Lead 处理日常请求、安排工作并审查结果；Sidekick 执行委派的任务。", "Choose a Lead and a Sidekick. The Lead handles requests, plans and reviews; the Sidekick does the delegated work.") }),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: tr(lang, "每个组合是一对 Lead 和 Sidekick，会作为单独的一项出现在模型菜单里。开启多个会话时，可以为每个会话选择不同的组合。", "Each combo is a Lead and a Sidekick pair, listed as its own entry in the model menu. With several conversations open, each one can use a different combo.") }),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: tr(lang, "Lead 处理日常请求、安排工作并审查结果；Sidekick 执行委派的任务。", "The Lead handles requests, plans and reviews; the Sidekick does the delegated work.") }),
 								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", { children: [
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("b", { children: tr(lang, "搭配建议", "Pairing tip") }),
 									": ",
@@ -923,13 +1045,84 @@ window.__ModuleLoader__.load({
 							children: tr(lang, "正在读取模型…", "Loading models…")
 						}),
 						state && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("fieldset", {
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
+								className: "fusion-card",
+								"aria-label": tr(lang, "组合列表", "Combo list"),
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										className: "fusion-combos",
+										children: [draft.map((combo, index) => {
+											const selected = combo.key === current?.key;
+											const label = combo.name.trim() || tr(lang, "未命名组合", "Untitled combo");
+											return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+												className: "fusion-combo",
+												"data-active": selected,
+												children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+													type: "button",
+													className: "fusion-combo-main",
+													"aria-pressed": selected,
+													onClick: () => setActive(index),
+													children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+														className: "fusion-combo-check",
+														"aria-hidden": "true"
+													}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+														className: "fusion-combo-text",
+														children: [
+															/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+																className: "fusion-combo-name",
+																children: label
+															}),
+															/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+																className: "fusion-combo-routes",
+																children: `${routeName(combo.pair.lead)} → ${routeName(combo.pair.worker)}`
+															}),
+															missingRoutes(combo.pair, state.catalog).length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+																className: "fusion-combo-stale",
+																children: tr(lang, "有模型已不可用，需要重新选择", "A model is no longer available; choose it again")
+															})
+														]
+													})]
+												}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+													type: "button",
+													className: "fusion-combo-actions",
+													disabled: saving || draft.length <= 1,
+													"aria-label": tr(lang, `删除组合 ${label}`, `Delete combo ${label}`),
+													onClick: (event) => {
+														event.stopPropagation();
+														removeCombo(index);
+													},
+													children: tr(lang, "删除", "Delete")
+												})]
+											}, combo.key);
+										}), !draft.length && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: tr(lang, "还没有组合。新增一个，选择 Lead 和 Sidekick 后保存。", "No combos yet. Add one, choose a Lead and a Sidekick, then save.") })]
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+										type: "button",
+										className: "fusion-combo-add",
+										disabled: saving || draft.length >= state.maxPairs,
+										onClick: addCombo,
+										children: tr(lang, "＋ 新增组合", "+ Add combo")
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: tr(lang, `最多保存 ${state.maxPairs} 个组合；模型菜单中的名称是「Fusion · 组合名称」。`, `Up to ${state.maxPairs} combos; the model menu shows them as “Fusion · name”.`) })
+								]
+							}),
+							current && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("fieldset", {
 								className: "fusion-card",
 								disabled: saving,
 								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [tr(lang, "名称", "Name"), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+										type: "text",
+										maxLength: 40,
+										"aria-label": tr(lang, "组合名称", "Combo name"),
+										value: current.name,
+										onChange: (event) => update((combo) => ({
+											...combo,
+											name: event.target.value
+										}))
+									})] }),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ModelChoice, {
 										role: "Lead",
-										route: draft.lead,
+										route: current.pair.lead,
 										catalog: state.catalog,
 										onChange: (route) => {
 											if (route) chooseModel("lead", route);
@@ -937,7 +1130,7 @@ window.__ModuleLoader__.load({
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ModelChoice, {
 										role: "Sidekick",
-										route: draft.worker,
+										route: current.pair.worker,
 										catalog: state.catalog,
 										onChange: (route) => {
 											if (route) chooseModel("worker", route);
@@ -949,37 +1142,42 @@ window.__ModuleLoader__.load({
 											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: tr(lang, "默认由当前角色模型压缩。也可以单独选择已连接的模型；请求由所选账号计费。", "By default each role compacts with its own model. You can pick another connected model; its account is billed.") }),
 											/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ModelChoice, {
 												role: "compactor",
-												route: draft.compactor?.route,
+												route: current.pair.compactor?.route,
 												catalog: state.catalog,
-												onChange: (route) => setDraft((value) => {
-													const { compactor, ...rest } = value;
-													return route ? {
-														...rest,
-														compactor: {
-															route,
-															maxOutputTokens: compactor?.maxOutputTokens ?? 8192
-														}
-													} : rest;
+												onChange: (route) => update((combo) => {
+													const { compactor, ...rest } = combo.pair;
+													return {
+														...combo,
+														pair: route ? {
+															...rest,
+															compactor: {
+																route,
+																maxOutputTokens: compactor?.maxOutputTokens ?? 8192
+															}
+														} : rest
+													};
 												})
 											}),
-											draft.compactor && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [tr(lang, "输出 Token 上限", "Output token limit"), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+											current.pair.compactor && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [tr(lang, "输出 Token 上限", "Output token limit"), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
 												"aria-label": tr(lang, "压缩输出 Token 上限", "Compaction output token limit"),
 												type: "number",
 												min: "1",
 												max: "128000",
-												value: draft.compactor.maxOutputTokens,
+												value: current.pair.compactor.maxOutputTokens,
 												onChange: (event) => {
 													const maxOutputTokens = Number(event.target.value);
-													setDraft((value) => value.compactor ? {
-														...value,
-														compactor: {
-															...value.compactor,
-															maxOutputTokens
+													update((combo) => combo.pair.compactor ? {
+														...combo,
+														pair: {
+															...combo.pair,
+															compactor: {
+																...combo.pair.compactor,
+																maxOutputTokens
+															}
 														}
-													} : value);
+													} : combo);
 												}
-											})] }),
-											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: tr(lang, "已选中的会话仍使用原配置。", "Conversations already using Fusion keep their setup.") })
+											})] })
 										]
 									})] })
 								]
@@ -987,11 +1185,11 @@ window.__ModuleLoader__.load({
 							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 								className: "fusion-actions",
 								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: tr(lang, "已选中的会话保留原组合；新选择使用新组合。额度耗尽后要换当前任务的 Sidekick，用该会话的 Fusion 恢复面板，而不是只改这里。", "Conversations already using Fusion keep their pair; new selections use the new one. After a quota stop, switch this conversation's Sidekick from its Fusion recovery panel, not only here.") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-									disabled: saving || !draft.lead || !draft.worker || JSON.stringify(draft) === JSON.stringify(state.pair),
+									disabled: saving || !dirty || !draft.length,
 									onClick: () => {
 										save();
 									},
-									children: saving ? tr(lang, "正在保存…", "Saving…") : tr(lang, "保存组合", "Save pair")
+									children: saving ? tr(lang, "正在保存…", "Saving…") : tr(lang, "保存组合", "Save combos")
 								})]
 							}),
 							notice && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
@@ -1000,10 +1198,10 @@ window.__ModuleLoader__.load({
 							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: tr(lang, "输出参数跟随原生模型设置，Fusion 不额外限制请求次数或任务轮数。", "Output settings follow the native model settings; Fusion adds no request or round limits.") }),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: tr(lang, "保存即表示允许 Fusion 使用所选模型的现有账号；费用由这些账号计入，当前未提供可靠的实际账单金额。", "Saving lets Fusion use the chosen models' existing accounts; they are billed there, and no reliable billed amount is available here.") }),
-							state.pair && !state.authorized && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
+							blocked.map((pair) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 								role: "status",
-								children: [tr(lang, "组合需要重新保存后才能使用", "Save the pair again before use"), state.reason ? `: ${state.reason}` : ""]
-							}),
+								children: `${pair.name}: ${tr(lang, "尚未就绪，需要重新保存这个组合", "not ready yet; save this combo again")}${pair.reason ? `: ${pair.reason}` : ""}`
+							}, pair.id)),
 							state.managedAuthorization && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: tr(lang, "运行额度由外部授权配置管理。", "Run limits are managed by an external authorization file.") })
 						] }),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(FusionCache, { refresh: state?.revision ?? 0 }),
@@ -1333,22 +1531,28 @@ window.__ModuleLoader__.load({
 				document.removeEventListener("visibilitychange", own.visibility);
 			};
 		}
-		/** One in-flight read per mounted session; collapsed hints still discover new attention states. */
-		function useFusionStatus(sessionId, expandedTask, attentionOnly = false) {
-			const expandedRef = (0, react.useRef)(expandedTask), attentionRef = (0, react.useRef)(attentionOnly);
+		/**
+		* One in-flight read per mounted session; collapsed hints still discover new attention states.
+		* `live` asks for the fast cadence whenever the task is running, for a view whose whole
+		* purpose is the current stage (the role and permission of the model working now).
+		*/
+		function useFusionStatus(sessionId, expandedTask, attentionOnly = false, live = false) {
+			const expandedRef = (0, react.useRef)(expandedTask), attentionRef = (0, react.useRef)(attentionOnly), liveRef = (0, react.useRef)(live);
 			expandedRef.current = expandedTask;
 			attentionRef.current = attentionOnly;
+			liveRef.current = live;
 			(0, react.useEffect)(() => {
 				if (expandedTask) entries.get(sessionId)?.visibility();
 			}, [sessionId, expandedTask]);
 			return (0, react.useSyncExternalStore)((0, react.useCallback)((listener) => subscribe(sessionId, listener, () => {
+				if (liveRef.current) return true;
 				const task = entries.get(sessionId)?.snapshot?.status?.task;
 				return expandedRef.current !== void 0 && task?.id === expandedRef.current && (!attentionRef.current || task.attention);
 			}), [sessionId]), (0, react.useCallback)(() => entries.get(sessionId)?.snapshot, [sessionId]), () => void 0);
 		}
 		//#endregion
 		//#region src/client/FusionStatus.tsx
-		const styles = `
+		const styles$1 = `
 .fusion-status{margin:8px 12px;color:var(--dsw-alias-label-primary);font-size:13px;line-height:1.5;overflow-wrap:anywhere}
 .fusion-status>summary{cursor:pointer;min-height:44px;display:flex;align-items:center;gap:12px;list-style:none;border-top:1px solid var(--dsw-alias-border-l2);outline-offset:2px}
 .fusion-status>summary::before{content:'›';font-size:18px;flex:none}.fusion-status[open]>summary::before{content:'⌄'}
@@ -1428,7 +1632,7 @@ window.__ModuleLoader__.load({
 				className: "fusion-status",
 				onToggle: (event) => setExpandedTask(event.currentTarget.open ? task.id : void 0),
 				children: [
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("style", { children: styles }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("style", { children: styles$1 }),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("summary", {
 						"aria-label": tr(lang, `Fusion · ${stage}，任务详情`, `Fusion · ${stage}, task details`),
 						"data-ud-check": "fusion-status-summary",
@@ -1572,7 +1776,12 @@ window.__ModuleLoader__.load({
 						if (!response.ok) throw new Error("unavailable");
 						return response.json();
 					}).then((state) => {
-						if (active) setMessage(!state.pair ? tr(lang, "Fusion 尚未配置模型，请前往设置 → Fusion 选择 Lead 和 Sidekick。", "Fusion has no models yet: open Settings → Fusion and choose a Lead and a Sidekick.") : !state.authorized ? tr(lang, "Fusion 当前配置未就绪，请前往设置 → Fusion 查看。", "The Fusion setup is not ready: see Settings → Fusion.") : void 0);
+						if (!active) return;
+						const combo = state.pairs.find((pair) => pair.id === selected?.model);
+						if (!state.pairs.length) setMessage(tr(lang, "Fusion 尚未配置模型，请前往设置 → Fusion 选择 Lead 和 Sidekick。", "Fusion has no models yet: open Settings → Fusion and choose a Lead and a Sidekick."));
+						else if (!combo) setMessage(tr(lang, "当前组合已被删除，请在模型菜单中选择其他组合。", "This combo was removed; pick another one in the model menu."));
+						else if (!combo.authorized) setMessage(tr(lang, "Fusion 当前配置未就绪，请前往设置 → Fusion 查看。", "The Fusion setup is not ready: see Settings → Fusion."));
+						else setMessage(void 0);
 					}).catch(() => {
 						if (active) setMessage(tr(lang, "暂时无法确认 Fusion 配置，请前往设置 → Fusion 查看。", "Cannot confirm the Fusion setup right now: see Settings → Fusion."));
 					});
@@ -1584,7 +1793,11 @@ window.__ModuleLoader__.load({
 					abort.abort();
 					off();
 				};
-			}, [fusion, lang]);
+			}, [
+				fusion,
+				lang,
+				selected?.model
+			]);
 			if (!fusion) return null;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [message && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 				role: "status",
@@ -1601,6 +1814,54 @@ window.__ModuleLoader__.load({
 			})] });
 		}
 		//#endregion
+		//#region src/client/FusionPermission.tsx
+		const styles = `
+.fusion-permission{display:inline-flex;align-items:center;gap:4px;height:28px;min-width:0;max-width:220px;padding:0 6px;border-radius:var(--dsw-radius-sm);color:var(--dsw-alias-label-secondary);font-size:13px;line-height:20px;font-weight:500}
+.fusion-permission svg{width:14px;height:14px;flex:none}
+.fusion-permission .fusion-permission-role{flex:none;color:var(--dsw-alias-label-caption)}
+.fusion-permission .fusion-permission-mode{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+`;
+		const modeOf = (lang, mode) => mode === "read-only" ? tr(lang, "仅可查看", "Read Only") : mode === "workspace-write" ? tr(lang, "工作区内修改", "Workspace Write") : tr(lang, "完全权限", "Full access");
+		const iconOf = (mode) => mode === "read-only" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.PermissionIconReadOnlyRegular, {}) : mode === "workspace-write" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.PermissionIconWorkspaceWriteRegular, {}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.PermissionIconFullAccessRegular, {});
+		/**
+		* The permission of the model working now. The composer's native permission control
+		* belongs to the conversation (Lead) session, which Fusion confines to read-only, and
+		* that confinement matches no configured preset — so the control reads Custom while a
+		* task runs. This additive chip names the role and its mode, so the tool row never
+		* shows an unexplained Custom alone.
+		*/
+		function FusionPermission({ sessionId, directory, load }) {
+			const selected = (0, react.useSyncExternalStore)(directory.subscribe, directory.getSnapshot).current;
+			const fusion = isFusionSelection(selected ?? void 0);
+			const lang = useLang();
+			const snapshot = useFusionStatus(sessionId, void 0, false, true);
+			(0, react.useEffect)(() => {
+				load();
+			}, [load]);
+			const permissions = fusion ? snapshot?.status?.task?.permissions : void 0;
+			if (!permissions) return null;
+			const role = permissions.active === "worker" ? "Sidekick" : "Lead";
+			const mode = permissions.active === "worker" ? permissions.worker : permissions.lead;
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+				className: "fusion-permission",
+				title: tr(lang, `Fusion 按角色分离权限：Lead ${modeOf(lang, permissions.lead)}，Sidekick ${modeOf(lang, permissions.worker)}。输入框的权限控件属于对话会话（Lead），运行期间可能显示 Custom。`, `Fusion separates permissions by role: Lead ${modeOf(lang, permissions.lead)}, Sidekick ${modeOf(lang, permissions.worker)}. The permission control belongs to the conversation (Lead) session, so it may read Custom while a task runs.`),
+				"aria-label": `${role} · ${modeOf(lang, mode)}`,
+				"data-ud-check": "fusion-permission",
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("style", { children: styles }),
+					iconOf(mode),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "fusion-permission-role",
+						children: role
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "fusion-permission-mode",
+						children: modeOf(lang, mode)
+					})
+				]
+			});
+		}
+		//#endregion
 		//#region src/activity.ts
 		/** Namespaced display identity; the unchanged native identity remains in source. */
 		function activityCallId(activity) {
@@ -1890,21 +2151,28 @@ window.__ModuleLoader__.load({
 				label: () => "Fusion"
 			}, FusionPanelIcon));
 			ctx.inject(["modelDirectories"], (scope) => {
+				const sessionProps = (sessionId) => {
+					const directory = scope.modelDirectories.directoryFor(sessionId);
+					return {
+						sessionId,
+						directory: directory.store,
+						load: () => {
+							directory.load().catch(() => void 0);
+						}
+					};
+				};
 				scope.slots.inject("conversation.input.dock", () => scope.slots.register({
 					name: "conversation.input.dock",
 					id: "fusion-configuration",
 					order: 20,
-					inject: (sessionId) => {
-						const directory = scope.modelDirectories.directoryFor(sessionId);
-						return {
-							sessionId,
-							directory: directory.store,
-							load: () => {
-								directory.load().catch(() => void 0);
-							}
-						};
-					}
+					inject: sessionProps
 				}, FusionHint));
+				scope.slots.inject("conversation.input.left", () => scope.slots.register({
+					name: "conversation.input.left",
+					id: "fusion-permission",
+					order: 10,
+					inject: sessionProps
+				}, FusionPermission));
 			});
 		}
 		//#endregion