task-o-matic 0.0.11 → 0.0.13

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

@@ -3,566 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractCommitInfo = extractCommitInfo;
 exports.executeTaskLoop = executeTaskLoop;
 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 task_execution_core_1 = require("./task-execution-core");
 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
- * This function analyzes the executor's work and generates appropriate commit info
- */
-/**
- * Extract commit message and file list from git state
- * This function analyzes the actual git state to generate appropriate commit info
- */
-async function extractCommitInfo(taskId, taskTitle, executionMessage, gitState, execFn = execAsync, aiOps = (0, ai_service_factory_2.getAIOperations)()) {
-    try {
-        // Case 1: Executor created a commit
-        if (gitState.beforeHead !== gitState.afterHead) {
-            console.log(chalk_1.default.blue("📝 Executor created a commit, extracting info..."));
-            const { stdout } = await execFn(`git show --stat --format="%s%n%b" ${gitState.afterHead}`);
-            const lines = stdout.trim().split("\n");
-            const message = lines[0].trim();
-            // Parse files from stat output (e.g. " src/file.ts | 10 +")
-            const files = lines
-                .slice(1)
-                .filter((line) => line.includes("|"))
-                .map((line) => line.split("|")[0].trim());
-            return {
-                message,
-                files,
-            };
-        }
-        // Case 2: Executor left uncommitted changes
-        if (gitState.hasUncommittedChanges) {
-            console.log(chalk_1.default.blue("📝 Uncommitted changes detected, generating commit message..."));
-            // Get the diff to send to AI
-            const { stdout: diff } = await execFn("git diff HEAD");
-            // Get list of changed files
-            const { stdout: status } = await execFn("git status --porcelain");
-            const files = status
-                .split("\n")
-                .filter((line) => line.length > 0)
-                .map((line) => line.substring(3).trim())
-                .filter((file) => file.length > 0);
-            // Use AI to generate commit message based on the diff
-            // const aiOps = getAIOperations(); // Injected
-            const prompt = `Based on the following git diff, generate a concise git commit message.
-      
-Task: ${taskTitle}
-
-Git Diff:
-${diff.substring(0, 10000)} // Limit diff size
-
-Please respond in JSON format:
-{
-  "message": "concise commit message following conventional commits format"
-}
-
-The commit message should:
-- Follow conventional commits format (feat:, fix:, refactor:, etc.)
-- Be concise and descriptive
-- Focus on what changed
-`;
-            const response = await aiOps.streamText(prompt, undefined, "You are a helpful assistant that generates git commit messages.");
-            // Try to parse JSON from response
-            const jsonMatch = response.match(/\{[\s\S]*\}/);
-            let message = `feat: complete task ${taskTitle}`;
-            if (jsonMatch) {
-                try {
-                    const parsed = JSON.parse(jsonMatch[0]);
-                    if (parsed.message) {
-                        message = parsed.message;
-                    }
-                }
-                catch (e) {
-                    // Ignore parse error
-                }
-            }
-            return {
-                message,
-                files,
-            };
-        }
-        // Case 3: No changes detected
-        return {
-            message: `feat: complete task ${taskTitle}`,
-            files: [],
-        };
-    }
-    catch (error) {
-        console.warn(chalk_1.default.yellow(`⚠️  Failed to extract commit info: ${error instanceof Error ? error.message : "Unknown error"}`));
-        // Fallback commit info
-        return {
-            message: `feat: complete task ${taskTitle}`,
-            files: [],
-        };
-    }
-}
-/**
- * Run verification commands and return results
- */
-async function runVerificationCommands(commands, dry) {
-    const results = [];
-    if (dry) {
-        console.log(chalk_1.default.yellow("🔍 DRY RUN - Verification commands:"));
-        commands.forEach((cmd) => {
-            console.log(chalk_1.default.cyan(`  ${cmd}`));
-            results.push({
-                command: cmd,
-                success: true,
-                output: "DRY RUN - not executed",
-            });
-        });
-        return results;
-    }
-    for (const command of commands) {
-        console.log(chalk_1.default.blue(`🧪 Running verification: ${command}`));
-        try {
-            const { stdout, stderr } = await execAsync(command);
-            console.log(chalk_1.default.green(`✅ Verification passed: ${command}`));
-            results.push({
-                command,
-                success: true,
-                output: stdout.trim(),
-            });
-        }
-        catch (error) {
-            console.error(chalk_1.default.red(`❌ Verification failed: ${command}`));
-            const errorOutput = error.stderr || error.stdout || error.message;
-            console.error(chalk_1.default.red(`   Error: ${errorOutput}`));
-            results.push({
-                command,
-                success: false,
-                error: errorOutput,
-            });
-            // Return early on first failure
-            break;
-        }
-    }
-    return results;
-}
-/**
- * Execute a single task with retry logic and error correction
- */
-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;
-        let currentModel;
-        if (tryModels && tryModels.length > 0) {
-            // Use the model config for this attempt (or last one if we've exceeded the list)
-            const modelConfigIndex = Math.min(currentAttempt - 1, tryModels.length - 1);
-            const modelConfig = tryModels[modelConfigIndex];
-            // Override executor if specified
-            if (modelConfig.executor) {
-                currentExecutor = modelConfig.executor;
-            }
-            // Store model name if specified
-            if (modelConfig.model) {
-                currentModel = modelConfig.model;
-            }
-        }
-        console.log(chalk_1.default.blue(`\n🎯 Attempt ${currentAttempt}/${maxRetries} for task: ${task.title} (${task.id})`));
-        if (currentModel) {
-            console.log(chalk_1.default.cyan(`   Using executor: ${currentExecutor} with model: ${currentModel}`));
-        }
-        else {
-            console.log(chalk_1.default.cyan(`   Using executor: ${currentExecutor}`));
-        }
-        const attemptStartTime = Date.now();
-        // Capture git state before execution
-        let beforeHead = "";
-        try {
-            const { stdout } = await execAsync("git rev-parse HEAD");
-            beforeHead = stdout.trim();
-        }
-        catch (e) {
-            // Git might not be initialized or no commits yet
-        }
-        try {
-            // 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
-            if (currentAttempt > 1 && lastError) {
-                messageParts.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`);
-                }
-                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 (from planning phase or service)
-            const storedPlanData = await tasks_1.taskService.getTaskPlan(task.id);
-            if (planContent) {
-                messageParts.push(`# Implementation Plan\n\n${planContent}\n\nPlease follow this plan to implement the task.\n`);
-            }
-            else if (storedPlanData) {
-                messageParts.push(`# Task Plan\n\n${storedPlanData.plan}\n`);
-            }
-            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`);
-                }
-                messageParts.push(`- **Auth**: ${taskContext.stack.auth}\n`);
-            }
-            // Add documentation context if available
-            if (taskContext.documentation) {
-                messageParts.push(`\n# Documentation Context\n\n`);
-                messageParts.push(`${taskContext.documentation.recap}\n`);
-            }
-            const executionMessage = messageParts.join("");
-            // Update task status to in-progress
-            if (!dry) {
-                await tasks_1.taskService.setTaskStatus(task.id, "in-progress");
-                console.log(chalk_1.default.yellow("⏳ Task status updated to in-progress"));
-            }
-            // Emit execution:start event
-            await hooks_1.hooks.emit("execution:start", {
-                taskId: task.id,
-                tool: currentExecutor,
-            });
-            // Create executor and run
-            // 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) {
-                finalExecutionMessage =
-                    `**Model Configuration**: Using ${currentModel}\n\n` +
-                        executionMessage;
-            }
-            await executor.execute(finalExecutionMessage, dry, executorConfig);
-            // Run verification commands
-            const verificationResults = await runVerificationCommands(verificationCommands, dry);
-            // Check if all verifications passed
-            const allVerificationsPassed = verificationResults.every((r) => r.success);
-            if (!allVerificationsPassed) {
-                // Verification failed - prepare error message for retry
-                const failedVerification = verificationResults.find((r) => !r.success);
-                lastError = `Verification command "${failedVerification?.command}" failed:\n${failedVerification?.error}`;
-                attempts.push({
-                    attemptNumber: currentAttempt,
-                    success: false,
-                    error: lastError,
-                    executor: currentExecutor,
-                    model: currentModel,
-                    verificationResults,
-                    timestamp: Date.now() - attemptStartTime,
-                });
-                console.log(chalk_1.default.red(`❌ Task execution failed verification on attempt ${currentAttempt}`));
-                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) {
-                console.log(chalk_1.default.blue("📝 Extracting commit information..."));
-                // Capture git state after execution
-                let afterHead = "";
-                let hasUncommittedChanges = false;
-                try {
-                    const { stdout: headStdout } = await execAsync("git rev-parse HEAD");
-                    afterHead = headStdout.trim();
-                    const { stdout: statusStdout } = await execAsync("git status --porcelain");
-                    hasUncommittedChanges = statusStdout.trim().length > 0;
-                }
-                catch (e) {
-                    // Git issues
-                }
-                commitInfo = await extractCommitInfo(task.id, task.title, executionMessage, {
-                    beforeHead,
-                    afterHead,
-                    hasUncommittedChanges,
-                });
-                console.log(chalk_1.default.green(`✅ Commit message: ${commitInfo.message}`));
-                if (commitInfo.files.length > 0) {
-                    console.log(chalk_1.default.green(`📁 Changed files: ${commitInfo.files.join(", ")}`));
-                }
-            }
-            // Update task status to completed
-            if (!dry) {
-                await tasks_1.taskService.setTaskStatus(task.id, "completed");
-                console.log(chalk_1.default.green("✅ Task execution completed successfully"));
-            }
-            // Record successful attempt
-            attempts.push({
-                attemptNumber: currentAttempt,
-                success: true,
-                executor: currentExecutor,
-                model: currentModel,
-                verificationResults,
-                commitInfo,
-                timestamp: Date.now() - attemptStartTime,
-            });
-            // Emit execution:end event
-            await hooks_1.hooks.emit("execution:end", { taskId: task.id, success: true });
-            return attempts; // Success - exit retry loop
-        }
-        catch (error) {
-            lastError = error instanceof Error ? error.message : String(error);
-            attempts.push({
-                attemptNumber: currentAttempt,
-                success: false,
-                error: lastError,
-                executor: currentExecutor,
-                model: currentModel,
-                timestamp: Date.now() - attemptStartTime,
-            });
-            // Emit execution:error event
-            await hooks_1.hooks.emit("execution:error", {
-                taskId: task.id,
-                error: error instanceof Error ? error : new Error(String(error)),
-            });
-            console.log(chalk_1.default.red(`❌ Task execution failed on attempt ${currentAttempt}: ${lastError}`));
-            if (!dry && currentAttempt < maxRetries) {
-                // Reset task status to todo for retry
-                await tasks_1.taskService.setTaskStatus(task.id, "todo");
-                console.log(chalk_1.default.yellow("⏸  Task status reset to todo for retry"));
-            }
-            currentAttempt++;
-        }
-    }
-    // All retries exhausted
-    if (!dry) {
-        await tasks_1.taskService.setTaskStatus(task.id, "todo");
-        console.log(chalk_1.default.red("❌ All retry attempts exhausted, task status reset to todo"));
-    }
-    return attempts;
-}
 /**
  * Execute multiple tasks in a loop with retry and verification
+ * This delegates to the unified executeTaskCore for each task
  */
 async function executeTaskLoop(options) {
     const startTime = Date.now();
     const { filters = {}, tool = "opencode", config = {}, dry = false } = options;
-    const { maxRetries = 3, verificationCommands = [], autoCommit = false, } = config;
+    const { maxRetries = 3, verificationCommands = [], autoCommit = false, tryModels, plan, planModel, reviewPlan, review, reviewModel, customMessage, continueSession, } = config;
     console.log(chalk_1.default.blue.bold("\n🔄 Starting Task Loop Execution\n"));
     console.log(chalk_1.default.cyan(`Executor Tool: ${tool}`));
     console.log(chalk_1.default.cyan(`Max Retries per Task: ${maxRetries}`));
@@ -610,49 +62,55 @@ async function executeTaskLoop(options) {
     for (let i = 0; i < tasksToExecute.length; i++) {
         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, config, dry);
-        // Check if task succeeded
-        const lastAttempt = attempts[attempts.length - 1];
-        const succeeded = lastAttempt.success;
-        if (succeeded) {
-            completedTasks++;
-            console.log(chalk_1.default.green.bold(`\n✅ Task ${task.title} completed successfully after ${attempts.length} attempt(s)\n`));
-        }
-        else {
-            failedTasks++;
-            console.log(chalk_1.default.red.bold(`\n❌ Task ${task.title} failed after ${attempts.length} attempt(s)\n`));
-        }
-        taskResults.push({
-            taskId: task.id,
-            taskTitle: task.title,
-            attempts,
-            finalStatus: succeeded ? "completed" : "failed",
-        });
-        // Auto-commit if enabled and task succeeded
-        if (autoCommit && succeeded && !dry && lastAttempt.commitInfo) {
-            try {
-                const { message, files } = lastAttempt.commitInfo;
-                if (files.length > 0) {
-                    // Stage specific files
-                    const gitAdd = `git add ${files.join(" ")}`;
-                    console.log(chalk_1.default.blue(`📦 Staging files: ${gitAdd}`));
-                    await execAsync(gitAdd);
-                }
-                else {
-                    // Stage all changes
-                    console.log(chalk_1.default.blue("📦 Staging all changes"));
-                    await execAsync("git add .");
-                }
-                // Commit
-                const gitCommit = `git commit -m "${message}"`;
-                console.log(chalk_1.default.blue(`💾 Committing: ${message}`));
-                await execAsync(gitCommit);
-                console.log(chalk_1.default.green("✅ Changes committed successfully\n"));
+        // Build unified task execution config
+        const taskConfig = {
+            tool,
+            customMessage, // NEW: Support custom message override
+            executorConfig: {
+                continueLastSession: continueSession, // NEW: Support session continuation
+            },
+            verificationCommands,
+            enableRetry: true, // Always enable retry in loop
+            maxRetries,
+            tryModels,
+            enablePlanPhase: plan,
+            planModel,
+            reviewPlan,
+            enableReviewPhase: review,
+            reviewModel,
+            autoCommit,
+            executeSubtasks: true, // Now supports subtasks!
+            dry,
+        };
+        try {
+            // Execute task using unified core
+            const result = await (0, task_execution_core_1.executeTaskCore)(task.id, taskConfig);
+            // Check if task succeeded
+            const succeeded = result.success;
+            if (succeeded) {
+                completedTasks++;
+                console.log(chalk_1.default.green.bold(`\n✅ Task ${task.title} completed successfully after ${result.attempts.length} attempt(s)\n`));
             }
-            catch (error) {
-                console.warn(chalk_1.default.yellow(`⚠️  Auto-commit failed: ${error instanceof Error ? error.message : "Unknown error"}\n`));
+            else {
+                failedTasks++;
+                console.log(chalk_1.default.red.bold(`\n❌ Task ${task.title} failed after ${result.attempts.length} attempt(s)\n`));
             }
+            taskResults.push({
+                taskId: task.id,
+                taskTitle: task.title,
+                attempts: result.attempts,
+                finalStatus: succeeded ? "completed" : "failed",
+            });
+        }
+        catch (error) {
+            failedTasks++;
+            console.error(chalk_1.default.red.bold(`\n❌ Task ${task.title} failed with error: ${error instanceof Error ? error.message : "Unknown error"}\n`));
+            taskResults.push({
+                taskId: task.id,
+                taskTitle: task.title,
+                attempts: [],
+                finalStatus: "failed",
+            });
         }
     }
     const duration = Date.now() - startTime;