dsh-skill-importer 0.2.1 → 0.2.3

package/README.md

@@ -171,7 +171,7 @@ If `dsh` is not installed globally, replace the last line with `npx @deepseek-ai
 ## Notes
 
 - A single imported file may be up to 256 KB.
-- Batch import accepts `.claude/skills`, `.codex/skills`, `.agents/skills`, `.dsh/skills`, or one skill directory directly below those roots. A scan accepts up to 200 skills; each skill may contain up to 2,000 files and 10 MB of resources. Symbolic links are refused.
+- Batch import accepts any agent directory named `skills` (for example `.claude/skills`, `.codex/skills`, or a custom `agent/skills`) or one skill directory directly below it. A scan accepts up to 200 skills; each skill may contain up to 2,000 files and 10 MB of resources. Symbolic links are refused.
 - URL import is HTTPS-only and refuses loopback, private, link-local, and reserved addresses; every redirect is validated again. `.md` sources are preserved, while HTML pages use lightweight text extraction, so direct Markdown URLs work best.
 - The installed list polls briefly after import (every 2 seconds for up to 20 seconds). **Refresh** syncs external changes immediately.
 

package/README.zh.md

@@ -171,7 +171,7 @@ dsh plugin --profile web add /path/to/dsh-skill-importer
 ## 注意事项
 
 - 单个导入文件最大 256 KB。
-- 批量导入仅接受 `.claude/skills`、`.codex/skills`、`.agents/skills`、`.dsh/skills` 或其中的单个技能目录；每次最多扫描 200 个技能，单个技能最多包含 2,000 个文件和 10 MB 资源，不接受符号链接。
+- 批量导入接受任意 Agent 中名为 `skills` 的目录（例如 `.claude/skills`、`.codex/skills`、项目自定义的 `agent/skills`）或其中的单个技能目录；每次最多扫描 200 个技能，单个技能最多包含 2,000 个文件和 10 MB 资源，不接受符号链接。
 - URL 导入仅支持 HTTPS，并拒绝本机、私有网络、链路本地和保留地址；每次重定向都会重新校验。`.md` 会原样保留，HTML 页面仅做轻量正文提取，因此推荐使用 Markdown 直链。
 - 导入后列表会短暂轮询（每 2 秒一次，最多 20 秒）；外部改动可点击 **刷新** 立即同步。
 

package/lib/client.js

@@ -5,8 +5,8 @@ window.__ModuleLoader__.load({
 		var exports = module.exports;
 		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 		let react = require("react");
-		let react_jsx_runtime = require("react/jsx-runtime");
 		let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
+		let react_jsx_runtime = require("react/jsx-runtime");
 		//#region src/frontmatter.ts
 		/** Kebab-case name rule shared with `dsh-skill` (`^[a-z0-9]+(?:-[a-z0-9]+)*$`). */
 		const KEBAB_CASE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
@@ -261,6 +261,8 @@ window.__ModuleLoader__.load({
 			const [batchScan, setBatchScan] = (0, react.useState)();
 			const [batchResults, setBatchResults] = (0, react.useState)();
 			const [replaceNames, setReplaceNames] = (0, react.useState)(() => /* @__PURE__ */ new Set());
+			const [pendingDelete, setPendingDelete] = (0, react.useState)();
+			const [batchConfirmation, setBatchConfirmation] = (0, react.useState)();
 			const fileInput = (0, react.useRef)(null);
 			const onFilePicked = async (file) => {
 				setFileDraft(void 0);
@@ -302,8 +304,9 @@ window.__ModuleLoader__.load({
 					}, () => pollForSkill(name, attemptsLeft - 1));
 				}, 2e3);
 			};
-			const removeSkill = async (skill) => {
-				if (!window.confirm(t("deleteConfirm", { name: skill.name }))) return;
+			const removeSkill = async () => {
+				if (pendingDelete === void 0) return;
+				const skill = pendingDelete;
 				setBusy(true);
 				setMessage(void 0);
 				setMessageError(false);
@@ -312,7 +315,10 @@ window.__ModuleLoader__.load({
 						name: skill.name,
 						source: skill.source,
 						workspacePath: workspace?.path
-					})) setMessage(t("deleted"));
+					})) {
+						setMessage(t("deleted"));
+						setPendingDelete(void 0);
+					}
 					setListEpoch((epoch) => epoch + 1);
 				} catch (error) {
 					setMessageError(true);
@@ -403,17 +409,20 @@ window.__ModuleLoader__.load({
 					setBusy(false);
 				}
 			};
-			const commitBatchDirectory = async () => {
+			const requestBatchCommit = () => {
 				if (batchScan === void 0) return;
 				const ready = batchScan.entries.filter((entry) => entry.status === "ready");
 				const replacing = ready.filter((entry) => replaceNames.has(entry.name)).length;
 				const importing = ready.filter((entry) => !entry.conflict).length;
 				const skipped = ready.filter((entry) => entry.conflict && !replaceNames.has(entry.name)).length;
-				if (!window.confirm(t("batchConfirm", {
+				setBatchConfirmation({
 					importing,
 					replacing,
 					skipped
-				}))) return;
+				});
+			};
+			const commitBatchDirectory = async () => {
+				if (batchScan === void 0 || batchConfirmation === void 0) return;
 				setBusy(true);
 				setMessage(void 0);
 				setMessageError(false);
@@ -425,6 +434,7 @@ window.__ModuleLoader__.load({
 					setBatchResults(result.results);
 					setBatchScan(void 0);
 					setReplaceNames(/* @__PURE__ */ new Set());
+					setBatchConfirmation(void 0);
 					setListEpoch((epoch) => epoch + 1);
 				} catch (error) {
 					setMessageError(true);
@@ -451,7 +461,7 @@ window.__ModuleLoader__.load({
 					return;
 				}
 				if (batchScan === void 0) scanBatchDirectory();
-				else commitBatchDirectory();
+				else requestBatchCommit();
 			};
 			const primaryLabel = mode !== "batch" ? busy ? t("importing") : t("import") : busy ? t("batchWorking") : batchScan === void 0 ? t("batchScan") : t("batchCommit");
 			const flags = (skill) => {
@@ -592,9 +602,7 @@ window.__ModuleLoader__.load({
 															type: "button",
 															"aria-label": `${t("delete")} ${skill.name}`,
 															title: t("delete"),
-															onClick: () => {
-																removeSkill(skill);
-															},
+															onClick: () => setPendingDelete(skill),
 															style: deleteIconButtonStyle,
 															children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(TrashIcon, {})
 														})
@@ -1048,6 +1056,50 @@ window.__ModuleLoader__.load({
 								})
 							]
 						})
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
+						open: pendingDelete !== void 0,
+						onClose: () => {
+							if (!busy) setPendingDelete(void 0);
+						},
+						title: t("deleteTitle"),
+						closeLabel: t("close"),
+						description: pendingDelete === void 0 ? void 0 : t("deleteConfirm", { name: pendingDelete.name }),
+						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",
+							disabled: busy,
+							onClick: () => setPendingDelete(void 0),
+							children: t("cancel")
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+							variant: "primary",
+							disabled: busy,
+							onClick: () => {
+								removeSkill();
+							},
+							children: busy ? t("deleting") : t("delete")
+						})] })
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
+						open: batchConfirmation !== void 0,
+						onClose: () => {
+							if (!busy) setBatchConfirmation(void 0);
+						},
+						title: t("batchConfirmTitle"),
+						closeLabel: t("close"),
+						description: batchConfirmation === void 0 ? void 0 : t("batchConfirm", batchConfirmation),
+						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",
+							disabled: busy,
+							onClick: () => setBatchConfirmation(void 0),
+							children: t("cancel")
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+							variant: "primary",
+							disabled: busy,
+							onClick: () => {
+								commitBatchDirectory();
+							},
+							children: busy ? t("batchWorking") : t("batchCommit")
+						})] })
 					})
 				]
 			});
@@ -1516,6 +1568,58 @@ window.__ModuleLoader__.load({
 			cursor: "default"
 		};
 		//#endregion
+		//#region src/client/atomicSkillDelete.ts
+		function leadingSkillToken(draft, names) {
+			const ordered = [...new Set(names)].sort((a, b) => b.length - a.length);
+			for (const name of ordered) {
+				if (name.length === 0) continue;
+				const token = `/${name}`;
+				if (!draft.startsWith(token)) continue;
+				const following = draft[token.length];
+				if (following !== void 0 && !/\s/u.test(following)) continue;
+				return {
+					tokenEnd: token.length,
+					boundaryEnd: token.length + (following === " " ? 1 : 0)
+				};
+			}
+		}
+		/**
+		* Delete one exact, leading, installed `/name` token as a single edit.
+		*
+		* This deliberately handles only the common boundary gesture. Selections,
+		* token-internal edits, unknown names, leading whitespace, and non-boundary
+		* carets fall through to the textarea's normal behavior.
+		*/
+		function atomicSkillBackspace(draft, caret, names) {
+			if (!Number.isInteger(caret) || caret < 0 || caret > draft.length) return void 0;
+			const token = leadingSkillToken(draft, names);
+			if (token === void 0) return void 0;
+			if (caret !== token.tokenEnd && caret !== token.boundaryEnd) return void 0;
+			return {
+				draft: draft.slice(token.boundaryEnd),
+				caret: 0
+			};
+		}
+		/**
+		* Resolve one whole-token horizontal caret jump.
+		* Left from anywhere inside/just after the leading skill goes before it;
+		* right from before/inside it goes after its single separator.
+		*/
+		function atomicSkillArrow(draft, caret, direction, names) {
+			if (!Number.isInteger(caret) || caret < 0 || caret > draft.length) return void 0;
+			const token = leadingSkillToken(draft, names);
+			if (token === void 0) return void 0;
+			if (direction === "left" && caret > 0 && caret <= token.boundaryEnd) return 0;
+			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
@@ -1526,13 +1630,25 @@ 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) {
+			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;
+				node = node.parentElement;
+			}
+		}
 		/** One row of the composer skill picker. */
-		function SkillsPicker({ t, useSkills, useInput, inputActions, actions }) {
+		function SkillsPicker({ t, sessionId, useSkills, useInput, inputActions, actions }) {
 			const skills = useSkills((value) => value);
 			const input = useInput((value) => value.draft);
 			const [open, setOpen] = (0, react.useState)(false);
 			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]);
@@ -1548,11 +1664,77 @@ window.__ModuleLoader__.load({
 				if (open) setQuery("");
 			}, [open]);
 			const usable = skills.filter((skill) => skill.userInvocable);
+			draftRef.current = input;
+			skillNamesRef.current = usable.map((skill) => skill.name);
+			const scheduleComposerFocus = (expectedDraft, caret) => {
+				const textarea = composerTextareaFor(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);
+				});
+			};
+			(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 (![
+						"Backspace",
+						"ArrowLeft",
+						"ArrowRight"
+					].includes(event.key)) return;
+					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;
+					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);
+						return;
+					}
+					const edit = atomicSkillBackspace(draftRef.current, start, skillNamesRef.current);
+					if (edit === void 0) return;
+					event.preventDefault();
+					event.stopPropagation();
+					inputActions.setDraft(edit.draft);
+					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);
+					});
+				};
+				document.addEventListener("keydown", onKeyDown, true);
+				return () => {
+					document.removeEventListener("keydown", onKeyDown, true);
+					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} `;
+				const nextDraft = `${prefix}${input}`;
 				setOpen(false);
-				inputActions.setDraft(`/${name} ${input}`);
+				inputActions.setDraft(nextDraft);
+				scheduleComposerFocus(nextDraft, prefix.length);
 			};
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				ref: rootRef,
@@ -1754,7 +1936,11 @@ window.__ModuleLoader__.load({
 			refresh: "刷新",
 			installedEmpty: "暂无技能。导入新技能或手动放入技能目录后会自动出现。",
 			delete: "删除",
+			deleting: "删除中…",
+			deleteTitle: "删除技能",
 			deleteConfirm: "确定删除技能 {name} 吗？将删除对应目录下的 SKILL.md 及资源文件。",
+			cancel: "取消",
+			close: "关闭",
 			deleteFailed: "删除失败",
 			deleted: "已删除。",
 			installedFailed: "无法读取技能列表",
@@ -1800,6 +1986,7 @@ window.__ModuleLoader__.load({
 			batchConflict: "名称重复",
 			batchReplace: "替换",
 			batchConfirm: "将新增 {importing} 个、替换 {replacing} 个、跳过 {skipped} 个技能。确认继续吗？",
+			batchConfirmTitle: "确认批量导入",
 			batchResultTitle: "本次导入结果",
 			batchResultSummary: "新增 {imported} · 替换 {replaced} · 跳过 {skipped} · 失败 {failed}",
 			batchStatusImported: "已导入",
@@ -1831,7 +2018,11 @@ window.__ModuleLoader__.load({
 			refresh: "Refresh",
 			installedEmpty: "No skills yet. Import one or drop files into a skill directory and they will appear automatically.",
 			delete: "Delete",
+			deleting: "Deleting…",
+			deleteTitle: "Delete skill",
 			deleteConfirm: "Delete the skill {name}? This removes its SKILL.md and resources from that directory.",
+			cancel: "Cancel",
+			close: "Close",
 			deleteFailed: "Failed to delete",
 			deleted: "Deleted.",
 			installedFailed: "Unable to read the skill list",
@@ -1877,6 +2068,7 @@ window.__ModuleLoader__.load({
 			batchConflict: "Name conflict",
 			batchReplace: "Replace",
 			batchConfirm: "Add {importing}, replace {replacing}, and skip {skipped} skills. Continue?",
+			batchConfirmTitle: "Confirm batch import",
 			batchResultTitle: "Import results",
 			batchResultSummary: "Added {imported} · Replaced {replaced} · Skipped {skipped} · Failed {failed}",
 			batchStatusImported: "Imported",
@@ -2000,7 +2192,14 @@ window.__ModuleLoader__.load({
 							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*/, "");
-							input.setDraft(`/${option.id} ${rest}`);
+							const prefix = `/${option.id} `;
+							const nextDraft = `${prefix}${rest}`;
+							input.setDraft(nextDraft);
+							requestComposerFocus({
+								sessionId: session.sessionId,
+								expectedDraft: nextDraft,
+								caret: prefix.length
+							});
 						}
 					}
 				});

package/lib/index.js

@@ -99,12 +99,6 @@ const MAX_BATCH_FILES_PER_SKILL = 2e3;
 const MAX_BATCH_SKILL_BYTES = 10485760;
 const BATCH_SCAN_TTL_MS = 6e5;
 const KEBAB_CASE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
-const AGENT_SKILL_PARENTS = /* @__PURE__ */ new Set([
-	".agents",
-	".claude",
-	".codex",
-	".dsh"
-]);
 const MAX_URL_REDIRECTS = 5;
 /** The harness home (`$DSH_HOME`, defaulting to `~/.dsh`). */
 function dshHomeDir() {
@@ -311,12 +305,9 @@ function scanBatch(request) {
 	if (!isAbsolute(request.sourcePath)) throw new Error("批量导入目录必须是绝对路径");
 	if (!existsSync(request.sourcePath) || !statSync(request.sourcePath).isDirectory()) throw new Error("批量导入目录不存在或不可读");
 	const sourcePath = realpathSync(request.sourcePath);
-	const leaf = basename(sourcePath);
-	const parent = basename(dirname(sourcePath));
-	const grandparent = basename(dirname(dirname(sourcePath)));
-	const isSkillsRoot = leaf === "skills" && AGENT_SKILL_PARENTS.has(parent);
-	const isSkillDirectory = parent === "skills" && AGENT_SKILL_PARENTS.has(grandparent);
-	if (!isSkillsRoot && !isSkillDirectory) throw new Error("批量导入仅支持 .claude、.codex、.agents 或 .dsh 下的 skills 目录");
+	const leaf = basename(sourcePath).toLowerCase();
+	const parent = basename(dirname(sourcePath)).toLowerCase();
+	if (!(leaf === "skills") && !(parent === "skills")) throw new Error("批量导入仅支持名为 skills 的目录或其中的单个技能目录");
 	if (request.target !== "user" && request.workspacePath === void 0) throw new Error("项目目标需要 workspacePath（当前工作区路径）");
 	const sources = batchSources(sourcePath);
 	if (sources.length === 0) throw new Error("所选目录中没有找到可导入的技能");
@@ -761,11 +752,17 @@ function apply(ctx) {
 				}
 				const workspacePath = requireWorkspace(body.target, body.workspacePath);
 				pruneBatchScans();
-				const session = scanBatch({
-					sourcePath: body.sourcePath,
-					target: body.target,
-					workspacePath
-				});
+				let session;
+				try {
+					session = scanBatch({
+						sourcePath: body.sourcePath,
+						target: body.target,
+						workspacePath
+					});
+				} catch (error) {
+					sendError(res, 400, error instanceof Error ? error.message : String(error));
+					return;
+				}
 				batchScans.set(session.scanId, session);
 				sendJson(res, 200, {
 					ok: true,

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

@@ -13,4 +13,4 @@ import type { SkillImporterInjected } from './index.ts';
 /** Props the renderer binds for the picker. */
 export type SkillsPickerProps = PropsRuntime<'conversation.input.left'> & PropsLocale<'skills.importer'> & InjectFace<SkillImporterInjected>;
 /** One row of the composer skill picker. */
-export declare function SkillsPicker({ t, useSkills, useInput, inputActions, actions }: SkillsPickerProps): ReactNode;
+export declare function SkillsPicker({ t, sessionId, useSkills, useInput, inputActions, actions }: SkillsPickerProps): ReactNode;

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

@@ -0,0 +1,19 @@
+/** One safe, collapsed-caret Backspace rewrite over a leading skill token. */
+export interface AtomicSkillDeleteEdit {
+    readonly draft: string;
+    readonly caret: number;
+}
+/**
+ * Delete one exact, leading, installed `/name` token as a single edit.
+ *
+ * This deliberately handles only the common boundary gesture. Selections,
+ * token-internal edits, unknown names, leading whitespace, and non-boundary
+ * carets fall through to the textarea's normal behavior.
+ */
+export declare function atomicSkillBackspace(draft: string, caret: number, names: readonly string[]): AtomicSkillDeleteEdit | undefined;
+/**
+ * Resolve one whole-token horizontal caret jump.
+ * Left from anywhere inside/just after the leading skill goes before it;
+ * right from before/inside it goes after its single separator.
+ */
+export declare function atomicSkillArrow(draft: string, caret: number, direction: 'left' | 'right', names: readonly string[]): number | undefined;

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

@@ -0,0 +1,9 @@
+/** 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;

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

@@ -21,7 +21,11 @@ export declare const zh: {
     refresh: string;
     installedEmpty: string;
     delete: string;
+    deleting: string;
+    deleteTitle: string;
     deleteConfirm: string;
+    cancel: string;
+    close: string;
     deleteFailed: string;
     deleted: string;
     installedFailed: string;
@@ -67,6 +71,7 @@ export declare const zh: {
     batchConflict: string;
     batchReplace: string;
     batchConfirm: string;
+    batchConfirmTitle: string;
     batchResultTitle: string;
     batchResultSummary: string;
     batchStatusImported: string;
@@ -100,7 +105,11 @@ export declare const en: {
     refresh: string;
     installedEmpty: string;
     delete: string;
+    deleting: string;
+    deleteTitle: string;
     deleteConfirm: string;
+    cancel: string;
+    close: string;
     deleteFailed: string;
     deleted: string;
     installedFailed: string;
@@ -146,6 +155,7 @@ export declare const en: {
     batchConflict: string;
     batchReplace: string;
     batchConfirm: string;
+    batchConfirmTitle: string;
     batchResultTitle: string;
     batchResultSummary: string;
     batchStatusImported: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-skill-importer",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "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",
@@ -24,6 +24,7 @@
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-ui-slots",
         "@deepseek-ai/dsh-client-ui-settings",
+        "@deepseek-ai/dsh-client-ui-primitives",
         "@deepseek-ai/dsh-api-remotes"
       ],
       "platform": "web"
@@ -45,6 +46,7 @@
   "scripts": {
     "build": "rm -rf lib && tsc -p tsconfig.json && tsdown",
     "test:batch": "node --experimental-strip-types tests/batch-import.test.mjs",
+    "test:atomic-delete": "node --experimental-strip-types tests/atomic-skill-delete.test.mjs",
     "watch": "tsdown --watch"
   },
   "license": "MIT",
@@ -55,6 +57,7 @@
     "@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",
     "react": "^18.2.0",
     "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.6",
@@ -71,6 +74,7 @@
     "@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",
     "@types/react": "^18.3.0",
     "react": "^18.2.0",

package/src/server.ts

@@ -34,7 +34,6 @@ export const MAX_BATCH_SKILL_BYTES = 10 * 1024 * 1024
 export const BATCH_SCAN_TTL_MS = 10 * 60 * 1000
 
 const KEBAB_CASE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/
-const AGENT_SKILL_PARENTS = new Set(['.agents', '.claude', '.codex', '.dsh'])
 const MAX_URL_REDIRECTS = 5
 
 /** The harness home (`$DSH_HOME`, defaulting to `~/.dsh`). */
@@ -284,13 +283,12 @@ export function scanBatch(request: BatchScanRequest): BatchScanSession {
   if (!isAbsolute(request.sourcePath)) throw new Error('批量导入目录必须是绝对路径')
   if (!existsSync(request.sourcePath) || !statSync(request.sourcePath).isDirectory()) throw new Error('批量导入目录不存在或不可读')
   const sourcePath = realpathSync(request.sourcePath)
-  const leaf = basename(sourcePath)
-  const parent = basename(dirname(sourcePath))
-  const grandparent = basename(dirname(dirname(sourcePath)))
-  const isSkillsRoot = leaf === 'skills' && AGENT_SKILL_PARENTS.has(parent)
-  const isSkillDirectory = parent === 'skills' && AGENT_SKILL_PARENTS.has(grandparent)
+  const leaf = basename(sourcePath).toLowerCase()
+  const parent = basename(dirname(sourcePath)).toLowerCase()
+  const isSkillsRoot = leaf === 'skills'
+  const isSkillDirectory = parent === 'skills'
   if (!isSkillsRoot && !isSkillDirectory) {
-    throw new Error('批量导入仅支持 .claude、.codex、.agents 或 .dsh 下的 skills 目录')
+    throw new Error('批量导入仅支持名为 skills 的目录或其中的单个技能目录')
   }
   if (request.target !== 'user' && request.workspacePath === undefined) throw new Error('项目目标需要 workspacePath（当前工作区路径）')
   const sources = batchSources(sourcePath)

package/tests/atomic-skill-delete.test.mjs

@@ -0,0 +1,24 @@
+import assert from 'node:assert/strict'
+import { atomicSkillArrow, atomicSkillBackspace } from '../src/client/atomicSkillDelete.ts'
+
+const names = ['foo', 'foo-bar', 'pangu-agent']
+
+assert.deepEqual(atomicSkillBackspace('/pangu-agent ', 13, names), { draft: '', caret: 0 })
+assert.deepEqual(atomicSkillBackspace('/pangu-agent ', 12, names), { draft: '', caret: 0 })
+assert.deepEqual(atomicSkillBackspace('/foo-bar explain', 9, names), { draft: 'explain', caret: 0 })
+assert.deepEqual(atomicSkillBackspace('/foo-bar', 8, names), { draft: '', caret: 0 })
+
+assert.equal(atomicSkillBackspace('/pangu-agent ', 6, names), undefined)
+assert.equal(atomicSkillBackspace('/unknown ', 9, names), undefined)
+assert.equal(atomicSkillBackspace(' /pangu-agent ', 14, names), undefined)
+assert.equal(atomicSkillBackspace('/foo-barium ', 12, names), undefined)
+assert.equal(atomicSkillBackspace('/foo\nnext', 5, names), undefined)
+
+assert.equal(atomicSkillArrow('/pangu-agent ', 13, 'left', names), 0)
+assert.equal(atomicSkillArrow('/pangu-agent ', 6, 'left', names), 0)
+assert.equal(atomicSkillArrow('/pangu-agent ', 0, 'right', names), 13)
+assert.equal(atomicSkillArrow('/pangu-agent explain', 13, 'right', names), undefined)
+assert.equal(atomicSkillArrow('/pangu-agent explain', 14, 'left', names), undefined)
+assert.equal(atomicSkillArrow('/unknown ', 0, 'right', names), undefined)
+
+console.log('atomic skill delete test: OK')

package/tests/batch-import.test.mjs

@@ -70,13 +70,19 @@ try {
   assert.match(changedResults[0]?.message ?? '', /发生变化/)
   assert.equal(existsSync(join(process.env.DSH_HOME, 'skills', 'beta')), false)
 
+  // Any agent may use its own parent directory; the selected root name is the boundary.
+  const customAgentSource = join(sandbox, 've_hcs_agent', 'skills')
+  mkdirSync(join(customAgentSource, 'gamma'), { recursive: true })
+  writeFileSync(join(customAgentSource, 'gamma', 'SKILL.md'), skill('gamma'))
+  assert.equal(scanBatch({ sourcePath: customAgentSource, target: 'user' }).entries[0]?.name, 'gamma')
+
   const empty = join(sandbox, '.agents', 'skills')
   mkdirSync(empty, { recursive: true })
   assert.throws(() => scanBatch({ sourcePath: empty, target: 'user' }), /没有找到/)
 
   const arbitrary = join(sandbox, 'arbitrary')
   mkdirSync(arbitrary)
-  assert.throws(() => scanBatch({ sourcePath: arbitrary, target: 'user' }), /仅支持/)
+  assert.throws(() => scanBatch({ sourcePath: arbitrary, target: 'user' }), /名为 skills/)
 
   assert.equal(originAllowed({ headers: {} }), false)
   assert.equal(originAllowed({ headers: { origin: 'https://evil.example' } }), false)