@fermindi/pwn-cli 0.9.0 → 0.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fermindi/pwn-cli",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "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,
@@ -434,7 +437,10 @@ export async function runBatch(options = {}, cwd = process.cwd()) {
       if (result.signal) {
         console.log(chalk.yellow(`  Killed by ${result.signal}`));
         if (taskBranch) {
-          try { await checkoutBranch(batchBranch, cwd, { force: true }); } catch {}
+          try {
+            try { await execAsync('git stash --include-untracked', { cwd }); } catch {}
+            await checkoutBranch(batchBranch, cwd, { force: true });
+          } catch {}
         }
         clearBatchState(cwd);
         printSummary(cwd, iteration, storiesCompleted, batchStart, branchesCreated, batchBranch, originalBranch, mergedCount, unmergedBranches);
@@ -544,15 +550,21 @@ export async function runBatch(options = {}, cwd = process.cwd()) {
         // Merge successful task branch into batch branch
         if (taskBranch) {
           try {
+            // Stash uncommitted metadata (task files etc.) before switching
+            await execAsync('git stash --include-untracked', { cwd });
             await checkoutBranch(batchBranch, cwd);
             await mergeBranch(taskBranch, cwd);
             mergedCount++;
             mergedBranches.push(taskBranch);
             console.log(chalk.green(`  Merged ${taskBranch} → ${batchBranch}`));
+            // Restore stashed metadata on batch branch
+            try { await execAsync('git stash pop', { cwd }); } catch {}
           } catch (err) {
             console.log(chalk.red(`  Merge failed: ${err.message}`));
             console.log(chalk.yellow(`  Branch ${taskBranch} available for manual merge`));
             unmergedBranches.push(taskBranch);
+            // Drop stash if checkout/merge failed (still on feat branch)
+            try { await execAsync('git stash drop', { cwd }); } catch {}
           }
         }
       } else {
@@ -586,10 +598,12 @@ export async function runBatch(options = {}, cwd = process.cwd()) {
       noProgressCount++;
     }
 
-    // --- Return to batch branch (force: discard dirty state from failed tasks) ---
+    // --- Return to batch branch (stash untracked + force for dirty state) ---
     if (taskBranch) {
       try {
+        try { await execAsync('git stash --include-untracked', { cwd }); } catch {}
         await checkoutBranch(batchBranch, cwd, { force: true });
+        try { await execAsync('git stash pop', { cwd }); } catch {}
         console.log(chalk.dim(`  Returned to branch: ${batchBranch}`));
       } catch (err) {
         console.log(chalk.red(`  Warning: failed to return to ${batchBranch}: ${err.message}`));

package/src/services/batch-service.js

@@ -34,18 +34,36 @@ export async function getCurrentBranch(cwd = process.cwd()) {
  */
 export async function createTaskBranch(taskId, cwd = process.cwd()) {
   const branch = `feat/${taskId}`;
+  let exists = false;
   try {
     await execAsync(`git rev-parse --verify ${branch}`, { cwd });
-    // Branch exists (rerun) — checkout and reset to current HEAD
+    exists = true;
+  } catch {
+    // Branch doesn't exist
+  }
+
+  // Stash untracked files (task metadata etc.) that block checkout
+  let stashed = false;
+  try {
+    const { stdout: stashOut } = await execAsync('git stash --include-untracked', { cwd });
+    stashed = !stashOut.includes('No local changes');
+  } catch {}
+
+  if (exists) {
+    // Rerun — checkout and reset to current HEAD
     // so we don't carry stale/dirty state from previous attempt
     const { stdout } = await execAsync('git rev-parse HEAD', { cwd });
     const baseRef = stdout.trim();
     await execAsync(`git checkout ${branch}`, { cwd });
     await execAsync(`git reset --hard ${baseRef}`, { cwd });
-  } catch {
-    // Branch doesn't exist — create
+  } else {
     await execAsync(`git checkout -b ${branch}`, { cwd });
   }
+
+  // Restore stashed files on the new branch
+  if (stashed) {
+    try { await execAsync('git stash pop', { cwd }); } catch {}
+  }
   return branch;
 }