dsh-skill-importer 0.2.4 → 0.2.5

package/lib/client.js

@@ -2102,15 +2102,70 @@ 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, useInput, inputActions, actions }) {
 			const input = useInput((value) => value.draft);
@@ -2164,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)(() => {
@@ -2192,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);
@@ -2214,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);
@@ -2703,12 +2759,46 @@ window.__ModuleLoader__.load({
 		};
 		//#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",
@@ -2762,12 +2852,10 @@ 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 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({
@@ -2792,8 +2880,7 @@ 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"),
@@ -2801,24 +2888,53 @@ window.__ModuleLoader__.load({
 					ui: {
 						kind: "popupSelect",
 						async options(session, _signal) {
-							return (await refreshSkillsForSession(session.sessionId)).filter((skill) => skill.userInvocable).map((skill) => ({
+							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} · ${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);
 						}
 					}
 				});
@@ -2847,7 +2963,13 @@ 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;
 			};

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

@@ -43,7 +43,7 @@ export interface SkillImporterInjected {
         checkForUpdates: () => Promise<UpdateStatusResponse>;
     };
 }
-/** Required services (cordis fiber inject). */
+/** Every client service used during apply is explicit; alpha DSH no longer tolerates load-order access. */
 export declare const inject: string[];
 /**
  * Client plugin body: register the section and its dictionaries.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-skill-importer",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "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",

package/tests/update.test.mjs

@@ -14,7 +14,7 @@ test('orders prereleases before stable releases', () => {
 })
 
 test('reads package version and produces an exact update command', () => {
-  assert.equal(currentVersion(), '0.2.4')
+  assert.equal(currentVersion(), '0.2.5')
   assert.equal(
     updateCommand('0.2.4'),
     'npx @deepseek-ai/dsh plugin --profile web add dsh-skill-importer@0.2.4',