@fermindi/pwn-cli 0.9.7 → 0.9.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fermindi/pwn-cli",
-  "version": "0.9.7",
+  "version": "0.9.9",
   "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;
@@ -840,6 +840,54 @@ function spawnClaude(prompt, task, iteration, maxIter, done, total, phase, logFi
   });
 }
 
+/**
+ * Ensure Python dev tools (pytest, ruff, mypy, etc.) exist in the venv.
+ * Extracts tool names from gate_commands and verifies they're importable.
+ * Installs missing ones to prevent wasted retries on environment issues.
+ * @param {string} taskCwd - Worktree directory (has .venv symlink)
+ * @param {string} mainCwd - Main repo directory for config
+ */
+async function ensureDevTools(taskCwd, mainCwd) {
+  const config = loadConfig(mainCwd);
+  const gateCommands = config.gate_commands;
+  if (!gateCommands) return;
+
+  // Find the python binary from gate commands
+  const sampleCmd = Object.values(gateCommands)[0] || '';
+  const pythonMatch = sampleCmd.match(/^(\S*python\S*)\s/);
+  if (!pythonMatch) return; // not a Python project
+
+  const python = pythonMatch[1];
+
+  // Extract module names from commands like ".venv/bin/python -m pytest --tb=short"
+  const modules = new Set();
+  for (const cmd of Object.values(gateCommands)) {
+    const modMatch = cmd.match(/-m\s+(\w+)/);
+    if (modMatch) modules.add(modMatch[1]);
+  }
+  if (modules.size === 0) return;
+
+  // Check which modules are missing
+  const missing = [];
+  for (const mod of modules) {
+    try {
+      await execAsync(`${python} -c "import ${mod}"`, { cwd: taskCwd, timeout: 10_000 });
+    } catch {
+      missing.push(mod);
+    }
+  }
+
+  if (missing.length > 0) {
+    console.log(chalk.yellow(`  Dev tools missing in venv: ${missing.join(', ')}. Installing...`));
+    try {
+      await execAsync(`${python} -m pip install ${missing.join(' ')} --quiet`, { cwd: taskCwd, timeout: 60_000 });
+      console.log(chalk.green(`  Installed: ${missing.join(', ')}`));
+    } catch (err) {
+      console.log(chalk.red(`  Failed to install dev tools: ${err.message}`));
+    }
+  }
+}
+
 /**
  * Run quality gates with real-time PASS/FAIL display.
  * @param {string} taskCwd - Directory where gates run (task worktree)
@@ -852,6 +900,9 @@ async function runGatesWithStatus(taskCwd, mainCwd = taskCwd) {
   let allPassed = true;
   let errorOutput = '';
 
+  // Pre-flight: ensure dev tools exist before running gates
+  await ensureDevTools(taskCwd, mainCwd);
+
   for (const gate of gates) {
     if (skipGates.includes(gate)) {
       console.log(chalk.dim(`  ${gate}: SKIP`));
@@ -875,12 +926,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');
 
@@ -891,9 +944,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
@@ -912,10 +992,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

@@ -5,7 +5,7 @@
  * checkpointing, and signal handling.
  */
 
-import { existsSync, readFileSync, writeFileSync, readdirSync, appendFileSync, symlinkSync, unlinkSync, lstatSync } from 'fs';
+import { existsSync, readFileSync, writeFileSync, readdirSync, appendFileSync, symlinkSync, unlinkSync, lstatSync, readlinkSync } from 'fs';
 import { join } from 'path';
 import os from 'os';
 import { exec } from 'child_process';
@@ -244,7 +244,22 @@ export function prepareWorktree(worktreePath, mainCwd) {
   for (const dir of DEP_DIRS) {
     const source = join(mainCwd, dir);
     const target = join(worktreePath, dir);
-    if (existsSync(source) && !existsSync(target)) {
+    if (!existsSync(source)) continue;
+
+    // Validate existing symlinks (git may restore stale ones from history)
+    try {
+      const stats = lstatSync(target);
+      if (stats.isSymbolicLink()) {
+        if (readlinkSync(target) !== source) {
+          unlinkSync(target);
+          symlinkSync(source, target);
+        }
+        continue; // symlink exists and is correct
+      }
+      // Not a symlink (real dir) — leave it alone
+      continue;
+    } catch {
+      // Doesn't exist — create it
       symlinkSync(source, target);
     }
   }