dsh-skill-importer 0.2.3 → 0.2.5

package/lib/client.js

@@ -225,14 +225,24 @@ window.__ModuleLoader__.load({
 			});
 		}
 		/** The settings section's page body. */
-		function SkillImporterSection({ t, useSkills, useWorkspaces, actions }) {
+		function SkillImporterSection({ t, useSkills, useSkillIssues, useWorkspaces, actions }) {
 			const skills = useSkills((value) => value);
+			const skillIssues = useSkillIssues((value) => value);
 			const workspaces = useWorkspaces((value) => value);
-			const workspace = (0, react.useMemo)(() => workspaces.items.find((item) => item.workspaceId === workspaces.recentWorkspaceId) ?? workspaces.items[0], [workspaces.items, workspaces.recentWorkspaceId]);
+			const [selectedWorkspaceId, setSelectedWorkspaceId] = (0, react.useState)(() => workspaces.recentWorkspaceId ?? workspaces.items[0]?.workspaceId);
+			(0, react.useEffect)(() => {
+				if (selectedWorkspaceId !== void 0 && workspaces.items.some((item) => item.workspaceId === selectedWorkspaceId)) return;
+				setSelectedWorkspaceId(workspaces.recentWorkspaceId ?? workspaces.items[0]?.workspaceId);
+			}, [
+				selectedWorkspaceId,
+				workspaces.items,
+				workspaces.recentWorkspaceId
+			]);
+			const workspace = (0, react.useMemo)(() => workspaces.items.find((item) => item.workspaceId === selectedWorkspaceId), [selectedWorkspaceId, workspaces.items]);
 			const [listState, setListState] = (0, react.useState)("idle");
 			const [listError, setListError] = (0, react.useState)();
 			const [listEpoch, setListEpoch] = (0, react.useState)(0);
-			const [collapsedSources, setCollapsedSources] = (0, react.useState)(() => /* @__PURE__ */ new Set());
+			const [expandedGroups, setExpandedGroups] = (0, react.useState)(() => /* @__PURE__ */ new Set());
 			(0, react.useEffect)(() => {
 				let cancelled = false;
 				setListState("loading");
@@ -249,7 +259,10 @@ window.__ModuleLoader__.load({
 				};
 			}, [listEpoch, actions]);
 			const [mode, setMode] = (0, react.useState)("file");
-			const [target, setTarget] = (0, react.useState)("project-agents");
+			const [target, setTarget] = (0, react.useState)("project-dsh");
+			(0, react.useEffect)(() => {
+				if (workspaces.items.length === 0 && target.startsWith("project-")) setTarget("user-dsh");
+			}, [target, workspaces.items.length]);
 			const [fileDraft, setFileDraft] = (0, react.useState)();
 			const [fileError, setFileError] = (0, react.useState)();
 			const [url, setUrl] = (0, react.useState)("");
@@ -262,8 +275,41 @@ window.__ModuleLoader__.load({
 			const [batchResults, setBatchResults] = (0, react.useState)();
 			const [replaceNames, setReplaceNames] = (0, react.useState)(() => /* @__PURE__ */ new Set());
 			const [pendingDelete, setPendingDelete] = (0, react.useState)();
+			const [locationOpen, setLocationOpen] = (0, react.useState)(false);
+			const [workspaceQuery, setWorkspaceQuery] = (0, react.useState)("");
+			const [draftTarget, setDraftTarget] = (0, react.useState)("project-dsh");
+			const [draftWorkspaceId, setDraftWorkspaceId] = (0, react.useState)();
+			const [updateState, setUpdateState] = (0, react.useState)("checking");
+			const [updateStatus, setUpdateStatus] = (0, react.useState)();
+			const [updateDialogOpen, setUpdateDialogOpen] = (0, react.useState)(false);
+			const [commandCopied, setCommandCopied] = (0, react.useState)(false);
 			const [batchConfirmation, setBatchConfirmation] = (0, react.useState)();
 			const fileInput = (0, react.useRef)(null);
+			const checkForUpdates = () => {
+				setUpdateState("checking");
+				actions.checkForUpdates().then((status) => {
+					setUpdateStatus(status);
+					setUpdateState(status.error === void 0 ? "ready" : "error");
+				}, () => setUpdateState("error"));
+			};
+			(0, react.useEffect)(() => {
+				let cancelled = false;
+				actions.checkForUpdates().then((status) => {
+					if (cancelled) return;
+					setUpdateStatus(status);
+					setUpdateState(status.error === void 0 ? "ready" : "error");
+				}, () => {
+					if (!cancelled) setUpdateState("error");
+				});
+				return () => {
+					cancelled = true;
+				};
+			}, [actions]);
+			const copyUpdateCommand = async () => {
+				if (updateStatus?.command === void 0) return;
+				await navigator.clipboard.writeText(updateStatus.command);
+				setCommandCopied(true);
+			};
 			const onFilePicked = async (file) => {
 				setFileDraft(void 0);
 				setFileError(void 0);
@@ -314,7 +360,7 @@ window.__ModuleLoader__.load({
 					if (await actions.deleteSkill({
 						name: skill.name,
 						source: skill.source,
-						workspacePath: workspace?.path
+						workspacePath: skill.workspacePath
 					})) {
 						setMessage(t("deleted"));
 						setPendingDelete(void 0);
@@ -454,7 +500,17 @@ window.__ModuleLoader__.load({
 				setTarget(next);
 				if (mode === "batch") resetBatchPreflight();
 			};
-			const canSubmit = busy || mode === "file" && fileDraft === void 0 || mode === "url" && (url.trim().length === 0 || !/^https?:\/\//i.test(url.trim())) || mode === "batch" && batchPath === void 0 || target !== "user" && workspace === void 0;
+			const chooseDestination = (nextTarget, nextWorkspaceId) => {
+				if (nextWorkspaceId !== void 0) setSelectedWorkspaceId(nextWorkspaceId);
+				changeTarget(nextTarget);
+				setLocationOpen(false);
+			};
+			const locationSummary = target === "project-dsh" ? t("locationSummaryProjectDsh", { title: workspace?.title ?? "" }) : target === "project-agents" ? t("locationSummaryProjectAgents", { title: workspace?.title ?? "" }) : target === "user-dsh" ? t("locationSummaryUserDsh") : t("locationSummaryUserAgents");
+			const filteredWorkspaces = workspaces.items.filter((item) => {
+				const query = workspaceQuery.trim().toLowerCase();
+				return query.length === 0 || item.title.toLowerCase().includes(query) || item.path.toLowerCase().includes(query);
+			});
+			const canSubmit = busy || mode === "file" && fileDraft === void 0 || mode === "url" && (url.trim().length === 0 || !/^https?:\/\//i.test(url.trim())) || mode === "batch" && batchPath === void 0 || target.startsWith("project-") && workspace === void 0;
 			const runPrimaryAction = () => {
 				if (mode !== "batch") {
 					submit();
@@ -468,13 +524,33 @@ window.__ModuleLoader__.load({
 				if (!skill.modelInvocable && skill.userInvocable) return t("userOnly");
 				if (skill.modelInvocable && !skill.userInvocable) return t("modelOnly");
 			};
-			const toggleSource = (source) => {
-				setCollapsedSources((current) => {
+			const toggleGroup = (groupKey) => {
+				setExpandedGroups((current) => {
 					const next = new Set(current);
-					if (!next.delete(source)) next.add(source);
+					if (!next.delete(groupKey)) next.add(groupKey);
 					return next;
 				});
 			};
+			const skillGroups = [
+				...workspaces.items.flatMap((item) => ["project-dsh", "project-agents"].map((source) => ({
+					key: `${item.workspaceId}:${source}`,
+					source,
+					workspacePath: item.path,
+					name: source === "project-dsh" ? t("targetProjectDsh", { title: item.title }) : t("targetProjectAgents", { title: item.title })
+				}))),
+				{
+					key: "user-dsh",
+					source: "user-dsh",
+					workspacePath: void 0,
+					name: t("targetUserDsh")
+				},
+				{
+					key: "user-agents",
+					source: "user-agents",
+					workspacePath: void 0,
+					name: t("targetUserAgents")
+				}
+			];
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				style: {
 					display: "flex",
@@ -529,23 +605,33 @@ window.__ModuleLoader__.load({
 									listError
 								]
 							}) : null,
+							listState !== "error" && skillIssues.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								style: {
+									...descriptionStyle,
+									color: "var(--dsw-alias-state-warn-label)"
+								},
+								children: [
+									t("installedPartial", { count: skillIssues.length }),
+									" ",
+									skillIssues[0]?.message
+								]
+							}) : null,
 							listState === "idle" && skills.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 								style: descriptionStyle,
 								children: t("installedEmpty")
 							}) : null,
 							skills.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 								style: skillGroupsStyle,
-								children: ["project-agents", "user"].map((source) => {
-									const rows = skills.filter((skill) => skill.source === source);
+								children: skillGroups.map((group) => {
+									const rows = skills.filter((skill) => skill.source === group.source && (!group.source.startsWith("project-") || skill.workspacePath === group.workspacePath));
 									if (rows.length === 0) return null;
-									const sourceName = source === "user" ? t("targetUser") : workspace === void 0 ? t("targetProjectNoWorkspace") : t("targetProjectAgents", { title: workspace.title });
-									const open = !collapsedSources.has(source);
+									const open = expandedGroups.has(group.key);
 									return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 										style: skillGroupCardStyle,
 										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 											type: "button",
 											"aria-expanded": open,
-											onClick: () => toggleSource(source),
+											onClick: () => toggleGroup(group.key),
 											style: {
 												...skillGroupHeaderStyle,
 												borderBottom: open ? skillGroupHeaderStyle.borderBottom : "none"
@@ -559,7 +645,7 @@ window.__ModuleLoader__.load({
 													style: skillGroupIdentityStyle,
 													children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 														style: skillGroupNameStyle,
-														children: sourceName
+														children: group.name
 													})
 												}),
 												/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
@@ -607,10 +693,10 @@ window.__ModuleLoader__.load({
 															children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(TrashIcon, {})
 														})
 													]
-												}, skill.source + ":" + skill.name);
+												}, skill.source + ":" + (skill.workspacePath ?? "") + ":" + skill.name);
 											})
 										}) : null]
-									}, source);
+									}, group.key);
 								})
 							}) : null
 						]
@@ -1014,17 +1100,28 @@ window.__ModuleLoader__.load({
 													style: fieldLabelStyle,
 													children: t("targetLabel")
 												}),
-												/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
-													value: target,
-													onChange: (event) => changeTarget(event.target.value),
-													style: selectStyle,
-													children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-														value: "project-agents",
-														disabled: workspace === void 0,
-														children: workspace === void 0 ? t("targetProjectNoWorkspace") : t("targetProjectAgents", { title: workspace.title })
-													}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-														value: "user",
-														children: t("targetUser")
+												/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+													type: "button",
+													onClick: () => {
+														setWorkspaceQuery("");
+														setDraftTarget(target);
+														setDraftWorkspaceId(selectedWorkspaceId);
+														setLocationOpen(true);
+													},
+													style: locationSummaryStyle,
+													children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+														style: {
+															minWidth: 0,
+															flex: 1,
+															overflow: "hidden",
+															textOverflow: "ellipsis",
+															whiteSpace: "nowrap",
+															textAlign: "left"
+														},
+														children: locationSummary
+													}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+														style: secondaryButtonStyle,
+														children: t("locationChange")
 													})]
 												}),
 												workspace === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
@@ -1057,6 +1154,191 @@ window.__ModuleLoader__.load({
 							]
 						})
 					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						style: versionFooterStyle,
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							style: versionCopyStyle,
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								style: versionLabelStyle,
+								children: updateStatus === void 0 ? t("versionChecking") : t("versionCurrent", { version: updateStatus.currentVersion })
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								style: descriptionStyle,
+								children: updateState === "checking" ? t("versionChecking") : updateState === "error" ? t("versionCheckFailed") : updateStatus?.updateAvailable === true ? t("versionAvailable", { version: updateStatus.latestVersion ?? "" }) : t("versionLatest")
+							})]
+						}), updateState === "error" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+							type: "button",
+							onClick: checkForUpdates,
+							style: pillStyle,
+							children: t("versionRetry")
+						}) : updateStatus?.updateAvailable === true ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+							type: "button",
+							onClick: () => {
+								setCommandCopied(false);
+								setUpdateDialogOpen(true);
+							},
+							style: updateButtonStyle,
+							children: t("versionUpdate")
+						}) : null]
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
+						open: locationOpen,
+						onClose: () => setLocationOpen(false),
+						title: t("locationTitle"),
+						closeLabel: t("close"),
+						footer: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+							variant: "outline",
+							onClick: () => setLocationOpen(false),
+							children: t("cancel")
+						}),
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							style: locationPanelStyle,
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								style: locationScopeStyle,
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									onClick: () => {
+										if (!draftTarget.startsWith("project-")) setDraftTarget("project-dsh");
+									},
+									style: {
+										...locationScopeButtonStyle,
+										...draftTarget.startsWith("project-") ? locationScopeButtonActiveStyle : {}
+									},
+									children: t("locationProject")
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									onClick: () => {
+										if (draftTarget.startsWith("project-")) setDraftTarget("user-dsh");
+									},
+									style: {
+										...locationScopeButtonStyle,
+										...!draftTarget.startsWith("project-") ? locationScopeButtonActiveStyle : {}
+									},
+									children: t("locationGlobal")
+								})]
+							}), draftTarget.startsWith("project-") ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+								type: "search",
+								value: workspaceQuery,
+								onChange: (event) => setWorkspaceQuery(event.target.value),
+								placeholder: t("workspaceSearch"),
+								style: controlStyle
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								style: locationWorkspaceListStyle,
+								children: [filteredWorkspaces.map((item) => {
+									const selected = item.workspaceId === draftWorkspaceId;
+									return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										style: {
+											...locationWorkspaceGroupStyle,
+											...selected ? locationWorkspaceActiveStyle : {}
+										},
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+											type: "button",
+											onClick: (event) => {
+												const group = event.currentTarget.parentElement;
+												setDraftWorkspaceId(selected ? void 0 : item.workspaceId);
+												if (!selected) window.requestAnimationFrame(() => group?.scrollIntoView({
+													block: "nearest",
+													behavior: "smooth"
+												}));
+											},
+											style: locationWorkspaceStyle,
+											"aria-expanded": selected,
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+												style: {
+													minWidth: 0,
+													flex: 1,
+													display: "flex",
+													flexDirection: "column",
+													gap: 2
+												},
+												children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+													style: skillNameStyle,
+													children: item.title
+												}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+													style: skillDescriptionStyle,
+													children: item.path
+												})]
+											}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												style: skillGroupChevronStyle,
+												children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ChevronIcon, { open: selected })
+											})]
+										}), selected ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											style: locationExpandedRootsStyle,
+											children: [
+												/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+													style: locationRootHintStyle,
+													children: t("chooseRootHint")
+												}),
+												/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+													type: "button",
+													onClick: () => chooseDestination("project-dsh", item.workspaceId),
+													style: locationOptionStyle,
+													children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+														style: locationOptionCopyStyle,
+														children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t("rootProjectDsh") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", {
+															style: descriptionStyle,
+															children: ".dsh/skills"
+														})]
+													}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+														style: priorityHighStyle,
+														children: t("priorityHighest")
+													})]
+												}),
+												/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+													type: "button",
+													onClick: () => chooseDestination("project-agents", item.workspaceId),
+													style: locationOptionStyle,
+													children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+														style: locationOptionCopyStyle,
+														children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t("rootProjectAgents") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", {
+															style: descriptionStyle,
+															children: ".agents/skills"
+														})]
+													}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+														style: priorityMediumStyle,
+														children: t("priorityHigher")
+													})]
+												})
+											]
+										}) : null]
+									}, item.workspaceId);
+								}), filteredWorkspaces.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+									style: descriptionStyle,
+									children: t("workspaceNoMatch")
+								}) : null]
+							})] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								style: locationRootsStyle,
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+									type: "button",
+									onClick: () => chooseDestination("user-dsh"),
+									style: locationOptionStyle,
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+										style: locationOptionCopyStyle,
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t("rootUserDsh") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", {
+											style: descriptionStyle,
+											children: "~/.dsh/skills"
+										})]
+									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										style: priorityLowStyle,
+										children: t("priorityLower")
+									})]
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+									type: "button",
+									onClick: () => chooseDestination("user-agents"),
+									style: locationOptionStyle,
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+										style: locationOptionCopyStyle,
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: t("rootUserAgents") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("small", {
+											style: descriptionStyle,
+											children: "~/.agents/skills"
+										})]
+									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										style: priorityLowStyle,
+										children: t("priorityLowest")
+									})]
+								})]
+							})]
+						})
+					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
 						open: pendingDelete !== void 0,
 						onClose: () => {
@@ -1100,6 +1382,34 @@ window.__ModuleLoader__.load({
 							},
 							children: busy ? t("batchWorking") : t("batchCommit")
 						})] })
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
+						open: updateDialogOpen,
+						onClose: () => setUpdateDialogOpen(false),
+						title: t("updateTitle"),
+						closeLabel: t("close"),
+						description: t("updateDescription"),
+						footer: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+							variant: "outline",
+							onClick: () => setUpdateDialogOpen(false),
+							children: t("cancel")
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+							variant: "primary",
+							onClick: () => {
+								copyUpdateCommand();
+							},
+							children: commandCopied ? t("commandCopied") : t("copyCommand")
+						})] }),
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							style: updateDialogBodyStyle,
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", {
+								style: updateCommandStyle,
+								children: updateStatus?.command
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+								style: descriptionStyle,
+								children: t("restartHint")
+							})]
+						})
 					})
 				]
 			});
@@ -1128,6 +1438,58 @@ window.__ModuleLoader__.load({
 			lineHeight: "18px",
 			color: "var(--dsw-alias-label-caption)"
 		};
+		const versionFooterStyle = {
+			minHeight: 58,
+			padding: "12px 0",
+			display: "flex",
+			alignItems: "center",
+			gap: 12,
+			borderTop: "1px solid var(--dsw-alias-border-l2)"
+		};
+		const versionCopyStyle = {
+			flex: 1,
+			minWidth: 0,
+			display: "flex",
+			flexDirection: "column",
+			gap: 2
+		};
+		const versionLabelStyle = {
+			fontSize: 12,
+			lineHeight: "18px",
+			fontWeight: 500,
+			color: "var(--dsw-alias-label-secondary)"
+		};
+		const updateButtonStyle = {
+			display: "inline-flex",
+			alignItems: "center",
+			height: 28,
+			padding: "0 12px",
+			border: "1px solid var(--dsw-alias-interactive-border-primary)",
+			borderRadius: 14,
+			background: "transparent",
+			font: "inherit",
+			fontSize: 13,
+			borderColor: "var(--dsw-alias-interactive-border-primary)",
+			color: "var(--dsw-alias-interactive-label-primary)",
+			cursor: "pointer"
+		};
+		const updateDialogBodyStyle = {
+			display: "flex",
+			flexDirection: "column",
+			gap: 10
+		};
+		const updateCommandStyle = {
+			display: "block",
+			padding: "10px 12px",
+			border: "1px solid var(--dsw-alias-border-l2)",
+			borderRadius: 8,
+			background: "var(--dsw-alias-bg-module-platform)",
+			color: "var(--dsw-alias-label-primary)",
+			fontSize: 12,
+			lineHeight: "18px",
+			whiteSpace: "pre-wrap",
+			wordBreak: "break-all"
+		};
 		const pillStyle = {
 			display: "inline-flex",
 			alignItems: "center",
@@ -1305,18 +1667,7 @@ window.__ModuleLoader__.load({
 			color: "var(--dsw-alias-label-primary)",
 			outline: "none"
 		};
-		/** Select variant: replace the OS arrow with the shared 12px chevron inset
-		* (same treatment as the composer chips / models page selects). */
-		const selectStyle = {
-			...controlStyle,
-			appearance: "none",
-			paddingRight: 32,
-			backgroundImage: "url(\"data:image/svg+xml,%3Csvg xmlns=%27http://www.w3.org/2000/svg%27 width=%2712%27 height=%2712%27 viewBox=%270 0 12 12%27 fill=%27none%27%3E%3Cpath d=%27M3 4.5L6 7.5L9 4.5%27 stroke=%27%2381858C%27 stroke-width=%271.5%27 stroke-linecap=%27round%27 stroke-linejoin=%27round%27/%3E%3C/svg%3E\")",
-			backgroundRepeat: "no-repeat",
-			backgroundPosition: "right 12px center",
-			backgroundSize: "12px 12px",
-			cursor: "pointer"
-		};
+		({ ...controlStyle });
 		const entryGridStyle = {
 			display: "grid",
 			gridTemplateColumns: "repeat(3, minmax(0, 1fr))",
@@ -1417,6 +1768,127 @@ window.__ModuleLoader__.load({
 			fontSize: 12,
 			lineHeight: "18px"
 		};
+		const locationSummaryStyle = {
+			...controlStyle,
+			display: "flex",
+			alignItems: "center",
+			gap: 10,
+			cursor: "pointer"
+		};
+		const locationPanelStyle = {
+			display: "flex",
+			flexDirection: "column",
+			gap: 14,
+			minWidth: 0
+		};
+		const locationScopeStyle = {
+			display: "grid",
+			gridTemplateColumns: "1fr 1fr",
+			gap: 4,
+			padding: 4,
+			borderRadius: 10,
+			background: "var(--dsw-alias-bg-module-platform)"
+		};
+		const locationScopeButtonStyle = {
+			border: "none",
+			borderRadius: 7,
+			padding: "8px 12px",
+			background: "transparent",
+			color: "var(--dsw-alias-label-secondary)",
+			cursor: "pointer",
+			fontWeight: 500
+		};
+		const locationScopeButtonActiveStyle = {
+			background: "var(--dsw-alias-bg-layer-1)",
+			color: "var(--dsw-alias-label-primary)",
+			boxShadow: "0 1px 3px rgba(0,0,0,.08)"
+		};
+		const locationWorkspaceListStyle = {
+			display: "flex",
+			flexDirection: "column",
+			gap: 4,
+			maxHeight: "min(440px, 52vh)",
+			overflowY: "auto",
+			scrollPadding: "8px 0"
+		};
+		const locationWorkspaceGroupStyle = {
+			overflow: "hidden",
+			borderRadius: 10,
+			transition: "background 140ms ease"
+		};
+		const locationWorkspaceStyle = {
+			width: "100%",
+			display: "flex",
+			alignItems: "center",
+			gap: 8,
+			border: "none",
+			borderRadius: 8,
+			padding: "9px 10px",
+			background: "transparent",
+			cursor: "pointer",
+			textAlign: "left"
+		};
+		const locationWorkspaceActiveStyle = { background: "var(--dsw-alias-bg-module-platform)" };
+		const locationExpandedRootsStyle = {
+			display: "flex",
+			flexDirection: "column",
+			gap: 8,
+			padding: "2px 10px 10px 18px"
+		};
+		const locationRootHintStyle = {
+			fontSize: 11,
+			lineHeight: "16px",
+			fontWeight: 500,
+			color: "var(--dsw-alias-label-tertiary)"
+		};
+		const locationRootsStyle = {
+			display: "flex",
+			flexDirection: "column",
+			gap: 8
+		};
+		const locationOptionStyle = {
+			display: "flex",
+			alignItems: "center",
+			gap: 12,
+			width: "100%",
+			border: "1px solid var(--dsw-alias-border-l2)",
+			borderRadius: 10,
+			padding: "10px 12px",
+			background: "var(--dsw-alias-bg-layer-1)",
+			color: "var(--dsw-alias-label-primary)",
+			cursor: "pointer",
+			textAlign: "left"
+		};
+		const locationOptionCopyStyle = {
+			minWidth: 0,
+			flex: 1,
+			display: "flex",
+			flexDirection: "column",
+			gap: 2
+		};
+		const priorityBaseStyle = {
+			flex: "none",
+			borderRadius: 999,
+			padding: "2px 7px",
+			fontSize: 11,
+			lineHeight: "16px",
+			fontWeight: 600
+		};
+		const priorityHighStyle = {
+			...priorityBaseStyle,
+			color: "var(--dsw-alias-state-success-primary)",
+			background: "var(--dsw-alias-bg-module-platform)"
+		};
+		const priorityMediumStyle = {
+			...priorityBaseStyle,
+			color: "var(--dsw-alias-label-primary)",
+			background: "var(--dsw-alias-bg-module-platform)"
+		};
+		const priorityLowStyle = {
+			...priorityBaseStyle,
+			color: "var(--dsw-alias-label-secondary)",
+			background: "var(--dsw-alias-bg-module-platform)"
+		};
 		const previewStyle = {
 			display: "flex",
 			flexDirection: "column",
@@ -1630,28 +2102,108 @@ window.__ModuleLoader__.load({
 		* with `/name ` — the native text gesture — highlighted via the plugin's
 		* lexicon contribution.
 		*/
-		/** Find the one composer textarea owned by the picker nearest in the slot tree. */
-		function composerTextareaFor(root) {
+		/** Find the one legacy textarea or Lexical contenteditable owned by this picker. */
+		function composerInputFor(root) {
 			let node = root?.parentElement;
 			while (node !== null && node !== void 0) {
-				const textareas = node.querySelectorAll("textarea");
-				if (textareas.length > 0) return textareas.length === 1 ? textareas[0] : void 0;
+				const inputs = node.querySelectorAll("textarea, [data-composer-input]");
+				if (inputs.length > 0) return inputs.length === 1 ? inputs[0] : void 0;
 				node = node.parentElement;
 			}
 		}
+		function composerText(input) {
+			return input instanceof HTMLTextAreaElement ? input.value : input.textContent ?? "";
+		}
+		function composerCaret(input) {
+			if (input instanceof HTMLTextAreaElement) {
+				if (input.selectionStart === null || input.selectionEnd === null) return void 0;
+				return {
+					start: input.selectionStart,
+					end: input.selectionEnd
+				};
+			}
+			const selection = window.getSelection();
+			if (selection === null || selection.rangeCount !== 1) return void 0;
+			const range = selection.getRangeAt(0);
+			if (!input.contains(range.startContainer) || !input.contains(range.endContainer)) return void 0;
+			const offsetOf = (container, offset) => {
+				const prefix = range.cloneRange();
+				prefix.selectNodeContents(input);
+				prefix.setEnd(container, offset);
+				return prefix.toString().length;
+			};
+			return {
+				start: offsetOf(range.startContainer, range.startOffset),
+				end: offsetOf(range.endContainer, range.endOffset)
+			};
+		}
+		function setComposerCaret(input, caret) {
+			input.focus({ preventScroll: true });
+			if (input instanceof HTMLTextAreaElement) {
+				input.setSelectionRange(caret, caret);
+				return;
+			}
+			const range = document.createRange();
+			let remaining = caret;
+			const walker = document.createTreeWalker(input, NodeFilter.SHOW_TEXT);
+			let text = walker.nextNode();
+			while (text !== null) {
+				const length = text.textContent?.length ?? 0;
+				if (remaining <= length) {
+					range.setStart(text, remaining);
+					range.collapse(true);
+					const selection = window.getSelection();
+					selection?.removeAllRanges();
+					selection?.addRange(range);
+					return;
+				}
+				remaining -= length;
+				text = walker.nextNode();
+			}
+			range.selectNodeContents(input);
+			range.collapse(false);
+			const selection = window.getSelection();
+			selection?.removeAllRanges();
+			selection?.addRange(range);
+		}
 		/** One row of the composer skill picker. */
-		function SkillsPicker({ t, sessionId, useSkills, useInput, inputActions, actions }) {
-			const skills = useSkills((value) => value);
+		function SkillsPicker({ t, sessionId, useInput, inputActions, actions }) {
 			const input = useInput((value) => value.draft);
+			const [skills, setSkills] = (0, react.useState)([]);
 			const [open, setOpen] = (0, react.useState)(false);
+			const [loading, setLoading] = (0, react.useState)(true);
 			const [query, setQuery] = (0, react.useState)("");
 			const rootRef = (0, react.useRef)(null);
 			const draftRef = (0, react.useRef)(input);
 			const skillNamesRef = (0, react.useRef)([]);
 			const caretFrameRef = (0, react.useRef)();
 			(0, react.useEffect)(() => {
-				actions.refreshSkills().catch(() => {});
-			}, [actions]);
+				let cancelled = false;
+				const refresh = (showLoading) => {
+					if (showLoading) setLoading(true);
+					actions.refreshSkillsForSession(sessionId).then((rows) => {
+						if (!cancelled) {
+							setSkills(rows);
+							setLoading(false);
+						}
+					}, () => {
+						if (!cancelled) {
+							setSkills([]);
+							setLoading(false);
+						}
+					});
+				};
+				refresh(true);
+				const timer = open ? window.setInterval(() => refresh(false), 2e3) : void 0;
+				return () => {
+					cancelled = true;
+					if (timer !== void 0) window.clearInterval(timer);
+				};
+			}, [
+				actions,
+				sessionId,
+				open
+			]);
 			(0, react.useEffect)(() => {
 				if (!open) return;
 				const onDown = (event) => {
@@ -1667,13 +2219,12 @@ window.__ModuleLoader__.load({
 			draftRef.current = input;
 			skillNamesRef.current = usable.map((skill) => skill.name);
 			const scheduleComposerFocus = (expectedDraft, caret) => {
-				const textarea = composerTextareaFor(rootRef.current);
+				const input = composerInputFor(rootRef.current);
 				if (caretFrameRef.current !== void 0) window.cancelAnimationFrame(caretFrameRef.current);
 				caretFrameRef.current = window.requestAnimationFrame(() => {
 					caretFrameRef.current = void 0;
-					if (textarea === void 0 || !textarea.isConnected || textarea.value !== expectedDraft) return;
-					textarea.focus({ preventScroll: true });
-					textarea.setSelectionRange(caret, caret);
+					if (input === void 0 || !input.isConnected || composerText(input) !== expectedDraft) return;
+					setComposerCaret(input, caret);
 				});
 			};
 			(0, react.useEffect)(() => {
@@ -1695,18 +2246,20 @@ window.__ModuleLoader__.load({
 					if (event.defaultPrevented || event.isComposing || event.keyCode === 229) return;
 					if (event.metaKey || event.ctrlKey || event.altKey) return;
 					if (event.shiftKey && event.key !== "Backspace") return;
-					const textarea = event.target;
-					if (!(textarea instanceof HTMLTextAreaElement) || document.activeElement !== textarea) return;
-					if (composerTextareaFor(rootRef.current) !== textarea || textarea.value !== draftRef.current) return;
-					const start = textarea.selectionStart;
-					const end = textarea.selectionEnd;
-					if (start === null || end === null || start !== end) return;
+					const target = event.target;
+					if (!(target instanceof Node)) return;
+					const input = composerInputFor(rootRef.current);
+					if (input === void 0 || document.activeElement !== input || !input.contains(target)) return;
+					if (composerText(input) !== draftRef.current) return;
+					const selection = composerCaret(input);
+					if (selection === void 0 || selection.start !== selection.end) return;
+					const start = selection.start;
 					if (event.key === "ArrowLeft" || event.key === "ArrowRight") {
 						const caret = atomicSkillArrow(draftRef.current, start, event.key === "ArrowLeft" ? "left" : "right", skillNamesRef.current);
 						if (caret === void 0) return;
 						event.preventDefault();
 						event.stopPropagation();
-						textarea.setSelectionRange(caret, caret);
+						setComposerCaret(input, caret);
 						return;
 					}
 					const edit = atomicSkillBackspace(draftRef.current, start, skillNamesRef.current);
@@ -1717,8 +2270,8 @@ window.__ModuleLoader__.load({
 					if (caretFrameRef.current !== void 0) window.cancelAnimationFrame(caretFrameRef.current);
 					caretFrameRef.current = window.requestAnimationFrame(() => {
 						caretFrameRef.current = void 0;
-						if (!textarea.isConnected || document.activeElement !== textarea || textarea.value !== edit.draft) return;
-						textarea.setSelectionRange(edit.caret, edit.caret);
+						if (!input.isConnected || document.activeElement !== input || composerText(input) !== edit.draft) return;
+						setComposerCaret(input, edit.caret);
 					});
 				};
 				document.addEventListener("keydown", onKeyDown, true);
@@ -1727,7 +2280,6 @@ window.__ModuleLoader__.load({
 					if (caretFrameRef.current !== void 0) window.cancelAnimationFrame(caretFrameRef.current);
 				};
 			}, [inputActions]);
-			if (usable.length === 0) return null;
 			const filtered = query.trim().length === 0 ? usable : usable.filter((skill) => skill.name.toLowerCase().includes(query.trim().toLowerCase()));
 			const onSelect = (name) => {
 				const prefix = `/${name} `;
@@ -1743,7 +2295,10 @@ window.__ModuleLoader__.load({
 					type: "button",
 					"aria-label": t("pickerLabel"),
 					"aria-expanded": open,
-					onClick: () => setOpen((value) => !value),
+					onClick: () => {
+						if (!open) setLoading(true);
+						setOpen((value) => !value);
+					},
 					style: triggerStyle,
 					children: [
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
@@ -1775,7 +2330,10 @@ window.__ModuleLoader__.load({
 							placeholder: t("pickerSearchPlaceholder"),
 							style: searchStyle
 						}),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", {
+						loading ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							style: emptyStyle,
+							children: t("pickerLoading")
+						}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", {
 							style: listStyle,
 							children: filtered.map((skill) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("li", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 								type: "button",
@@ -1785,13 +2343,19 @@ window.__ModuleLoader__.load({
 									style: avatarStyle,
 									"aria-hidden": "true",
 									children: skill.name.charAt(0).toUpperCase()
-								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									style: rowLabelStyle,
-									children: skill.name
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+									style: rowCopyStyle,
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										style: rowLabelStyle,
+										children: skill.name
+									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										style: rowDetailStyle,
+										children: skill.source === "project-dsh" ? t("pickerSourceProjectDsh") : skill.source === "project-agents" ? t("pickerSourceProjectAgents") : skill.source === "user-dsh" ? t("pickerSourceUserDsh") : t("pickerSourceUserAgents")
+									})]
 								})]
 							}) }, skill.name))
 						}),
-						filtered.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						!loading && filtered.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 							style: emptyStyle,
 							children: t("pickerEmpty")
 						}) : null
@@ -1906,12 +2470,41 @@ window.__ModuleLoader__.load({
 			minWidth: 0,
 			overflow: "hidden"
 		};
+		const rowCopyStyle = {
+			display: "flex",
+			flexDirection: "column",
+			minWidth: 0,
+			flex: 1,
+			lineHeight: "18px"
+		};
+		const rowDetailStyle = {
+			overflow: "hidden",
+			textOverflow: "ellipsis",
+			whiteSpace: "nowrap",
+			color: "var(--dsw-alias-label-caption)",
+			fontSize: 11,
+			lineHeight: "16px"
+		};
 		const emptyStyle = {
 			padding: "8px 10px",
 			fontSize: 12,
 			color: "var(--dsw-alias-label-caption)"
 		};
 		//#endregion
+		//#region src/client/effectiveSkills.ts
+		const SOURCE_RANK = {
+			"project-dsh": 100,
+			"project-agents": 200,
+			"user-dsh": 400,
+			"user-agents": 500
+		};
+		/** Mirror DSH's name-based winner selection for one session-scoped catalog. */
+		function effectiveSkills(rows) {
+			const winners = /* @__PURE__ */ new Map();
+			for (const row of [...rows].sort((a, b) => SOURCE_RANK[a.source] - SOURCE_RANK[b.source])) if (!winners.has(row.name)) winners.set(row.name, row);
+			return [...winners.values()].sort((a, b) => a.name.localeCompare(b.name));
+		}
+		//#endregion
 		//#region src/client/locales.ts
 		/**
 		* Locale dictionaries for the skill importer settings section.
@@ -1928,7 +2521,12 @@ window.__ModuleLoader__.load({
 			pickerLabel: "技能",
 			pickerPlaceholder: "技能",
 			pickerSearchPlaceholder: "筛选技能…",
+			pickerLoading: "正在同步当前项目技能…",
 			pickerEmpty: "没有匹配的技能",
+			pickerSourceProjectDsh: "当前项目 · .dsh",
+			pickerSourceProjectAgents: "当前项目 · .agents",
+			pickerSourceUserDsh: "全局 · .dsh",
+			pickerSourceUserAgents: "全局 · .agents",
 			commandDescription: "选择技能：弹出技能列表，选中后填入 /<名称>",
 			entryTitle: "技能入口",
 			entryDescription: "通过输入框工具行的技能下拉或 /skills 命令选择技能；也可直接输入 /<名称>。选中的技能会高亮并注入指令。",
@@ -1944,6 +2542,7 @@ window.__ModuleLoader__.load({
 			deleteFailed: "删除失败",
 			deleted: "已删除。",
 			installedFailed: "无法读取技能列表",
+			installedPartial: "有 {count} 个技能目录暂时无法读取，其他技能已正常显示。",
 			userOnly: "仅斜杠可用",
 			modelOnly: "仅模型可用",
 			importTitle: "导入技能",
@@ -1994,15 +2593,48 @@ window.__ModuleLoader__.load({
 			batchStatusSkipped: "已跳过",
 			batchStatusError: "失败",
 			targetLabel: "安装到",
-			targetUser: "全局技能（~/.dsh/skills）",
-			targetProjectAgents: "项目技能（{title} · .agents/skills）",
+			targetProjectDsh: "DSH 项目技能（{title}）",
+			targetProjectAgents: "通用项目技能（{title}）",
+			targetUserDsh: "DSH 全局技能",
+			targetUserAgents: "通用全局技能",
+			locationChange: "更改",
+			locationTitle: "选择安装位置",
+			locationProject: "项目技能",
+			locationGlobal: "全局技能",
+			workspaceSearch: "搜索工作区…",
+			workspaceNoMatch: "没有匹配的工作区",
+			chooseRootHint: "选择技能目录",
+			rootProjectDsh: "DSH 项目技能",
+			rootProjectAgents: "通用项目技能",
+			rootUserDsh: "DSH 全局技能",
+			rootUserAgents: "通用全局技能",
+			priorityHighest: "最高",
+			priorityHigher: "较高",
+			priorityLower: "较低",
+			priorityLowest: "最低",
+			locationSummaryProjectDsh: "项目技能 · {title} · .dsh/skills",
+			locationSummaryProjectAgents: "项目技能 · {title} · .agents/skills",
+			locationSummaryUserDsh: "全局技能 · ~/.dsh/skills",
+			locationSummaryUserAgents: "全局技能 · ~/.agents/skills",
 			targetProjectNoWorkspace: "项目技能（需先添加工作区）",
 			noWorkspace: "未注册工作区：请先在会话页选择/创建工作区，或改用用户技能目录。",
 			import: "导入",
 			importing: "导入中…",
 			imported: "已写入：",
 			importFailed: "导入失败",
-			hostUnreachable: "无法连接 dsh 服务（插件路由未生效）。请确认插件已安装，并重启 dsh web 后刷新页面。"
+			hostUnreachable: "无法连接 dsh 服务（插件路由未生效）。请确认插件已安装，并重启 dsh web 后刷新页面。",
+			versionChecking: "正在检查更新…",
+			versionCurrent: "当前版本 v{version}",
+			versionLatest: "已是最新版本",
+			versionAvailable: "发现新版本 v{version}",
+			versionCheckFailed: "暂时无法检查更新",
+			versionRetry: "重试",
+			versionUpdate: "更新",
+			updateTitle: "更新 dsh-skill-importer",
+			updateDescription: "复制下面的精确版本命令，在终端运行后重启 dsh web。",
+			copyCommand: "复制更新命令",
+			commandCopied: "已复制",
+			restartHint: "更新完成后需要重启 dsh web 才会生效。"
 		};
 		/** English dictionary, checked complete against the zh key set. */
 		const en = {
@@ -2010,7 +2642,12 @@ window.__ModuleLoader__.load({
 			pickerLabel: "Skills",
 			pickerPlaceholder: "Skills",
 			pickerSearchPlaceholder: "Filter skills…",
+			pickerLoading: "Syncing skills for the current project…",
 			pickerEmpty: "No matching skills",
+			pickerSourceProjectDsh: "Current project · .dsh",
+			pickerSourceProjectAgents: "Current project · .agents",
+			pickerSourceUserDsh: "Global · .dsh",
+			pickerSourceUserAgents: "Global · .agents",
 			commandDescription: "Pick a skill: opens a popup list; selecting fills /<name>",
 			entryTitle: "Skill entry points",
 			entryDescription: "Pick a skill from the composer tool-row dropdown or the /skills command; or type /<name> directly. The picked skill is highlighted and its instructions are injected.",
@@ -2026,6 +2663,7 @@ window.__ModuleLoader__.load({
 			deleteFailed: "Failed to delete",
 			deleted: "Deleted.",
 			installedFailed: "Unable to read the skill list",
+			installedPartial: "{count} skill directories are temporarily unreadable; other skills are still shown.",
 			userOnly: "Slash only",
 			modelOnly: "Model only",
 			importTitle: "Import a skill",
@@ -2076,24 +2714,91 @@ window.__ModuleLoader__.load({
 			batchStatusSkipped: "Skipped",
 			batchStatusError: "Failed",
 			targetLabel: "Install into",
-			targetUser: "Global skills (~/.dsh/skills)",
-			targetProjectAgents: "Project skills ({title} · .agents/skills)",
+			targetProjectDsh: "DSH project skills ({title})",
+			targetProjectAgents: "Shared project skills ({title})",
+			targetUserDsh: "DSH global skills",
+			targetUserAgents: "Shared global skills",
+			locationChange: "Change",
+			locationTitle: "Choose install location",
+			locationProject: "Project skills",
+			locationGlobal: "Global skills",
+			workspaceSearch: "Search workspaces…",
+			workspaceNoMatch: "No matching workspaces",
+			chooseRootHint: "Choose a skill directory",
+			rootProjectDsh: "DSH project skills",
+			rootProjectAgents: "Shared project skills",
+			rootUserDsh: "DSH global skills",
+			rootUserAgents: "Shared global skills",
+			priorityHighest: "Highest",
+			priorityHigher: "Higher",
+			priorityLower: "Lower",
+			priorityLowest: "Lowest",
+			locationSummaryProjectDsh: "Project · {title} · .dsh/skills",
+			locationSummaryProjectAgents: "Project · {title} · .agents/skills",
+			locationSummaryUserDsh: "Global · ~/.dsh/skills",
+			locationSummaryUserAgents: "Global · ~/.agents/skills",
 			targetProjectNoWorkspace: "Project skills (add a workspace first)",
 			noWorkspace: "No registered workspace: create/select one in a session, or use the user skill directory.",
 			import: "Import",
 			importing: "Importing…",
 			imported: "Written to: ",
 			importFailed: "Import failed",
-			hostUnreachable: "Cannot reach the dsh service (plugin routes are not active). Make sure the plugin is installed, restart dsh web, and refresh the page."
+			hostUnreachable: "Cannot reach the dsh service (plugin routes are not active). Make sure the plugin is installed, restart dsh web, and refresh the page.",
+			versionChecking: "Checking for updates…",
+			versionCurrent: "Current version v{version}",
+			versionLatest: "Up to date",
+			versionAvailable: "Version v{version} is available",
+			versionCheckFailed: "Unable to check for updates",
+			versionRetry: "Retry",
+			versionUpdate: "Update",
+			updateTitle: "Update dsh-skill-importer",
+			updateDescription: "Copy this exact-version command, run it in a terminal, then restart dsh web.",
+			copyCommand: "Copy update command",
+			commandCopied: "Copied",
+			restartHint: "Restart dsh web after the update for it to take effect."
 		};
 		//#endregion
 		//#region src/client/index.ts
-		/** Required services (cordis fiber inject). */
+		/** Every client service used during apply is explicit; alpha DSH no longer tolerates load-order access. */
 		const inject = [
 			"slots",
 			"locale",
-			"connection"
+			"connection",
+			"remote",
+			"remote.skills",
+			"remote.directoryPicker",
+			"inputTriggers",
+			"commandUi",
+			"sessions",
+			"conversation"
 		];
+		const popupEscapeHandlers = /* @__PURE__ */ new WeakMap();
+		/** Restore keyboard ownership when DSH opens this plugin's popup from the composer. */
+		function focusSkillsPopupSearch(options) {
+			const focus = () => {
+				for (const input of document.querySelectorAll("input[type=\"text\"]")) {
+					let node = input;
+					while (node !== null) {
+						if ((node.getAttribute("aria-label") ?? "").toLowerCase().includes("skills")) {
+							const previous = popupEscapeHandlers.get(input);
+							if (previous !== void 0) input.removeEventListener("keydown", previous);
+							const onKeyDown = (event) => {
+								if (event.key !== "Escape") return;
+								window.setTimeout(options.onEscape, 0);
+							};
+							popupEscapeHandlers.set(input, onKeyDown);
+							input.addEventListener("keydown", onKeyDown);
+							input.focus({ preventScroll: true });
+							options.resetActive();
+							return;
+						}
+						node = node.parentElement;
+					}
+				}
+			};
+			window.requestAnimationFrame(focus);
+			window.setTimeout(focus, 0);
+		}
 		/** Same-origin route literals (mirrors the host half's ROUTES). */
 		const ROUTES = {
 			list: "/skill-importer/list",
@@ -2101,7 +2806,8 @@ window.__ModuleLoader__.load({
 			importUrl: "/skill-importer/import-url",
 			delete: "/skill-importer/delete",
 			batchScan: "/skill-importer/batch/scan",
-			batchCommit: "/skill-importer/batch/commit"
+			batchCommit: "/skill-importer/batch/commit",
+			updateStatus: "/skill-importer/update-status"
 		};
 		/** Fetch one route and unwrap the JSON envelope; throws on transport/HTTP errors. */
 		async function call(path, body) {
@@ -2134,7 +2840,10 @@ window.__ModuleLoader__.load({
 				en
 			}), "dsh-skill-importer: dictionaries");
 			const t = ctx.locale.bind(NS);
+			const sourceLabel = (source) => source === "project-dsh" ? t("pickerSourceProjectDsh") : source === "project-agents" ? t("pickerSourceProjectAgents") : source === "user-dsh" ? t("pickerSourceUserDsh") : t("pickerSourceUserAgents");
 			let catalog = [];
+			let issues = [];
+			const sessionCatalogs = /* @__PURE__ */ new Map();
 			const listeners = /* @__PURE__ */ new Set();
 			const notify = () => {
 				for (const listener of [...listeners]) try {
@@ -2143,13 +2852,11 @@ window.__ModuleLoader__.load({
 					console.error("[dsh-skill-importer] listener failed:", error);
 				}
 			};
-			const connection = ctx.get("connection");
-			const skillsApi = connection.api.skills;
-			skillsApi.list.bind(skillsApi);
-			skillsApi.list = ((_request, _signal) => {
-				return Promise.reject(/* @__PURE__ */ new Error("skill group hidden: use the composer skill picker or /skills"));
-			});
-			const usableNames = () => catalog.filter((skill) => skill.userInvocable).map((skill) => skill.name);
+			const legacyApi = ctx.get("connection").api;
+			const remote = ctx.remote ?? ctx.get("remote");
+			const skillsApi = remote?.skills ?? legacyApi?.skills;
+			if (skillsApi !== void 0) skillsApi.list = () => Promise.reject(/* @__PURE__ */ new Error("skill group hidden: use the composer skill picker or /skills"));
+			const usableNames = () => [...new Set([...sessionCatalogs.values()].flat().filter((skill) => skill.userInvocable).map((skill) => skill.name))];
 			ctx.effect(() => {
 				return ctx.get("inputTriggers").registerSource({
 					trigger: "/",
@@ -2173,42 +2880,79 @@ window.__ModuleLoader__.load({
 			}, "dsh-skill-importer: lexicon source");
 			const commandUi = ctx.get("commandUi");
 			const sessions = ctx.get("sessions");
-			const conversation = ctx.get("conversation");
-			if (commandUi !== void 0 && sessions !== void 0 && conversation !== void 0) ctx.effect(() => {
+			if (commandUi !== void 0 && sessions !== void 0) ctx.effect(() => {
 				return commandUi.register({
 					name: "skills",
 					description: t("commandDescription"),
 					available: () => true,
 					ui: {
 						kind: "popupSelect",
-						async options(_session, _signal) {
-							return catalog.filter((skill) => skill.userInvocable).map((skill) => ({
+						async options(session, _signal) {
+							const rows = await refreshSkillsForSession(session.sessionId);
+							const restoreComposerFocus = () => {
+								const actx = sessions.scope(session.sessionId);
+								if (actx === void 0) return;
+								const conversation = actx.get("conversation");
+								if (conversation === void 0) return;
+								const draft = conversation.input.for(actx).state.getSnapshot().draft;
+								requestComposerFocus({
+									sessionId: session.sessionId,
+									expectedDraft: draft,
+									caret: draft.length
+								});
+							};
+							const resetActive = () => {
+								const actx = sessions.scope(session.sessionId);
+								if (actx === void 0) return;
+								commandUi.popupFor(actx).highlight?.(0);
+							};
+							focusSkillsPopupSearch({
+								onEscape: restoreComposerFocus,
+								resetActive
+							});
+							return rows.filter((skill) => skill.userInvocable).map((skill) => ({
 								id: skill.name,
-								label: skill.name
+								label: `${skill.name} · ${sourceLabel(skill.source)}`
 							}));
 						},
 						onSelect(option, session) {
 							const actx = sessions.scope(session.sessionId);
-							if (actx === void 0) return;
-							const input = conversation.input.for(actx);
-							const rest = input.state.getSnapshot().draft.replace(/^\s*\/[a-zA-Z][a-zA-Z0-9-]*\s*/, "");
+							if (actx === void 0) throw new Error("this session is no longer available");
+							const conversation = actx.get("conversation");
+							if (conversation === void 0) throw new Error("conversation input is unavailable");
+							const rest = conversation.input.for(actx).state.getSnapshot().draft.replace(/^\s*\/[a-zA-Z][a-zA-Z0-9-]*\s*/, "");
 							const prefix = `/${option.id} `;
 							const nextDraft = `${prefix}${rest}`;
-							input.setDraft(nextDraft);
-							requestComposerFocus({
-								sessionId: session.sessionId,
-								expectedDraft: nextDraft,
-								caret: prefix.length
-							});
+							window.setTimeout(() => {
+								const liveScope = sessions.scope(session.sessionId);
+								if (liveScope === void 0) return;
+								const liveConversation = liveScope.get("conversation");
+								if (liveConversation === void 0) return;
+								liveConversation.input.for(liveScope).setDraft(nextDraft);
+								requestComposerFocus({
+									sessionId: session.sessionId,
+									expectedDraft: nextDraft,
+									caret: prefix.length
+								});
+							}, 0);
 						}
 					}
 				});
 			}, "dsh-skill-importer: /skills popupSelect command");
-			const refreshSkills = async () => {
-				catalog = (await call(ROUTES.list)).skills;
+			const refreshSkills = async (workspacePath) => {
+				const result = await call(workspacePath === void 0 ? ROUTES.list : `${ROUTES.list}?workspacePath=${encodeURIComponent(workspacePath)}`);
+				catalog = result.skills;
+				issues = result.issues;
 				notify();
 				return catalog;
 			};
+			const refreshSkillsForSession = async (sessionId) => {
+				const cwd = sessions.list.getSnapshot().byId[sessionId]?.cwd;
+				const effective = effectiveSkills((await call(cwd === void 0 ? `${ROUTES.list}?scope=global` : `${ROUTES.list}?workspacePath=${encodeURIComponent(cwd)}`)).skills);
+				sessionCatalogs.set(sessionId, effective);
+				notify();
+				return effective;
+			};
 			const importSkill = async (request) => {
 				return (await call(ROUTES.import, request)).path;
 			};
@@ -2219,30 +2963,50 @@ window.__ModuleLoader__.load({
 				return (await call(ROUTES.delete, request)).removed;
 			};
 			const pickDirectory = async () => {
-				const response = await connection.api.host.pickDirectory({});
+				if (remote?.directoryPicker !== void 0) {
+					const result = await remote.directoryPicker.pick();
+					if (!result.ok) throw new Error(result.error.message);
+					return result.value;
+				}
+				if (legacyApi?.host === void 0) throw new Error("当前 DSH 未提供目录选择能力");
+				const response = await legacyApi.host.pickDirectory({});
 				if (!response.result.ok) throw new Error(response.result.error.message);
 				return response.result.value.path;
 			};
 			const scanBatch = (request) => call(ROUTES.batchScan, request);
 			const commitBatch = (request) => call(ROUTES.batchCommit, request);
+			const checkForUpdates = () => call(ROUTES.updateStatus);
 			const face = () => ({
-				hooks: { skills: {
-					getSnapshot: () => catalog,
-					subscribe: (listener) => {
-						listeners.add(listener);
-						return () => {
-							listeners.delete(listener);
-						};
+				hooks: {
+					skills: {
+						getSnapshot: () => catalog,
+						subscribe: (listener) => {
+							listeners.add(listener);
+							return () => {
+								listeners.delete(listener);
+							};
+						}
+					},
+					skillIssues: {
+						getSnapshot: () => issues,
+						subscribe: (listener) => {
+							listeners.add(listener);
+							return () => {
+								listeners.delete(listener);
+							};
+						}
 					}
-				} },
+				},
 				actions: {
 					refreshSkills,
+					refreshSkillsForSession,
 					importSkill,
 					importUrl,
 					deleteSkill,
 					pickDirectory,
 					scanBatch,
-					commitBatch
+					commitBatch,
+					checkForUpdates
 				}
 			});
 			ctx.slots.inject("settings.section", () => ctx.slots.register({