@fermindi/pwn-cli 0.9.3 → 0.9.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fermindi/pwn-cli",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "description": "Professional AI Workspace - Inject structured memory and automation into any project for AI-powered development",
   "type": "module",
   "bin": {

package/src/services/batch-runner.js

@@ -9,10 +9,13 @@
  * Completed files are cleaned up at the end; failed are kept for review.
  */
 
-import { spawn } from 'child_process';
+import { spawn, exec } from 'child_process';
 import { existsSync, readFileSync, writeFileSync, mkdirSync, createWriteStream, appendFileSync, unlinkSync, readdirSync } from 'fs';
 import { join } from 'path';
+import { promisify } from 'util';
 import ora from 'ora';
+
+const execAsync = promisify(exec);
 import chalk from 'chalk';
 import {
   parsePrdTasks,
@@ -31,7 +34,7 @@ import {
 } from './batch-service.js';
 
 // --- Constants ---
-const RUNNER_VERSION = '2.2';
+const RUNNER_VERSION = '2.3';
 const DEFAULT_TIMEOUT_MS = 900_000;  // 15 minutes fallback
 const MIN_TIMEOUT_MS = 300_000;      // 5 minutes minimum (claude init ~30-40s + real work)
 
@@ -388,7 +391,84 @@ export async function runBatch(options = {}, cwd = process.cwd()) {
       }
     }
 
-    // --- Branch isolation: create/checkout task branch ---
+    // --- Pre-validation: check existing feat branch before reset ---
+    let storyDone = false;
+    const taskBranchName = `feat/${task.id}`;
+    let branchExists = false;
+    try {
+      await execAsync(`git rev-parse --verify ${taskBranchName}`, { cwd });
+      branchExists = true;
+    } catch {}
+
+    if (branchExists) {
+      try {
+        // Checkout WITHOUT reset to inspect existing work
+        await checkoutBranch(taskBranchName, cwd, { stash: true });
+        const { stdout: logCount } = await execAsync(`git rev-list --count ${batchBranch}..HEAD`, { cwd });
+        const commits = parseInt(logCount.trim(), 10);
+
+        if (commits > 0) {
+          console.log(chalk.blue(`  Pre-validation: found ${commits} commit(s) on ${taskBranchName}, running quality gates...`));
+          const preGates = await runGatesWithStatus(cwd);
+
+          if (preGates.success) {
+            console.log(chalk.green(`  Pre-validation PASSED — skipping execution`));
+            markStoryDone(task.id, cwd);
+            appendProgress(progressPath, task.id, 'Pre-validation: existing code passed quality gates');
+
+            storyDone = true;
+            storiesCompleted++;
+            noProgressCount = 0;
+
+            if (taskFile) {
+              taskFile.status = 'completed';
+              taskFile.completed_at = new Date().toISOString();
+              saveTaskFile(taskFile, cwd);
+            }
+
+            updateBatchState({
+              completed: [task.id],
+              current_task: null,
+              last_completed_at: new Date().toISOString()
+            }, cwd);
+
+            // Merge into batch branch
+            try {
+              await checkoutBranch(batchBranch, cwd, { stash: true });
+              await mergeBranch(taskBranchName, cwd);
+              mergedCount++;
+              mergedBranches.push(taskBranchName);
+              console.log(chalk.green(`  Merged ${taskBranchName} → ${batchBranch}`));
+            } catch (err) {
+              console.log(chalk.red(`  Merge failed: ${err.message}`));
+              console.log(chalk.yellow(`  Branch ${taskBranchName} available for manual merge`));
+              unmergedBranches.push(taskBranchName);
+            }
+          } else {
+            console.log(chalk.yellow(`  Pre-validation FAILED — will re-execute`));
+            // Return to batch branch so createTaskBranch resets properly
+            await checkoutBranch(batchBranch, cwd, { force: true, stash: true });
+          }
+        } else {
+          // No commits — return to batch branch for normal flow
+          await checkoutBranch(batchBranch, cwd, { force: true, stash: true });
+        }
+      } catch {
+        // Checkout failed — proceed normally
+        try { await checkoutBranch(batchBranch, cwd, { force: true, stash: true }); } catch {}
+      }
+    }
+
+    if (storyDone) {
+      branchesCreated.push(taskBranchName);
+      try {
+        await checkoutBranch(batchBranch, cwd, { force: true, stash: true });
+        console.log(chalk.dim(`  Returned to branch: ${batchBranch}`));
+      } catch {}
+      continue;
+    }
+
+    // --- Branch isolation: create/checkout task branch (resets existing) ---
     let taskBranch = null;
     try {
       taskBranch = await createTaskBranch(task.id, cwd);
@@ -411,7 +491,6 @@ export async function runBatch(options = {}, cwd = process.cwd()) {
 
     let retry = 0;
     let rateLimitAttempts = 0;
-    let storyDone = false;
     let errorContext = '';
 
     while (retry <= MAX_RETRIES && !storyDone) {