dsh-skill-importer 0.2.1 → 0.2.2

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-skill-importer",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "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/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/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)