新增: Git worktree生命周期管理(创建/提交/合并/冲突检测/清理)

- create_plan_worktree: 创建Plan级工作分支 - create_worktree: 创建SubTask专属worktree(天然文件隔离) - commit_worktree: worktree内提交改动(含user.email兜底) - merge_branch: merge-tree预检+merge实际合并,返回Clean/Conflict - remove_plan_worktrees: 批量清理Plan所有worktree+分支 - 7个集成测试全绿(隔离/并行/提交/无冲突合并/冲突检测/非Git降级/清理) - 使用真实Git+tempdir测试(参考df-execute/tests/shell.rs模式)
2026-07-01 21:54:30 +08:00
parent ae6d3d0043
commit 4483358f6b
5 changed files with 548 additions and 1 deletions
--- a/Batch.md
+++ b/Batch.md
@@ -437,7 +437,7 @@

 ### 数据层 + Git worktree 隔离 + 并行执行

- **提交**: `当前待提交`
+- **提交**: `ae6d3d0`

 | # | 任务 | 文件 |
 |---|------|------|