@dsh-electron/dsh-plugin-multi-root-workspace 0.1.9 → 0.1.10

package/lib/client.js

@@ -36,12 +36,12 @@ window.__ModuleLoader__.load({
 		}) : target, mod));
 		//#endregion
 		let react = require("react");
-		let react_dom = require("react-dom");
 		let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
 		_deepseek_ai_dsh_client_ui_primitives = __toESM(_deepseek_ai_dsh_client_ui_primitives, 1);
+		let react_jsx_runtime = require("react/jsx-runtime");
+		let react_dom = require("react-dom");
 		require("@deepseek-ai/cordis");
 		let _deepseek_ai_dsh_client_store = require("@deepseek-ai/dsh-client-store");
-		let react_jsx_runtime = require("react/jsx-runtime");
 		//#region src/compat/client-session.ts
 		/**
 		* The session the composed client is showing, when it can name one.
@@ -62,6 +62,17 @@ window.__ModuleLoader__.load({
 			const list = sessions.list;
 			return typeof list?.subscribe === "function" ? list.subscribe(listener) : () => {};
 		}
+		/** Selection changes only: activity/title updates must not close a Skill preview. */
+		function subscribeCurrentSession(sessions, listener) {
+			let previous = currentSessionIdOf(sessions);
+			return subscribeSessions(sessions, () => {
+				const current = currentSessionIdOf(sessions);
+				if (current !== previous) {
+					previous = current;
+					listener();
+				}
+			});
+		}
 		/**
 		* The list snapshot, when the service actually exposes one.
 		*
@@ -5248,6 +5259,34 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			return /* @__PURE__ */ _superRefine(fn, params);
 		}
 		//#endregion
+		//#region src/skills-contract.ts
+		/** Browser-safe Skills wire shapes. Session IDs select authority; clients never send paths. */
+		const nameSchema = string().regex(/^[a-z0-9]+(?:-[a-z0-9]+)*:[a-z0-9]+(?:-[a-z0-9]+)*$/);
+		object({
+			sessionId: string().min(1),
+			name: nameSchema.optional(),
+			generation: number().int().nonnegative().optional()
+		}).strict();
+		const status = {
+			sessionId: string(),
+			generation: number().int().nonnegative(),
+			enabled: boolean()
+		};
+		const skillsStatusSchema = object(status);
+		const skillsCatalogSchema = object({
+			...status,
+			skills: array(object({
+				name: nameSchema,
+				description: string(),
+				modelInvocable: boolean()
+			}))
+		});
+		const skillsPreviewSchema = object({
+			...status,
+			name: nameSchema,
+			content: string()
+		});
+		//#endregion
 		//#region src/contract.ts
 		/**
 		* The wire contract between the browser panel and this plugin's host half.
@@ -5291,6 +5330,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			}).strict().optional(),
 			id: string().optional(),
 			path: string().optional(),
+			aliasId: string().optional(),
+			skillsEnabled: boolean().optional(),
 			alias: string().optional(),
 			access: _enum([
 				"inherit",
@@ -5314,6 +5355,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			ordinal: number().int().positive(),
 			id: string(),
 			path: string(),
+			aliasId: string().optional(),
+			skillsEnabled: boolean().optional(),
 			alias: string().optional(),
 			addedAt: string(),
 			state: _enum([
@@ -5424,6 +5467,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				state: value.state,
 				access: value.access ?? "inherit",
 				...value.effectiveAccess === void 0 ? {} : { effectiveAccess: value.effectiveAccess },
+				...value.aliasId === void 0 ? {} : { aliasId: value.aliasId },
+				...value.skillsEnabled === void 0 ? {} : { skillsEnabled: value.skillsEnabled },
 				...value.alias === void 0 ? {} : { alias: value.alias },
 				...value.detail === void 0 ? {} : { detail: value.detail }
 			};
@@ -5450,13 +5495,20 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		const NS$2 = "multiRootWorkspace";
 		/** Chinese copy (the canonical shape). */
 		const zh = {
-			"panel.mode": "当前会话权限：",
-			"panel.effectiveAccess": "当前有效：",
+			"skills.globalEnable": "启用附属根 Skills",
+			"skills.globalHint": "控制所有附属目录的 Skill 发现与新调用；保留每个目录的独立选择。",
+			"skills.settingsFailed": "设置保存失败，请重试。",
+			"skills.userOnly": "仅用户调用",
+			"panel.skills": "目录技能",
+			"panel.skillsEnabled": "此目录技能已启用，点击停用",
+			"panel.skillsDisabled": "此目录技能已停用，点击启用",
+			"panel.aliasIdEdit": "编辑 Skill 命名空间",
+			"panel.aliasIdPlaceholder": "唯一的 kebab-case 标识",
+			"panel.aliasIdInvalid": "命名空间需要修复",
+			"error.invalid-alias-id": "Skill 命名空间须为唯一的 kebab-case，最长 48 字符。",
+			"panel.accessEffective": "{access}（{effective}）",
 			"panel.toolCaps": "工具 {tools} 对附属根始终只读。",
 			"panel.invalidCap": "工具权限配置无效，附属根写入全部被拒绝。",
-			"mode.read-only": "只读",
-			"mode.workspace-write": "读写",
-			"mode.danger-full-access": "完全权限（Full-access）",
 			"effective.read-only": "只读",
 			"effective.read-write": "读写",
 			"effective.full-access": "完全权限（Full-access）",
@@ -5465,11 +5517,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			"action.title": "管理本会话的附属工作目录",
 			"switcher.manage": "管理工作区目录…",
 			"panel.title": "工作区目录",
-			"panel.subtitle": "主目录与「跟随会话」的附加目录遵循当前沙箱模式；目录也可固定为只读或读写。",
-			"panel.primary": "主根",
+			"panel.primary": "主要工作目录",
 			"panel.primaryNote": "会话原始项目，不可移除",
-			"panel.cwd": "当前执行目录",
-			"panel.cwdNote": "切换目录不会增加授权",
+			"panel.currentAgentCwd": "当前Agent工作目录",
 			"panel.additional": "附属工作目录",
 			"panel.limitReached": "已达到附加目录数量上限，请先移除一个再添加。",
 			"panel.empty": "还没有附属工作目录。",
@@ -5495,12 +5545,12 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			"panel.moveUp": "上移",
 			"panel.moveDown": "下移",
 			"access.inherit": "跟随会话",
-			"access.readWrite": "固定读写",
-			"access.readOnly": "只读",
+			"access.readWrite": "工作区内修改",
+			"access.readOnly": "仅可查看",
 			"panel.accessLabel": "访问权限",
 			"panel.accessInherit": "设为跟随会话",
-			"panel.accessReadOnly": "设为只读",
-			"panel.accessReadWrite": "设为固定读写",
+			"panel.accessReadOnly": "仅可查看",
+			"panel.accessReadWrite": "工作区内修改",
 			"panel.accessUpgradeConfirm": "将该目录的权限改为「{access}」？在某些沙箱模式下，这将允许 Agent 修改其中的文件。",
 			"panel.accessUpgradeTitle": "扩大访问权限",
 			"panel.accessUpgradeDo": "修改",
@@ -5532,13 +5582,20 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		};
 		/** English copy, pinned to the Chinese key set. */
 		const en = {
-			"panel.mode": "Current session access:",
-			"panel.effectiveAccess": "Effective:",
+			"skills.globalEnable": "Enable additional-root Skills",
+			"skills.globalHint": "Controls discovery and new invocations for all additional folders, preserving each folder’s choice.",
+			"skills.settingsFailed": "Could not save settings. Please try again.",
+			"skills.userOnly": "User invocation only",
+			"panel.skills": "Folder skills",
+			"panel.skillsEnabled": "Skills enabled for this folder. Click to disable.",
+			"panel.skillsDisabled": "Skills disabled for this folder. Click to enable.",
+			"panel.aliasIdEdit": "Edit Skill namespace",
+			"panel.aliasIdPlaceholder": "Unique kebab-case identifier",
+			"panel.aliasIdInvalid": "Namespace needs repair",
+			"error.invalid-alias-id": "Skill namespace must be unique kebab-case, up to 48 characters.",
+			"panel.accessEffective": "{access} ({effective})",
 			"panel.toolCaps": "The tools {tools} always have read-only access to additional roots.",
 			"panel.invalidCap": "Invalid tool access configuration refuses all additional-root writes.",
-			"mode.read-only": "Read-only",
-			"mode.workspace-write": "Read-write",
-			"mode.danger-full-access": "Full-access",
 			"effective.read-only": "Read-only",
 			"effective.read-write": "Read-write",
 			"effective.full-access": "Full-access",
@@ -5547,11 +5604,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			"action.title": "Manage this session's secondary working directories",
 			"switcher.manage": "Manage workspace folders…",
 			"panel.title": "Workspace folders",
-			"panel.subtitle": "The primary root and inherit folders follow the current sandbox mode; a folder can also be pinned read-only or read-write.",
-			"panel.primary": "Primary root",
+			"panel.primary": "Primary working directory",
 			"panel.primaryNote": "The session's original project; it cannot be removed",
-			"panel.cwd": "Current working directory",
-			"panel.cwdNote": "Changing directory does not grant access",
+			"panel.currentAgentCwd": "Current Agent working directory",
 			"panel.additional": "Secondary working directories",
 			"panel.limitReached": "The additional-folder limit is reached; remove one before adding another.",
 			"panel.empty": "No secondary working directories yet.",
@@ -5577,12 +5632,12 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			"panel.moveUp": "Move up",
 			"panel.moveDown": "Move down",
 			"access.inherit": "Inherit",
-			"access.readWrite": "Read-write",
-			"access.readOnly": "Read-only",
+			"access.readWrite": "Workspace Write",
+			"access.readOnly": "Read Only",
 			"panel.accessLabel": "Access",
 			"panel.accessInherit": "Make inherit",
-			"panel.accessReadOnly": "Make read-only",
-			"panel.accessReadWrite": "Make read-write",
+			"panel.accessReadOnly": "Read Only",
+			"panel.accessReadWrite": "Workspace Write",
 			"panel.accessUpgradeConfirm": "Change this folder's access to \"{access}\"? Under some sandbox modes this lets the agent modify files in it.",
 			"panel.accessUpgradeTitle": "Widen access",
 			"panel.accessUpgradeDo": "Change",
@@ -6193,13 +6248,6 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   padding: 0 24px 24px;
 }
 
-.mrfw-description {
-  margin: 0 0 8px;
-  font-size: 14px;
-  line-height: 22px;
-  color: var(--dsw-alias-label-tertiary);
-}
-
 .mrfw-alert {
   margin: 0 0 8px;
   font-size: 14px;
@@ -6251,6 +6299,23 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 
 /* A root entry's two lines: the display name on top, the absolute path under
    it in the tertiary voice (the workspace rows recipe of the host sidebar). */
+/* Match upstream General Settings' DeveloperToolsRow layout. */
+.mrfw-skillsSettings {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 24px;
+  padding: 16px 0;
+  border-bottom: 0.5px solid var(--dsw-alias-border-l2);
+}
+.mrfw-skillsSettingsText { min-width: 0; }
+.mrfw-skillsSettingsTitle { font-size: 14px; line-height: 20px; }
+.mrfw-skillsSettingsDescription {
+  margin-top: 4px;
+  color: var(--dsw-alias-label-secondary);
+  font-size: 12px;
+  line-height: 18px;
+}
 .mrfw-rootText {
   display: flex;
   flex: 1 1 240px;
@@ -6259,15 +6324,14 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   min-width: 0;
 }
 
-/* The name line is a flex row: the truncating name text first, the access
-   badge beside it never shrinking — baseline-aligned so the badge's smaller
-   voice sits on the name's baseline rather than its middle. */
+/* Keep status tags and permission glyphs visible beside the alias, wrapping
+   onto another line when the dialog is narrow. */
 .mrfw-rootName {
   display: flex;
-  align-items: baseline;
+  align-items: center;
+  flex-wrap: wrap;
   gap: 6px;
   min-width: 0;
-  overflow: hidden;
   font-size: 14px;
   line-height: 20px;
   font-weight: 500;
@@ -6349,6 +6413,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   transition: background-color var(--ds-transition-duration-fast) var(--ds-ease-in-out);
 }
 
+.mrfw-btn[aria-busy='true'] {
+  cursor: wait;
+}
+
 .mrfw-btn:disabled {
   cursor: not-allowed;
   opacity: 0.4;
@@ -6442,8 +6510,23 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   padding: 0 12px;
 }
 
-.mrfw-accessBadge,
-.mrfw-effectiveAccess {
+.mrfw-cwdTag {
+  flex: none;
+  padding: 0 6px;
+  border-radius: 4px;
+  background: var(--dsw-alias-interactive-bg-hover);
+  color: var(--dsw-alias-label-secondary);
+  font-size: 11px;
+  line-height: 18px;
+}
+
+.mrfw-accessBadge {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.mrfw-accessBadge {
   flex: none;
   font-size: 12px;
   line-height: 18px;
@@ -6477,6 +6560,336 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   width: 32px;
 }
 `;
+		//#endregion
+		//#region src/compat/skills-client.ts
+		function bindSkillsForm(ctx) {
+			const modern = ctx.get("configForms");
+			if (modern !== void 0) return modern.get("multi-root-skills");
+			return ctx.get("settingsScope")?.bind({ namespace: "multi-root-skills" });
+		}
+		function clientInject(ctx, services, callback) {
+			if (typeof ctx.inject === "function") ctx.inject(services, callback);
+		}
+		function registerNamespaceRule(ctx, rule) {
+			const conversation = ctx.get("uiConversation");
+			return typeof conversation?.userText?.register === "function" ? conversation.userText.register(rule) : void 0;
+		}
+		//#endregion
+		//#region src/client/skills-client.ts
+		/** Session-addressed Connection cache. Every refresh and change notification fences old replies. */
+		var SkillsClient = class {
+			connection;
+			states = /* @__PURE__ */ new Map();
+			closed = false;
+			constructor(connection) {
+				this.connection = connection;
+			}
+			state(id) {
+				let state = this.states.get(id);
+				if (state === void 0) {
+					state = {
+						epoch: 0,
+						listeners: /* @__PURE__ */ new Set()
+					};
+					this.states.set(id, state);
+				}
+				return state;
+			}
+			async call(endpoint, payload, signal) {
+				signal?.throwIfAborted();
+				const result = await this.connection.rpc.call(PANEL_CHANNEL, endpoint, payload, signal);
+				signal?.throwIfAborted();
+				if (!result.ok) throw new Error(result.error?.message ?? "Skills request failed");
+				return result.value;
+			}
+			async list(sessionId, signal) {
+				if (this.closed) throw new Error("Skills client is closed");
+				const state = this.state(sessionId);
+				if (state.pending === void 0) {
+					const epoch = ++state.epoch;
+					state.request?.abort();
+					const request = new AbortController();
+					state.request = request;
+					const pending = (async () => {
+						const value = skillsCatalogSchema.parse(await this.call("skillsList", { sessionId }, request.signal));
+						if (this.closed || value.sessionId !== sessionId || epoch !== state.epoch) throw new Error("Stale Skills response");
+						const changed = JSON.stringify(state.value) !== JSON.stringify(value);
+						state.value = value;
+						if (changed) for (const listener of state.listeners) listener();
+						return value;
+					})();
+					state.pending = pending;
+					pending.then(() => {
+						if (state.pending === pending) delete state.pending;
+					}, () => {
+						if (state.pending === pending) delete state.pending;
+					});
+				}
+				return await withAbort(state.pending, signal);
+			}
+			snapshot(sessionId) {
+				return this.states.get(sessionId)?.value;
+			}
+			async preview(sessionId, name, signal) {
+				const state = this.state(sessionId), epoch = state.epoch;
+				const value = skillsPreviewSchema.parse(await this.call("skillsPreview", {
+					sessionId,
+					name
+				}, signal));
+				if (this.closed || epoch !== state.epoch || value.sessionId !== sessionId || value.name !== name) throw new Error("Stale Skills preview");
+				return value;
+			}
+			subscribe(sessionId, listener) {
+				const state = this.state(sessionId);
+				state.listeners.add(listener);
+				if (state.watching === void 0) {
+					const lifetime = new AbortController();
+					state.watching = lifetime;
+					this.watch(sessionId, state, lifetime.signal);
+				}
+				return () => {
+					state.listeners.delete(listener);
+					if (state.listeners.size === 0) {
+						state.watching?.abort();
+						delete state.watching;
+						state.request?.abort();
+						this.states.delete(sessionId);
+					}
+				};
+			}
+			invalidate(state) {
+				state.epoch++;
+				state.request?.abort();
+				delete state.pending;
+				delete state.value;
+				for (const listener of state.listeners) listener();
+			}
+			reset() {
+				for (const state of this.states.values()) this.invalidate(state);
+			}
+			dispose() {
+				this.closed = true;
+				for (const state of this.states.values()) {
+					this.invalidate(state);
+					state.watching?.abort();
+				}
+				this.states.clear();
+			}
+			async watch(id, state, signal) {
+				while (!signal.aborted && !this.closed) try {
+					const current = state.value ?? await this.list(id, signal);
+					const next = skillsStatusSchema.parse(await this.call("skillsChanges", {
+						sessionId: id,
+						generation: current.generation
+					}, signal));
+					if (next.sessionId !== id) throw new Error("Wrong Skills Session");
+					if (next.generation !== current.generation) this.invalidate(state);
+				} catch {
+					if (signal.aborted || this.closed) return;
+					this.invalidate(state);
+					await new Promise((resolve) => {
+						const finish = () => {
+							clearTimeout(timer);
+							signal.removeEventListener("abort", finish);
+							resolve();
+						};
+						const timer = setTimeout(finish, 1e3);
+						signal.addEventListener("abort", finish, { once: true });
+					});
+				}
+			}
+		};
+		async function withAbort(promise, signal) {
+			signal?.throwIfAborted();
+			if (signal === void 0) return await promise;
+			return await new Promise((resolve, reject) => {
+				const abort = () => reject(signal.reason);
+				signal.addEventListener("abort", abort, { once: true });
+				promise.then((value) => {
+					signal.removeEventListener("abort", abort);
+					if (!signal.aborted) resolve(value);
+				}, (error) => {
+					signal.removeEventListener("abort", abort);
+					reject(error);
+				});
+			});
+		}
+		//#endregion
+		//#region src/client/skills.tsx
+		const namespaceSkillRule = {
+			id: "multi-root-skill",
+			order: 19,
+			match(text, from) {
+				const regex = /(?<!\S)\/([a-z0-9]+(?:-[a-z0-9]+)*:[a-z0-9]+(?:-[a-z0-9]+)*)(?!\S)/g;
+				regex.lastIndex = from;
+				const match = regex.exec(text);
+				return match === null ? void 0 : {
+					id: "multi-root-skill",
+					start: match.index,
+					end: match.index + match[0].length,
+					data: { name: match[1] }
+				};
+			}
+		};
+		function namespaceSource(client, t) {
+			return {
+				trigger: "/",
+				name: "multi-root-skills",
+				order: 3,
+				async candidates({ sessionId }, { query, signal }) {
+					try {
+						const view = client.snapshot(sessionId) ?? await client.list(sessionId, signal);
+						signal.throwIfAborted();
+						return view.skills.filter((skill) => skill.name.toLowerCase().includes(query.toLowerCase())).map((skill) => ({
+							name: skill.name,
+							description: skill.modelInvocable ? skill.description : `${t("skills.userOnly")} · ${skill.description}`
+						}));
+					} catch (error) {
+						if (signal.aborted) return [];
+						throw error;
+					}
+				},
+				onPick({ candidate }) {
+					return { text: `/${candidate.name} ` };
+				},
+				lexicon({ sessionId }) {
+					return client.snapshot(sessionId)?.skills.map((skill) => skill.name);
+				},
+				subscribeLexicon({ sessionId }, listener) {
+					return client.subscribe(sessionId, listener);
+				}
+			};
+		}
+		function installSkillsClient(ctx, t, subscribeSession) {
+			const connection = ctx.get("connection");
+			if (connection === void 0) return;
+			const client = new SkillsClient(connection);
+			ctx.effect(() => () => client.dispose());
+			ctx.effect(() => subscribeSession(() => {
+				client.reset();
+			}));
+			const source = namespaceSource(client, t);
+			clientInject(ctx, ["inputTriggers"], (scope) => {
+				return scope.get("inputTriggers").registerSource(source);
+			});
+			clientInject(ctx, ["uiConversation"], (scope) => {
+				const stop = registerNamespaceRule(scope, namespaceSkillRule);
+				if (stop === void 0) return;
+				const slots = scope.slots;
+				const stopRenderer = slots.inject("conversation.user.text.node", () => slots.register({
+					name: "conversation.user.text.node",
+					key: namespaceSkillRule.id,
+					priority: 100
+				}, ({ node }) => `/${node.data.name}`));
+				return () => {
+					stopRenderer();
+					stop();
+				};
+			});
+			if (typeof ctx.on === "function") ctx.on("connection/reset", () => {
+				client.reset();
+			});
+		}
+		//#endregion
+		//#region src/client/skills-settings.tsx
+		const BUNDLE_KEY = "@dsh-electron/dsh-plugin-multi-root-workspace";
+		function SkillsSettingsCard({ form, t }) {
+			const snapshot = (0, react.useSyncExternalStore)((listener) => form.subscribe(listener), () => form.getSnapshot());
+			const [busy, setBusy] = (0, react.useState)(false), [error, setError] = (0, react.useState)();
+			const mounted = (0, react.useRef)(true);
+			(0, react.useEffect)(() => {
+				mounted.current = true;
+				return () => {
+					mounted.current = false;
+				};
+			}, []);
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "mrfw-skillsSettings",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					className: "mrfw-skillsSettingsText",
+					children: [
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							className: "mrfw-skillsSettingsTitle",
+							children: t("skills.globalEnable")
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							className: "mrfw-skillsSettingsDescription",
+							children: t("skills.globalHint")
+						}),
+						error ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							role: "alert",
+							children: error
+						}) : null
+					]
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Switch, {
+					label: t("skills.globalEnable"),
+					checked: snapshot.value?.enabled ?? true,
+					disabled: busy || snapshot.status !== "ready" || !snapshot.writable,
+					onChange: (enabled) => {
+						setBusy(true);
+						setError(void 0);
+						form.mutate([{
+							op: "set",
+							path: ["enabled"],
+							value: enabled
+						}], snapshot.revision).then((ok) => {
+							if (mounted.current && !ok) setError(t("skills.settingsFailed"));
+						}).catch(() => {
+							if (mounted.current) setError(t("skills.settingsFailed"));
+						}).finally(() => {
+							if (mounted.current) setBusy(false);
+						});
+					}
+				})]
+			});
+		}
+		function installSkillsSettingsCard(ctx, t) {
+			let current;
+			let stop;
+			const candidates = /* @__PURE__ */ new Map();
+			const update = () => {
+				const chosen = [...candidates.entries()].sort(([a], [b]) => Number(b.get("configForms") !== void 0) - Number(a.get("configForms") !== void 0))[0];
+				if (chosen?.[1] === current) return;
+				stop?.();
+				stop = void 0;
+				current = chosen?.[1];
+				if (!chosen) return;
+				const [scope, form] = chosen;
+				const slots = scope.slots;
+				const disposers = [slots.inject("settings.plugin.item", () => slots.register({
+					name: "settings.plugin.item",
+					key: "multi-root-skills",
+					inject: () => ({
+						form,
+						t
+					})
+				}, SkillsSettingsCard)), slots.inject("plugins.bundle.config", () => slots.register({
+					name: "plugins.bundle.config",
+					key: BUNDLE_KEY,
+					inject: () => ({
+						form,
+						t
+					})
+				}, SkillsSettingsCard))];
+				stop = () => {
+					for (const dispose of disposers) dispose();
+				};
+			};
+			for (const service of ["settingsScope", "configForms"]) clientInject(ctx, [service], (scope) => {
+				const form = bindSkillsForm(scope);
+				if (form === void 0) return;
+				candidates.set(scope, form);
+				update();
+				return () => {
+					candidates.delete(scope);
+					update();
+				};
+			});
+			ctx.effect(() => () => {
+				stop?.();
+				candidates.clear();
+			});
+		}
 		//#endregion
 		//#region src/compat/client-icons.ts
 		/**
@@ -6536,11 +6949,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		const IconRefresh = icon("IconRefreshOutline16", "IconRefreshOutlineRegular");
 		const IconSettings = icon("IconSettingsOutline16", "IconSettingsOutlineRegular");
 		const IconTrash = icon("IconTrashOutline16", "IconTrashOutlineRegular");
-		const IconAccessReadWrite = maybeIcon(["IconWorkspaceWriteRegular"]);
-		const IconAccessReadOnly = maybeIcon(["IconReadOnlyRegular"]);
+		const IconAccessReadWrite = maybeIcon(["PermissionIconWorkspaceWriteRegular", "IconWorkspaceWriteRegular"]);
+		const IconAccessReadOnly = maybeIcon(["PermissionIconReadOnlyRegular", "IconReadOnlyRegular"]);
 		const IconAccessInherit = maybeIcon(["IconWorkspaceTreeOutline16", "IconWorkspaceTreeOutlineRegular"]);
 		//#endregion
-		//#region node_modules/.pnpm/@deepseek-ai+dsh-typert-protocol@0.2.1-rc.2_@deepseek-ai+cordis@4.0.5/node_modules/@deepseek-ai/dsh-typert-protocol/lib/index.js
+		//#region node_modules/.pnpm/@deepseek-ai+dsh-typert-protocol@0.2.1-rc.3_@deepseek-ai+cordis@4.0.5/node_modules/@deepseek-ai/dsh-typert-protocol/lib/index.js
 		/** The one Remote failure class shared by owners, the Gateway, and consumers. */
 		/**
 		* One Remote call failure: a real Error carrying its stable code and typed
@@ -7050,7 +7463,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			return n;
 		}
 		//#endregion
-		//#region node_modules/.pnpm/@deepseek-ai+dsh-util-workspace-path@0.2.1-rc.2_@deepseek-ai+cordis@4.0.5/node_modules/@deepseek-ai/dsh-util-workspace-path/lib/index.js
+		//#region node_modules/.pnpm/@deepseek-ai+dsh-util-workspace-path@0.2.1-rc.3_@deepseek-ai+cordis@4.0.5/node_modules/@deepseek-ai/dsh-util-workspace-path/lib/index.js
 		/**
 		* The `dsh-resource://file/…` address grammar: how a file is named across the
 		* Sidebar and the resource model, built and parsed without touching a
@@ -7472,7 +7885,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			};
 		}
 		//#endregion
-		//#region node_modules/.pnpm/@deepseek-ai+dsh-host-open-in-app@0.2.1-rc.2_@deepseek-ai+cordis@4.0.5_@deepseek-ai+dsh_90dfa79a7f5aae0c8b5a66b41d5c318b/node_modules/@deepseek-ai/dsh-host-open-in-app/lib/types/shared.js
+		//#region node_modules/.pnpm/@deepseek-ai+dsh-host-open-in-app@0.2.1-rc.3_@deepseek-ai+cordis@4.0.5_@deepseek-ai+dsh_5b371ee77d0b761177ea40ae8a5dc767/node_modules/@deepseek-ai/dsh-host-open-in-app/lib/types/shared.js
 		var shared_exports = /* @__PURE__ */ __exportAll({
 			OPEN_IN_APP_APPS_PATH: () => OPEN_IN_APP_APPS_PATH,
 			OPEN_IN_APP_APPS_ROUTE: () => OPEN_IN_APP_APPS_ROUTE,
@@ -8039,7 +8452,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		* The Workspace Folders panel: one sidebar footer action that opens a dialog
 		* listing this session's workspace root and the additional roots registered for
 		* it, with the actions the milestone requires — Add (through the composed
-		* directory picker), Remove, Alias, Copy Path, Reveal, and reordering.
+		* directory picker), Remove, Alias, Copy Path, and Reveal.
 		*
 		* Why a footer action and its own dialog, instead of a first-class panel: the
 		* slots that can host a full panel (`sidebar.panellist` + the keyed `main`
@@ -8065,14 +8478,19 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			primary: "mrfw-btnPrimary",
 			danger: "mrfw-btnDanger"
 		};
-		/** One small capsule button matching the panel's own styling. */
+		/** One small capsule button matching the panel's own styling.
+		* Pending requests block activation through aria-disabled without changing
+		* opacity, hover or keyboard focus. Native disabled is for unavailable actions.
+		*/
 		function Action(props) {
 			const variant = props.variant ?? "ghost";
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 				type: "button",
 				className: `mrfw-btn ${VARIANT_CLASS[variant]}`,
-				onClick: props.onClick,
+				onClick: props.pending === true ? void 0 : props.onClick,
 				disabled: props.disabled === true,
+				"aria-disabled": props.disabled === true || props.pending === true || void 0,
+				"aria-busy": props.pending === true || void 0,
 				children: props.children
 			});
 		}
@@ -8085,13 +8503,35 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 				type: "button",
 				className: `mrfw-btn mrfw-iconBtn ${VARIANT_CLASS[variant]}`,
-				title: props.label,
+				title: props.hint ?? props.label,
 				"aria-label": props.label,
-				onClick: props.onClick,
+				"aria-pressed": props.pressed,
+				onClick: props.pending === true ? void 0 : props.onClick,
 				disabled: props.disabled === true,
+				"aria-disabled": props.disabled === true || props.pending === true || void 0,
+				"aria-busy": props.pending === true || void 0,
 				children: props.icon
 			});
 		}
+		/** A skill is a reusable instruction document; the star denotes its capability. */
+		function SkillsIcon({ enabled }) {
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("svg", {
+				width: "16",
+				height: "16",
+				viewBox: "0 0 16 16",
+				fill: "none",
+				stroke: "currentColor",
+				strokeWidth: "1",
+				strokeLinecap: "round",
+				strokeLinejoin: "round",
+				"aria-hidden": "true",
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", { d: "M8 13.5H3a1 1 0 0 1-1-1v-10a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1V7M4.5 4.5h5M4.5 7h3" }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", { d: "m11.5 8 .85 2.65L15 11.5l-2.65.85-.85 2.65-.85-2.65L8 11.5l2.65-.85Z" }),
+					enabled ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", { d: "m2 14 12-12" })
+				]
+			});
+		}
 		/** The 16px close glyph of the dialog's header button. */
 		function CloseIcon() {
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("svg", {
@@ -8111,7 +8551,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		* and reveals a trailing icon on hover — clicking the text or the icon
 		* copies the same canonical path. The accessible name swaps to "copied"
 		* for the feedback window, the icon button's old recipe. Shared by the
-		* primary row, the current-directory line, and every additional root.
+		* primary row and every additional root.
 		*/
 		function PathCopy(props) {
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
@@ -8167,6 +8607,18 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		function displayNameOf(root) {
 			return root.alias ?? basename(root.path);
 		}
+		/** Display-only path matching; the host remains the sole authority for grants. */
+		function workingRootOf(view) {
+			if (view?.effectiveCwd === void 0) return void 0;
+			const normalize = (path) => {
+				return (/^[a-z]:[\\/]/i.test(path) || path.startsWith("\\") ? path.replace(/\\/g, "/").toLowerCase() : path).replace(/\/+$/, "") || "/";
+			};
+			const cwd = normalize(view.effectiveCwd);
+			return [view.primaryRoot, ...view.roots.map((root) => root.path)].filter((path) => {
+				const root = normalize(path);
+				return cwd === root || cwd.startsWith(root.endsWith("/") ? root : `${root}/`);
+			}).sort((a, b) => normalize(b).length - normalize(a).length)[0];
+		}
 		/** The sidebar footer action plus the dialog it opens. */
 		function WorkspaceFoldersAction(props) {
 			const [open, setOpen] = (0, react.useState)(false);
@@ -8243,6 +8695,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			const [upgradeFor, setUpgradeFor] = (0, react.useState)(void 0);
 			const [aliasFor, setAliasFor] = (0, react.useState)(void 0);
 			const [aliasDraft, setAliasDraft] = (0, react.useState)("");
+			const [aliasField, setAliasField] = (0, react.useState)("alias");
 			const [copiedId, setCopiedId] = (0, react.useState)(void 0);
 			const [menuFor, setMenuFor] = (0, react.useState)(void 0);
 			const dialogRef = (0, react.useRef)(null);
@@ -8521,7 +8974,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					}));
 				}
 			}, []);
-			const move = (0, react.useCallback)(async (root, before) => {
+			(0, react.useCallback)(async (root, before) => {
 				await mutate("move", before === void 0 ? { entry: entryOf(root) } : {
 					entry: entryOf(root),
 					beforeEntry: entryOf(before)
@@ -8531,7 +8984,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			const atLimit = state.view !== void 0 && state.view.count >= state.view.limit;
 			const IconAccessTrigger = addAccess === "read-only" ? IconAccessReadOnly : addAccess === "read-write" ? IconAccessReadWrite : IconAccessInherit;
 			const primaryPath = state.view?.primaryRoot;
-			const cwdPath = state.view?.effectiveCwd;
+			const workingRoot = workingRootOf(state.view);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "mrfw-overlay",
 				role: "presentation",
@@ -8568,18 +9021,6 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 							className: "mrfw-note",
 							children: t("panel.noSession")
 						}) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-								className: "mrfw-description",
-								children: t("panel.subtitle")
-							}),
-							state.view?.mode === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
-								className: "mrfw-note",
-								children: [
-									t("panel.mode"),
-									" ",
-									t(`mode.${state.view.mode}`)
-								]
-							}),
 							state.view?.toolAccessInvalid ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 								className: "mrfw-note",
 								children: t("panel.invalidCap")
@@ -8612,12 +9053,15 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 									className: "mrfw-row mrfw-rowBare",
 									children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 										className: "mrfw-rootText",
-										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 											className: "mrfw-rootName",
-											children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 												className: "mrfw-rootNameText",
 												children: state.view === void 0 ? "…" : state.view.primaryName ?? basename(state.view.primaryRoot)
-											})
+											}), primaryPath !== void 0 && workingRoot === primaryPath ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "mrfw-cwdTag",
+												children: t("panel.currentAgentCwd")
+											}) : null]
 										}), primaryPath === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 											className: "mrfw-rootPath",
 											children: "…"
@@ -8632,26 +9076,6 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 									})
 								})]
 							}),
-							cwdPath !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
-								className: "mrfw-section",
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "mrfw-sectionTitleRow",
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "mrfw-sectionTitle",
-										children: t("panel.cwd")
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "mrfw-sectionNote",
-										children: t("panel.cwdNote")
-									})]
-								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(PathCopy, {
-									path: cwdPath,
-									copied: copiedId === "cwd",
-									onCopy: () => {
-										copyPath("cwd", cwdPath);
-									},
-									t
-								})]
-							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 								className: "mrfw-section",
 								children: [
@@ -8674,8 +9098,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 											t("panel.emptyHint")
 										]
 									}) : null,
-									roots.map((root, index) => {
+									roots.map((root) => {
 										const key = rowKey(root);
+										const IconAccess = root.access === "read-only" ? IconAccessReadOnly : root.access === "read-write" ? IconAccessReadWrite : IconAccessInherit;
 										return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 											className: "mrfw-row",
 											children: [
@@ -8688,17 +9113,16 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 																className: "mrfw-rootNameText",
 																children: displayNameOf(root)
 															}),
-															/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+															workingRoot === root.path ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+																className: "mrfw-cwdTag",
+																children: t("panel.currentAgentCwd")
+															}) : null,
+															/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 																className: "mrfw-accessBadge",
-																children: t(accessKey(root.access))
-															}),
-															root.effectiveAccess === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-																className: "mrfw-effectiveAccess",
-																children: [
-																	t("panel.effectiveAccess"),
-																	" ",
-																	t(`effective.${root.effectiveAccess}`)
-																]
+																children: [IconAccess === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconAccess, { size: 14 }), root.effectiveAccess === void 0 ? t(accessKey(root.access)) : t("panel.accessEffective", {
+																	access: t(accessKey(root.access)),
+																	effective: t(`effective.${root.effectiveAccess}`)
+																})]
 															})
 														]
 													}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(PathCopy, {
@@ -8716,36 +9140,33 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 													children: t(stateKey(root.state))
 												}),
 												root.state === "available" ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconButton, {
-													disabled: state.busy,
+													pending: state.busy,
 													onClick: () => {
 														reRegister(root);
 													},
 													icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconRefresh, {}),
 													label: t("panel.reRegister")
 												}),
-												/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconButton, {
-													disabled: state.busy,
-													onClick: () => {
-														reveal(root);
-													},
-													icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconFolderOpen, {}),
-													label: t("panel.reveal")
-												}),
-												/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconButton, {
-													disabled: state.busy || index === 0,
+												root.skillsEnabled === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconButton, {
+													pending: state.busy,
+													pressed: root.skillsEnabled,
 													onClick: () => {
-														move(root, roots[index - 1]);
+														mutate("setSkillsEnabled", {
+															entry: entryOf(root),
+															skillsEnabled: !root.skillsEnabled
+														});
 													},
-													icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconChevronUp, {}),
-													label: t("panel.moveUp")
+													icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SkillsIcon, { enabled: root.skillsEnabled }),
+													label: t("panel.skills"),
+													hint: t(root.skillsEnabled ? "panel.skillsEnabled" : "panel.skillsDisabled")
 												}),
 												/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconButton, {
-													disabled: state.busy || index === roots.length - 1,
+													pending: state.busy,
 													onClick: () => {
-														move(root, roots[index + 2]);
+														reveal(root);
 													},
-													icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconChevronDown, {}),
-													label: t("panel.moveDown")
+													icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconFolderOpen, {}),
+													label: t("panel.reveal")
 												}),
 												/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Menu, {
 													open: menuFor === key,
@@ -8758,19 +9179,27 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 															label: t("panel.rename"),
 															icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconEdit, {})
 														},
+														{
+															id: "alias-id",
+															label: t("panel.aliasIdEdit"),
+															disabled: state.busy
+														},
 														{
 															id: "access:inherit",
 															label: t("panel.accessInherit"),
+															icon: IconAccessInherit === void 0 ? void 0 : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconAccessInherit, {}),
 															disabled: state.busy || root.access === "inherit"
 														},
 														{
 															id: "access:read-only",
 															label: t("panel.accessReadOnly"),
+															icon: IconAccessReadOnly === void 0 ? void 0 : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconAccessReadOnly, {}),
 															disabled: state.busy || root.access === "read-only"
 														},
 														{
 															id: "access:read-write",
 															label: t("panel.accessReadWrite"),
+															icon: IconAccessReadWrite === void 0 ? void 0 : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconAccessReadWrite, {}),
 															disabled: state.busy || root.access === "read-write"
 														},
 														{
@@ -8783,7 +9212,13 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 													],
 													onSelect: (id) => {
 														setMenuFor(void 0);
+														if (id === "alias-id") {
+															setAliasField("aliasId");
+															setAliasFor(key);
+															setAliasDraft(root.aliasId ?? "");
+														}
 														if (id === "rename") {
+															setAliasField("alias");
 															setAliasFor(key);
 															setAliasDraft(root.alias ?? "");
 														}
@@ -8807,7 +9242,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 													align: "end",
 													closeOnPointerLeave: true,
 													anchor: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconButton, {
-														disabled: state.busy,
+														pending: state.busy,
 														onClick: () => {
 															setMenuFor((current) => current === key ? void 0 : key);
 														},
@@ -8822,19 +9257,20 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 															autoFocus: true,
 															className: "mrfw-input mrfw-inputInline",
 															value: aliasDraft,
-															placeholder: t("panel.aliasPlaceholder"),
+															placeholder: t(aliasField === "aliasId" ? "panel.aliasIdPlaceholder" : "panel.aliasPlaceholder"),
 															onChange: (event) => {
 																setAliasDraft(event.target.value);
 															}
 														}),
 														/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Action, {
-															disabled: state.busy,
+															pending: state.busy,
 															onClick: () => {
-																mutate("alias", {
+																mutate(aliasField === "aliasId" ? "setAliasId" : "alias", {
 																	entry: entryOf(root),
-																	alias: aliasDraft
+																	[aliasField]: aliasDraft
+																}).then((ok) => {
+																	if (ok) setAliasFor(void 0);
 																});
-																setAliasFor(void 0);
 															},
 															children: t("panel.aliasSave")
 														}),
@@ -8856,7 +9292,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 							children: [
 								state.noSession || props.pickDirectory === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconButton, {
 									variant: "outline",
-									disabled: state.busy || atLimit,
+									pending: state.busy,
+									disabled: atLimit,
 									onClick: () => {
 										addViaPicker();
 									},
@@ -8918,9 +9355,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 											"aria-label": t("panel.accessLabel"),
 											"aria-haspopup": "menu",
 											"aria-expanded": accessMenuOpen,
-											disabled: state.busy || atLimit,
+											disabled: atLimit,
+											"aria-disabled": state.busy || atLimit || void 0,
+											"aria-busy": state.busy || void 0,
 											onClick: () => {
-												setAccessMenuOpen((open) => !open);
+												if (!state.busy) setAccessMenuOpen((open) => !open);
 											},
 											children: [
 												IconAccessTrigger === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconAccessTrigger, {}),
@@ -8933,7 +9372,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 										onClick: () => {
 											addManualPath();
 										},
-										disabled: state.busy || atLimit || manualPath.trim() === "",
+										pending: state.busy,
+										disabled: atLimit || manualPath.trim() === "",
 										variant: "primary",
 										children: t("panel.addConfirm")
 									})
@@ -8946,7 +9386,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 									onClick: () => {
 										refresh();
 									},
-									disabled: state.busy,
+									pending: state.busy,
 									variant: "outline",
 									children: t("panel.retry")
 								})
@@ -8969,7 +9409,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					children: t("panel.aliasCancel")
 				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Action, {
 					variant: "danger",
-					disabled: state.busy,
+					pending: state.busy,
 					onClick: () => {
 						const pending = upgradeFor;
 						setUpgradeFor(void 0);
@@ -9301,6 +9741,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			const sessionId = () => currentSessionIdOf(readService(ctx, "sessions"));
 			const subscribeSession = (listener) => subscribeSessions(readService(ctx, "sessions"), listener);
 			const t = ctx.locale.bind(NS$2);
+			installSkillsClient(ctx, t, (listener) => subscribeCurrentSession(readService(ctx, "sessions"), listener));
+			installSkillsSettingsCard(ctx, t);
 			const openInApp = createOpenInAppAdapter({
 				t: ctx.locale.bind(NS),
 				shortcuts: readService(ctx, "shortcuts")?.catalog