@ronkovic/aad 0.3.8 → 0.3.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/modules/git-workspace/merge-service.ts +5 -9
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ronkovic/aad",
3
- "version": "0.3.8",
3
+ "version": "0.3.9",
4
4
  "description": "Autonomous Agent Development Orchestrator - Multi-agent TDD pipeline powered by Claude",
5
5
  "module": "src/main.ts",
6
6
  "type": "module",
package/src/modules/git-workspace/merge-service.ts CHANGED
@@ -68,18 +68,14 @@ export class MergeService {
68
68
  try {
69
69
  await lock.acquire();
70
70
 
71
- this.logger?.info({ taskId, taskBranch, parentBranch }, "Merging task to parent");
71
+ this.logger?.info({ taskId, taskBranch, parentBranch, parentWorktree }, "Merging task to parent");
72
72
 
73
- // Fetch latest from task branch
74
- await gitExec(
75
- ["fetch", this.repoRoot, taskBranch],
76
- { cwd: parentWorktree, logger: this.logger }
77
- );
78
-
79
- // Try merge
73
+ // Worktrees share the same git object store, so we can merge the task
74
+ // branch directly without fetching. This is more reliable than
75
+ // `git fetch <repoRoot> <branch>` + `git merge FETCH_HEAD`.
80
76
  try {
81
77
  await gitExec(
82
- ["merge", "--no-ff", "-m", `Merge task ${taskId as string}: ${taskBranch}`, "FETCH_HEAD"],
78
+ ["merge", "--no-ff", "-m", `Merge task ${taskId as string}: ${taskBranch}`, taskBranch],
83
79
  { cwd: parentWorktree, logger: this.logger }
84
80
  );
85
81