@ifrankwang/openspec-agents 0.132.0 → 0.132.1

package/.mcp-server/cli.mjs

@@ -29775,7 +29775,7 @@ var defaultRunner = {
   },
   async runChecked(worktree, args) {
     const { stdout, stderr, exitCode } = await execGit(["-C", worktree, ...args]);
-    return { success: exitCode === 0, stdout: stdout.trim(), stderr: stderr.trim() };
+    return { success: exitCode === 0, stdout: stdout.trim(), stderr: stderr.trim(), exitCode };
   }
 };
 var gitRunner = defaultRunner;
@@ -29890,16 +29890,45 @@ async function markTaskGroupCheckboxesComplete(worktree, changeId, taskGroupId)
     throw new Error(`git commit tasks.md 失败：${commitResult.stderr}`);
   }
 }
-async function mergeBranchToTarget(worktree, sourceBranch, targetBranch) {
-  const checkoutResult = await runGitChecked(worktree, ["checkout", targetBranch]);
-  if (!checkoutResult.success) {
-    throw new Error(`无法切到目标分支 "${targetBranch}"：${checkoutResult.stderr}`);
+async function mergeBranchToTarget(repoDir, sourceBranch, targetBranch) {
+  const ancestor = await runGitChecked(repoDir, ["merge-base", "--is-ancestor", sourceBranch, targetBranch]);
+  if (ancestor.success)
+    return { success: true, conflict: false };
+  if (ancestor.exitCode !== 1) {
+    throw new Error(`无法判断 "${sourceBranch}" 是否已并入 "${targetBranch}"：${ancestor.stderr}`);
   }
-  const mergeResult = await runGitChecked(worktree, ["merge", "--no-ff", sourceBranch]);
-  if (!mergeResult.success) {
-    await runGitChecked(worktree, ["merge", "--abort"]);
+  const mergeTree = await runGitChecked(repoDir, ["merge-tree", "--write-tree", "--messages", targetBranch, sourceBranch]);
+  if (!mergeTree.success) {
+    if (mergeTree.exitCode !== 1) {
+      throw new Error(`无法试算 "${sourceBranch}" → "${targetBranch}" 的合并：${mergeTree.stderr}`);
+    }
     return { success: false, conflict: true };
   }
+  const treeOid = mergeTree.stdout.split(`
+`)[0].trim();
+  if (!treeOid)
+    throw new Error("merge-tree 未返回树对象，无法生成合并提交。");
+  const targetOid = (await runGit(repoDir, ["rev-parse", targetBranch])).trim();
+  const sourceOid = (await runGit(repoDir, ["rev-parse", sourceBranch])).trim();
+  if (!targetOid || !sourceOid) {
+    throw new Error(`无法解析分支 OID：target="${targetOid}" source="${sourceOid}"`);
+  }
+  const commitOid = (await runGit(repoDir, [
+    "commit-tree",
+    treeOid,
+    "-p",
+    targetOid,
+    "-p",
+    sourceOid,
+    "-m",
+    `Merge branch '${sourceBranch}'`
+  ])).trim();
+  if (!commitOid)
+    throw new Error("git commit-tree 失败：无法创建合并提交。");
+  const updateRef = await runGitChecked(repoDir, ["update-ref", `refs/heads/${targetBranch}`, commitOid, targetOid]);
+  if (!updateRef.success) {
+    throw new Error(`基础分支 "${targetBranch}" 已被并发推进，合并提交未写入（update-ref 旧值校验失败）：${updateRef.stderr}`);
+  }
   return { success: true, conflict: false };
 }
 async function discoverDiskWorktrees(worktree) {
@@ -36569,8 +36598,8 @@ async function completeTaskGroupExecute(params, ctx) {
       return [
         `- **status**: blocked`,
         `- **merge_conflict**: true`,
-        `- **说明**: 合并到 "${mergeTarget}" 时发生冲突，已中止合并。`,
-        `- **处理**: 请手动在目标分支解决冲突后完成合并 (git merge ${branchName})，完成后重新调 opx_orch_complete_task_group 完成收尾。worktree 与分支已保留。`
+        `- **说明**: 合并到 "${mergeTarget}" 时发生冲突，未产生任何变更（分支引用未动，无半成品合并）。`,
+        `- **处理**: 请自行执行 \`git checkout ${mergeTarget} && git merge ${branchName}\` 解决冲突并提交，完成后重新调用 opx_orch_complete_task_group 完成收尾（重调时工具会自动识别已合并并继续）。worktree 与分支已保留。`
       ].join(`
 `);
     }
@@ -37684,7 +37713,7 @@ async function ensureDefaultUnattended(args, ctx) {
     }
   } catch {}
 }
-var PKG_VERSION = "0.132.0";
+var PKG_VERSION = "0.132.1";
 function buildMcpServer(worktree, opts = {}) {
   const mcp = new McpServer({ name: "openspec-agents", version: PKG_VERSION });
   for (const [name, spec] of Object.entries(TOOL_SPECS)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ifrankwang/openspec-agents",
-  "version": "0.132.0",
+  "version": "0.132.1",
   "description": "OpenSpec change orchestration plugin for AI coding agents (Claude Code, Codex, ZCode, DeepSeek Harness, OpenCode)",
   "author": "ifrankwang",
   "license": "MIT",

package/src/core/git.ts

@@ -17,7 +17,7 @@ export interface GitRunner {
   runChecked(
     worktree: string,
     args: string[]
-  ): Promise<{ success: boolean; stdout: string; stderr: string }>
+  ): Promise<{ success: boolean; stdout: string; stderr: string; exitCode: number }>
 }
 
 function execGit(args: string[]): Promise<{ stdout: string; stderr: string; exitCode: number }> {
@@ -43,7 +43,7 @@ const defaultRunner: GitRunner = {
   },
   async runChecked(worktree, args) {
     const { stdout, stderr, exitCode } = await execGit(["-C", worktree, ...args])
-    return { success: exitCode === 0, stdout: stdout.trim(), stderr: stderr.trim() }
+    return { success: exitCode === 0, stdout: stdout.trim(), stderr: stderr.trim(), exitCode }
   },
 }
 
@@ -60,7 +60,7 @@ export async function runGit(worktree: string, args: string[]): Promise<string>
 export async function runGitChecked(
   worktree: string,
   args: string[]
-): Promise<{ success: boolean; stdout: string; stderr: string }> {
+): Promise<{ success: boolean; stdout: string; stderr: string; exitCode: number }> {
   return gitRunner.runChecked(worktree, args)
 }
 
@@ -204,20 +204,55 @@ export async function markTaskGroupCheckboxesComplete(
   }
 }
 
+/**
+ * 收尾裸合并：将任务组分支合并进基础分支，全程不触碰任何工作目录（worktreeless 底层命令）。
+ *
+ * 主仓库工作区状态（当前分支、未提交改动、index）不受影响；冲突时目标分支引用未动、磁盘无半成品。
+ * 序列：
+ * 1. `merge-base --is-ancestor` 幂等检查：源分支已是目标分支祖先（如人工解决冲突后重调）直接成功，
+ *    不产生空合并提交；
+ * 2. `merge-tree --write-tree`（需 git ≥ 2.38）内存试算合并树：退出码 1 = 冲突，直接返回；
+ * 3. `commit-tree` 生成双父合并提交，`update-ref` 以试算前目标分支 oid 作旧值校验推进（CAS，防并发覆盖）。
+ *
+ * @param repoDir 仓库内任意目录（底层命令不读取工作区，不影响 HEAD/index）
+ */
 export async function mergeBranchToTarget(
-  worktree: string,
+  repoDir: string,
   sourceBranch: string,
   targetBranch: string
 ): Promise<{ success: boolean; conflict: boolean }> {
-  const checkoutResult = await runGitChecked(worktree, ["checkout", targetBranch])
-  if (!checkoutResult.success) {
-    throw new Error(`无法切到目标分支 "${targetBranch}"：${checkoutResult.stderr}`)
+  const ancestor = await runGitChecked(repoDir, ["merge-base", "--is-ancestor", sourceBranch, targetBranch])
+  if (ancestor.success) return { success: true, conflict: false }
+  // is-ancestor 退出码 1 = 尚未并入（继续合并）；其余为分支缺失等真实错误
+  if (ancestor.exitCode !== 1) {
+    throw new Error(`无法判断 "${sourceBranch}" 是否已并入 "${targetBranch}"：${ancestor.stderr}`)
   }
-  const mergeResult = await runGitChecked(worktree, ["merge", "--no-ff", sourceBranch])
-  if (!mergeResult.success) {
-    await runGitChecked(worktree, ["merge", "--abort"])
+
+  const mergeTree = await runGitChecked(repoDir, ["merge-tree", "--write-tree", "--messages", targetBranch, sourceBranch])
+  if (!mergeTree.success) {
+    // merge-tree 退出码 1 = 冲突；其余为分支缺失等真实错误
+    if (mergeTree.exitCode !== 1) {
+      throw new Error(`无法试算 "${sourceBranch}" → "${targetBranch}" 的合并：${mergeTree.stderr}`)
+    }
     return { success: false, conflict: true }
   }
+  const treeOid = mergeTree.stdout.split("\n")[0].trim()
+  if (!treeOid) throw new Error("merge-tree 未返回树对象，无法生成合并提交。")
+
+  const targetOid = (await runGit(repoDir, ["rev-parse", targetBranch])).trim()
+  const sourceOid = (await runGit(repoDir, ["rev-parse", sourceBranch])).trim()
+  if (!targetOid || !sourceOid) {
+    throw new Error(`无法解析分支 OID：target="${targetOid}" source="${sourceOid}"`)
+  }
+  const commitOid = (await runGit(repoDir, [
+    "commit-tree", treeOid, "-p", targetOid, "-p", sourceOid, "-m", `Merge branch '${sourceBranch}'`,
+  ])).trim()
+  if (!commitOid) throw new Error("git commit-tree 失败：无法创建合并提交。")
+
+  const updateRef = await runGitChecked(repoDir, ["update-ref", `refs/heads/${targetBranch}`, commitOid, targetOid])
+  if (!updateRef.success) {
+    throw new Error(`基础分支 "${targetBranch}" 已被并发推进，合并提交未写入（update-ref 旧值校验失败）：${updateRef.stderr}`)
+  }
   return { success: true, conflict: false }
 }
 

package/src/core/tools/lifecycle.ts

@@ -774,8 +774,8 @@ export async function completeTaskGroupExecute(params: { change_id: string }, ct
       return [
         `- **status**: blocked`,
         `- **merge_conflict**: true`,
-        `- **说明**: 合并到 "${mergeTarget}" 时发生冲突，已中止合并。`,
-        `- **处理**: 请手动在目标分支解决冲突后完成合并 (git merge ${branchName})，完成后重新调 opx_orch_complete_task_group 完成收尾。worktree 与分支已保留。`,
+        `- **说明**: 合并到 "${mergeTarget}" 时发生冲突，未产生任何变更（分支引用未动，无半成品合并）。`,
+        `- **处理**: 请自行执行 \`git checkout ${mergeTarget} && git merge ${branchName}\` 解决冲突并提交，完成后重新调用 opx_orch_complete_task_group 完成收尾（重调时工具会自动识别已合并并继续）。worktree 与分支已保留。`,
       ].join("\n")
     }
   }