dsh-skill-importer 0.2.5 → 0.2.6

package/README.md

@@ -11,7 +11,7 @@
 
   [![npm](https://img.shields.io/npm/v/dsh-skill-importer?style=flat-square&color=5dd8bd&label=npm)](https://www.npmjs.com/package/dsh-skill-importer)
   [![downloads](https://img.shields.io/npm/dm/dsh-skill-importer?style=flat-square&color=6da8ff)](https://www.npmjs.com/package/dsh-skill-importer)
-  [![DeepSeek Harness](https://img.shields.io/badge/DeepSeek_Harness-%E2%89%A50.1.0--rc.6-5965f2?style=flat-square)](https://github.com/deepseek-ai/deepseek-harness)
+  [![DeepSeek Harness](https://img.shields.io/badge/DeepSeek_Harness-%E2%89%A50.2.0--rc.2-5965f2?style=flat-square)](https://github.com/deepseek-ai/deepseek-harness)
   [![license](https://img.shields.io/badge/license-MIT-a786ff?style=flat-square)](LICENSE)
 
   <br />
@@ -118,7 +118,7 @@ Replace both `X.Y.Z` placeholders with the same target version. This opts that v
 
 Open **Settings → Skills**. Import a Markdown file or URL, or choose **Batch import** to migrate another agent's complete skills directory. Choose a target and the imported skills will appear as soon as the filesystem watcher discovers them.
 
-> Requires DeepSeek Harness `>= 0.1.0-rc.6`.
+> Requires DeepSeek Harness `>= 0.2.0-rc.2`.
 
 ### Duplicate plugin after upgrading
 

package/README.zh.md

@@ -11,7 +11,7 @@
 
   [![npm](https://img.shields.io/npm/v/dsh-skill-importer?style=flat-square&color=5dd8bd&label=npm)](https://www.npmjs.com/package/dsh-skill-importer)
   [![downloads](https://img.shields.io/npm/dm/dsh-skill-importer?style=flat-square&color=6da8ff)](https://www.npmjs.com/package/dsh-skill-importer)
-  [![DeepSeek Harness](https://img.shields.io/badge/DeepSeek_Harness-%E2%89%A50.1.0--rc.6-5965f2?style=flat-square)](https://github.com/deepseek-ai/deepseek-harness)
+  [![DeepSeek Harness](https://img.shields.io/badge/DeepSeek_Harness-%E2%89%A50.2.0--rc.2-5965f2?style=flat-square)](https://github.com/deepseek-ai/deepseek-harness)
   [![license](https://img.shields.io/badge/license-MIT-a786ff?style=flat-square)](LICENSE)
 
   <br />
@@ -118,7 +118,7 @@ minimumReleaseAgeExclude:
 
 打开 **设置 → 技能**，选择 Markdown 文件、粘贴 URL，或通过「批量导入」迁移其他 Agent 的完整技能目录，再选择目标范围。文件系统 watcher 发现后，技能会立即出现。
 
-> 需要 DeepSeek Harness `>= 0.1.0-rc.6`。
+> 需要 DeepSeek Harness `>= 0.2.0-rc.2`。
 
 ### 旧配置导致重复插件
 

package/lib/client.js

@@ -229,15 +229,11 @@ window.__ModuleLoader__.load({
 			const skills = useSkills((value) => value);
 			const skillIssues = useSkillIssues((value) => value);
 			const workspaces = useWorkspaces((value) => value);
-			const [selectedWorkspaceId, setSelectedWorkspaceId] = (0, react.useState)(() => workspaces.recentWorkspaceId ?? workspaces.items[0]?.workspaceId);
+			const [selectedWorkspaceId, setSelectedWorkspaceId] = (0, react.useState)(() => 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
-			]);
+				setSelectedWorkspaceId(workspaces.items[0]?.workspaceId);
+			}, [selectedWorkspaceId, workspaces.items]);
 			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)();
@@ -2085,13 +2081,6 @@ window.__ModuleLoader__.load({
 			if (direction === "right" && caret >= 0 && caret < token.boundaryEnd) return token.boundaryEnd;
 		}
 		//#endregion
-		//#region src/client/composerFocus.ts
-		const COMPOSER_FOCUS_EVENT = "dsh-skill-importer/composer-focus";
-		/** Ask the mounted picker in one session to restore its composer focus. */
-		function requestComposerFocus(request) {
-			window.dispatchEvent(new CustomEvent(COMPOSER_FOCUS_EVENT, { detail: request }));
-		}
-		//#endregion
 		//#region src/client/SkillsPicker.tsx
 		/**
 		* Composer skill picker: a compact pill trigger in the composer's tool row
@@ -2227,15 +2216,6 @@ window.__ModuleLoader__.load({
 					setComposerCaret(input, caret);
 				});
 			};
-			(0, react.useEffect)(() => {
-				const onFocusRequest = (event) => {
-					const request = event.detail;
-					if (request.sessionId !== sessionId) return;
-					scheduleComposerFocus(request.expectedDraft, request.caret);
-				};
-				window.addEventListener(COMPOSER_FOCUS_EVENT, onFocusRequest);
-				return () => window.removeEventListener(COMPOSER_FOCUS_EVENT, onFocusRequest);
-			}, [sessionId]);
 			(0, react.useEffect)(() => {
 				const onKeyDown = (event) => {
 					if (![
@@ -2304,7 +2284,7 @@ window.__ModuleLoader__.load({
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							style: triggerIconStyle,
 							"aria-hidden": "true",
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChecklistOutline14, {})
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChecklistOutlineRegular, {})
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							style: triggerLabelStyle,
@@ -2316,7 +2296,7 @@ window.__ModuleLoader__.load({
 								transform: open ? "rotate(180deg)" : void 0
 							},
 							"aria-hidden": "true",
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, {})
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutlineRegular, {})
 						})
 					]
 				}), open ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -2763,42 +2743,12 @@ window.__ModuleLoader__.load({
 		const inject = [
 			"slots",
 			"locale",
-			"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",
@@ -2843,7 +2793,6 @@ window.__ModuleLoader__.load({
 			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 {
@@ -2852,67 +2801,21 @@ window.__ModuleLoader__.load({
 					console.error("[dsh-skill-importer] listener failed:", error);
 				}
 			};
-			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: "/",
-					name: "skill-importer",
-					order: 99,
-					async candidates() {
-						throw new Error("skill group hidden: use the composer skill picker");
-					},
-					onPick() {},
-					warm() {},
-					lexicon() {
-						return usableNames();
-					},
-					subscribeLexicon(_session, listener) {
-						listeners.add(listener);
-						return () => {
-							listeners.delete(listener);
-						};
-					}
-				});
-			}, "dsh-skill-importer: lexicon source");
 			const commandUi = ctx.get("commandUi");
 			const sessions = ctx.get("sessions");
 			if (commandUi !== void 0 && sessions !== void 0) ctx.effect(() => {
 				return commandUi.register({
 					name: "skills",
-					description: t("commandDescription"),
+					description: () => t("commandDescription"),
 					available: () => true,
 					ui: {
 						kind: "popupSelect",
+						searchMode: "fuzzy-label",
 						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) => ({
+							return (await refreshSkillsForSession(session.sessionId)).filter((skill) => skill.userInvocable).map((skill) => ({
 								id: skill.name,
-								label: `${skill.name} · ${sourceLabel(skill.source)}`
+								label: skill.name,
+								detail: sourceLabel(skill.source)
 							}));
 						},
 						onSelect(option, session) {
@@ -2921,19 +2824,15 @@ window.__ModuleLoader__.load({
 							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}`;
+							const nextDraft = `${`/${option.id} `}${rest}`;
 							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
-								});
+								const liveInput = liveConversation.input.for(liveScope);
+								liveInput.setDraft(nextDraft);
+								liveInput.focus();
 							}, 0);
 						}
 					}
@@ -2949,7 +2848,6 @@ window.__ModuleLoader__.load({
 			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;
 			};
@@ -2963,15 +2861,9 @@ window.__ModuleLoader__.load({
 				return (await call(ROUTES.delete, request)).removed;
 			};
 			const pickDirectory = async () => {
-				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 result = await ctx.remote.directoryPicker.pick();
+				if (!result.ok) throw new Error(result.error.message);
+				return result.value;
 			};
 			const scanBatch = (request) => call(ROUTES.batchScan, request);
 			const commitBatch = (request) => call(ROUTES.batchCommit, request);

package/lib/types/client/index.d.ts

@@ -1,5 +1,5 @@
-import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client';
-import type { SessionId } from '@deepseek-ai/dsh-api-remotes/client';
+import type { Context as ClientContext } from '@deepseek-ai/cordis';
+import type { SessionId } from '@deepseek-ai/dsh-session/types';
 import type { HostObservable } from '@deepseek-ai/dsh-client-ui-slots';
 import type { SkillImporterProps } from './SkillImporterSection.tsx';
 import type { SkillsPickerProps } from './SkillsPicker.tsx';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-skill-importer",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Web UI plugin for DeepSeek Harness: import skills from local Markdown files or URLs into the skill roots the harness discovers automatically",
   "type": "module",
   "main": "lib/index.js",
@@ -19,13 +19,16 @@
   "dsh": {
     "client": {
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-connection",
+        "@deepseek-ai/dsh-api-session-controller",
+        "@deepseek-ai/dsh-api-workspace-controller",
         "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-ui-renderer",
+        "@deepseek-ai/dsh-client-ui-session",
         "@deepseek-ai/dsh-client-ui-slots",
         "@deepseek-ai/dsh-client-ui-settings",
         "@deepseek-ai/dsh-client-ui-primitives",
-        "@deepseek-ai/dsh-api-remotes"
+        "@deepseek-ai/dsh-client-ui-conversation",
+        "@deepseek-ai/dsh-client-ui-commands"
       ],
       "platform": "web"
     },
@@ -54,42 +57,46 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-api-remotes": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-connection": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.6",
+    "@deepseek-ai/cordis": "^4.0.4 || ^4.0.5-alpha.1",
+    "@deepseek-ai/dsh-api-session-controller": "^0.2.0-rc.2 || ^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-api-workspace-controller": "^0.2.0-rc.2 || ^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-locale": "^0.2.0-rc.2 || ^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-store": "^0.2.0-rc.2 || ^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.2.0-rc.2 || ^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.2.0-rc.2 || ^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.2.0-rc.2 || ^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-ui-session": "^0.2.0-rc.2 || ^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.2.0-rc.2 || ^0.2.1-alpha.1",
     "react": "^18.2.0",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-workspace": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-commands": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-skill": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-commands": "^0.1.0-rc.6"
+    "@deepseek-ai/dsh-host-webserver": "^0.2.0-rc.2 || ^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-workspace": "^0.2.0-rc.2 || ^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-skill": "^0.2.0-rc.2 || ^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-session": "^0.2.0-rc.2 || ^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.2.0-rc.2 || ^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-ui-commands": "^0.2.0-rc.2 || ^0.2.1-alpha.1"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-api-remotes": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-connection": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.6",
+    "@deepseek-ai/cordis": "4.0.5-alpha.1",
+    "@deepseek-ai/dsh-api-session-controller": "^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-api-workspace-controller": "^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-locale": "^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-store": "^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-ui-session": "^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.2.1-alpha.1",
     "@types/react": "^18.3.0",
     "react": "^18.2.0",
     "tsdown": "^0.22.2",
     "typescript": "^6.0.3",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-host-webserver": "^0.2.1-alpha.1",
     "@types/node": "^24.0.0",
-    "@deepseek-ai/dsh-workspace": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-commands": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-skill": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-commands": "^0.1.0-rc.6"
+    "@deepseek-ai/dsh-workspace": "^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-skill": "^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-session": "^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.2.1-alpha.1",
+    "@deepseek-ai/dsh-client-ui-commands": "^0.2.1-alpha.1"
   },
   "repository": {
     "type": "git",

package/tests/update.test.mjs

@@ -1,5 +1,6 @@
 import assert from 'node:assert/strict'
 import test from 'node:test'
+import { readFileSync } from 'node:fs'
 import { compareVersions, currentVersion, updateCommand } from '../src/update.ts'
 
 test('compares stable semantic versions', () => {
@@ -14,7 +15,8 @@ test('orders prereleases before stable releases', () => {
 })
 
 test('reads package version and produces an exact update command', () => {
-  assert.equal(currentVersion(), '0.2.5')
+  const manifest = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'))
+  assert.equal(currentVersion(), manifest.version)
   assert.equal(
     updateCommand('0.2.4'),
     'npx @deepseek-ai/dsh plugin --profile web add dsh-skill-importer@0.2.4',

package/lib/types/client/composerFocus.d.ts

@@ -1,9 +0,0 @@
-/** Session-routed request emitted after a non-React command popup edits the draft. */
-export interface ComposerFocusRequest {
-    readonly sessionId: string;
-    readonly expectedDraft: string;
-    readonly caret: number;
-}
-export declare const COMPOSER_FOCUS_EVENT = "dsh-skill-importer/composer-focus";
-/** Ask the mounted picker in one session to restore its composer focus. */
-export declare function requestComposerFocus(request: ComposerFocusRequest): void;