@ifrankwang/openspec-agents 0.122.0 → 0.122.1

package/.mcp-server/cli.mjs

@@ -34345,21 +34345,43 @@ function loadWorkflow(yamlText) {
 import { readFileSync as readFileSync4 } from "node:fs";
 
 // src/skills/scan.ts
-import { existsSync as existsSync3 } from "node:fs";
+import { existsSync as existsSync3, readdirSync as readdirSync2 } from "node:fs";
 import { resolve, dirname as dirname2, join as join2 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 import { homedir } from "node:os";
 var projectRoot = resolve(dirname2(fileURLToPath2(import.meta.url)), "..", "..");
+function resolveSkillScanRoot(moduleUrl) {
+  const startDir = dirname2(fileURLToPath2(moduleUrl));
+  let dir = startDir;
+  for (;; ) {
+    for (const candidate of [resolve(dir, "assets", "skills"), resolve(dir, "skills")]) {
+      if (isSkillRoot(candidate))
+        return candidate;
+    }
+    const parent = dirname2(dir);
+    if (parent === dir)
+      break;
+    dir = parent;
+  }
+  return null;
+}
+function isSkillRoot(candidate) {
+  if (!existsSync3(candidate))
+    return false;
+  try {
+    return readdirSync2(candidate, { withFileTypes: true }).some((entry) => entry.isDirectory() && existsSync3(join2(candidate, entry.name, "SKILL.md")));
+  } catch {
+    return false;
+  }
+}
+var scanRoot = resolveSkillScanRoot(import.meta.url);
 var SKILL_SCAN_ROOTS = [
-  resolve(projectRoot, "assets", "skills"),
+  ...scanRoot ? [scanRoot] : [],
   resolve(projectRoot, ".agents", "skills"),
   resolve(projectRoot, ".opencode", "skills"),
   join2(homedir(), ".agents", "skills"),
   join2(homedir(), ".config", "opencode", "skills")
 ];
-var DISTRIBUTED_SKILL_ROOTS = [
-  resolve(projectRoot, "assets", "skills")
-];
 function findSkillPath(name) {
   for (const root of SKILL_SCAN_ROOTS) {
     const p = resolve(root, name, "SKILL.md");
@@ -34370,7 +34392,7 @@ function findSkillPath(name) {
 }
 
 // src/skills/resolve.ts
-import { readdirSync as readdirSync2, readFileSync as readFileSync3, existsSync as existsSync4 } from "node:fs";
+import { readdirSync as readdirSync3, readFileSync as readFileSync3, existsSync as existsSync4 } from "node:fs";
 import { resolve as resolve2 } from "node:path";
 var cacheKey = null;
 var cacheIndex = null;
@@ -34385,7 +34407,7 @@ function scanSkillTags(roots = SKILL_SCAN_ROOTS) {
   for (const root of roots) {
     if (!existsSync4(root))
       continue;
-    for (const entry of readdirSync2(root, { withFileTypes: true })) {
+    for (const entry of readdirSync3(root, { withFileTypes: true })) {
       if (!entry.isDirectory())
         continue;
       if (seen.has(entry.name))
@@ -37070,7 +37092,7 @@ async function ensureDefaultUnattended(args, ctx) {
     }
   } catch {}
 }
-var PKG_VERSION = "0.122.0";
+var PKG_VERSION = "0.122.1";
 function buildMcpServer(worktree, opts = {}) {
   const mcp = new McpServer({ name: "openspec-agents", version: PKG_VERSION });
   for (const [name, spec] of Object.entries(TOOL_SPECS)) {
@@ -39211,7 +39233,7 @@ class StreamableHTTPServerTransport {
 import { createServer } from "node:http";
 
 // src/core/dashboard.ts
-import { readdirSync as readdirSync3, existsSync as existsSync5 } from "node:fs";
+import { readdirSync as readdirSync4, existsSync as existsSync5 } from "node:fs";
 import { readFile as readFile5 } from "node:fs/promises";
 import path7 from "path";
 function toWorkItemCard(item) {
@@ -39268,7 +39290,7 @@ async function readDashboardState(worktree, changeId) {
   const stateDir = getStateDir(worktree);
   if (!existsSync5(stateDir))
     return null;
-  const files = readdirSync3(stateDir).filter((f) => f.endsWith(".json"));
+  const files = readdirSync4(stateDir).filter((f) => f.endsWith(".json"));
   const results = [];
   for (const f of files) {
     try {
@@ -39356,7 +39378,7 @@ async function startDashboard(worktree) {
   console.error(`[dashboard] 无法启动编排进度看板：端口 ${BASE_PORT}-${BASE_PORT + MAX_ATTEMPTS - 1} 均被占用`);
 }
 // src/core/workflow/collector.ts
-import { readdirSync as readdirSync4, readFileSync as readFileSync6 } from "node:fs";
+import { readdirSync as readdirSync5, readFileSync as readFileSync6 } from "node:fs";
 import { join as join4 } from "node:path";
 var DEFAULT_POLL_INTERVAL_MS = 30000;
 var SOURCE = "openspec";
@@ -39394,7 +39416,7 @@ class OpenSpecCollector {
     const changesDir = join4(this.openspecDir, "changes");
     let entries;
     try {
-      entries = readdirSync4(changesDir, { withFileTypes: true });
+      entries = readdirSync5(changesDir, { withFileTypes: true });
     } catch {
       return [];
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ifrankwang/openspec-agents",
-  "version": "0.122.0",
+  "version": "0.122.1",
   "type": "module",
   "main": "./src/core/index.ts",
   "exports": {

package/src/skills/scan.ts

@@ -1,12 +1,52 @@
-import { existsSync } from "node:fs"
+import { existsSync, readdirSync } from "node:fs"
 import { resolve, dirname, join } from "node:path"
 import { fileURLToPath } from "node:url"
 import { homedir } from "node:os"
 
 const projectRoot = resolve(dirname(fileURLToPath(import.meta.url)), "..", "..")
 
+/**
+ * 定位随包分发的 skill 根目录：源码（src/skills/ 上溯 2 级=仓库根 assets/skills）、插件包 dist 形态
+ * （<插件根>/.mcp-server/ 上溯 1 级=插件根 skills/，plugin-common buildSkills 输出）与 ZCode 缓存嵌套形态
+ * （cache/<marketplace>/<plugin>/<version>/.mcp-server/ 上溯 1 级=版本目录 skills/）部署深度不同，
+ * 故从模块所在目录逐级上溯探测（与 resolveWorkflowFilePath 同范式）。每级按固定顺序探测两个候选：
+ * assets/skills 优先、skills 其次；命中要求目录下至少有一个子目录含 SKILL.md（防御空骨架目录，
+ * 如仓库根遗留的空 skills/）。首个命中即采用（首中即用，不做多根收集——避免 npm 形态上溯越过
+ * 包根误收消费方项目根）。bundle 单文件合并后 import.meta.url 指向部署位置（cli.mjs），源码形态
+ * 指向本文件自身，两者自然成立。
+ */
+export function resolveSkillScanRoot(moduleUrl: string): string | null {
+  const startDir = dirname(fileURLToPath(moduleUrl))
+  let dir = startDir
+  for (;;) {
+    for (const candidate of [resolve(dir, "assets", "skills"), resolve(dir, "skills")]) {
+      if (isSkillRoot(candidate)) return candidate
+    }
+    const parent = dirname(dir)
+    if (parent === dir) break // 到达文件系统根
+    dir = parent
+  }
+  return null
+}
+
+/** 目录存在且至少有一个子目录含 SKILL.md 才算 skill 根；空骨架目录（子目录无 SKILL.md）不命中。 */
+function isSkillRoot(candidate: string): boolean {
+  if (!existsSync(candidate)) return false
+  try {
+    return readdirSync(candidate, { withFileTypes: true }).some(
+      (entry) => entry.isDirectory() && existsSync(join(candidate, entry.name, "SKILL.md")),
+    )
+  } catch {
+    return false // 不可读目录按未命中处理（优雅降级，不阻断扫描）
+  }
+}
+
+// 随包分发 skill 缺失时优雅降级（返回 null）：只影响视图加载建议与门禁索引，不阻断 server 启动；
+// 与 loader 的 workflow 缺失即抛错差异是有意为之——opx_* 工具全部依赖 workflow，缺失时 server 无可用性。
+const scanRoot = resolveSkillScanRoot(import.meta.url)
+
 export const SKILL_SCAN_ROOTS: string[] = [
-  resolve(projectRoot, "assets", "skills"),
+  ...(scanRoot ? [scanRoot] : []),
   resolve(projectRoot, ".agents", "skills"),
   resolve(projectRoot, ".opencode", "skills"),
   join(homedir(), ".agents", "skills"),
@@ -14,9 +54,8 @@ export const SKILL_SCAN_ROOTS: string[] = [
 ]
 
 // 仅随插件分发注入 opencode 的 skill 根目录。.agents/skills 靠 opencode 标准发现对本仓库自用生效，非插件注入职责。
-export const DISTRIBUTED_SKILL_ROOTS: string[] = [
-  resolve(projectRoot, "assets", "skills"),
-]
+// 源码形态探测根即仓库根 assets/skills（与改动前行为一致）；插件形态为插件根 skills/。
+export const DISTRIBUTED_SKILL_ROOTS: string[] = scanRoot ? [scanRoot] : []
 
 export function findSkillPath(name: string): string | null {
   for (const root of SKILL_SCAN_ROOTS) {
@@ -25,5 +64,3 @@ export function findSkillPath(name: string): string | null {
   }
   return null
 }
-
-