@fermindi/pwn-cli 0.9.8 → 0.9.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fermindi/pwn-cli",
-  "version": "0.9.8",
+  "version": "0.9.10",
   "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

@@ -534,7 +534,7 @@ export async function runBatch(options = {}, cwd = process.cwd()) {
         console.log(chalk.yellow(`  Retry ${retry}/${MAX_RETRIES}`));
       }
 
-      const prompt = buildPrompt(task.id, batchWorktreePath, mainCwd, errorContext);
+      const prompt = buildPrompt(task.id, batchWorktreePath, mainCwd, errorContext, retry);
       if (!prompt) {
         console.log(chalk.red(`  Cannot build prompt for ${task.id} — skipping`));
         break;
@@ -626,6 +626,9 @@ export async function runBatch(options = {}, cwd = process.cwd()) {
         markStoryDone(task.id, taskWorktreePath);
         appendProgress(progressPath, task.id, 'All quality gates passed');
 
+        // Remove symlinks before commit so git add . doesn't stage them
+        unprepareWorktree(taskWorktreePath);
+
         const config = loadConfig(mainCwd);
         if (config.auto_commit) {
           await commitTask(task, {}, taskWorktreePath);
@@ -926,12 +929,14 @@ async function runGatesWithStatus(taskCwd, mainCwd = taskCwd) {
 
 /**
  * Build the prompt from template, substituting placeholders.
+ * On retries, generates a focused "fix" prompt instead of the full template.
  * @param {string} storyId - Story ID
  * @param {string} batchWorktreePath - Batch worktree (for prd.json, tracked file)
  * @param {string} mainCwd - Main repo (for prompt.md, gitignored file)
  * @param {string} extraContext - Error context from previous attempt
+ * @param {number} retry - Retry number (0 = first attempt)
  */
-function buildPrompt(storyId, batchWorktreePath, mainCwd, extraContext) {
+function buildPrompt(storyId, batchWorktreePath, mainCwd, extraContext, retry = 0) {
   const prdPath = join(batchWorktreePath, '.ai', 'tasks', 'prd.json');
   const promptPath = join(mainCwd, '.ai', 'batch', 'prompt.md');
 
@@ -942,9 +947,36 @@ function buildPrompt(storyId, batchWorktreePath, mainCwd, extraContext) {
     return '';
   }
 
-  const doneIds = prd.stories.filter(s => s.passes).map(s => s.id);
   const acList = (story.acceptance_criteria || []).map(ac => `- ${ac}`).join('\n') || 'None';
 
+  // --- Retry: focused fix prompt ---
+  if (retry > 0 && extraContext) {
+    return `You are fixing story ${storyId}: ${story.title}
+
+## Context
+A previous attempt already implemented this story. The working tree contains the implementation.
+Read the modified files to understand what was done.
+
+## Acceptance criteria
+${acList}
+
+## Quality gate failures
+\`\`\`
+${extraContext}
+\`\`\`
+
+## Instructions
+1. Read the existing code in the working tree
+2. Analyze the quality gate errors above
+3. Fix ONLY what's needed to make the gates pass
+4. If the errors indicate a deeper design problem that can't be patched, you may rewrite the implementation — but try fixing first
+5. Make sure the fix still satisfies all acceptance criteria above
+6. Commit your changes when done`;
+  }
+
+  // --- First attempt: full template ---
+  const doneIds = prd.stories.filter(s => s.passes).map(s => s.id);
+
   let depsList = 'None';
   if (story.dependencies?.length > 0) {
     depsList = story.dependencies
@@ -963,10 +995,6 @@ function buildPrompt(storyId, batchWorktreePath, mainCwd, extraContext) {
   prompt = prompt.replaceAll('{NOTES}', story.notes || '');
   prompt = prompt.replaceAll('{DEPENDENCIES}', depsList);
 
-  if (extraContext) {
-    prompt += `\n\n## Previous Attempt Failed\nThe previous attempt failed quality gates. Here is the error output:\n\n\`\`\`\n${extraContext}\n\`\`\`\n\nFix these issues before committing.`;
-  }
-
   return prompt;
 }
 

package/src/services/batch-service.js

@@ -809,7 +809,18 @@ export async function runQualityGate(gate, cwd = process.cwd(), { configCwd } =
         command
       };
     } catch (error) {
-      // If command not found, try next variant
+      // Custom commands must not be silently skipped — "not found" is a real failure
+      if (customCmd) {
+        return {
+          success: false,
+          error: error.message,
+          output: error.stdout,
+          stderr: error.stderr,
+          command
+        };
+      }
+
+      // For default/fallback commands: if command not found, try next variant
       if (error.message?.includes('not found') ||
           error.message?.includes('ENOENT') ||
           error.message?.includes('missing script')) {
@@ -827,7 +838,7 @@ export async function runQualityGate(gate, cwd = process.cwd(), { configCwd } =
     }
   }
 
-  // No command variant worked
+  // No default command variant worked (only reached for non-custom gates)
   return {
     success: true, // Skip if no command available
     skipped: true,