@ronkovic/aad 0.3.4 → 0.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronkovic/aad",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Autonomous Agent Development Orchestrator - Multi-agent TDD pipeline powered by Claude",
   "module": "src/main.ts",
   "type": "module",

package/src/modules/cli/commands/cleanup.ts

@@ -102,10 +102,10 @@ export async function cleanupWorktrees(
   await worktreeManager.pruneWorktrees();
   logger.info("Pruned orphaned worktrees");
 
-  // 4. Cleanup orphaned branches
+  // 4. Cleanup orphaned branches (always force-delete — AAD branches are safe to remove)
   const deletedBranches = runId
-    ? await branchManager.cleanupOrphanBranches(runId)
-    : await branchManager.cleanupOrphanBranches();
+    ? await branchManager.cleanupOrphanBranches(runId, true)
+    : await branchManager.cleanupOrphanBranches(undefined, true);
 
   if (deletedBranches.length > 0) {
     console.log(`\nDeleted ${deletedBranches.length} orphan branch(es):`);

package/src/modules/cli/commands/resume.ts

@@ -122,7 +122,15 @@ export async function resumeRun(app: App, runIdStr: string): Promise<void> {
     stores: { runStore: stores.runStore, taskStore: stores.taskStore },
     logger,
   });
-  registerTaskDispatchHandler({ app, runId, parentBranch: runState.parentBranch });
+  // Check if parent worktree exists from a previous run
+  const parentWorktreePath = `${process.cwd()}/.aad/worktrees/parent-${runId}`;
+  const parentWorktreeExists = await Bun.file(`${parentWorktreePath}/.git`).exists();
+  registerTaskDispatchHandler({
+    app,
+    runId,
+    parentBranch: runState.parentBranch,
+    parentWorktreePath: parentWorktreeExists ? parentWorktreePath : undefined,
+  });
 
   // 6. Dispatcher.start()
   dispatcher.start();

package/src/modules/cli/commands/run.ts

@@ -144,8 +144,17 @@ export async function runPipeline(app: App, requirementsPath: string, keepWorktr
     logger,
   });
 
-  // 5. Register task dispatch handler (shared with resume)
-  registerTaskDispatchHandler({ app, runId, parentBranch });
+  // 5. Create parent worktree for merging task branches
+  let parentWorktreePath: string | undefined;
+  try {
+    parentWorktreePath = await worktreeManager.createParentWorktree(runId, parentBranch);
+    logger.info({ parentWorktreePath }, "Parent worktree created for merging");
+  } catch (error) {
+    logger.warn({ error }, "Failed to create parent worktree, using repo root as fallback");
+  }
+
+  // 5.5. Register task dispatch handler (shared with resume)
+  registerTaskDispatchHandler({ app, runId, parentBranch, parentWorktreePath });
 
   // 6. 進捗表示
   const progressSpinner = createSpinner("Executing tasks...");

package/src/modules/cli/commands/task-dispatch-handler.ts

@@ -25,6 +25,9 @@ export interface TaskDispatchContext {
   app: App;
   runId: RunId;
   parentBranch: string;
+  /** Path to the parent worktree where task branches are merged into.
+   *  If not provided, falls back to process.cwd() (repo root). */
+  parentWorktreePath?: string;
 }
 
 /**
@@ -32,7 +35,8 @@ export interface TaskDispatchContext {
  * Handles memory gate, worker state, worktree creation, and TDD pipeline execution.
  */
 export function registerTaskDispatchHandler(ctx: TaskDispatchContext): void {
-  const { app, runId, parentBranch } = ctx;
+  const { app, runId, parentBranch, parentWorktreePath } = ctx;
+  const mergeTarget = parentWorktreePath ?? process.cwd();
   const { eventBus, logger, config, processManager, worktreeManager, providerRegistry, stores } = app;
 
   let memoryGateLock: Promise<void> = Promise.resolve();
@@ -63,7 +67,7 @@ export function registerTaskDispatchHandler(ctx: TaskDispatchContext): void {
 
       const provider = providerRegistry.getProvider("implementer");
       const result = await executeTddPipeline(
-        task, workspace, branchName, parentBranch, process.cwd(),
+        task, workspace, branchName, parentBranch, mergeTarget,
         runId, app.config, provider, app.mergeService, eventBus,
       );