@ifrankwang/openspec-agents 0.122.0 → 0.123.0

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))
@@ -36029,6 +36051,14 @@ async function completeTaskGroupExecute(params, ctx) {
   if (unresolvedBlockers.length > 0) {
     throw new Error(`存在 ${unresolvedBlockers.length} 个未解决 blocker，无法完成任务组。`);
   }
+  let checkboxWarning = "";
+  if (worktreePath) {
+    try {
+      await markTaskGroupCheckboxesComplete(worktreePath, params.change_id, state.taskGroupId);
+    } catch (e) {
+      checkboxWarning = `- **tasks.md 复选框勾选失败**: ${e instanceof Error ? e.message : String(e)}（不影响收尾）`;
+    }
+  }
   const mergeTarget = state.baseBranch;
   if (branchName) {
     const mergeResult = await mergeBranchToTarget(ctx.worktree, branchName, mergeTarget);
@@ -36050,7 +36080,9 @@ async function completeTaskGroupExecute(params, ctx) {
   }
   item.metadata["completed_at"] = new Date().toISOString();
   await writeState(ctx.worktree, state);
-  return `任务组已完成并合并到 "${mergeTarget}"。`;
+  const doneMessage = `任务组已完成并合并到 "${mergeTarget}"。`;
+  return checkboxWarning ? `${doneMessage}
+${checkboxWarning}` : doneMessage;
 }
 async function setUnattendedExecute(params, ctx) {
   assertOrchestrator(ctx, "opx_orch_set_unattended");
@@ -36527,10 +36559,6 @@ async function agentSubmitExecute(params, ctx) {
         baseRef
       });
     }
-    if (params.step_id === "verify_task" && params.verdict === "passed" && taskChildrenOf(item).every((c) => isTerminalPhase(c.phase))) {
-      const worktreePath = typeof item.metadata["worktree_path"] === "string" ? item.metadata["worktree_path"] : ctx.worktree;
-      await markTaskGroupCheckboxesComplete(worktreePath, params.change_id, state.taskGroupId);
-    }
     if (params.step_id === "verify_tool" && agentToReviewLayer(ctx.agent) === "tool") {
       const head = await getCurrentHead(wtPath);
       if (head)
@@ -37070,7 +37098,7 @@ async function ensureDefaultUnattended(args, ctx) {
     }
   } catch {}
 }
-var PKG_VERSION = "0.122.0";
+var PKG_VERSION = "0.123.0";
 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 +39239,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 +39296,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 +39384,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 +39422,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/README.md

@@ -27,7 +27,7 @@ OpenSpec 把需求、设计、任务拆解成规范文档后，实施阶段仍
 
 `implement → quality_review → done`
 
-面向轻量变更的精简流程：无 analyze 环节（执行边界默认整个 worktree），无 verify_tool / verify_task / verify_cleanup 环节。implement 失败自循环重试；quality_review 由单一审查者合并承担工具检查、任务验证与质量审查（工具改进建议双报机制保留，由开发者实施），失败回 implement 整步重审；开发者提交 implement 成果时强检查工作区干净（不干净拒绝并提示先 commit），收尾为直接合并分支并清理（裸合并，无回归、无环境清理；合并冲突由开发者解决后直接收尾）。tasks.md 复选框不随 simple 流程自动勾选——复选框同步由 full 流程的 verify_task 环节触发，simple 无该环节，任务完成状态以状态文件为准。
+面向轻量变更的精简流程：无 analyze 环节（执行边界默认整个 worktree），无 verify_tool / verify_task / verify_cleanup 环节。implement 失败自循环重试；quality_review 由单一审查者合并承担工具检查、任务验证与质量审查（工具改进建议双报机制保留，由开发者实施），失败回 implement 整步重审；开发者提交 implement 成果时强检查工作区干净（不干净拒绝并提示先 commit），收尾为直接合并分支并清理（裸合并，无回归、无环境清理；合并冲突由开发者解决后直接收尾）。tasks.md 复选框在任务组收尾（opx_orch_complete_task_group）时统一勾选当前任务组，勾选提交落在 worktree 分支、随合并带回主分支；full 与 simple 行为一致，任务完成状态以状态文件为准。
 
 ## 身份与角色
 

package/package.json

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

package/src/core/tools/lifecycle.ts

@@ -2,7 +2,7 @@ import path from "path"
 import type { TaskItem, TaskStatus, WorkflowMode } from "../types.ts"
 import { BUILD_PHASE_TARGETS, REVIEW_LAYERS, REVIEW_VERIFY_STEPS } from "../types.ts"
 import { agentToReviewLayer } from "../constants.ts"
-import { runGit, runGitChecked, getCurrentBranch, getMergeBase, isWorktreeClean, mergeBranchToTarget, discoverDiskWorktrees, detectMainRepoPollution, detectChanges, type DetectChangesResult } from "../git.ts"
+import { runGit, runGitChecked, getCurrentBranch, getMergeBase, isWorktreeClean, markTaskGroupCheckboxesComplete, mergeBranchToTarget, discoverDiskWorktrees, detectMainRepoPollution, detectChanges, type DetectChangesResult } from "../git.ts"
 import { readStateByWorktree, readStateByChangeId, writeState, writeContextToWorktree } from "../state.ts"
 import { generateIsolationNamespace } from "../namespace.ts"
 import { readExemptions } from "../exemptions.ts"
@@ -663,6 +663,16 @@ export async function completeTaskGroupExecute(params: { change_id: string }, ct
     throw new Error(`存在 ${unresolvedBlockers.length} 个未解决 blocker，无法完成任务组。`)
   }
 
+  // tasks.md 复选框统一在收尾勾选（原 G19 语义迁移）：仅写 worktree，随合并带回主分支；失败不阻断收尾
+  let checkboxWarning = ""
+  if (worktreePath) {
+    try {
+      await markTaskGroupCheckboxesComplete(worktreePath, params.change_id, state.taskGroupId)
+    } catch (e) {
+      checkboxWarning = `- **tasks.md 复选框勾选失败**: ${e instanceof Error ? e.message : String(e)}（不影响收尾）`
+    }
+  }
+
   const mergeTarget = state.baseBranch
   if (branchName) {
     const mergeResult = await mergeBranchToTarget(ctx.worktree, branchName, mergeTarget)
@@ -684,7 +694,8 @@ export async function completeTaskGroupExecute(params: { change_id: string }, ct
   }
   item.metadata["completed_at"] = new Date().toISOString()
   await writeState(ctx.worktree, state)
-  return `任务组已完成并合并到 "${mergeTarget}"。`
+  const doneMessage = `任务组已完成并合并到 "${mergeTarget}"。`
+  return checkboxWarning ? `${doneMessage}\n${checkboxWarning}` : doneMessage
 }
 
 export async function setUnattendedExecute(params: UnattendedParams, ctx: ToolContext): Promise<string> {

package/src/core/tools/submit.ts

@@ -15,7 +15,7 @@ import { agentToReviewDimension, agentToReviewLayer, readIssueSource } from "../
 import { REVIEW_DIMENSIONS } from "../types.ts"
 import type { Dimension } from "../types.ts"
 import { taskChildrenOf, taskChildById, normalizeTaskChildIds, taskListOf, issueChildrenOf } from "../task-children.ts"
-import { markTaskGroupCheckboxesComplete, reconcileMainPollution, getCurrentHead, isWorktreeClean } from "../git.ts"
+import { reconcileMainPollution, getCurrentHead, isWorktreeClean } from "../git.ts"
 import { assertIssueFilesWithin } from "../paths.ts"
 import {
   readStateByWorktree, writeState, getLockPath, acquireLock, releaseLock,
@@ -750,17 +750,6 @@ export async function agentSubmitExecute(params: AgentSubmitParams, ctx: ToolCon
       })
     }
 
-    // G19：verify_task passed 且全部 task child 达终态（done）→ 同步 tasks.md 复选框 [ ] → [x]
-    if (
-      params.step_id === "verify_task" &&
-      params.verdict === "passed" &&
-      taskChildrenOf(item).every((c) => isTerminalPhase(c.phase))
-    ) {
-      const worktreePath =
-        typeof item.metadata["worktree_path"] === "string" ? item.metadata["worktree_path"] : ctx.worktree
-      await markTaskGroupCheckboxesComplete(worktreePath, params.change_id, state.taskGroupId)
-    }
-
     // tool review 检查点增量检测（A3）：verify_tool 的 reviewer-tool 提交成功后记录当前 HEAD，
     // 供下次重进 verify_tool 时仅对比「检查点 → 当前 HEAD」区间的变更（无代码/配置变更时直提 passed，
     // 省去全量工具扫描）。写入位于 submitForStep 成功与 writeState 之间，任何异常路径均不落盘（零状态变更）。

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
 }
-
-