task-o-matic 0.0.10 → 0.0.12

package/dist/lib/storage/storage-callbacks.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Simple storage callbacks - just read/write key-value pairs
+ * This allows the library to be used with ANY storage backend (DB, Redis, S3, etc.)
+ */
+export interface StorageCallbacks {
+    read: (key: string) => Promise<string | null>;
+    write: (key: string, value: string) => Promise<void>;
+    delete: (key: string) => Promise<void>;
+    list: (prefix?: string) => Promise<string[]>;
+    exists: (key: string) => Promise<boolean>;
+}
+/**
+ * Default file system callbacks (Node.js environment)
+ * Uses fs/promises to implement the storage interface
+ */
+export declare function createFileSystemCallbacks(baseDir?: string): StorageCallbacks;
+//# sourceMappingURL=storage-callbacks.d.ts.map

package/dist/lib/storage/storage-callbacks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage-callbacks.d.ts","sourceRoot":"","sources":["../../../src/lib/storage/storage-callbacks.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAE/B,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAG9C,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAGrD,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAGvC,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAG7C,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC3C;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,GAAE,MAAsB,GAC9B,gBAAgB,CAwFlB"}

package/dist/lib/storage/storage-callbacks.js

@@ -0,0 +1,94 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createFileSystemCallbacks = createFileSystemCallbacks;
+const promises_1 = require("fs/promises");
+const path_1 = require("path");
+const fs_1 = require("fs");
+/**
+ * Default file system callbacks (Node.js environment)
+ * Uses fs/promises to implement the storage interface
+ */
+function createFileSystemCallbacks(baseDir = process.cwd()) {
+    const resolvePath = (key) => (0, path_1.join)(baseDir, key);
+    const ensureDir = (filePath) => {
+        const dir = (0, path_1.dirname)(filePath);
+        if (!(0, fs_1.existsSync)(dir)) {
+            (0, fs_1.mkdirSync)(dir, { recursive: true });
+        }
+    };
+    return {
+        read: async (key) => {
+            try {
+                const path = resolvePath(key);
+                if (!(0, fs_1.existsSync)(path))
+                    return null;
+                return await (0, promises_1.readFile)(path, "utf-8");
+            }
+            catch (error) {
+                if (error.code === "ENOENT")
+                    return null;
+                throw error;
+            }
+        },
+        write: async (key, value) => {
+            const path = resolvePath(key);
+            ensureDir(path);
+            await (0, promises_1.writeFile)(path, value, "utf-8");
+        },
+        delete: async (key) => {
+            try {
+                const path = resolvePath(key);
+                if ((0, fs_1.existsSync)(path)) {
+                    await (0, promises_1.unlink)(path);
+                }
+            }
+            catch (error) {
+                // Ignore if already gone
+                if (error.code !== "ENOENT")
+                    throw error;
+            }
+        },
+        list: async (prefix) => {
+            const searchPath = prefix ? resolvePath(prefix) : baseDir;
+            try {
+                // If it's a directory, recursively list all files in it
+                if ((0, fs_1.existsSync)(searchPath) && (await (0, promises_1.stat)(searchPath)).isDirectory()) {
+                    const files = [];
+                    const scan = async (dir, currentPrefix) => {
+                        const items = await (0, promises_1.readdir)(dir);
+                        for (const item of items) {
+                            const fullPath = (0, path_1.join)(dir, item);
+                            const itemPrefix = currentPrefix
+                                ? (0, path_1.join)(currentPrefix, item)
+                                : item;
+                            if ((await (0, promises_1.stat)(fullPath)).isDirectory()) {
+                                await scan(fullPath, itemPrefix);
+                            }
+                            else {
+                                files.push(itemPrefix);
+                            }
+                        }
+                    };
+                    await scan(searchPath, prefix || "");
+                    return files;
+                }
+                // If it's a file prefix (e.g. "tasks/task-")
+                const dir = (0, path_1.dirname)(searchPath);
+                if ((0, fs_1.existsSync)(dir)) {
+                    const files = await (0, promises_1.readdir)(dir);
+                    const namePrefix = prefix ? prefix.split("/").pop() || "" : "";
+                    return files
+                        .filter((f) => f.startsWith(namePrefix))
+                        .map((f) => (0, path_1.join)((0, path_1.dirname)(prefix || ""), f));
+                }
+                return [];
+            }
+            catch (error) {
+                return [];
+            }
+        },
+        exists: async (key) => {
+            return (0, fs_1.existsSync)(resolvePath(key));
+        },
+    };
+}

package/dist/lib/task-execution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-execution.d.ts","sourceRoot":"","sources":["../../src/lib/task-execution.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAgB,MAAM,UAAU,CAAC;AA8L5D,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqE5E"}
+{"version":3,"file":"task-execution.d.ts","sourceRoot":"","sources":["../../src/lib/task-execution.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAgC,MAAM,UAAU,CAAC;AA0J5E,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgF5E"}

package/dist/lib/task-execution.js

@@ -9,8 +9,9 @@ const executor_factory_1 = require("./executors/executor-factory");
 const validation_1 = require("./validation");
 const ai_service_factory_1 = require("../utils/ai-service-factory");
 const hooks_1 = require("./hooks");
+const prompt_builder_1 = require("./prompt-builder");
 const chalk_1 = __importDefault(require("chalk"));
-async function executeSingleTask(taskId, tool, dry) {
+async function executeSingleTask(taskId, tool, dry, executorConfig) {
     // Load task
     const task = await tasks_1.taskService.getTask(taskId);
     if (!task) {
@@ -20,50 +21,20 @@ async function executeSingleTask(taskId, tool, dry) {
     // Build comprehensive execution message with full context
     const contextBuilder = (0, ai_service_factory_1.getContextBuilder)();
     const taskContext = await contextBuilder.buildContext(taskId);
-    // Build execution message with ALL context
-    const messageParts = [];
-    // Add task plan if available
+    // Get task plan if available
     const planData = await tasks_1.taskService.getTaskPlan(taskId);
-    if (planData) {
-        messageParts.push(`# Task Plan\n\n${planData.plan}\n`);
+    // Build execution prompt using PromptBuilder
+    const promptResult = prompt_builder_1.PromptBuilder.buildExecutionPrompt({
+        taskTitle: task.title,
+        taskDescription: task.description,
+        taskPlan: planData?.plan,
+        stack: taskContext.stack,
+        documentation: taskContext.documentation,
+    });
+    if (!promptResult.success) {
+        throw new Error(`Failed to build execution prompt: ${promptResult.error}`);
     }
-    else {
-        messageParts.push(`# Task: ${task.title}\n\n${task.description || "No description"}\n`);
-    }
-    // Add PRD context if available
-    if (taskContext.prdContent) {
-        messageParts.push(`\n# Product Requirements Document\n\n${taskContext.prdContent}\n`);
-    }
-    // Add stack/technology context
-    if (taskContext.stack) {
-        messageParts.push(`\n# Technology Stack\n\n`);
-        messageParts.push(`- **Project**: ${taskContext.stack.projectName}\n`);
-        messageParts.push(`- **Frontend**: ${taskContext.stack.frontend}\n`);
-        messageParts.push(`- **Backend**: ${taskContext.stack.backend}\n`);
-        if (taskContext.stack.database !== "none") {
-            messageParts.push(`- **Database**: ${taskContext.stack.database}\n`);
-        }
-        if (taskContext.stack.orm !== "none") {
-            messageParts.push(`- **ORM**: ${taskContext.stack.orm}\n`);
-        }
-        messageParts.push(`- **Auth**: ${taskContext.stack.auth}\n`);
-        if (taskContext.stack.addons.length > 0) {
-            messageParts.push(`- **Addons**: ${taskContext.stack.addons.join(", ")}\n`);
-        }
-        messageParts.push(`- **Package Manager**: ${taskContext.stack.packageManager}\n`);
-    }
-    // Add documentation context if available
-    if (taskContext.documentation) {
-        messageParts.push(`\n# Documentation Context\n\n`);
-        messageParts.push(`${taskContext.documentation.recap}\n`);
-        if (taskContext.documentation.files.length > 0) {
-            messageParts.push(`\n**Relevant Documentation Files**:\n`);
-            taskContext.documentation.files.forEach((file) => {
-                messageParts.push(`- ${file.path}\n`);
-            });
-        }
-    }
-    const executionMessage = messageParts.join("");
+    const executionMessage = promptResult.prompt;
     if (!dry) {
         // Update task status to in-progress
         await tasks_1.taskService.setTaskStatus(taskId, "in-progress");
@@ -73,8 +44,8 @@ async function executeSingleTask(taskId, tool, dry) {
     await hooks_1.hooks.emit("execution:start", { taskId, tool });
     try {
         // Create executor and run
-        const executor = executor_factory_1.ExecutorFactory.create(tool);
-        await executor.execute(executionMessage, dry);
+        const executor = executor_factory_1.ExecutorFactory.create(tool, executorConfig);
+        await executor.execute(executionMessage, dry, executorConfig);
         if (!dry) {
             // Update task status to completed
             await tasks_1.taskService.setTaskStatus(taskId, "completed");
@@ -97,7 +68,7 @@ async function executeSingleTask(taskId, tool, dry) {
         throw error;
     }
 }
-async function executeTaskWithSubtasks(taskId, tool, dry) {
+async function executeTaskWithSubtasks(taskId, tool, dry, executorConfig) {
     const task = await tasks_1.taskService.getTask(taskId);
     if (!task) {
         throw new Error(`Task with ID ${taskId} not found`);
@@ -115,7 +86,7 @@ async function executeTaskWithSubtasks(taskId, tool, dry) {
         const subtask = subtasks[i];
         console.log(chalk_1.default.cyan(`\n[${i + 1}/${subtasks.length}] Executing subtask: ${subtask.title} (${subtask.id})`));
         try {
-            await executeTaskWithSubtasks(subtask.id, tool, dry);
+            await executeTaskWithSubtasks(subtask.id, tool, dry, executorConfig);
         }
         catch (error) {
             console.error(chalk_1.default.red(`❌ Failed to execute subtask ${subtask.id}: ${error instanceof Error ? error.message : "Unknown error"}`));
@@ -132,7 +103,14 @@ async function executeTaskWithSubtasks(taskId, tool, dry) {
     }
 }
 async function executeTask(options) {
-    const { taskId, tool = "opencode", message, dry = false, validate = [], } = options;
+    const { taskId, tool = "opencode", message, model, continueSession, dry = false, validate = [], } = options;
+    // Build executor config from options
+    const executorConfig = model || continueSession
+        ? {
+            model,
+            continueLastSession: continueSession,
+        }
+        : undefined;
     // If custom message is provided, execute just this task (ignore subtasks)
     if (message) {
         const task = await tasks_1.taskService.getTask(taskId);
@@ -147,8 +125,8 @@ async function executeTask(options) {
         // Emit execution:start event
         await hooks_1.hooks.emit("execution:start", { taskId, tool });
         try {
-            const executor = executor_factory_1.ExecutorFactory.create(tool);
-            await executor.execute(message, dry);
+            const executor = executor_factory_1.ExecutorFactory.create(tool, executorConfig);
+            await executor.execute(message, dry, executorConfig);
             if (!dry) {
                 await tasks_1.taskService.setTaskStatus(taskId, "completed");
                 console.log(chalk_1.default.green("✅ Task execution completed successfully"));
@@ -173,7 +151,7 @@ async function executeTask(options) {
         return;
     }
     // No custom message - execute recursively with subtasks
-    await executeTaskWithSubtasks(taskId, tool, dry);
+    await executeTaskWithSubtasks(taskId, tool, dry, executorConfig);
     // Run validations after all subtasks complete
     await (0, validation_1.runValidations)(validate, dry);
 }

package/dist/lib/task-loop-execution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-loop-execution.d.ts","sourceRoot":"","sources":["../../src/lib/task-loop-execution.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EAIlB,MAAM,UAAU,CAAC;AAYlB;;;GAGG;AACH;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE;IACR,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,qBAAqB,EAAE,OAAO,CAAC;CAChC,EACD,MAAM,GAAE,CACN,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAa,EAC5D,KAAK,GAAE,GAAuB,GAC7B,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CA+G/C;AAsXD;;GAEG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC,CA0K5B"}
+{"version":3,"file":"task-loop-execution.d.ts","sourceRoot":"","sources":["../../src/lib/task-loop-execution.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EAMlB,MAAM,UAAU,CAAC;AAgBlB;;;GAGG;AACH;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE;IACR,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,qBAAqB,EAAE,OAAO,CAAC;CAChC,EACD,MAAM,GAAE,CACN,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAa,EAC5D,KAAK,GAAE,GAAuB,GAC7B,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CA+G/C;AA6oBD;;GAEG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC,CAmK5B"}

package/dist/lib/task-loop-execution.js

@@ -9,10 +9,13 @@ const tasks_1 = require("../services/tasks");
 const executor_factory_1 = require("./executors/executor-factory");
 const ai_service_factory_1 = require("../utils/ai-service-factory");
 const hooks_1 = require("./hooks");
+const prompt_builder_1 = require("./prompt-builder");
 const chalk_1 = __importDefault(require("chalk"));
 const child_process_1 = require("child_process");
 const util_1 = require("util");
 const ai_service_factory_2 = require("../utils/ai-service-factory");
+const fs_1 = require("fs");
+const inquirer_1 = __importDefault(require("inquirer"));
 const execAsync = (0, util_1.promisify)(child_process_1.exec);
 /**
  * Extract commit message and file list from AI conversation/output
@@ -152,10 +155,104 @@ async function runVerificationCommands(commands, dry) {
 /**
  * Execute a single task with retry logic and error correction
  */
-async function executeTaskWithRetry(task, tool, verificationCommands, maxRetries, dry, tryModels) {
+async function executeTaskWithRetry(task, tool, config, dry) {
+    const { maxRetries = 3, verificationCommands = [], tryModels, plan, planModel, reviewPlan, review, reviewModel, autoCommit, } = config;
     const attempts = [];
     let currentAttempt = 1;
     let lastError;
+    let planContent;
+    // ----------------------------------------------------------------------
+    // PLANNING PHASE
+    // ----------------------------------------------------------------------
+    if (plan) {
+        console.log(chalk_1.default.blue.bold(`\n🧠 Starting Planning Phase for Task: ${task.title}`));
+        const planFileName = `task-${task.id}-plan.md`;
+        const planExecutor = planModel
+            ? planModel.split(":")[0]
+            : tool;
+        const planModelName = planModel ? planModel.split(":")[1] : undefined;
+        let planningPrompt = `You are a senior software architect. Analyze the following task and create a detailed implementation plan.
+    
+Task: ${task.title}
+Description: ${task.description || "No description provided."}
+
+Requirements:
+1. Analyze the task requirements.
+2. Create a detailed step-by-step implementation plan.
+3. Identify necessary file changes.
+4. Write this plan to a file named "${planFileName}" in the current directory.
+5. Do NOT implement the code yet, just create the plan file.
+
+Please create the "${planFileName}" file now.`;
+        console.log(chalk_1.default.cyan(`   Using executor for planning: ${planExecutor}${planModelName ? ` (${planModelName})` : ""}`));
+        // Create executor for planning
+        const planningConfig = {
+            model: planModelName,
+            continueLastSession: false,
+        };
+        const executor = executor_factory_1.ExecutorFactory.create(planExecutor, planningConfig);
+        try {
+            let planningComplete = false;
+            while (!planningComplete) {
+                await executor.execute(planningPrompt, dry, planningConfig);
+                if (!dry) {
+                    // Verify plan file exists and read it
+                    if ((0, fs_1.existsSync)(planFileName)) {
+                        planContent = (0, fs_1.readFileSync)(planFileName, "utf-8");
+                        console.log(chalk_1.default.green(`✅ Plan created successfully: ${planFileName}`));
+                        // Human Review Loop
+                        if (reviewPlan) {
+                            console.log(chalk_1.default.yellow(`\n👀 Pausing for Human Review of the Plan: ${planFileName}`));
+                            console.log(chalk_1.default.cyan("You can edit the file now."));
+                            const { feedback } = await inquirer_1.default.prompt([
+                                {
+                                    type: "input",
+                                    name: "feedback",
+                                    message: "Enter feedback to refine the plan (or press Enter to approve and continue):",
+                                },
+                            ]);
+                            if (feedback && feedback.trim() !== "") {
+                                console.log(chalk_1.default.blue("🔄 Refining plan based on feedback..."));
+                                planningPrompt = `The user provided the following feedback on the plan you just created:
+                
+"${feedback}"
+
+Please update the plan file "${planFileName}" to incorporate this feedback.`;
+                                // Continue loop to regenerate plan
+                                continue;
+                            }
+                        }
+                        // Auto-commit plan if enabled (only after approval)
+                        if (autoCommit) {
+                            try {
+                                console.log(chalk_1.default.blue(`📦 Staging plan file: ${planFileName}`));
+                                await execAsync(`git add ${planFileName}`);
+                                await execAsync(`git commit -m "docs: create implementation plan for task ${task.id}"`);
+                                console.log(chalk_1.default.green("✅ Plan committed successfully"));
+                            }
+                            catch (e) {
+                                console.warn(chalk_1.default.yellow(`⚠️  Failed to commit plan: ${e instanceof Error ? e.message : "Unknown error"}`));
+                            }
+                        }
+                        planningComplete = true;
+                    }
+                    else {
+                        console.warn(chalk_1.default.yellow(`⚠️  Plan file ${planFileName} was not created by the executor.`));
+                        planningComplete = true; // Exit loop to avoid infinite retry if file not created
+                    }
+                }
+                else {
+                    planningComplete = true; // Dry run
+                }
+            }
+        }
+        catch (error) {
+            console.error(chalk_1.default.red(`❌ Planning phase failed: ${error instanceof Error ? error.message : String(error)}`));
+        }
+    }
+    // ----------------------------------------------------------------------
+    // EXECUTION PHASE
+    // ----------------------------------------------------------------------
     while (currentAttempt <= maxRetries) {
         // Determine which executor and model to use for this attempt
         let currentExecutor = tool;
@@ -194,52 +291,47 @@ async function executeTaskWithRetry(task, tool, verificationCommands, maxRetries
             // Build execution message with context
             const contextBuilder = (0, ai_service_factory_1.getContextBuilder)();
             const taskContext = await contextBuilder.buildContext(task.id);
-            const messageParts = [];
-            // Add retry context if this is a retry attempt
+            // Build retry context if this is a retry attempt
+            let retryContext = "";
             if (currentAttempt > 1 && lastError) {
-                messageParts.push(`# RETRY ATTEMPT ${currentAttempt}/${maxRetries}\n\n`);
+                const retryParts = [];
+                retryParts.push(`# RETRY ATTEMPT ${currentAttempt}/${maxRetries}\n\n`);
                 // Add model escalation context
                 if (currentModel) {
-                    messageParts.push(`**Note**: You are ${currentExecutor} using the ${currentModel} model. This is a more capable model than the previous attempt.\n\n`);
+                    retryParts.push(`**Note**: You are ${currentExecutor} using the ${currentModel} model. This is a more capable model than the previous attempt.\n\n`);
                 }
-                messageParts.push(`## Previous Attempt Failed With Error:\n\n${lastError}\n\n`);
-                messageParts.push(`Please analyze the error carefully and fix it. The error might be due to:\n`);
-                messageParts.push(`- Syntax errors\n`);
-                messageParts.push(`- Logic errors\n`);
-                messageParts.push(`- Missing dependencies or imports\n`);
-                messageParts.push(`- Incorrect configuration\n`);
-                messageParts.push(`- Build or test failures\n\n`);
-                messageParts.push(`Please fix the error above and complete the task successfully.\n\n`);
-            }
-            // Add task plan if available
-            const planData = await tasks_1.taskService.getTaskPlan(task.id);
-            if (planData) {
-                messageParts.push(`# Task Plan\n\n${planData.plan}\n`);
-            }
-            else {
-                messageParts.push(`# Task: ${task.title}\n\n${task.description || "No description"}\n`);
+                retryParts.push(`## Previous Attempt Failed With Error:\n\n${lastError}\n\n`);
+                retryParts.push(`Please analyze the error carefully and fix it. The error might be due to:\n`);
+                retryParts.push(`- Syntax errors\n`);
+                retryParts.push(`- Logic errors\n`);
+                retryParts.push(`- Missing dependencies or imports\n`);
+                retryParts.push(`- Incorrect configuration\n`);
+                retryParts.push(`- Build or test failures\n\n`);
+                retryParts.push(`Please fix the error above and complete the task successfully.\n\n`);
+                retryContext = retryParts.join("");
             }
-            // Add PRD context if available
-            if (taskContext.prdContent) {
-                messageParts.push(`\n# Product Requirements Document\n\n${taskContext.prdContent}\n`);
+            // Get task plan if available (from planning phase or service)
+            const storedPlanData = await tasks_1.taskService.getTaskPlan(task.id);
+            let finalPlan;
+            if (planContent) {
+                finalPlan = `${planContent}\n\nPlease follow this plan to implement the task.`;
             }
-            // Add stack/technology context
-            if (taskContext.stack) {
-                messageParts.push(`\n# Technology Stack\n\n`);
-                messageParts.push(`- **Project**: ${taskContext.stack.projectName}\n`);
-                messageParts.push(`- **Frontend**: ${taskContext.stack.frontend}\n`);
-                messageParts.push(`- **Backend**: ${taskContext.stack.backend}\n`);
-                if (taskContext.stack.database !== "none") {
-                    messageParts.push(`- **Database**: ${taskContext.stack.database}\n`);
-                }
-                messageParts.push(`- **Auth**: ${taskContext.stack.auth}\n`);
+            else if (storedPlanData) {
+                finalPlan = storedPlanData.plan;
             }
-            // Add documentation context if available
-            if (taskContext.documentation) {
-                messageParts.push(`\n# Documentation Context\n\n`);
-                messageParts.push(`${taskContext.documentation.recap}\n`);
+            // Build execution prompt using PromptBuilder
+            const promptResult = prompt_builder_1.PromptBuilder.buildExecutionPrompt({
+                taskTitle: task.title,
+                taskDescription: task.description,
+                taskPlan: finalPlan,
+                stack: taskContext.stack,
+                documentation: taskContext.documentation,
+                retryContext,
+            });
+            if (!promptResult.success) {
+                throw new Error(`Failed to build execution prompt: ${promptResult.error}`);
             }
-            const executionMessage = messageParts.join("");
+            const executionMessage = promptResult.prompt;
             // Update task status to in-progress
             if (!dry) {
                 await tasks_1.taskService.setTaskStatus(task.id, "in-progress");
@@ -251,7 +343,16 @@ async function executeTaskWithRetry(task, tool, verificationCommands, maxRetries
                 tool: currentExecutor,
             });
             // Create executor and run
-            const executor = executor_factory_1.ExecutorFactory.create(currentExecutor);
+            // Build executor config
+            const executorConfig = {
+                model: currentModel,
+                continueLastSession: currentAttempt > 1, // Resume session on retries
+            };
+            // Log session resumption
+            if (currentAttempt > 1) {
+                console.log(chalk_1.default.cyan("🔄 Resuming previous session to provide error feedback to AI"));
+            }
+            const executor = executor_factory_1.ExecutorFactory.create(currentExecutor, executorConfig);
             // Add model info to execution message if specified
             let finalExecutionMessage = executionMessage;
             if (currentModel) {
@@ -259,7 +360,7 @@ async function executeTaskWithRetry(task, tool, verificationCommands, maxRetries
                     `**Model Configuration**: Using ${currentModel}\n\n` +
                         executionMessage;
             }
-            await executor.execute(finalExecutionMessage, dry);
+            await executor.execute(finalExecutionMessage, dry, executorConfig);
             // Run verification commands
             const verificationResults = await runVerificationCommands(verificationCommands, dry);
             // Check if all verifications passed
@@ -281,6 +382,97 @@ async function executeTaskWithRetry(task, tool, verificationCommands, maxRetries
                 currentAttempt++;
                 continue;
             }
+            // ----------------------------------------------------------------------
+            // AI REVIEW PHASE
+            // ----------------------------------------------------------------------
+            if (review && !dry) {
+                console.log(chalk_1.default.blue.bold("\n🕵️  Starting AI Review Phase..."));
+                try {
+                    // Get git diff
+                    const { stdout: diff } = await execAsync("git diff HEAD");
+                    if (!diff.trim()) {
+                        console.log(chalk_1.default.yellow("⚠️  No changes detected to review."));
+                    }
+                    else {
+                        const reviewExecutor = reviewModel
+                            ? reviewModel.split(":")[0]
+                            : tool;
+                        const reviewModelName = reviewModel
+                            ? reviewModel.split(":")[1]
+                            : undefined;
+                        console.log(chalk_1.default.cyan(`   Using executor for review: ${reviewExecutor}${reviewModelName ? ` (${reviewModelName})` : ""}`));
+                        const reviewPrompt = `You are a strict code reviewer. Review the following changes for the task.
+            
+Task: ${task.title}
+Plan: ${planContent || "No plan provided."}
+
+Git Diff:
+${diff.substring(0, 10000)}
+
+Analyze the changes for:
+1. Correctness (does it solve the task?)
+2. Code Quality (clean code, best practices)
+3. Potential Bugs
+
+Return a JSON object:
+{
+  "approved": boolean,
+  "feedback": "Detailed feedback explaining why it was rejected or approved"
+}
+`;
+                        const reviewConfig = {
+                            model: reviewModelName,
+                            continueLastSession: false,
+                        };
+                        // We use a separate executor instance for review to avoid polluting the main context
+                        // But wait, ExecutorFactory.create returns a new instance usually.
+                        // However, we need to capture the output which is usually streamed to stdout/file.
+                        // The current Executor interface doesn't easily return the output string directly if it's designed for side-effects.
+                        // But we can use getAIOperations().generateText directly for this since it's a simple Q&A.
+                        const aiOps = (0, ai_service_factory_2.getAIOperations)();
+                        // We need to construct a proper AI config for getAIOperations
+                        // This is a bit hacky, ideally we'd use the executor abstraction, but we need the return value.
+                        // Let's assume we can use the default AI provider for review for now, or try to respect the reviewModel.
+                        // Actually, let's use the executor but we need to capture its output.
+                        // The current executor implementation writes to files/stdout.
+                        // Let's use aiOps directly for the review to get the JSON response.
+                        const aiResponse = await aiOps.streamText(reviewPrompt);
+                        const jsonMatch = aiResponse.match(/\{[\s\S]*\}/);
+                        if (jsonMatch) {
+                            const reviewResult = JSON.parse(jsonMatch[0]);
+                            if (!reviewResult.approved) {
+                                lastError = `AI Review Failed:\n${reviewResult.feedback}`;
+                                attempts.push({
+                                    attemptNumber: currentAttempt,
+                                    success: false,
+                                    error: lastError,
+                                    executor: currentExecutor,
+                                    model: currentModel,
+                                    verificationResults,
+                                    timestamp: Date.now() - attemptStartTime,
+                                });
+                                console.log(chalk_1.default.red(`❌ AI Review Rejected Changes: ${reviewResult.feedback}`));
+                                // Revert changes? Or just let the next attempt fix them?
+                                // Usually better to let the next attempt see the bad code and fix it.
+                                // But we might want to undo if it's really bad.
+                                // For now, let's keep the changes so the AI can see what it did wrong.
+                                currentAttempt++;
+                                continue;
+                            }
+                            else {
+                                console.log(chalk_1.default.green(`✅ AI Review Approved: ${reviewResult.feedback}`));
+                            }
+                        }
+                        else {
+                            console.warn(chalk_1.default.yellow("⚠️  Could not parse AI review response. Assuming approval."));
+                        }
+                    }
+                }
+                catch (error) {
+                    console.error(chalk_1.default.red(`❌ AI Review failed: ${error instanceof Error ? error.message : String(error)}`));
+                    // If review crashes, do we fail the task? Maybe safe to warn and proceed.
+                }
+            }
             // Success! Extract commit info
             let commitInfo;
             if (!dry) {
@@ -412,7 +604,7 @@ async function executeTaskLoop(options) {
         const task = tasksToExecute[i];
         console.log(chalk_1.default.blue.bold(`\n${"=".repeat(60)}\n📌 Task ${i + 1}/${tasksToExecute.length}: ${task.title} (${task.id})\n${"=".repeat(60)}\n`));
         // Execute task with retry logic
-        const attempts = await executeTaskWithRetry(task, tool, verificationCommands, maxRetries, dry, config.tryModels);
+        const attempts = await executeTaskWithRetry(task, tool, config, dry);
         // Check if task succeeded
         const lastAttempt = attempts[attempts.length - 1];
         const succeeded = lastAttempt.success;

package/dist/prompts/documentation-recap.d.ts

@@ -0,0 +1,3 @@
+export declare const DOCUMENTATION_RECAP_PROMPT = "Create a concise recap of the documentation fetched for these libraries:\n\nLibraries:\n{LIBRARIES_LIST}\n\nDocumentation Contents:\n{DOCUMENTATION_CONTENTS}\n\nPlease provide a 2-3 sentence summary of what documentation is available and how it relates to the task.";
+export declare const DOCUMENTATION_RECAP_SYSTEM_PROMPT = "You are a technical writer who creates concise summaries of documentation collections.";
+//# sourceMappingURL=documentation-recap.d.ts.map

package/dist/prompts/documentation-recap.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"documentation-recap.d.ts","sourceRoot":"","sources":["../../src/prompts/documentation-recap.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,0BAA0B,8QAQkE,CAAC;AAE1G,eAAO,MAAM,iCAAiC,2FAA2F,CAAC"}

package/dist/prompts/documentation-recap.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DOCUMENTATION_RECAP_SYSTEM_PROMPT = exports.DOCUMENTATION_RECAP_PROMPT = void 0;
+exports.DOCUMENTATION_RECAP_PROMPT = `Create a concise recap of the documentation fetched for these libraries:
+
+Libraries:
+{LIBRARIES_LIST}
+
+Documentation Contents:
+{DOCUMENTATION_CONTENTS}
+
+Please provide a 2-3 sentence summary of what documentation is available and how it relates to the task.`;
+exports.DOCUMENTATION_RECAP_SYSTEM_PROMPT = `You are a technical writer who creates concise summaries of documentation collections.`;

package/dist/prompts/index.d.ts

@@ -4,5 +4,11 @@ export * from "./task-enhancement";
 export * from "./prd-rework";
 export * from "./documentation-detection";
 export * from "./task-planning";
+export * from "./task-execution";
 export * from "./prd-question";
+export * from "./prd-generation";
+export * from "./prd-combination";
+export * from "./documentation-recap";
+export * from "./prd-question-answer";
+export * from "./workflow-prompts";
 //# sourceMappingURL=index.d.ts.map

package/dist/prompts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/prompts/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/prompts/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC"}