weir-harness 1.1.3 → 1.1.5

package/cordis.patch.yml

@@ -40,7 +40,7 @@
         worktreeAutoSetup: true
         worktreeWatchTimeoutMinutes: 360
         worktreeAutoApprove: auto-clean
-        editLockEnabled: false
+        editLockEnabled: true
         # Message-driven auto-resume (edit-lock-auto-resume-on-message): a genuine
         # user message resumes a stopped session and confirms its retained files.
         # Read live per message, so toggling applies without a restart.
@@ -70,13 +70,12 @@
     - id: weir-notify
       name: 'weir-harness/notify'
     # Capability read channel (silent-capability-reads): the plugin-owned
-    # typert remote serving the Badge/manager READ verbs (receipt / list /
-    # conditions) so reads never touch the session log. Host layer by
-    # necessity: the typert gateway resolves the service from the host root
-    # (S27); the preset-layer skill-selection feeds its faces through the
-    # module-level bridge. Inert with a warning when typert is absent.
+    # typert remote serving all five Badge/manager reads without session-log
+    # writes. The host gateway resolves this service from the root (S27);
+    # preset feeds are labeled and routed by the sessionQuery projection.
     - id: weir-capability-remote
       name: 'weir-harness/capability-remote'
+      inject: [typert, sessionQuery]
     # Session blackboard panel data channel (design D8): plugin-owned typert
     # remote serving list/read/apply/write/remove so panel reads never touch
     # the session log. Host layer for the same S27 reason as the capability
@@ -146,6 +145,7 @@
               - id: weir-skill-selection
                 name: 'weir-harness/skill-selection'
                 config:
+                  readPresetId: weir
                   # preset-skill-applicability (D2): profile-supplemental roots
                   # used ONLY to classify apply-missing names as known-but-
                   # inapplicable (skip with report) vs genuinely unknown — the
@@ -179,33 +179,13 @@
                     Make the plan decision-complete: state the goal and success criteria; group implementation changes by subsystem; identify public API, schema, and data-flow changes; cover edge cases, failure modes, tests, acceptance criteria, and explicit assumptions. Keep it concise enough to review but detailed enough that another engineer can implement it without making design decisions.
 
                     When ready, call exit_plan_mode with the complete plan markdown, starting with a # title. Make exit_plan_mode the only and final tool call in that assistant response: it presents the plan for approval, and implementation begins only in a later step after approval. Do not paste the final plan as a plain reply or ask "should I proceed?" through prose or ask_user_question. If review rejects it, incorporate the feedback and present again. If the review channel is unavailable or aborted, stay in plan mode and ask the user to switch modes manually; do not proceed with implementation.
-          - id: compaction
+          - id: delegation
             name: cordis:group
             group: true
             isolate:
               compaction: true
               toolResultPruner: true
-            config:
-              - id: compaction-basic
-                name: '@deepseek-ai/dsh-compaction-basic'
-              - id: command-compact
-                name: '@deepseek-ai/dsh-command-compact'
-              - id: tool-result-pruner
-                name: '@deepseek-ai/dsh-compaction-tool-result-pruner'
-                config:
-                  thresholdChars: 8192
-                  headChars: 4096
-                  tailChars: 1024
-              # F6 自动压缩：上下文压力阈值 + 模型择时压缩 + 边界强制 + 压缩后续推。
-              # `compaction` 服务被本组 isolate：消费者必须与提供者同 realm（否则
-              # inject 永久等待，预设加载失败）。
-              - id: context-guard
-                name: 'weir-harness/context-guard'
-          - id: delegation
-            name: cordis:group
-            group: true
-            isolate:
-              workflowEngine: true
+              weirCompactionCoordinator: true
               # 编辑锁服务：提供者 edit-lock 与消费者 todo-driver / hashline-edit /
               # lsp 同在本组。预设服务必须 isolate，否则预设加载以
               # "Preset services require isolate realms" 失败。
@@ -217,29 +197,29 @@
               # delegate write-contract consumer (slice 2) share this realm.
               weirBlackboard: true
             config:
+              - id: compaction
+                name: cordis:group
+                group: true
+                config:
+                  - id: compaction-basic
+                    name: '@deepseek-ai/dsh-compaction-basic'
+                  - id: command-compact
+                    name: '@deepseek-ai/dsh-command-compact'
+                  - id: tool-result-pruner
+                    name: '@deepseek-ai/dsh-compaction-tool-result-pruner'
+                    config:
+                      thresholdChars: 8192
+                      headChars: 4096
+                      tailChars: 1024
+                  # F6 自动压缩：上下文压力阈值 + 模型择时压缩 + 边界强制 + 压缩后续推。
+                  # `compaction` 服务被本组 isolate：消费者必须与提供者同 realm（否则
+                  # inject 永久等待，预设加载失败）。
+                  - id: context-guard
+                    name: 'weir-harness/context-guard'
               - id: tool-subagent-control
                 name: '@deepseek-ai/dsh-tool-subagent-control'
               - id: tool-subagent-list-agents
                 name: '@deepseek-ai/dsh-tool-subagent-control/list-agents'
-              - id: tool-subagent
-                name: '@deepseek-ai/dsh-tool-subagent'
-                config:
-                  provider: spawn
-                  toolName: subagent
-                  modelSelectionSettings: true
-                  backgroundMode: continuable
-              - id: tool-subagent-fork
-                name: '@deepseek-ai/dsh-tool-subagent'
-                config:
-                  provider: fork
-                  toolName: subagent_fork
-                  backgroundMode: continuable
-              - id: workflow-ptc
-                name: '@deepseek-ai/dsh-workflow-ptc'
-                config:
-                  provider: spawn
-              - id: tool-workflow
-                name: '@deepseek-ai/dsh-tool-workflow'
               - id: tool-ralph
                 name: '@deepseek-ai/dsh-tool-ralph'
                 disabled: true
@@ -262,8 +242,8 @@
               # F4 todo 续推：空转续推 + 用户打断/供应商错误语义 + 逃生舱
               - id: todo-driver
                 name: 'weir-harness/todo-driver'
-              # 编辑锁（实验，默认关）：设置 editLockEnabled 开启并重启后生效。
-              # 必须排在 hashline-edit / lsp 之前，二者在挂载时捕获锁服务。
+              # 编辑锁（默认开）：显式保存 false 后重启才关闭；须在 hashline-edit / lsp 前挂载。
+              # 两个消费者挂载时捕获隔离组内的锁服务。
               - id: edit-lock
                 name: 'weir-harness/edit-lock'
               # F7 锚点编辑：read 锚点增强 + fail-closed hash_edit 工具
@@ -356,6 +336,7 @@
               - id: weir-skill-selection
                 name: 'weir-harness/skill-selection'
                 config:
+                  readPresetId: weir-creative
                   supplementalSkillDirs:
                     - !!js (() => { try { const p = process.getBuiltinModule('node:path'); return p.join(p.dirname(process.getBuiltinModule('node:module').createRequire(baseUrl).resolve('@deepseek-ai/dsh-agent-preset/package.json')), 'skills') } catch { return process.getBuiltinModule('node:path').join(process.getBuiltinModule('node:os').tmpdir(), 'dsh-agent-preset-skills-unavailable') } })()
                   customSkillDirs:
@@ -392,57 +373,37 @@
                     Make the plan decision-complete: state the goal and success criteria; group implementation changes by subsystem; identify public API, schema, and data-flow changes; cover edge cases, failure modes, tests, acceptance criteria, and explicit assumptions. Keep it concise enough to review but detailed enough that another engineer can implement it without making design decisions.
 
                     When ready, call exit_plan_mode with the complete plan markdown, starting with a # title. Make exit_plan_mode the only and final tool call in that assistant response: it presents the plan for approval, and implementation begins only in a later step after approval. Do not paste the final plan as a plain reply or ask "should I proceed?" through prose or ask_user_question. If review rejects it, incorporate the feedback and present again. If the review channel is unavailable or aborted, stay in plan mode and ask the user to switch modes manually; do not proceed with implementation.
-          - id: compaction
+          - id: delegation
             name: cordis:group
             group: true
             isolate:
               compaction: true
               toolResultPruner: true
-            config:
-              - id: compaction-basic
-                name: '@deepseek-ai/dsh-compaction-basic'
-              - id: command-compact
-                name: '@deepseek-ai/dsh-command-compact'
-              - id: tool-result-pruner
-                name: '@deepseek-ai/dsh-compaction-tool-result-pruner'
-                config:
-                  thresholdChars: 8192
-                  headChars: 4096
-                  tailChars: 1024
-              - id: context-guard
-                name: 'weir-harness/context-guard'
-          - id: delegation
-            name: cordis:group
-            group: true
-            isolate:
-              workflowEngine: true
+              weirCompactionCoordinator: true
               weirEditLock: true
               weirWorktreeLanes: true
               weirBlackboard: true
             config:
+              - id: compaction
+                name: cordis:group
+                group: true
+                config:
+                  - id: compaction-basic
+                    name: '@deepseek-ai/dsh-compaction-basic'
+                  - id: command-compact
+                    name: '@deepseek-ai/dsh-command-compact'
+                  - id: tool-result-pruner
+                    name: '@deepseek-ai/dsh-compaction-tool-result-pruner'
+                    config:
+                      thresholdChars: 8192
+                      headChars: 4096
+                      tailChars: 1024
+                  - id: context-guard
+                    name: 'weir-harness/context-guard'
               - id: tool-subagent-control
                 name: '@deepseek-ai/dsh-tool-subagent-control'
               - id: tool-subagent-list-agents
                 name: '@deepseek-ai/dsh-tool-subagent-control/list-agents'
-              - id: tool-subagent
-                name: '@deepseek-ai/dsh-tool-subagent'
-                config:
-                  provider: spawn
-                  toolName: subagent
-                  modelSelectionSettings: true
-                  backgroundMode: continuable
-              - id: tool-subagent-fork
-                name: '@deepseek-ai/dsh-tool-subagent'
-                config:
-                  provider: fork
-                  toolName: subagent_fork
-                  backgroundMode: continuable
-              - id: workflow-ptc
-                name: '@deepseek-ai/dsh-workflow-ptc'
-                config:
-                  provider: spawn
-              - id: tool-workflow
-                name: '@deepseek-ai/dsh-tool-workflow'
               - id: tool-ralph
                 name: '@deepseek-ai/dsh-tool-ralph'
                 disabled: true

package/lib/client.capability-badge.js

@@ -120,32 +120,35 @@ window.__ModuleLoader__.load({
 			const [panelOpen, setPanelOpen] = react.useState(false);
 			const [convergence, setConvergence] = react.useState(null);
 			const aliveRef = react.useRef(false);
+			const requestRef = react.useRef(0);
 			const refresh = react.useCallback(() => {
 				if (!sessionId || typeof props.fetchReceipt !== "function") return Promise.resolve();
+				const request = ++requestRef.current;
 				return props.fetchReceipt(sessionId).then((receipt) => {
-					if (aliveRef.current) { setState(model.badgeStateOf(receipt, null)); setSettled(true); }
-				}).catch(() => { if (aliveRef.current) setSettled(true); });
+					if (aliveRef.current && request === requestRef.current) { setState(model.badgeStateOf(receipt, null)); setSettled(true); }
+				}).catch(() => {
+					if (aliveRef.current && request === requestRef.current) { setState(null); setSettled(true); }
+				});
 			}, [sessionId]);
 			react.useEffect(() => {
+				++requestRef.current;
+				setState(null);
 				if (!sessionId || typeof props.fetchReceipt !== "function") {
-					setState(null);
 					setSettled(false);
 					return undefined;
 				}
 				aliveRef.current = true;
 				setSettled(false);
 				refresh();
-				// 12.5: a same-session frame refreshes this window's Badge; a
-				// missing subscription degrades to an explicit refresh hint.
 				if (typeof props.subscribeFrames === "function") {
 					setConvergence(model.convergenceHintOf({ subscribed: true }));
 					const stop = props.subscribeFrames((frame) => {
 						if (model.frameRefreshesSession(frame, sessionId)) refresh();
 					});
-					return () => { aliveRef.current = false; if (typeof stop === "function") stop(); };
+					return () => { aliveRef.current = false; ++requestRef.current; if (typeof stop === "function") stop(); };
 				}
 				setConvergence(model.convergenceHintOf({ subscribed: false }));
-				return () => { aliveRef.current = false; };
+				return () => { aliveRef.current = false; ++requestRef.current; };
 			}, [sessionId, refresh]);
 			// Close on outside click (edit-lock panel pattern): any pointerdown
 			// outside this entry's wrapper dismisses the panel. Clicks INSIDE
@@ -168,15 +171,12 @@ window.__ModuleLoader__.load({
 			const known = Boolean(state && state.known);
 			const label = known
 				? t("capability.badge", "{skills} skills · {mcp} MCP").replace("{skills}", String(state.applied.skills)).replace("{mcp}", String(state.applied.mcpServers))
-				: settled
-					// The receipt fetch settled without a receipt: this session's
-					// composition has no capability command (a non-Weir preset)
-					// or it failed — an explicit n/a, never a perpetual spinner.
-					? t("capability.unavailable.short", "Capabilities n/a")
-					: t("capability.loading", "Capabilities…");
-			const compactLabel = known ? `${state.applied.skills} · ${state.applied.mcpServers}` : label;
-			const hasWarning = Boolean(state && state.unavailable && state.unavailable.length > 0);
-			const title = hasWarning ? state.unavailable.join("; ") : (convergence ?? (known ? label : undefined));
+				: settled && state?.degraded
+					? t("capability.effectiveUnknown", "Applied count unknown — refresh and check Skill sources")
+					: settled ? t("capability.unavailable.short", "Capabilities n/a") : t("capability.loading", "Capabilities…");
+			const compactLabel = known ? `${state.applied.skills} · ${state.applied.mcpServers}` : state?.degraded ? t("capability.effectiveUnknownShort", "Skills ? · MCP ?") : label;
+			const hasWarning = Boolean(state?.degraded);
+			const title = hasWarning ? `${label}: ${state.warnings.join("; ")}` : (convergence ?? (known ? label : undefined));
 			// D4: with the composition root's openPanel verb (a shell with a right
 			// sidebar) activation opens the dedicated panel and closes any open
 			// popover; without it the existing popover path runs unchanged.

package/lib/client.capability-manager.js

@@ -539,6 +539,9 @@ window.__ModuleLoader__.load({
 			// recompute dirty, Apply goes through /capabilities apply with the
 			// draft's CAS revision and a fresh request ID.
 			const [draft, setDraft] = react.useState(null);
+			const [receiptState, setReceiptState] = react.useState(null);
+			const receiptRequest = react.useRef(0);
+			const applying = react.useRef(false);
 			const [commit, setCommit] = react.useState(null);
 			// Managed MCP add form (8.1/8.2): per-field errors are derived by the
 			// pure model (mcpAddErrorsOf) and shown after the first submit
@@ -546,13 +549,25 @@ window.__ModuleLoader__.load({
 			// return crashes with React #310.
 			const [addForm, setAddForm] = react.useState({ open: false, identity: "", label: "", command: "", args: "", showErrors: false, error: null, busy: false });
 
+			const refreshReceipt = () => {
+				if (typeof props.fetchReceipt !== "function") return;
+				const request = ++receiptRequest.current;
+				props.fetchReceipt(props.sessionId).then((receipt) => {
+					if (request !== receiptRequest.current) return;
+					setReceiptState(model.badgeStateOf(receipt, null));
+					setDraft(current => model.draftAfterRefresh(current, receipt));
+				}).catch(() => {
+					if (request === receiptRequest.current) {
+						setReceiptState(null);
+						setDraft(current => model.draftAfterRefresh(current, null));
+					}
+				});
+			};
 			const refreshAll = () => {
 				if (typeof props.fetchListing === "function") {
 					props.fetchListing(props.sessionId).then((data) => setListing(data ?? { error: true })).catch(() => setListing({ error: true }));
 				}
-				if (typeof props.fetchReceipt === "function") {
-					props.fetchReceipt(props.sessionId).then((receipt) => setDraft(receipt ? model.draftFromReceipt(receipt) : null)).catch(() => {});
-				}
+				refreshReceipt();
 			};
 			react.useEffect(() => {
 				let alive = true;
@@ -564,16 +579,16 @@ window.__ModuleLoader__.load({
 				if (typeof props.fetchConditions === "function") {
 					props.fetchConditions(props.sessionId).then((data) => { if (alive) setConditions(data); }).catch(() => {});
 				}
-				if (typeof props.fetchReceipt === "function") {
-					props.fetchReceipt(props.sessionId).then((receipt) => { if (alive) setDraft(receipt ? model.draftFromReceipt(receipt) : null); }).catch(() => {});
-				}
-				return () => { alive = false; };
+				refreshReceipt();
+				return () => { alive = false; ++receiptRequest.current; };
 			}, [props.sessionId]);
 			const toggle = (kind, name) => {
-				if (draft && commit?.phase !== "submitting") setDraft(model.draftToggle(draft, kind, name));
+				if (draft && commit?.phase !== "submitting") { setDraft(model.draftToggle(draft, kind, name)); setCommit(null); }
 			};
 			const applyDraft = () => {
-				if (!draft || !draft.dirty || typeof props.applySelection !== "function") return;
+				const check = model.skillDraftConflicts(draft, listing);
+				if (applying.current || !draft || !draft.dirty || (draft.unknownBaseline && !draft.overwriteConfirmed) || check.selected.length || check.unresolved.some(item => item.state === "ambiguous") || typeof props.applySelection !== "function") return;
+				applying.current = true;
 				const requestId = crypto.randomUUID();
 				setCommit({ phase: "submitting", requestId });
 				props.applySelection(props.sessionId, {
@@ -582,18 +597,18 @@ window.__ModuleLoader__.load({
 					skills: draft.skills,
 					mcpServers: draft.mcpServers,
 				}).then((response) => {
+					applying.current = false;
 					const outcome = model.commitOutcomeOf(response);
 					setCommit(outcome);
 					if (outcome.phase === "applied") {
+						setDraft(current => current ? { ...current, applied: { skills: [...current.skills], mcpServers: [...current.mcpServers], unresolvedRefs: [...current.unresolvedRefs] }, revision: outcome.revision, dirty: false, appliedDigest: undefined, appliedSourceIssue: "receipt" } : null);
 						refreshAll();
-						// The Badge holds its own receipt state — tell it to re-pull
-						// so the composer counts follow the Apply immediately.
 						if (typeof props.onApplied === "function") props.onApplied();
 					}
-				}).catch(() => setCommit({ phase: "failed", error: "apply request failed", draftKept: true }));
+				}).catch(() => { applying.current = false; setCommit({ phase: "failed", error: "apply request failed", draftKept: true }); });
 			};
 			const discardDraft = () => {
-				if (draft) setDraft({ ...draft, skills: [...draft.applied.skills], mcpServers: [...draft.applied.mcpServers], dirty: false });
+				if (draft) setDraft({ ...draft, skills: [...draft.applied.skills], mcpServers: [...draft.applied.mcpServers], unresolvedRefs: [], dirty: false });
 				setCommit(null);
 			};
 			// Load-into-draft staging (preset view): only the preset's resolved
@@ -601,7 +616,11 @@ window.__ModuleLoader__.load({
 			// the session's applied set.
 			const stagePreset = (document) => {
 				if (commit?.phase === "submitting") return;
-				setDraft(model.draftFromPreset(document, draft));
+				const resolveName = (name) => {
+					const matches = (listing?.skills ?? []).filter(row => row.status === "parsed" && row.name === name && row.identity);
+					return matches.length === 1 ? matches[0].identity : undefined;
+				};
+				setDraft(model.draftFromPreset(document, draft, resolveName));
 				setCommit(null);
 			};
 			// Managed MCP add form (8.1/8.2): registers a stdio server and mounts
@@ -670,7 +689,9 @@ window.__ModuleLoader__.load({
 						icon: "warn",
 						color: DANGER,
 						title: t("capability.error", "Capabilities unavailable for this session."),
-						description: t("capability.state.errorDesc", "The capability listing could not be loaded.")
+						description: (draft?.skills ?? []).some(entry => typeof entry === "string")
+							? t("capability.inventoryUnavailableName", "The listing is unavailable; legacy names remain unresolved in the draft. Retry later; no source was selected.")
+							: t("capability.state.errorDesc", "The capability listing could not be loaded.")
 					})
 				});
 			}
@@ -697,6 +718,22 @@ window.__ModuleLoader__.load({
 			}
 			const partition = model.partitionManagerListing(listing);
 			const skillRows = model.groupSkillRows(model.filterSkillRows(partition.skills, query));
+			const skillKeys = new Set((draft?.skills ?? []).map(model.skillEntryKeyOf));
+			const check = model.skillDraftConflicts(draft, listing);
+			const sourceLabels = model.skillSourceLabels(partition.skills);
+			const sourceOf = identity => (sourceLabels[model.skillIdentityKeyOf(identity)] ?? t("capability.sourceUnknown", "unknown source"))
+				.replace(" · source ", t("capability.sourceNumber", " · source "));
+			const selectedKeys = new Set(check.selected.flatMap(item => item.identities.map(model.skillEntryKeyOf)));
+			const ambiguous = check.unresolved.filter(item => item.state === "ambiguous");
+			const unknown = check.unresolved.filter(item => item.state === "unknown");
+			const replaceName = (name, identity) => { if (commit?.phase !== "submitting") { setDraft(model.resolveSkillName(draft, name, identity)); setCommit(null); } };
+			const warningText = [
+				...check.selected.map(item => t("capability.sameNameWarning", "{name}: only one source can be enabled in this session. Uncheck one: {sources}.")
+					.replace("{name}", item.name).replace("{sources}", item.identities.map(sourceOf).join(", "))),
+				...ambiguous.map(item => t("capability.unresolvedNameWarning", "{name}: legacy name has no chosen source. Choose an exact source or remove the name: {sources}.")
+					.replace("{name}", item.name).replace("{sources}", item.candidates.map(sourceOf).join(", "))),
+				...unknown.map(item => t("capability.unknownLegacyName", "{name}: no matching Skill in the current listing. Refresh the listing or remove this legacy name.").replace("{name}", item.name))
+			];
 			const draftHas = (kind, name) => draft !== null && draft[kind].includes(name);
 			const selectionDisabled = draft === null || commit?.phase === "submitting";
 			const fieldError = (code) => code === "invalid"
@@ -752,8 +789,10 @@ window.__ModuleLoader__.load({
 						] })
 					] })
 			] }) : null;
-			const skillRow = (skill) => {
-				const selected = draftHas("skills", skill.name);
+			const skillRow = (skill, index) => {
+				const selected = skillKeys.has(model.skillEntryKeyOf(skill.identity ?? skill.name));
+				const selectedConflict = selectedKeys.has(model.skillEntryKeyOf(skill.identity));
+				const source = skill.identity ? sourceOf(skill.identity) : skill.source;
 				const rest = selected ? tint(ACCENT, 8) : "transparent";
 				return react_jsx_runtime.jsxs("label", {
 					style: { ...S.row.base, background: rest },
@@ -765,20 +804,21 @@ window.__ModuleLoader__.load({
 							style: S.row.checkbox,
 							checked: selected,
 							disabled: selectionDisabled,
-							"aria-label": skill.name,
-							onChange: () => toggle("skills", skill.name)
+							"aria-label": `${skill.name} — ${source}`,
+							"aria-invalid": selectedConflict || undefined,
+							onChange: () => toggle("skills", skill.identity ?? skill.name)
 						}),
 						react_jsx_runtime.jsxs("span", { style: S.row.text, children: [
 							react_jsx_runtime.jsxs("span", { style: S.row.nameLine, children: [
 								react_jsx_runtime.jsx("span", { style: S.row.name, title: skill.name, children: skill.name }),
-								react_jsx_runtime.jsx("span", { style: { ...S.tag.base, ...S.tag.scope(skill.scopeKey) }, children: skill.source }),
-								skill.conflict ? react_jsx_runtime.jsx("span", { style: { ...S.tag.base, ...S.tag.warn }, children: t("capability.conflict", "conflict") }) : null,
+								react_jsx_runtime.jsx("span", { style: { ...S.tag.base, ...S.tag.scope(skill.scopeKey) }, children: source }),
+								selectedConflict || skill.conflict ? react_jsx_runtime.jsx("span", { style: { ...S.tag.base, ...S.tag.warn }, children: t("capability.conflict", "conflict") }) : null,
 								skill.missing ? react_jsx_runtime.jsx("span", { style: { ...S.tag.base, ...S.tag.danger }, title: skill.status, children: t("capability.missing", "missing") }) : null
 							] }),
 							skill.description ? react_jsx_runtime.jsx("span", { style: S.row.desc, title: skill.description, children: skill.description }) : null
 						] })
 					]
-				}, skill.name);
+				}, `${model.skillIdentityKeyOf(skill.identity) ?? `${skill.scopeKey}:${skill.name}`}:${index}`);
 			};
 			const mcpRow = (server) => {
 				const name = server.identity ?? server.serverName ?? "unknown";
@@ -819,11 +859,16 @@ window.__ModuleLoader__.load({
 					]
 				}, name);
 			};
+			const legacyActions = [...ambiguous, ...unknown].map(item => react_jsx_runtime.jsxs("div", { style: S.list.card, children: [
+				react_jsx_runtime.jsx("div", { style: S.form.title, children: t("capability.unresolvedNameTitle", "Choose a source for legacy name {name}").replace("{name}", item.name) }),
+				react_jsx_runtime.jsxs("div", { style: S.form.actions, children: [
+					...item.candidates.map(identity => react_jsx_runtime.jsx("button", { type: "button", style: S.form.ghost, ...ring, disabled: selectionDisabled, onClick: () => replaceName(item.name, identity), children: t("capability.replaceName", "Replace {name} with {source}").replace("{name}", item.name).replace("{source}", sourceOf(identity)) }, model.skillIdentityKeyOf(identity))),
+					react_jsx_runtime.jsx("button", { type: "button", style: S.form.ghost, ...ring, disabled: selectionDisabled, onClick: () => replaceName(item.name, null), children: t("capability.removeName", "Remove legacy name {name}").replace("{name}", item.name) })
+				] })
+			] }, item.name));
 			const body = tab === "skills"
-				? (skillRows.length === 0
-					? react_jsx_runtime.jsx(StatePanel, { icon: "search", title: t("capability.noSkills", "No skills match.") })
-					: react_jsx_runtime.jsxs(react_jsx_runtime.Fragment, {
-						children: skillRows.map((group) => react_jsx_runtime.jsxs("div", {
+				? react_jsx_runtime.jsxs(react_jsx_runtime.Fragment, {
+						children: [...(skillRows.length === 0 ? [react_jsx_runtime.jsx(StatePanel, { icon: "search", title: t("capability.noSkills", "No skills match.") })] : skillRows.map((group) => react_jsx_runtime.jsxs("div", {
 							style: S.list.group,
 							children: [
 								react_jsx_runtime.jsxs("div", {
@@ -835,8 +880,8 @@ window.__ModuleLoader__.load({
 								}),
 								...group.rows.map(skillRow)
 							]
-						}, group.key))
-					}))
+						}, group.key))), ...legacyActions]
+					})
 				: tab === "mcp"
 					? react_jsx_runtime.jsxs(react_jsx_runtime.Fragment, {
 						children: [
@@ -895,7 +940,7 @@ window.__ModuleLoader__.load({
 			// Footer commit bar (12.3): the dirty diff summary (+n/−m) ahead of
 			// the same Apply/Discard/commit-phase semantics as before.
 			const diff = draft ? model.draftDiffOf(draft) : null;
-			const diffParts = diff && diff.any
+			const diffParts = diff && diff.any && !draft?.unknownBaseline
 				? [
 					diff.skillsAdded > 0 ? { added: true, text: t("capability.diff.addSkills", "+{n} skills").replace("{n}", String(diff.skillsAdded)) } : null,
 					diff.skillsRemoved > 0 ? { added: false, text: t("capability.diff.removeSkills", "−{n} skills").replace("{n}", String(diff.skillsRemoved)) } : null,
@@ -903,19 +948,19 @@ window.__ModuleLoader__.load({
 					diff.mcpRemoved > 0 ? { added: false, text: t("capability.diff.removeMcp", "−{n} MCP").replace("{n}", String(diff.mcpRemoved)) } : null
 				].filter(Boolean)
 				: null;
-			const applyDisabled = !draft || !draft.dirty || commit?.phase === "submitting";
+			const applyDisabled = !draft || !draft.dirty || (draft.unknownBaseline && !draft.overwriteConfirmed) || commit?.phase === "submitting" || check.selected.length > 0 || ambiguous.length > 0;
 			// Session state summary (sidebar header only): the APPLIED counts,
 			// same template the composer Badge renders.
-			const appliedSummary = draft !== null
-				? t("capability.badge", "{skills} skills · {mcp} MCP").replace("{skills}", String(draft.applied.skills.length)).replace("{mcp}", String(draft.applied.mcpServers.length))
-				: null;
+			const appliedSummary = receiptState?.known
+				? t("capability.badge", "{skills} skills · {mcp} MCP").replace("{skills}", String(receiptState.applied.skills)).replace("{mcp}", String(receiptState.applied.mcpServers))
+				: receiptState?.degraded ? t("capability.effectiveUnknownShort", "Skills ? · MCP ?") : null;
 			return react_jsx_runtime.jsxs("div", { style: frameStyle, children: [
 				react_jsx_runtime.jsxs("div", { style: S.header.row, children: [
 					react_jsx_runtime.jsx("button", { type: "button", style: S.tabs.segment(tab === "skills", "first"), ...ring, onClick: () => setTab("skills"), "aria-pressed": tab === "skills", children: t("capability.tab.skills", "Skills") }),
 					react_jsx_runtime.jsx("button", { type: "button", style: S.tabs.segment(tab === "mcp", "middle"), ...ring, onClick: () => setTab("mcp"), "aria-pressed": tab === "mcp", children: t("capability.tab.mcp", "MCP") }),
 					react_jsx_runtime.jsx("button", { type: "button", style: S.tabs.segment(tab === "presets", "last"), ...ring, onClick: () => setTab("presets"), "aria-pressed": tab === "presets", children: t("capability.tab.presets", "Presets") }),
 					props.shell === "sidebar" && appliedSummary
-						? react_jsx_runtime.jsx("span", { style: S.header.summary, children: appliedSummary })
+						? react_jsx_runtime.jsx("span", { style: S.header.summary, title: receiptState?.degraded ? t("capability.effectiveUnknown", "Applied count unknown — refresh and check Skill sources") : undefined, children: appliedSummary })
 						: null,
 					react_jsx_runtime.jsxs("span", {
 						style: S.search.wrap,
@@ -944,8 +989,12 @@ window.__ModuleLoader__.load({
 				...(props.shell === "sidebar"
 					? [react_jsx_runtime.jsxs("div", { style: S.list.scroll, children: [addBlock, body] })]
 					: [addBlock, body]),
+				receiptState?.degraded ? react_jsx_runtime.jsx("div", { role: "status", "aria-live": "polite", style: { color: WARN_TEXT, lineHeight: "16px", padding: "6px" }, children: t("capability.effectiveUnknownDetail", "Accepted revision; effective capabilities cannot be verified. Refresh and check Skill sources. Draft kept; only Apply changes the session.") }) : null,
 				draft !== null ? react_jsx_runtime.jsxs("div", { style: S.footer.bar, children: [
 					diffParts ? react_jsx_runtime.jsx("span", { style: S.footer.diff, "data-weir-capability-diff": "", children: diffParts.map((part, index) => react_jsx_runtime.jsx("span", { style: S.footer.diffBadge(part.added), children: part.text }, index)) }) : null,
+					warningText.length ? react_jsx_runtime.jsx("div", { role: "alert", "aria-live": "assertive", style: { width: "100%", color: WARN_TEXT, lineHeight: "16px" }, children: warningText.join(" ") }) : null,
+					draft.unknownBaseline ? react_jsx_runtime.jsx("div", { role: "alert", style: { width: "100%", color: WARN_TEXT, lineHeight: "16px" }, children: t("capability.unknownOverwriteRisk", "Previous selection is unknown. Applying this draft may replace other accepted Skills and MCP servers. Review the full selection before confirming.") }) : null,
+					draft.unknownBaseline && draft.dirty && !draft.overwriteConfirmed ? react_jsx_runtime.jsx("button", { type: "button", style: S.footer.discard, ...ring, disabled: commit?.phase === "submitting", onClick: () => setDraft(current => current ? { ...current, overwriteConfirmed: true } : null), children: t("capability.confirmUnknownOverwrite", "Confirm replacing unknown selection") }) : null,
 					react_jsx_runtime.jsx("button", {
 						type: "button",
 						style: applyDisabled ? { ...S.footer.apply, ...S.footer.disabled } : S.footer.apply,
@@ -956,11 +1005,13 @@ window.__ModuleLoader__.load({
 						children: commit?.phase === "submitting" ? t("capability.applying", "Applying…") : t("capability.apply", "Apply")
 					}),
 					draft.dirty ? react_jsx_runtime.jsx("button", { type: "button", style: S.footer.discard, ...ring, ...hover(HOVER_BG, "none"), onClick: discardDraft, children: t("capability.discard", "Discard") }) : null,
-					commit?.phase === "applied" ? react_jsx_runtime.jsx("span", { style: S.footer.chip(SUCCESS), children: t("capability.applied", "Applied") }) : null,
+					commit?.phase === "applied" ? react_jsx_runtime.jsx("span", { style: S.footer.chip(receiptState?.degraded ? WARN : SUCCESS), children: receiptState?.degraded ? t("capability.acceptedUnknown", "Accepted · effective count unknown") : t("capability.applied", "Applied") }) : null,
 					commit?.phase === "applied" && Array.isArray(commit.skipped) && commit.skipped.length > 0
 						? react_jsx_runtime.jsx("span", { style: S.footer.chip(WARN), title: commit.skipped.map(entry => `${entry.name} — ${entry.reason}`).join("\n"), children: t("capability.appliedSkipped", "skipped {n} (not applicable here)").replace("{n}", String(commit.skipped.length)) })
 						: null,
-					commit?.phase === "failed" ? react_jsx_runtime.jsx("span", { style: S.footer.chip(DANGER), title: commit.error, children: t("capability.failed", "Failed — draft kept") }) : null,
+					commit?.phase === "failed" ? react_jsx_runtime.jsx("span", { style: S.footer.chip(DANGER), role: "alert", children: t("capability.failed", "Failed — draft kept") }) : null,
+					commit?.phase === "same-name-conflict" ? react_jsx_runtime.jsx("span", { style: S.footer.chip(DANGER), role: "alert", children: t("capability.serverSameName", "Server rejected same-name Skill {names}. Uncheck one source, or refresh the listing; draft kept.").replace("{names}", commit.names.join(", ") || t("capability.unknownName", "unknown name")) }) : null,
+					commit?.phase === "missing" ? react_jsx_runtime.jsx("span", { style: S.footer.chip(WARN), role: "alert", children: t("capability.serverMissing", "Server could not resolve {names}. Refresh the listing and choose an exact source or remove the name; draft kept.").replace("{names}", commit.names.join(", ") || t("capability.unknownName", "unknown name")) }) : null,
 					commit?.phase === "revision-conflict" ? react_jsx_runtime.jsx("span", { style: S.footer.chip(WARN), children: t("capability.conflictState", "Changed elsewhere — review current state") }) : null,
 					commit?.phase === "install-or-configure" ? react_jsx_runtime.jsx("span", { style: S.footer.chip(ACCENT), title: (commit.missing ?? []).join(", "), children: t("capability.missingAction", "Missing items need install/configure") }) : null,
 					commit?.phase === "indeterminate" ? react_jsx_runtime.jsx("span", { style: S.footer.chip(MUTED), children: t("capability.pending", "Result pending — query the receipt") }) : null