@agile-vibe-coding/avc 0.3.3 → 0.3.5

package/cli/seed-processor.js

@@ -779,6 +779,37 @@ Return your response as JSON following the exact structure specified in your ins
       this.debug(`[INFO] Updated story doc.md after task extraction (${storyDocContent.length} bytes)`);
     }
 
+    // Compute ready status for tasks/subtasks with no pending dependencies
+    try {
+      const { checkDependenciesReady } = await import('./dependency-checker.js');
+      const lookup = {};
+      for (const task of hierarchy.tasks) {
+        lookup[task.id] = { id: task.id, name: task.name, type: 'task', status: 'planned', dependencies: task.dependencies || [] };
+        for (const sub of task.subtasks || []) {
+          lookup[sub.id] = { id: sub.id, name: sub.name, type: 'subtask', status: 'planned', dependencies: sub.dependencies || [] };
+        }
+      }
+
+      let readyCount = 0;
+      for (const id of Object.keys(lookup)) {
+        const result = checkDependenciesReady(id, lookup);
+        if (result.ready) {
+          const itemDir = path.join(this.projectPath, id);
+          const wjPath = path.join(itemDir, 'work.json');
+          if (fs.existsSync(wjPath)) {
+            const wj = JSON.parse(fs.readFileSync(wjPath, 'utf8'));
+            wj.status = 'ready';
+            fs.writeFileSync(wjPath, JSON.stringify(wj, null, 2), 'utf8');
+            lookup[id].status = 'ready';
+            readyCount++;
+          }
+        }
+      }
+      this.debug(`[INFO] Set ${readyCount} task/subtask items to 'ready' status (dependency-free)`);
+    } catch (err) {
+      this.debug(`[WARN] Ready status computation failed (non-critical): ${err.message}`);
+    }
+
     return { taskCount, subtaskCount, taskIds };
   }
 
@@ -895,7 +926,6 @@ Return your response as JSON following the exact structure specified in your ins
       throw error;
     }
   }
-}
 
   /**
    * Worker-compatible execution — uses callbacks instead of REPL output functions.

package/cli/worktree-runner.js

@@ -141,16 +141,21 @@ export class WorktreeRunner {
         return { success: false, error: `Tests failed: ${testResult.summary}` };
       }
 
-      // 5. Commit and merge
-      progressCallback?.('Committing and merging to main...');
+      // 5. Commit in worktree (do NOT merge — leave for human review)
+      progressCallback?.('Committing changes in worktree...');
       if (cancelledCheck?.()) throw new Error('CANCELLED');
-      this.commitAndMerge();
+      this.commitInWorktree();
 
-      // 6. Cleanup
-      progressCallback?.('Cleaning up worktree...');
-      this.cleanup();
+      // 6. Leave worktree in place for review — do NOT cleanup or merge
+      progressCallback?.(`Code ready for review in worktree: ${this.worktreePath}`);
+      progressCallback?.(`Branch: ${this.branchName}`);
 
-      return { success: true };
+      return {
+        success: true,
+        review: true,
+        worktreePath: this.worktreePath,
+        branchName: this.branchName,
+      };
     } catch (err) {
       // Always cleanup on failure
       try { this.cleanup(); } catch {}
@@ -583,28 +588,35 @@ export class WorktreeRunner {
   /**
    * Commit changes in the worktree and merge to the main branch.
    */
-  commitAndMerge() {
-    // Stage all changes
+  /**
+   * Commit all changes in the worktree (does NOT merge to main).
+   * Called after tests pass — the worktree stays in place for human review.
+   */
+  commitInWorktree() {
     git(['add', '-A'], this.worktreePath);
 
-    // Check if there's anything to commit
     const status = git(['status', '--porcelain'], this.worktreePath);
     if (!status) {
       this.debug('No changes to commit');
       return;
     }
 
-    // Commit
     const commitMsg = `feat(${this.taskId}): implement task\n\nGenerated by AVC WorktreeRunner`;
     git(['commit', '-m', commitMsg], this.worktreePath);
     this.debug('Committed in worktree');
+  }
 
+  /**
+   * Merge the worktree branch into main and clean up.
+   * Called AFTER human review approves the code (status: implemented → completed).
+   * Can be invoked via API or CLI.
+   */
+  mergeAndCleanup() {
     // Determine the main branch name
     let mainBranch = 'main';
     try {
       mainBranch = git(['symbolic-ref', '--short', 'HEAD'], this.projectRoot);
     } catch {
-      // If HEAD is detached, try common branch names
       try { git(['rev-parse', '--verify', 'main'], this.projectRoot); mainBranch = 'main'; } catch {
         try { git(['rev-parse', '--verify', 'master'], this.projectRoot); mainBranch = 'master'; } catch {}
       }
@@ -615,10 +627,12 @@ export class WorktreeRunner {
       git(['merge', '--no-ff', this.branchName, '-m', `Merge ${this.branchName}: implement ${this.taskId}`], this.projectRoot);
       this.debug('Merged to main', { mainBranch });
     } catch (err) {
-      // Merge conflict — abort and report
       try { git(['merge', '--abort'], this.projectRoot); } catch {}
       throw new Error(`Merge conflict: ${err.message}`);
     }
+
+    // Cleanup worktree and branch
+    this.cleanup();
   }
 
   /**