weir-harness 2.1.2 → 2.1.3

package/lib/client.capability-manager.js

@@ -63,7 +63,15 @@ window.__ModuleLoader__.load({
 			if (el && el.style) Object.assign(el.style, styles);
 		};
 		const ring = {
-			onFocus: (event) => paint(event, { outline: "2px solid var(--dsw-alias-focus-ring, currentColor)", outlineOffset: "1px" }),
+			onFocus: (event) => {
+				const el = event?.currentTarget;
+				const focused = event?.target ?? el;
+				const visible = typeof focused?.matches !== "function" || focused.matches(":focus-visible");
+				paint(event, visible
+					? { outline: "2px solid var(--dsw-alias-focus-ring, currentColor)", outlineOffset: "1px" }
+					: { outline: "none", outlineOffset: "" });
+			},
+			onPointerDown: (event) => paint(event, { outline: "none", outlineOffset: "" }),
 			onBlur: (event) => paint(event, { outline: "none", outlineOffset: "" }),
 		};
 		const hover = (over, out) => ({
@@ -115,7 +123,7 @@ window.__ModuleLoader__.load({
 					borderBottom: "1px solid var(--dsw-alias-border-l1, rgba(127,127,127,.10))",
 					flex: "none"
 				},
-				summary: { fontSize: "11px", lineHeight: "16px", color: MUTED, whiteSpace: "nowrap", flex: "none", marginLeft: "2px" },
+				summary: { fontSize: "11px", lineHeight: "16px", color: MUTED, whiteSpace: "nowrap", flex: "0 1 auto", minWidth: 0, overflow: "hidden", textOverflow: "ellipsis", marginLeft: "2px" },
 				close: {
 					width: "22px",
 					height: "22px",
@@ -132,6 +140,54 @@ window.__ModuleLoader__.load({
 					transition: TRANSITION
 				}
 			},
+			path: {
+				trigger: {
+					minWidth: "22px",
+					height: "22px",
+					display: "inline-flex",
+					alignItems: "center",
+					justifyContent: "center",
+					gap: "3px",
+					flex: "none",
+					padding: "0 4px",
+					cursor: "pointer",
+					background: "none",
+					border: "none",
+					borderRadius: "var(--dsw-radius-sm, 6px)",
+					color: MUTED,
+					transition: TRANSITION
+				},
+				count: {
+					fontSize: "9px",
+					lineHeight: "12px",
+					fontWeight: 600,
+					color: LABEL2,
+					background: HOVER_BG,
+					borderRadius: "var(--dsw-radius-xl, 999px)",
+					padding: "0 4px",
+					minWidth: "12px",
+					textAlign: "center",
+					flex: "none"
+				},
+				overlay: (position) => ({
+					position: "fixed",
+					zIndex: 1000,
+					top: position.top,
+					left: position.left,
+					width: position.width,
+					maxHeight: position.maxHeight,
+					boxSizing: "border-box",
+					overflowY: "auto",
+					overflowX: "hidden",
+					background: "var(--dsw-alias-bg-overlay, #fff)",
+					border: `1px solid ${BORDER}`,
+					borderRadius: "var(--dsw-radius-lg, 12px)",
+					boxShadow: "var(--dsw-elevation-prominent, 0 8px 24px rgba(0,0,0,.14))",
+					padding: "12px",
+					fontSize: "12px",
+					color: LABEL1
+				})
+			},
 			tabs: {
 				// Segmented control (host SegmentedControl recipe, containerless):
 				// inactive segments carry the track fill, the active segment is a
@@ -446,6 +502,10 @@ window.__ModuleLoader__.load({
 		// ---- 16x16 stroke icons (worktree-view style, stroke: currentColor) ----
 		const ICON_PATHS = {
 			search: [["circle", { cx: 7, cy: 7, r: 4.6 }], ["path", { d: "M10.6 10.6L14 14" }]],
+			folder: [
+				["path", { d: "M2.2 4.2c0-.6.4-1 1-1h3l1.5 1.8h5.1c.6 0 1 .4 1 1v5.8c0 .6-.4 1-1 1H3.2c-.6 0-1-.4-1-1V4.2z" }],
+				["path", { d: "M2.2 6h11.6" }]
+			],
 			x: [["path", { d: "M4 4l8 8M12 4l-8 8" }]],
 			warn: [
 				["path", { d: "M8 2.6l6 10.4H2l6-10.4z" }],
@@ -518,6 +578,338 @@ window.__ModuleLoader__.load({
 			}
 			return react_jsx_runtime.jsx(impl, { ...props });
 		}
+		/** Skills-only path management. All hooks live here so CapabilityManagerPanel
+		 * keeps its pinned 7/1 hook structure in both shells. */
+		function SkillPathManager(props) {
+			const model = props.model;
+			const t = props.t;
+			const [registry, setRegistry] = react.useState(null);
+			const [input, setInput] = react.useState("");
+			const [reading, setReading] = react.useState(false);
+			const [busy, setBusy] = react.useState(null);
+			const [feedback, setFeedback] = react.useState(null);
+			const [pendingRemove, setPendingRemove] = react.useState(null);
+			const [returnFocusTo, setReturnFocusTo] = react.useState(null);
+			const [open, setOpen] = react.useState(false);
+			const [position, setPosition] = react.useState({ top: 12, left: 12, width: 360, maxHeight: 420 });
+			const readRequest = react.useRef(0);
+			const operationRequest = react.useRef(0);
+			const operationRunning = react.useRef(false);
+			const alive = react.useRef(true);
+			const triggerRef = react.useRef(null);
+			const overlayRef = react.useRef(null);
+			const inputRef = react.useRef(null);
+
+			const refreshPaths = async () => {
+				const request = ++readRequest.current;
+				setReading(true);
+				let response;
+				try {
+					response = typeof props.fetchSkillPaths === "function"
+						? await props.fetchSkillPaths(props.sessionId)
+						: { status: "unavailable", saved: false, error: { code: "unavailable", message: "Skill scan path reads are unavailable on this client." } };
+				} catch (error) {
+					response = { status: "call-threw", saved: false, error: { code: "call-threw", message: error instanceof Error ? error.message : String(error) } };
+				}
+				if (!alive.current || request !== readRequest.current) return null;
+				setRegistry(current => model.skillPathsAfterRead(current, response));
+				setReading(false);
+				return response;
+			};
+
+			const closeManager = () => {
+				if (busy !== null) return;
+				setOpen(false);
+				triggerRef.current?.focus();
+			};
+			const openManager = () => {
+				if (open) return;
+				const viewportWidth = window.innerWidth;
+				const viewportHeight = window.innerHeight;
+				const rect = triggerRef.current?.getBoundingClientRect();
+				const width = Math.max(0, Math.min(360, viewportWidth - 24));
+				const left = Math.max(12, Math.min((rect?.right ?? viewportWidth - 12) - width, viewportWidth - width - 12));
+				const top = Math.max(12, Math.min((rect?.bottom ?? 12) + 8, Math.max(12, viewportHeight - 12)));
+				setPosition({ top, left, width, maxHeight: Math.max(0, viewportHeight - top - 12) });
+				setOpen(true);
+				void refreshPaths();
+			};
+
+			react.useEffect(() => {
+				alive.current = true;
+				setRegistry(null);
+				setInput("");
+				setOpen(false);
+				setFeedback(null);
+				setPendingRemove(null);
+				setReturnFocusTo(null);
+				setBusy(null);
+				operationRunning.current = false;
+				void refreshPaths();
+				return () => {
+					alive.current = false;
+					++readRequest.current;
+					++operationRequest.current;
+					operationRunning.current = false;
+				};
+			}, [props.sessionId]);
+
+			react.useEffect(() => {
+				if (!open) return undefined;
+				const document = window.document;
+				const onOutsidePointer = (event) => {
+					if (overlayRef.current?.contains(event.target) || triggerRef.current?.contains(event.target)) return;
+					closeManager();
+				};
+				const onViewportChange = () => { closeManager(); };
+				const onScroll = (event) => {
+					if (overlayRef.current?.contains(event.target)) return;
+					closeManager();
+				};
+				document.addEventListener("pointerdown", onOutsidePointer);
+				window.addEventListener("resize", onViewportChange);
+				window.addEventListener("scroll", onScroll, true);
+				return () => {
+					document.removeEventListener("pointerdown", onOutsidePointer);
+					window.removeEventListener("resize", onViewportChange);
+					window.removeEventListener("scroll", onScroll, true);
+				};
+			}, [open, busy]);
+
+			react.useEffect(() => {
+				if (open && busy === null && !reading && registry?.status === "ok") inputRef.current?.focus();
+			}, [open, busy, reading, registry?.status]);
+
+			const cancelRemove = (path) => {
+				if (busy !== null) return;
+				setPendingRemove(null);
+				setReturnFocusTo(path);
+				setFeedback(null);
+			};
+			const runMutation = async (kind, path) => {
+				if (operationRunning.current || busy !== null || reading || registry?.status !== "ok") return;
+				const verb = kind === "add" ? props.skillPathAdd : props.skillPathRemove;
+				if (typeof verb !== "function") {
+					setFeedback({ kind: "error", operation: kind, outcome: model.skillPathMutationOutcomeOf({ status: "unavailable", saved: false, error: { message: "Skill scan path mutations are unavailable on this client." } }) });
+					return;
+				}
+				const request = ++operationRequest.current;
+				operationRunning.current = true;
+				setBusy(kind);
+				setFeedback(null);
+				setReturnFocusTo(null);
+				let response;
+				try {
+					response = await verb(props.sessionId, { path, expectedRevision: registry.revision });
+				} catch (error) {
+					response = { status: "call-threw", saved: false, error: { code: "call-threw", message: error instanceof Error ? error.message : String(error) } };
+				}
+				if (!alive.current || request !== operationRequest.current) return;
+				const outcome = model.skillPathMutationOutcomeOf(response);
+				if (outcome.snapshot !== null) setRegistry(outcome.snapshot);
+				if (outcome.saved) {
+					if (kind === "add") setInput("");
+					else setPendingRemove(null);
+				}
+				setFeedback({ kind: outcome.saved ? (outcome.phase === "degraded" ? "warning" : "success") : "error", operation: kind, outcome });
+				try {
+					const refreshes = [];
+					if (outcome.refreshPaths) refreshes.push(refreshPaths());
+					if (outcome.refreshCapabilities && typeof props.refreshCapabilities === "function") refreshes.push(props.refreshCapabilities());
+					await Promise.all(refreshes);
+				} catch (error) {
+					if (alive.current && request === operationRequest.current) setFeedback(current => ({ ...current, refreshError: error instanceof Error ? error.message : String(error) }));
+				} finally {
+					if (alive.current && request === operationRequest.current) {
+						operationRunning.current = false;
+						setBusy(null);
+					}
+				}
+			};
+			const detail = (text) => {
+				const message = feedback?.outcome?.error?.message;
+				return typeof message === "string" && message !== "" && !text.includes(message) ? `${text} ${message}` : text;
+			};
+			let feedbackText = null;
+			if (feedback) {
+				const phase = feedback.outcome.phase;
+				if (phase === "saved") feedbackText = feedback.operation === "add"
+					? t("capability.skills.paths.added", "Directory added. Newly discovered Skills remain unselected until you select and Apply them.")
+					: t("capability.skills.paths.removed", "Directory removed. Selection drafts, applied capabilities, and defaults were not rewritten.");
+				else if (phase === "degraded") feedbackText = detail(t("capability.skills.paths.degraded", "The path change was saved, but the host reported a post-commit problem. Fresh registry, Skill listing, and receipt reads were requested; no rollback is claimed."));
+				else if (phase === "validation-failed") feedbackText = detail(t("capability.skills.paths.validation", "The server rejected this directory. Enter an existing readable absolute directory or ~/directory; your input was kept and nothing was saved."));
+				else if (phase === "duplicate") feedbackText = detail(t("capability.skills.paths.duplicate", "This canonical directory is already registered. Current paths were re-read; your input was kept and no duplicate was saved."));
+				else if (phase === "not-found") feedbackText = detail(t("capability.skills.paths.notFound", "That canonical directory is no longer registered. Current paths were re-read; nothing was removed."));
+				else if (phase === "revision-conflict") feedbackText = detail(t("capability.skills.paths.conflict", "The path registry changed elsewhere. Current paths were re-read; your input was kept and was not merged. Review the registry before retrying."));
+				else if (phase === "indeterminate") feedbackText = detail(t("capability.skills.paths.indeterminate", "The operation outcome could not be confirmed. Fresh registry, Skill listing, and receipt reads were requested; your input was kept and no rollback is claimed."));
+				else if (phase === "unavailable") feedbackText = detail(t("capability.skills.paths.unavailable", "The Skill scan path registry is unavailable. No path change was saved."));
+				else feedbackText = detail(t("capability.skills.paths.failed", "The path operation failed. No saved change is claimed; your input was kept."));
+				if (feedback.refreshError) feedbackText += ` ${t("capability.skills.paths.refreshFailed", "A follow-up refresh failed: {message}").replace("{message}", feedback.refreshError)}`;
+			}
+			const unavailable = registry?.status !== "ok";
+			const controlsDisabled = busy !== null || reading || unavailable;
+			const liveText = busy === "add" ? t("capability.skills.paths.adding", "Adding…")
+				: busy === "remove" ? t("capability.skills.paths.removing", "Removing…")
+					: reading && registry === null ? t("capability.skills.paths.loading", "Loading scan paths…") : null;
+			const pathRow = (path) => {
+				const confirming = pendingRemove === path;
+				return react_jsx_runtime.jsx("div", {
+					style: { ...S.list.card, margin: "4px 0", padding: "6px 8px" },
+					"data-weir-skill-path": path,
+					children: confirming ? react_jsx_runtime.jsxs("div", {
+						role: "group",
+						"aria-label": t("capability.skills.paths.confirmTitle", "Remove this Skill scan path?"),
+						onKeyDown: (event) => {
+							if (event.key === "Escape" && busy === null) {
+								event.preventDefault();
+								event.stopPropagation();
+								cancelRemove(path);
+							}
+						},
+						children: [
+							react_jsx_runtime.jsx("div", { style: S.form.title, children: t("capability.skills.paths.confirmTitle", "Remove this Skill scan path?") }),
+							react_jsx_runtime.jsxs("div", { style: { fontSize: "11px", lineHeight: "16px", color: LABEL2, overflowWrap: "anywhere" }, children: [
+								t("capability.skills.paths.confirmBody", "Remove this canonical directory from the Profile? Selection drafts, applied capabilities, and defaults are not rewritten: "),
+								react_jsx_runtime.jsx("code", { style: { color: LABEL1, fontFamily: "var(--dsw-font-markdown-code-block-font-family, ui-monospace, monospace)" }, children: path })
+							] }),
+							react_jsx_runtime.jsxs("div", { style: { ...S.form.actions, marginTop: "6px" }, children: [
+								react_jsx_runtime.jsx("button", {
+									type: "button", autoFocus: true, disabled: busy !== null,
+									style: busy !== null ? { ...S.form.primary, ...S.footer.disabled } : S.form.primary,
+									...ring,
+									onClick: () => { void runMutation("remove", path); },
+									children: busy === "remove" ? t("capability.skills.paths.removing", "Removing…") : t("capability.skills.paths.confirmRemove", "Remove path")
+								}),
+								react_jsx_runtime.jsx("button", {
+									type: "button", disabled: busy !== null, style: S.form.ghost, ...ring,
+									onClick: () => cancelRemove(path),
+									children: t("capability.skills.paths.cancel", "Cancel")
+								})
+							] })
+						]
+					}) : react_jsx_runtime.jsxs("div", {
+						style: { display: "flex", alignItems: "center", gap: "8px", minWidth: 0 },
+						children: [
+							react_jsx_runtime.jsx("code", {
+								title: path,
+								style: { flex: 1, minWidth: 0, color: LABEL1, fontSize: "11px", lineHeight: "16px", fontFamily: "var(--dsw-font-markdown-code-block-font-family, ui-monospace, monospace)", overflowWrap: "anywhere" },
+								children: path
+							}),
+							react_jsx_runtime.jsx("button", {
+								type: "button", autoFocus: returnFocusTo === path, disabled: controlsDisabled,
+								style: controlsDisabled ? { ...S.form.ghost, ...S.footer.disabled } : S.form.ghost,
+								...ring,
+								"aria-label": t("capability.skills.paths.removeAria", "Remove scan path {path}").replace("{path}", path),
+								onClick: () => { setFeedback(null); setReturnFocusTo(null); setPendingRemove(path); },
+								children: t("capability.skills.paths.remove", "Remove")
+							})
+						]
+					})
+				}, path);
+			};
+			return react_jsx_runtime.jsxs(react_jsx_runtime.Fragment, {
+				children: [
+					react_jsx_runtime.jsxs("button", {
+						type: "button",
+						ref: triggerRef,
+						style: S.path.trigger,
+						...ring,
+						...hover(HOVER_BG, "none"),
+						onClick: openManager,
+						"aria-label": t("capability.skills.paths.manage", "Manage Skill scan paths"),
+						title: t("capability.skills.paths.manage", "Manage Skill scan paths"),
+						"aria-haspopup": "dialog",
+						"aria-expanded": open,
+						"data-weir-skill-path-trigger": "",
+						children: [
+							react_jsx_runtime.jsx(Icon, { name: "folder", size: 13 }),
+							registry?.status === "ok" ? react_jsx_runtime.jsx("span", {
+								style: S.path.count,
+								"aria-hidden": "true",
+								"data-weir-skill-path-count": "",
+								children: String(registry.paths.length)
+							}) : null
+						]
+					}),
+					open ? react_jsx_runtime.jsxs("section", {
+						ref: overlayRef,
+						role: "dialog",
+						"aria-modal": false,
+						style: S.path.overlay(position),
+						"aria-label": t("capability.skills.paths.title", "Custom Skill scan paths"),
+						"aria-busy": busy !== null || reading,
+						"data-weir-skill-path-manager": "",
+						onKeyDown: (event) => {
+							if (event.key !== "Escape" || busy !== null) return;
+							event.preventDefault();
+							event.stopPropagation();
+							if (pendingRemove !== null) cancelRemove(pendingRemove);
+							else closeManager();
+						},
+						children: [
+							react_jsx_runtime.jsxs("div", { style: S.list.cardHead, children: [
+								react_jsx_runtime.jsx("span", { children: t("capability.skills.paths.title", "Custom Skill scan paths") }),
+								react_jsx_runtime.jsxs("div", { style: { display: "flex", alignItems: "center", gap: "4px" }, children: [
+									react_jsx_runtime.jsx("button", {
+										type: "button", onClick: () => { void refreshPaths(); }, disabled: busy !== null || reading,
+										style: busy !== null || reading ? { ...S.form.ghost, ...S.footer.disabled } : S.form.ghost,
+										...ring,
+										children: t("capability.skills.paths.refresh", "Refresh paths")
+									}),
+									react_jsx_runtime.jsx("button", {
+										type: "button", onClick: closeManager, disabled: busy !== null,
+										style: busy !== null ? { ...S.header.close, ...S.footer.disabled } : S.header.close,
+										...ring,
+										"aria-label": t("capability.close", "Close"),
+										title: t("capability.close", "Close"),
+										children: react_jsx_runtime.jsx(Icon, { name: "x", size: 12 })
+									})
+								] })
+							] }),
+							react_jsx_runtime.jsx("div", { style: { fontSize: "11px", lineHeight: "16px", color: MUTED, marginBottom: "6px" }, children: t("capability.skills.paths.description", "Profile-scoped directories shared by Weir sessions. Path changes never select Skills, Apply a draft, or rewrite defaults.") }),
+							react_jsx_runtime.jsxs("form", {
+								"aria-label": t("capability.skills.paths.addLabel", "Skill scan directory"),
+								onSubmit: (event) => { event.preventDefault(); void runMutation("add", input); },
+								children: [
+									react_jsx_runtime.jsx("label", {
+										style: { display: "flex", flexDirection: "column", gap: "3px", ...S.form.title },
+										children: [
+											t("capability.skills.paths.addLabel", "Skill scan directory"),
+											react_jsx_runtime.jsx("input", {
+												ref: inputRef,
+												value: input, onChange: (event) => setInput(event.target.value), disabled: controlsDisabled,
+												placeholder: t("capability.skills.paths.placeholder", "~/skills or /absolute/path"),
+												style: S.form.input, ...ring,
+												"aria-invalid": feedback?.kind === "error" && feedback.operation === "add" ? true : undefined
+											})
+										]
+									}),
+									react_jsx_runtime.jsx("div", { style: { ...S.form.actions, marginTop: "6px" }, children: react_jsx_runtime.jsx("button", {
+										type: "submit", disabled: controlsDisabled,
+										style: controlsDisabled ? { ...S.form.primary, ...S.footer.disabled } : S.form.primary,
+										...ring,
+										children: busy === "add" ? t("capability.skills.paths.adding", "Adding…") : t("capability.skills.paths.add", "Add path")
+									}) })
+								]
+							}),
+							liveText ? react_jsx_runtime.jsx("div", { role: "status", "aria-live": "polite", style: { ...S.form.title, marginTop: "6px" }, children: liveText }) : null,
+							registry?.error ? react_jsx_runtime.jsx("div", { role: "alert", style: { ...S.form.error, marginTop: "6px" }, children: `${t("capability.skills.paths.readFailed", "The path registry could not be read. Existing rows, when present, are stale.")} ${registry.error.message}` }) : null,
+							feedbackText ? react_jsx_runtime.jsx("div", {
+								role: feedback.kind === "success" ? "status" : "alert",
+								"aria-live": feedback.kind === "success" ? "polite" : "assertive",
+								"data-weir-skill-path-feedback": feedback.kind,
+								style: { ...(feedback.kind === "success" ? S.form.title : S.form.error), marginTop: "6px", color: feedback.kind === "success" ? SUCCESS : feedback.kind === "warning" ? WARN_TEXT : DANGER },
+								children: feedbackText
+							}) : null,
+							registry?.status === "ok" && registry.paths.length === 0
+								? react_jsx_runtime.jsx("div", { style: { ...S.form.title, marginTop: "6px" }, children: t("capability.skills.paths.empty", "No custom scan paths are registered.") })
+								: null,
+							...(registry?.paths ?? []).map(pathRow)
+						]
+					}) : null
+				]
+			});
+		}
 		function CapabilityManagerPanel(props) {
 			const model = props.model;
 			// Echo-guard like the Badge: an unregistered dictionary entry must
@@ -720,6 +1112,11 @@ window.__ModuleLoader__.load({
 			];
 			const selectionDisabled = draft === null || commit?.phase === "submitting";
 			const addBlock = null;
+			const pathManager = tab === "skills" ? react_jsx_runtime.jsx(SkillPathManager, {
+				sessionId: props.sessionId, model, t,
+				fetchSkillPaths: props.fetchSkillPaths, skillPathAdd: props.skillPathAdd, skillPathRemove: props.skillPathRemove,
+				refreshCapabilities: refreshAll
+			}) : null;
 			const skillRow = (skill, index) => {
 				const selected = skillKeys.has(model.skillEntryKeyOf(skill.identity ?? skill.name));
 				const selectedConflict = selectedKeys.has(model.skillEntryKeyOf(skill.identity));
@@ -836,6 +1233,7 @@ window.__ModuleLoader__.load({
 							react_jsx_runtime.jsx("input", { value: query, onChange: (event) => setQuery(event.target.value), placeholder: t("capability.search", "Search"), style: S.search.input, ...ring })
 						]
 					}),
+					pathManager,
 					typeof props.onClose === "function"
 						? react_jsx_runtime.jsx("button", {
 							type: "button",
@@ -884,6 +1282,73 @@ window.__ModuleLoader__.load({
 				] }) : null
 			] });
 		}
+		// View-owned locale data face. The entry merges this with the model's
+		// established capability dictionary when either shared shell arrives.
+		const dictionaries = {
+			en: {
+				"capability.skills.paths.title": "Custom Skill scan paths",
+				"capability.skills.paths.manage": "Manage Skill scan paths",
+				"capability.skills.paths.description": "Profile-scoped directories shared by Weir sessions. Path changes never select Skills, Apply a draft, or rewrite defaults.",
+				"capability.skills.paths.addLabel": "Skill scan directory",
+				"capability.skills.paths.placeholder": "~/skills or /absolute/path",
+				"capability.skills.paths.add": "Add path",
+				"capability.skills.paths.adding": "Adding…",
+				"capability.skills.paths.removing": "Removing…",
+				"capability.skills.paths.loading": "Loading scan paths…",
+				"capability.skills.paths.refresh": "Refresh paths",
+				"capability.skills.paths.refreshFailed": "A follow-up refresh failed: {message}",
+				"capability.skills.paths.readFailed": "The path registry could not be read. Existing rows, when present, are stale.",
+				"capability.skills.paths.empty": "No custom scan paths are registered.",
+				"capability.skills.paths.added": "Directory added. Newly discovered Skills remain unselected until you select and Apply them.",
+				"capability.skills.paths.removed": "Directory removed. Selection drafts, applied capabilities, and defaults were not rewritten.",
+				"capability.skills.paths.degraded": "The path change was saved, but the host reported a post-commit problem. Fresh registry, Skill listing, and receipt reads were requested; no rollback is claimed.",
+				"capability.skills.paths.validation": "The server rejected this directory. Enter an existing readable absolute directory or ~/directory; your input was kept and nothing was saved.",
+				"capability.skills.paths.duplicate": "This canonical directory is already registered. Current paths were re-read; your input was kept and no duplicate was saved.",
+				"capability.skills.paths.notFound": "That canonical directory is no longer registered. Current paths were re-read; nothing was removed.",
+				"capability.skills.paths.conflict": "The path registry changed elsewhere. Current paths were re-read; your input was kept and was not merged. Review the registry before retrying.",
+				"capability.skills.paths.indeterminate": "The operation outcome could not be confirmed. Fresh registry, Skill listing, and receipt reads were requested; your input was kept and no rollback is claimed.",
+				"capability.skills.paths.unavailable": "The Skill scan path registry is unavailable. No path change was saved.",
+				"capability.skills.paths.failed": "The path operation failed. No saved change is claimed; your input was kept.",
+				"capability.skills.paths.remove": "Remove",
+				"capability.skills.paths.removeAria": "Remove scan path {path}",
+				"capability.skills.paths.confirmTitle": "Remove this Skill scan path?",
+				"capability.skills.paths.confirmBody": "Remove this canonical directory from the Profile? Selection drafts, applied capabilities, and defaults are not rewritten: ",
+				"capability.skills.paths.confirmRemove": "Remove path",
+				"capability.skills.paths.cancel": "Cancel"
+			},
+			zh: {
+				"capability.skills.paths.title": "自定义技能扫描路径",
+				"capability.skills.paths.manage": "管理技能扫描路径",
+				"capability.skills.paths.description": "由 Weir 会话共享的 Profile 级目录。路径变更不会选择技能、应用草稿或改写默认值。",
+				"capability.skills.paths.addLabel": "技能扫描目录",
+				"capability.skills.paths.placeholder": "~/skills 或 /absolute/path",
+				"capability.skills.paths.add": "添加路径",
+				"capability.skills.paths.adding": "正在添加…",
+				"capability.skills.paths.removing": "正在移除…",
+				"capability.skills.paths.loading": "正在加载扫描路径…",
+				"capability.skills.paths.refresh": "刷新路径",
+				"capability.skills.paths.refreshFailed": "后续刷新失败：{message}",
+				"capability.skills.paths.readFailed": "无法读取路径注册表；如有既有行，现已过期。",
+				"capability.skills.paths.empty": "尚未登记自定义扫描路径。",
+				"capability.skills.paths.added": "目录已添加。新发现的技能保持未选状态，需手动选择并应用后才会启用。",
+				"capability.skills.paths.removed": "目录已移除。选择草稿、已应用能力和默认值均未被改写。",
+				"capability.skills.paths.degraded": "路径变更已保存，但宿主报告了提交后检查问题。已请求重新读取注册表、技能清单和回执；不声称已回滚。",
+				"capability.skills.paths.validation": "服务端拒绝了此目录。请输入存在且可读的绝对目录或 ~/directory；输入已保留，未保存任何变更。",
+				"capability.skills.paths.duplicate": "此规范化目录已登记。已重新读取当前路径；输入已保留，未保存重复项。",
+				"capability.skills.paths.notFound": "此规范化目录已不在注册表中。已重新读取当前路径；未移除任何项目。",
+				"capability.skills.paths.conflict": "路径注册表已在别处变更。已重新读取当前路径；输入已保留且未合并。重试前请核对注册表。",
+				"capability.skills.paths.indeterminate": "无法确认操作结果。已请求重新读取注册表、技能清单和回执；输入已保留，不声称已回滚。",
+				"capability.skills.paths.unavailable": "技能扫描路径注册表不可用。未保存路径变更。",
+				"capability.skills.paths.failed": "路径操作失败。不声称变更已保存；输入已保留。",
+				"capability.skills.paths.remove": "移除",
+				"capability.skills.paths.removeAria": "移除扫描路径 {path}",
+				"capability.skills.paths.confirmTitle": "移除此技能扫描路径？",
+				"capability.skills.paths.confirmBody": "从此 Profile 移除以下规范化目录？选择草稿、已应用能力和默认值均不会被改写：",
+				"capability.skills.paths.confirmRemove": "移除路径",
+				"capability.skills.paths.cancel": "取消"
+			}
+		};
+		exports.dictionaries = dictionaries;
 		exports.CapabilityManagerPanel = CapabilityManagerPanel;
 		return module.exports;
 	}

package/lib/client.capability-model.js

@@ -83,6 +83,81 @@ window.__ModuleLoader__.load({
 			return "unsupported";
 		}
 
+		// ---- Profile-scoped Skill scan paths (add-custom-skill-scan-paths D5) ----
+		// This registry has its OWN revision/CAS. None of these helpers reads or
+		// writes the selection draft revision; receipt coordination remains solely
+		// draftAfterRefresh's job below.
+		const skillPathListOf = (value) => Array.isArray(value)
+			? value.filter(path => typeof path === "string" && path !== "")
+			: null;
+		const skillPathRevisionOf = (value, fallback = 0) => Number.isSafeInteger(value) && value >= 0 ? value : fallback;
+		const skillPathErrorOf = (response, status) => {
+			const error = response?.error;
+			return {
+				code: typeof error?.code === "string" && error.code !== "" ? error.code : status,
+				message: typeof error?.message === "string" && error.message !== "" ? error.message : "The Skill scan path registry is unavailable."
+			};
+		};
+		/** Normalize a registry read. Absent successful lists mean an empty registry;
+		 * failed re-reads retain last-good paths only as explicitly stale rows. */
+		function skillPathsAfterRead(current, response) {
+			const currentPaths = skillPathListOf(current?.paths) ?? [];
+			const currentRevision = skillPathRevisionOf(current?.revision);
+			if (response?.status === "ok") {
+				return {
+					status: "ok",
+					revision: skillPathRevisionOf(response.revision, currentRevision),
+					paths: skillPathListOf(response.paths) ?? [],
+					error: null,
+					stale: false
+				};
+			}
+			const status = typeof response?.status === "string" && response.status !== "" ? response.status : "unavailable";
+			return {
+				status,
+				revision: skillPathRevisionOf(response?.revision, currentRevision),
+				paths: skillPathListOf(response?.paths) ?? currentPaths,
+				error: skillPathErrorOf(response, status),
+				stale: current !== null && current !== undefined
+			};
+		}
+		/** Normalize every path mutation without ever inferring a save from status
+		 * alone. Duplicate/not-found/conflict re-read only the registry; durable
+		 * (including landed-but-degraded) outcomes re-read registry + capabilities. */
+		function skillPathMutationOutcomeOf(response) {
+			const status = typeof response?.status === "string" && response.status !== "" ? response.status : "unavailable";
+			const saved = response?.saved === true && ["saved", "removed", "invalidation-failed", "owner-changed"].includes(status);
+			const degraded = saved && (status === "invalidation-failed" || status === "owner-changed");
+			const uncertain = status === "indeterminate" || status === "call-threw" || status === "call-failed" || status.startsWith("gateway/");
+			const phase = saved ? (degraded ? "degraded" : "saved")
+				: status === "revision-conflict" ? "revision-conflict"
+					: status === "validation-failed" ? "validation-failed"
+						: status === "duplicate" ? "duplicate"
+							: status === "not-found" ? "not-found"
+								: uncertain ? "indeterminate"
+									: ["unavailable", "unreadable", "unsupported", "locked", "write-failed", "storage-failed"].includes(status) ? "unavailable" : "failed";
+			const current = response?.current && typeof response.current === "object" && !Array.isArray(response.current) ? response.current : null;
+			const rawPaths = response?.paths === undefined ? current?.paths : response.paths;
+			const paths = skillPathListOf(rawPaths);
+			const rawRevision = response?.revision === undefined ? current?.revision : response.revision;
+			const hasRevision = Number.isSafeInteger(rawRevision) && rawRevision >= 0;
+			const snapshot = paths !== null && hasRevision
+				? { status: "ok", revision: rawRevision, paths, error: null, stale: false }
+				: null;
+			const refreshPaths = saved || phase === "revision-conflict" || phase === "duplicate" || phase === "not-found" || phase === "indeterminate";
+			return {
+				phase,
+				status,
+				saved,
+				revision: hasRevision ? rawRevision : null,
+				paths,
+				snapshot,
+				error: saved && !degraded ? null : skillPathErrorOf(response, status),
+				refreshPaths,
+				refreshCapabilities: saved || phase === "indeterminate"
+			};
+		}
+
 		/**
 		 * Second-window convergence (12.5): an agent-preset/selected frame
 		 * refreshes THIS session's Badge only when the frame names the same
@@ -1347,6 +1422,8 @@ window.__ModuleLoader__.load({
 		exports.skillRowOf = skillRowOf;
 		exports.partitionManagerListing = partitionManagerListing;
 		exports.managerConditionState = managerConditionState;
+		exports.skillPathsAfterRead = skillPathsAfterRead;
+		exports.skillPathMutationOutcomeOf = skillPathMutationOutcomeOf;
 		exports.frameRefreshesSession = frameRefreshesSession;
 		exports.draftFromReceipt = draftFromReceipt;
 		exports.draftAfterRefresh = draftAfterRefresh;

package/lib/client.js

@@ -1,4 +1,4 @@
-// Weir client chunks: {"client.blackboard-model.js":"2e5abdd44edb599d10d9d547fa07133e84250d6007161c2c8704b58151896f93","client.blackboard-panel.js":"c9d6a0f02623075fc884f3519f982574ad33ad871f7bcd7e8c36f12512f0de39","client.capability-badge.js":"f5c5d21293360d00815446beb8455794a1778ae033e270af37e436329ac09185","client.capability-manager.js":"f02e08174487f2f70e90a5c50a4a44cbeb4d462f115a2d2ab8a52ed8b4e70aee","client.capability-model.js":"57127dc5ea7ca6aa70c619480684f4de84fcbff4922f70df9886f55fad66abbf","client.capability-presets.js":"12ac8da3568d013abd76b67cfe473a329f4af2feaac9cd55a82d8881e5bc1017","client.chain-editor.js":"1e9a33bc68cabc43bc27b91ef83eab5028a33256596c147e15722d684687765b","client.chain-model.js":"2e885922cf8c2972725c6eef8bf20c7d1202d961edfb8ad41574dac062d74371","client.disabled-categories-editor.js":"f9103fd2e2691eda9afd199e1a5462189097a9f3dee0518be5fa3587d896e033","client.file-lease-badge.js":"cd30546307c91c94fe05484557e46f58c53fe55657f62b0a0415a072dfb3b582","client.file-lease-tool-model.js":"f72d87b049454ec489b4dffac1f32dabc273947b8a4c55fe07c91ddf320bd899","client.file-lease-tool-view.js":"7004caa06b36d8497a1d2e448b6ce5e4c8efd22ad903d8b39e26220de64bb1fe","client.hash-edit-model.js":"71727d47a6ef32ebd2abfb063fa93499a5e607d6716e3ec8983ae056c4fb317f","client.hash-edit-view.js":"fc0f4dabddab9a48527553ad4232b3715e46e6863aab75e02ae2dcd6687265c2","client.lsp-model.js":"30943ed1ed11c1f2770a724da855ea2417c11566c2778c79e17cfc2de499cd80","client.lsp-panel.js":"61629a4d317dae9ed01c1cc0355632fb752788dc23f7606257188050734cd030","client.lsp-toggle.js":"d6af81be5e5b854e98563bbb9349a6db89834a9d7dee9cf0e97759ecb32090e8","client.mcp-manager.js":"cfcd4792251fcca8bfa6a2c35b80881ab6f6480cf2ebce24a8ce304cddf940a7","client.model-picker.js":"57f96826e00b37ae6d6474a6750f31b4e128e5fdb37e302875a41cdb2e18f14a","client.notify-permissions.js":"2be9bdbeffef96baa3cbe4ce430ab30a1d1bf797782453d287d54602ea47db8e","client.notify-web.js":"0943f67d5526ff0fb7cb4f69580e0a9ea54ed06465c513afc51a5a7fb1c55ccf","client.robash-editor.js":"cd6a283b72cb02598e32ca4ce03a1b8de5f328ecdd1f5f920377524f3bdcbe1c","client.robash-model.js":"f4395338a773e8bb48e4f96aeb737cd634edcca0b90af992a7dbbe47be42e451","client.settings-page.js":"f3c04a5b33cdb963357bc653f7050e598f19efc4cc833694379a4ba055e949d3","client.worktree-model.js":"8bfbaaa080f20e90a0128afccb9b4e232514615a8f2fee3a32a42dde78b34a8f","client.worktree-view.js":"356c3f5f683b8509ae8679243a6460ca02957fd15e057a629b2ac4fdd12ed057"}
+// Weir client chunks: {"client.blackboard-model.js":"2e5abdd44edb599d10d9d547fa07133e84250d6007161c2c8704b58151896f93","client.blackboard-panel.js":"c9d6a0f02623075fc884f3519f982574ad33ad871f7bcd7e8c36f12512f0de39","client.capability-badge.js":"f5c5d21293360d00815446beb8455794a1778ae033e270af37e436329ac09185","client.capability-manager.js":"0c5b0e469b66b1ccdf720bb3db91ae15fd0be70c84287739de36a3bfceaed223","client.capability-model.js":"9beddda506617152c51d8159964fee74aecb99e8d50b50de82ab050d597ec9d1","client.capability-presets.js":"12ac8da3568d013abd76b67cfe473a329f4af2feaac9cd55a82d8881e5bc1017","client.chain-editor.js":"1e9a33bc68cabc43bc27b91ef83eab5028a33256596c147e15722d684687765b","client.chain-model.js":"2e885922cf8c2972725c6eef8bf20c7d1202d961edfb8ad41574dac062d74371","client.disabled-categories-editor.js":"f9103fd2e2691eda9afd199e1a5462189097a9f3dee0518be5fa3587d896e033","client.file-lease-badge.js":"cd30546307c91c94fe05484557e46f58c53fe55657f62b0a0415a072dfb3b582","client.file-lease-tool-model.js":"f72d87b049454ec489b4dffac1f32dabc273947b8a4c55fe07c91ddf320bd899","client.file-lease-tool-view.js":"7004caa06b36d8497a1d2e448b6ce5e4c8efd22ad903d8b39e26220de64bb1fe","client.hash-edit-model.js":"71727d47a6ef32ebd2abfb063fa93499a5e607d6716e3ec8983ae056c4fb317f","client.hash-edit-view.js":"fc0f4dabddab9a48527553ad4232b3715e46e6863aab75e02ae2dcd6687265c2","client.lsp-model.js":"30943ed1ed11c1f2770a724da855ea2417c11566c2778c79e17cfc2de499cd80","client.lsp-panel.js":"61629a4d317dae9ed01c1cc0355632fb752788dc23f7606257188050734cd030","client.lsp-toggle.js":"d6af81be5e5b854e98563bbb9349a6db89834a9d7dee9cf0e97759ecb32090e8","client.mcp-manager.js":"cfcd4792251fcca8bfa6a2c35b80881ab6f6480cf2ebce24a8ce304cddf940a7","client.model-picker.js":"57f96826e00b37ae6d6474a6750f31b4e128e5fdb37e302875a41cdb2e18f14a","client.notify-permissions.js":"2be9bdbeffef96baa3cbe4ce430ab30a1d1bf797782453d287d54602ea47db8e","client.notify-web.js":"0943f67d5526ff0fb7cb4f69580e0a9ea54ed06465c513afc51a5a7fb1c55ccf","client.robash-editor.js":"cd6a283b72cb02598e32ca4ce03a1b8de5f328ecdd1f5f920377524f3bdcbe1c","client.robash-model.js":"f4395338a773e8bb48e4f96aeb737cd634edcca0b90af992a7dbbe47be42e451","client.settings-page.js":"f3c04a5b33cdb963357bc653f7050e598f19efc4cc833694379a4ba055e949d3","client.worktree-model.js":"8bfbaaa080f20e90a0128afccb9b4e232514615a8f2fee3a32a42dde78b34a8f","client.worktree-view.js":"356c3f5f683b8509ae8679243a6460ca02957fd15e057a629b2ac4fdd12ed057"}
 window.__ModuleLoader__.load({
 	id: "weir-harness",
 	factory: (require) => {
@@ -891,6 +891,10 @@ window.__ModuleLoader__.load({
 			const capabilityVerbs = (sessionId) => ({
 				sessionId,
 				fetchReceipt: (sid) => capabilityRead("receipt", sid, null),
+				fetchSkillPaths: (sid) => capabilityRead("skillPaths", sid, {
+					status: "unavailable", saved: false, revision: 0, paths: [],
+					error: { code: "unavailable", message: "Skill scan paths are unavailable." }
+				}),
 				// Forwarded host events arrive via ctx.remote.$on — NOT a
 				// remote.session.subscribe (that API does not exist; the old
 				// wiring silently never subscribed, which is why cold sessions
@@ -910,6 +914,8 @@ window.__ModuleLoader__.load({
 				mcpPreview: (sid, request) => capabilityMutation("mutate", sid, request),
 				mcpMutate: (sid, request) => capabilityMutation("mutate", sid, request),
 				mcpBatch: (sid, request) => capabilityMutation("batch", sid, request),
+				skillPathAdd: (sid, request) => capabilityMutation("skillPathAdd", sid, request),
+				skillPathRemove: (sid, request) => capabilityMutation("skillPathRemove", sid, request),
 				fetchListing: (sid) => capabilityRead("list", sid, { error: true }),
 				fetchConditions: (sid) => capabilityRead("conditions", sid, { error: true }),
 				// The manager forwards only its established props. Adapt the lazy view
@@ -935,6 +941,10 @@ window.__ModuleLoader__.load({
 			// True once the right-sidebar package mounted the capabilities tab
 			// (the optional inject below ran); the Badge's openPanel verb exists
 			// only then — without it the Badge falls back to its composer popover.
+			const capabilityDictionaries = (model, panel) => ({
+				en: { ...model.dictionaries?.en, ...panel.dictionaries?.en },
+				zh: { ...model.dictionaries?.zh, ...panel.dictionaries?.zh }
+			});
 			let capabilitySidebarTab = false;
 			const CapabilityBadgeWrapper = (props) => {
 				const [impl, setImpl] = react.useState(null);
@@ -946,8 +956,19 @@ window.__ModuleLoader__.load({
 						require.async("./client.capability-manager.js"),
 						require.async("./client.mcp-manager.js").catch(() => null),
 					]).then(([badge, model, panel, mcp]) => {
-						registerChunkDictionaries("settings.weir.capability", model.dictionaries);
-						if (alive) setImpl(() => ({ Badge: badge.CapabilityBadge, model, Panel: panel.CapabilityManagerPanel, McpManagerView: mcp?.McpManagerView, McpManagerBoundary: mcp?.McpManagerBoundary }));
+						registerChunkDictionaries("settings.weir.capability", capabilityDictionaries(model, panel));
+						if (alive) setImpl(() => {
+							// The Badge chunk's established prop bridge is intentionally unchanged.
+							// Bind the new verbs once at this composition-root adapter so the
+							// composer popover and sidebar drive the identical path child.
+							const Panel = (panelProps) => react_jsx_runtime.jsx(panel.CapabilityManagerPanel, {
+								...panelProps,
+								fetchSkillPaths: props.fetchSkillPaths,
+								skillPathAdd: props.skillPathAdd,
+								skillPathRemove: props.skillPathRemove
+							});
+							return { Badge: badge.CapabilityBadge, model, Panel, McpManagerView: mcp?.McpManagerView, McpManagerBoundary: mcp?.McpManagerBoundary };
+						});
 					});
 					return () => { alive = false; };
 				}, [props.sessionId]);
@@ -984,7 +1005,7 @@ window.__ModuleLoader__.load({
 				require.async("./client.capability-manager.js"),
 				require.async("./client.mcp-manager.js").catch(() => null),
 			]).then((chunks) => {
-				registerChunkDictionaries("settings.weir.capability", chunks[0].dictionaries);
+				registerChunkDictionaries("settings.weir.capability", capabilityDictionaries(chunks[0], chunks[1]));
 				return chunks;
 			}));
 			function CapabilityPanelWrapper(props) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weir-harness",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "type": "module",
   "description": "Weir \u2014 orchestrator-centric DSH agent preset: intent gate, category delegation, todo driver, pull-based background jobs, auto-compaction, hashline edit.",
   "license": "MIT",

package/src/capabilities/capability-remote.js

@@ -22,13 +22,14 @@ import { buildReceiptPayload, buildListPayload, buildConditionsPayload, buildPre
 import { PRESET_SELECTED_EVENT } from './preset-invalidation.js'
 import { createAudit } from '../shared/audit.js'
 import { mcpDiagnostic, sanitizeMcpPayload } from './mcp-diagnostics.js'
+import { createSkillScanPathRegistry } from './skill-scan-path-registry.js'
 
 /** The host-root service key the typert gateway resolves (S27: ctx.get from the host root). */
 export const CAPABILITY_READ_SERVICE_KEY = 'weirCapabilityRead'
 /** The wire namespace: POST /api/weirCapabilities/<method>, client ctx.remote.weirCapabilities.*. */
 export const CAPABILITY_READ_NAMESPACE = 'weirCapabilities'
-/** The five read methods, each taking exactly one parameter. */
-export const CAPABILITY_READ_METHODS = ['receipt', 'list', 'conditions', 'presets', 'defaultGet']
+/** The six read methods, each taking exactly one parameter. */
+export const CAPABILITY_READ_METHODS = ['receipt', 'list', 'conditions', 'presets', 'defaultGet', 'skillPaths']
 
 /** Typed infrastructure/ownership failure, distinct from domain status values. */
 export class CapabilityReadError extends Error {
@@ -157,6 +158,7 @@ export function capabilityOwnership(observation, sessionId) {
 export function createCapabilityReadService(dependencies = {}) {
   const bridgeFor = feedResolver(dependencies)
   const storeFor = dependencies.store ?? (profileContext => openCapabilityStore({ profileContext }))
+  const skillPathRegistryFor = dependencies.skillPathRegistry ?? (profileContext => createSkillScanPathRegistry({ store: storeFor(profileContext) }))
   const ensure = dependencies.ensureRegistered ?? (() => true)
   const onDegraded = dependencies.onDegraded ?? (() => {})
   const observeSession = dependencies.observeSession ?? (sessionId => dependencies.sessionQuery?.()?.observeSession(sessionId))
@@ -242,12 +244,13 @@ export function createCapabilityReadService(dependencies = {}) {
     defaultGet: sessionId => read(sessionId, 'defaultGet', (faces, options) => buildDefaultGetPayload({
       store: storeFor(faces.profileContext?.()),
     }, options)),
+    skillPaths: sessionId => read(sessionId, 'skillPaths', faces => skillPathRegistryFor(faces.profileContext?.()).read()),
   }
 }
 
 export const CAPABILITY_MUTATION_SERVICE_KEY = 'weirCapabilityMutation'
 export const CAPABILITY_MUTATION_NAMESPACE = 'weirCapabilityMutations'
-export const CAPABILITY_MUTATION_METHODS = ['mutate', 'batch']
+export const CAPABILITY_MUTATION_METHODS = ['mutate', 'batch', 'skillPathAdd', 'skillPathRemove']
 
 export function sameMutationOwner(first, second) {
   const profile = value => value ? `${value.home ?? ''}\0${value.name ?? ''}` : ''
@@ -257,9 +260,38 @@ export function sameMutationOwner(first, second) {
     && profile(first.profile) === profile(second.profile)
 }
 
+/** Call every accepting-process provider for exactly one changed Profile. */
+export function invalidateSkillScanPathProviders(profile) {
+  const failures = []
+  if (typeof profile?.home !== 'string' || typeof profile?.name !== 'string') {
+    return [new Error('changed Profile identity is unavailable')]
+  }
+  for (const feeds of bridgeFeeds.values()) {
+    for (const token of feeds) {
+      const faces = token.faces ?? token
+      try {
+        const candidate = faces.profileContext?.()
+        if (candidate?.home !== profile.home || candidate?.name !== profile.name) continue
+        if (typeof faces.provider?.sourceChanged !== 'function') throw new Error('mounted Skill provider cannot invalidate')
+        faces.provider.sourceChanged()
+      } catch (cause) {
+        failures.push(cause)
+      }
+    }
+  }
+  return failures
+}
+
+const pathDiagnostic = (cause, code = cause?.code ?? 'validation-failed') => ({
+  code,
+  message: cause instanceof Error ? cause.message : String(cause),
+})
+
 /** Session-preset/profile/feed ownership for mutations; selectionSeq is not compared. */
 export function createCapabilityMutationService(dependencies = {}) {
   const bridgeFor = feedResolver(dependencies)
+  const storeFor = dependencies.store ?? (profileContext => openCapabilityStore({ profileContext }))
+  const skillPathRegistryFor = dependencies.skillPathRegistry ?? (profileContext => createSkillScanPathRegistry({ store: storeFor(profileContext) }))
   const ensure = dependencies.ensureRegistered ?? (() => true)
   const observeSession = dependencies.observeSession ?? (sessionId => dependencies.sessionQuery?.()?.observeSession(sessionId))
   const observe = async sessionId => {
@@ -278,16 +310,18 @@ export function createCapabilityMutationService(dependencies = {}) {
       throw new CapabilityReadError('unknown-session', `capability mutation: cannot observe session ${JSON.stringify(sessionId)}`, { cause })
     }
   }
+  // The same exact observation/feed/Profile recheck serves MCP and path writes.
+  const ownershipAssertion = (sessionId, first) => async () => {
+    const current = await observe(sessionId)
+    try {
+      if (!sameMutationOwner(first, current)) throw new CapabilityReadError('owner-changed', 'capability mutation: session preset/profile/feed owner changed')
+    } finally { current.lease[Symbol.dispose]() }
+  }
   async function mutate(sessionId, request, batch = false) {
     if (!ensure()) throw new CapabilityReadError('channel-unavailable', 'capability mutation channel is not registered')
     const first = await observe(sessionId)
     try {
-      const assertOwner = async () => {
-        const current = await observe(sessionId)
-        try {
-          if (!sameMutationOwner(first, current)) throw new CapabilityReadError('owner-changed', 'capability mutation: session preset/profile/feed owner changed')
-        } finally { current.lease[Symbol.dispose]() }
-      }
+      const assertOwner = ownershipAssertion(sessionId, first)
       if (typeof first.faces.mcpOperations !== 'function') throw new CapabilityReadError('bridge-absent', 'capability mutation: owning preset has no MCP operations')
       const operations = first.faces.mcpOperations({ id: sessionId, header: { cwd: first.owner.cwd } }, { assertOwner })
       let result
@@ -322,9 +356,62 @@ export function createCapabilityMutationService(dependencies = {}) {
       first.lease[Symbol.dispose]()
     }
   }
+
+  async function mutatePath(sessionId, request, kind) {
+    if (!ensure()) throw new CapabilityReadError('channel-unavailable', 'capability mutation channel is not registered')
+    const first = await observe(sessionId)
+    try {
+      const assertOwner = ownershipAssertion(sessionId, first)
+      let result
+      try {
+        const registry = skillPathRegistryFor(first.profile)
+        result = kind === 'add'
+          ? await registry.add(request?.path, request?.expectedRevision, { assertOwner })
+          : await registry.remove(request?.path, request?.expectedRevision, { assertOwner })
+      } catch (cause) {
+        result = {
+          status: cause?.code === 'owner-changed' ? 'owner-changed' : 'validation-failed',
+          saved: false, revision: null, paths: null,
+          error: pathDiagnostic(cause, cause?.code ?? 'validation-failed'),
+        }
+      }
+
+      // A known or possibly landed registry write may already have changed the
+      // durable discovery scope. Invalidate every same-Profile mount before the
+      // response, without converting an ambiguous outcome into a definite one.
+      const indeterminate = result.status === 'indeterminate'
+      let invalidationFailure = null
+      if (result.saved === true || indeterminate) {
+        const failures = invalidateSkillScanPathProviders(first.profile)
+        if (failures.length > 0) invalidationFailure = failures.map(failure => pathDiagnostic(failure).message).join('; ')
+      }
+      try {
+        await assertOwner()
+      } catch (cause) {
+        return {
+          ...result,
+          status: indeterminate ? 'indeterminate' : 'owner-changed', ownerChanged: true, saved: result.saved === true,
+          error: pathDiagnostic(cause, 'owner-changed'),
+        }
+      }
+      if (invalidationFailure !== null) {
+        return {
+          ...result,
+          status: indeterminate ? 'indeterminate' : 'invalidation-failed',
+          error: { code: 'invalidation-failed', message: invalidationFailure },
+        }
+      }
+      return result
+    } finally {
+      first.lease[Symbol.dispose]()
+    }
+  }
+
   return {
     mutate: (sessionId, request) => mutate(sessionId, request, false),
     batch: (sessionId, request) => mutate(sessionId, request, true),
+    skillPathAdd: (sessionId, request) => mutatePath(sessionId, request, 'add'),
+    skillPathRemove: (sessionId, request) => mutatePath(sessionId, request, 'remove'),
   }
 }
 
@@ -343,7 +430,7 @@ export const CAPABILITY_ENDPOINTS = [
  * codecs, no zod, no generated artifacts). Parameters and results are plain
  * JSON; the envelope validates the argument name only.
  *
- * ALL five read and two mutation invocations live in ONE contribution, because
+ * ALL six read and four mutation invocations live in ONE contribution, because
  * the registry keys exactly one record per package+face and rejects any second
  * registration while that record is live: two separate `weir-harness` host-face
  * contributions could never overlap generations, and the face the mutation half

package/src/capabilities/skill-inventory.js

@@ -3,6 +3,8 @@ import { dirname, join, resolve } from 'node:path'
 import { createHash } from 'node:crypto'
 import { createSkillIdentity } from './skill-identity.js'
 import { parseSkillText } from './frontmatter.js'
+import { canonicalPathKey } from './skill-applicability.js'
+import { requireSkillScanPaths } from './skill-scan-path-registry.js'
 
 export const SKILL_ROOT_RANKS = Object.freeze({ 'project-dsh': 100, 'project-agents': 200, custom: 300, 'user-dsh': 400, 'user-agents': 500, bundled: 600 })
 
@@ -19,7 +21,7 @@ export async function findProjectRoot(cwd, fs = nodeFs) {
 }
 
 /** Homes are supplied by the host adapter, not inferred from the process profile. */
-export async function resolveSkillRoots({ cwd, dshHome, agentsHome, customSkillDirs = [], bundledSkillDir, weirBuiltinDir, includeDefaultRoots = true }, fs = nodeFs) {
+export async function resolveSkillRoots({ cwd, dshHome, agentsHome, customSkillDirs = [], bundledSkillDir, weirBuiltinDir, includeDefaultRoots = true, skillScanPathRegistry }, fs = nodeFs) {
   const roots = []
   const add = (path, source, scope, extra = {}) => roots.push({ path: resolve(path), source, scope, rank: SKILL_ROOT_RANKS[source], ...extra })
   if (includeDefaultRoots && cwd !== undefined) {
@@ -37,7 +39,21 @@ export async function resolveSkillRoots({ cwd, dshHome, agentsHome, customSkillD
   }
   // Host bundles are not automatically Weir-owned or selected.
   if (bundledSkillDir !== undefined) add(bundledSkillDir, 'bundled', 'custom', { trustedHost: true })
-  return roots
+  // Existing composition/default roots keep their source, scope and rank. User
+  // registry roots append in registry order and never replace Creative's roots.
+  if (skillScanPathRegistry) {
+    for (const path of await requireSkillScanPaths(skillScanPathRegistry)) add(path, 'custom', 'custom')
+  }
+  // Canonical identity, not lexical spelling, controls enumeration. A root whose
+  // canonical key cannot be proven stays independent so discovery's established
+  // partial-failure path reports its real unreadable/missing outcome.
+  const seen = new Set()
+  return roots.filter((root, index) => {
+    const key = canonicalPathKey(root.path) ?? `unresolved:${index}`
+    if (seen.has(key)) return false
+    seen.add(key)
+    return true
+  })
 }
 
 const rootKey = root => JSON.stringify([resolve(root.path), root.source, root.scope, root.rank])

package/src/capabilities/skill-scan-path-registry.js

@@ -0,0 +1,238 @@
+// Profile-scoped, user-managed Skill discovery roots. The capability store owns
+// locking, revisions and crash-safe writes; this module owns strict payload
+// validation and canonical directory semantics. No mutation executes a command,
+// appends to a session, or treats a failed write as a discovery change.
+import { constants } from 'node:fs'
+import { access, realpath, stat } from 'node:fs/promises'
+import { homedir } from 'node:os'
+import * as nodePath from 'node:path'
+import { canonicalPathKey } from './skill-applicability.js'
+
+export const SKILL_SCAN_PATH_UNIT = Object.freeze({ kind: 'skill-scan-paths' })
+
+const message = error => error instanceof Error ? error.message : String(error)
+const codeOf = error => error?.code
+const missing = error => ['ENOENT', 'ENOTDIR'].includes(codeOf(error))
+const denied = error => ['EACCES', 'EPERM'].includes(codeOf(error))
+const clone = paths => [...paths]
+
+class SkillPathFailure extends Error {
+  constructor(code, text, result = undefined) {
+    super(text)
+    this.name = 'SkillPathFailure'
+    this.code = code
+    this.result = result
+  }
+}
+
+const validation = (code, text) => ({
+  status: 'validation-failed', saved: false, revision: null, paths: null,
+  error: { code, message: text },
+})
+
+const unavailable = (code, text, revision = null) => ({
+  status: 'unavailable', saved: false, revision, paths: null,
+  error: { code, message: text },
+})
+
+/**
+ * Comparison of paths already canonicalized by realpath. Registry payloads never
+ * store this folded key: the canonical spelling remains the display/read value.
+ */
+function storedPathKey(path, pathApi, platform) {
+  let key = pathApi.normalize(path)
+  if (platform === 'win32') key = key.replaceAll('\\', '/').toLowerCase()
+  return key.replace(/\/+$/, '')
+}
+
+/** Strict payload shape: unknown or malformed records are never repaired. */
+function payloadPaths(payload, pathApi, platform) {
+  if (payload === undefined) return []
+  if (payload === null || typeof payload !== 'object' || Array.isArray(payload)
+    || Object.keys(payload).length !== 1 || !Array.isArray(payload.paths)
+    || !payload.paths.every(path => typeof path === 'string' && path.length > 0 && pathApi.isAbsolute(path))) {
+    throw new SkillPathFailure('invalid-payload', 'Skill scan path registry payload is invalid')
+  }
+  const seen = new Set()
+  for (const path of payload.paths) {
+    const key = storedPathKey(path, pathApi, platform)
+    if (seen.has(key)) throw new SkillPathFailure('invalid-payload', 'Skill scan path registry contains duplicate paths')
+    seen.add(key)
+  }
+  return clone(payload.paths)
+}
+
+/**
+ * @param {{
+ *   store: ReturnType<typeof import('./store/store.js').openCapabilityStore>,
+ *   fs?: { realpath(path: string): Promise<string>, stat(path: string): Promise<{ isDirectory(): boolean }>, access(path: string, mode?: number): Promise<void> },
+ *   home?: string,
+ *   platform?: string,
+ *   pathApi?: typeof nodePath,
+ * }} options
+ */
+export function createSkillScanPathRegistry(options) {
+  const store = options.store
+  const fs = options.fs ?? { realpath, stat, access }
+  const platform = options.platform ?? process.platform
+  const pathApi = options.pathApi ?? (platform === 'win32' ? nodePath.win32 : nodePath)
+  const home = options.home ?? homedir()
+  const unit = SKILL_SCAN_PATH_UNIT
+
+  const pathKey = path => storedPathKey(path, pathApi, platform)
+
+  function expanded(input) {
+    if (typeof input !== 'string') throw new SkillPathFailure('path-invalid', 'Skill scan path must be a string')
+    const trimmed = input.trim()
+    if (!trimmed) throw new SkillPathFailure('path-empty', 'Skill scan path cannot be empty')
+    let value = trimmed
+    if (trimmed === '~') value = home
+    else if (trimmed.startsWith('~/') || (platform === 'win32' && trimmed.startsWith('~\\'))) {
+      if (typeof home !== 'string' || !pathApi.isAbsolute(home)) throw new SkillPathFailure('home-unavailable', 'Home directory is unavailable')
+      value = pathApi.resolve(home, trimmed.slice(2))
+    }
+    if (!pathApi.isAbsolute(value)) throw new SkillPathFailure('path-not-absolute', 'Skill scan path must be absolute or start with ~')
+    return value
+  }
+
+  async function canonicalForAdd(input) {
+    const value = expanded(input)
+    let canonical
+    try { canonical = await fs.realpath(value) }
+    catch (error) {
+      if (missing(error)) throw new SkillPathFailure('path-missing', `Skill scan path does not exist: ${value}`)
+      if (denied(error)) throw new SkillPathFailure('path-unreadable', `Skill scan path is unreadable: ${value}`)
+      throw new SkillPathFailure('path-canonicalization-failed', `Cannot canonicalize Skill scan path: ${message(error)}`)
+    }
+    let info
+    try { info = await fs.stat(canonical) }
+    catch (error) {
+      throw new SkillPathFailure(denied(error) ? 'path-unreadable' : 'path-missing', `Cannot inspect Skill scan path: ${message(error)}`)
+    }
+    if (!info.isDirectory()) throw new SkillPathFailure('path-not-directory', `Skill scan path is not a directory: ${canonical}`)
+    try { await fs.access(canonical, constants.R_OK) }
+    catch (error) { throw new SkillPathFailure('path-unreadable', `Skill scan path is not readable: ${message(error)}`) }
+    return { path: canonical, key: pathKey(canonical) }
+  }
+
+  async function keyForRemove(input) {
+    const value = expanded(input)
+    try { return pathKey(await fs.realpath(value)) }
+    catch (error) {
+      if (!missing(error)) {
+        throw new SkillPathFailure(denied(error) ? 'path-unreadable' : 'path-canonicalization-failed', `Cannot canonicalize Skill scan path: ${message(error)}`)
+      }
+      // Removal must remain possible after a directory disappears. The shared
+      // platform key canonicalizes the deepest surviving ancestor without
+      // requiring the removed directory itself to exist.
+      const key = canonicalPathKey(value, platform)
+      if (key === null) throw new SkillPathFailure('path-canonicalization-failed', `Cannot canonicalize Skill scan path: ${value}`)
+      return key
+    }
+  }
+
+  async function read() {
+    let record
+    try { record = await store.read(unit) }
+    catch (error) { return unavailable('read-failed', `Skill scan path registry is unreadable: ${message(error)}`) }
+    if (record.kind === 'absent') return { status: 'ok', revision: 0, paths: [] }
+    if (record.kind !== 'ok') return unavailable(record.kind, `Skill scan path registry is ${record.kind}`)
+    try {
+      return { status: 'ok', revision: record.revision, paths: payloadPaths(record.payload, pathApi, platform) }
+    } catch (error) {
+      return unavailable(error?.code ?? 'invalid-payload', message(error), record.revision)
+    }
+  }
+
+  async function currentAfterConflict(result) {
+    const current = await read()
+    if (current.status === 'ok') return { revision: current.revision, paths: current.paths, error: null }
+    return {
+      revision: result.revision ?? current.revision ?? null,
+      paths: null,
+      error: { code: 'current-state-unavailable', message: `Revision conflict; current registry state is unavailable: ${current.error?.message ?? current.status}` },
+    }
+  }
+
+  async function mutate(kind, input, expectedRevision, options = {}) {
+    if (!Number.isSafeInteger(expectedRevision) || expectedRevision < 0) {
+      return validation('revision-invalid', 'expectedRevision must be a non-negative safe integer')
+    }
+    let candidate
+    try { candidate = kind === 'add' ? await canonicalForAdd(input) : { key: await keyForRemove(input) } }
+    catch (error) {
+      if (error instanceof SkillPathFailure) return validation(error.code, error.message)
+      return validation('path-validation-failed', message(error))
+    }
+
+    let result
+    try {
+      result = await store.commit(unit, expectedRevision, async payload => {
+        let paths
+        try { paths = payloadPaths(payload, pathApi, platform) }
+        catch (error) {
+          throw new SkillPathFailure(error?.code ?? 'invalid-payload', message(error), unavailable(error?.code ?? 'invalid-payload', message(error)))
+        }
+        const index = paths.findIndex(path => pathKey(path) === candidate.key)
+        if (kind === 'add' && index >= 0) {
+          throw new SkillPathFailure('duplicate', `Skill scan path is already registered: ${paths[index]}`, {
+            status: 'duplicate', saved: false, revision: expectedRevision, paths: clone(paths),
+            error: { code: 'duplicate', message: `Skill scan path is already registered: ${paths[index]}` },
+          })
+        }
+        if (kind === 'remove' && index < 0) {
+          throw new SkillPathFailure('not-found', `Skill scan path is not registered: ${input}`, {
+            status: 'not-found', saved: false, revision: expectedRevision, paths: clone(paths),
+            error: { code: 'not-found', message: `Skill scan path is not registered: ${input}` },
+          })
+        }
+        // Ownership is rechecked under the unit lock, immediately before the
+        // payload is handed to the store's atomic write phase.
+        await options.assertOwner?.()
+        return { paths: kind === 'add' ? [...paths, candidate.path] : paths.filter((_, i) => i !== index) }
+      })
+    } catch (error) {
+      if (error?.code === 'owner-changed') throw error
+      if (error instanceof SkillPathFailure && error.result) return error.result
+      return {
+        status: 'storage-failed', saved: false, revision: null, paths: null,
+        error: { code: 'storage-failed', message: message(error) },
+      }
+    }
+
+    if (result.status === 'committed') {
+      return {
+        status: kind === 'add' ? 'saved' : 'removed', saved: true,
+        revision: result.revision, paths: clone(result.payload.paths), error: null,
+      }
+    }
+    if (result.status === 'revision-conflict') {
+      const current = await currentAfterConflict(result)
+      return {
+        status: 'revision-conflict', saved: false, revision: current.revision, paths: current.paths,
+        error: current.error ?? { code: 'revision-conflict', message: `Skill scan path registry revision ${expectedRevision} is stale` },
+      }
+    }
+    return {
+      status: result.status === 'write-failed' ? 'indeterminate' : result.status,
+      saved: false, revision: result.revision ?? null, paths: null,
+      error: { code: result.kind ?? result.status, message: result.reason ?? message(result.error ?? `Skill scan path registry write failed: ${result.status}`) },
+    }
+  }
+
+  return {
+    unit,
+    read,
+    add: (path, expectedRevision, options) => mutate('add', path, expectedRevision, options),
+    remove: (path, expectedRevision, options) => mutate('remove', path, expectedRevision, options),
+  }
+}
+
+/** Registry read failures must become visible inventory/roots failures. */
+export async function requireSkillScanPaths(registry) {
+  const result = await registry.read()
+  if (result.status !== 'ok') {
+    throw new Error(`Skill scan path registry unavailable: ${result.error?.message ?? result.status}`)
+  }
+  return result.paths
+}

package/src/capabilities/skill-selection-plugin.js

@@ -7,6 +7,7 @@ import { fileURLToPath } from 'node:url'
 import { createSkillIdentity, skillIdentityKey } from './skill-identity.js'
 import { openCapabilityStore } from './store/store.js'
 import { discoverSkillInventory, resolveSkillRoots } from './skill-inventory.js'
+import { createSkillScanPathRegistry } from './skill-scan-path-registry.js'
 import { createSkillSelectionProvider } from './skill-selection-provider.js'
 import { assertBuiltinSkillMigration } from './skill-builtin-migration.js'
 import { createOfficeAdapter, officeDenials } from './skill-office-adapter.js'
@@ -67,6 +68,9 @@ export function createSkillSelectionPlugin(dependencies = {}) {
     /** Task 6.5 initialization reports per session (manager surface). */
     let initialReports = new Map()
     let lifecycle = null
+    const scanPathRegistry = dependencies.skillScanPathRegistry ?? createSkillScanPathRegistry({
+      store: openCapabilityStore({ profileContext: ctx.get?.('profileContext') }),
+    })
     try {
       ctx.skills.registerProvider(control => {
         const readSelection = dependencies.readSelection ?? (async options => {
@@ -134,6 +138,7 @@ export function createSkillSelectionPlugin(dependencies = {}) {
             customSkillDirs: config.customSkillDirs ?? [],
             bundledSkillDir: config.bundledSkillDir ?? process.env.DSH_BUNDLED_SKILL_DIR,
             weirBuiltinDir: config.weirBuiltinDir ?? fileURLToPath(new URL('../../skills/', import.meta.url)),
+            skillScanPathRegistry: scanPathRegistry,
           })
           const snapshot = await discoverSkillInventory({ roots, machineId, previous })
           // First-run migration check (D-H 6): a non-equivalent builtin
@@ -323,6 +328,7 @@ export function createSkillSelectionPlugin(dependencies = {}) {
         customSkillDirs: config.customSkillDirs ?? [],
         bundledSkillDir: config.bundledSkillDir ?? process.env.DSH_BUNDLED_SKILL_DIR,
         weirBuiltinDir: config.weirBuiltinDir ?? fileURLToPath(new URL('../../skills/', import.meta.url)),
+        skillScanPathRegistry: scanPathRegistry,
       })
     }
     // The shared cold-safe audit channel (cordis emit + .weir/audit.jsonl

package/src/capabilities/store/paths.js

@@ -38,6 +38,7 @@ export function resolveStoreRoot(profileContext) {
  *   | { kind: 'preset', scope: 'global', presetId: string }
  *   | { kind: 'preset', scope: 'workspace', workspaceKey: string, presetId: string }
  *   | { kind: 'mcp-registry' }
+ *   | { kind: 'skill-scan-paths' }
  *   | { kind: 'distribution', scope: string }} Unit
  */
 
@@ -77,6 +78,8 @@ export function unitLayout(unit) {
       break
     case 'mcp-registry':
       return layout(['mcp'], 'registry')
+    case 'skill-scan-paths':
+      return layout(['skills'], 'scan-paths')
     case 'distribution':
       need(u.scope)
       return layout(['distribution', /** @type {string} */ (u.scope)], 'active')