task-o-matic 0.0.12 → 0.0.13

package/dist/lib/task-execution.js

@@ -1,157 +1,39 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeTask = executeTask;
-const tasks_1 = require("../services/tasks");
-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, executorConfig) {
-    // Load task
-    const task = await tasks_1.taskService.getTask(taskId);
-    if (!task) {
-        throw new Error(`Task with ID ${taskId} not found`);
-    }
-    console.log(chalk_1.default.blue(`🎯 ${dry ? "DRY RUN" : "Executing"} task: ${task.title} (${taskId})`));
-    // Build comprehensive execution message with full context
-    const contextBuilder = (0, ai_service_factory_1.getContextBuilder)();
-    const taskContext = await contextBuilder.buildContext(taskId);
-    // Get task plan if available
-    const planData = await tasks_1.taskService.getTaskPlan(taskId);
-    // 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}`);
-    }
-    const executionMessage = promptResult.prompt;
-    if (!dry) {
-        // Update task status to in-progress
-        await tasks_1.taskService.setTaskStatus(taskId, "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, tool });
-    try {
-        // Create executor and run
-        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");
-            console.log(chalk_1.default.green("✅ Task execution completed successfully"));
-        }
-        // Emit execution:end event
-        await hooks_1.hooks.emit("execution:end", { taskId, success: true });
-    }
-    catch (error) {
-        // Emit execution:error event
-        await hooks_1.hooks.emit("execution:error", {
-            taskId,
-            error: error instanceof Error ? error : new Error(String(error)),
-        });
-        if (!dry) {
-            // Update task status back to todo on failure
-            await tasks_1.taskService.setTaskStatus(taskId, "todo");
-            console.log(chalk_1.default.red("❌ Task execution failed, status reset to todo"));
-        }
-        throw error;
-    }
-}
-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`);
-    }
-    // Get subtasks
-    const subtasks = await tasks_1.taskService.getSubtasks(taskId);
-    if (subtasks.length === 0) {
-        // No subtasks, execute this task directly
-        await executeSingleTask(taskId, tool, dry);
-        return;
-    }
-    // Has subtasks - execute them one by one
-    console.log(chalk_1.default.blue(`📋 Task has ${subtasks.length} subtasks, executing recursively...`));
-    for (let i = 0; i < subtasks.length; i++) {
-        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, executorConfig);
-        }
-        catch (error) {
-            console.error(chalk_1.default.red(`❌ Failed to execute subtask ${subtask.id}: ${error instanceof Error ? error.message : "Unknown error"}`));
-            throw error;
-        }
-    }
-    // After all subtasks are done, mark the main task as completed
-    if (!dry) {
-        await tasks_1.taskService.setTaskStatus(taskId, "completed");
-        console.log(chalk_1.default.green(`✅ Main task ${task.title} completed after all subtasks`));
-    }
-    else {
-        console.log(chalk_1.default.cyan(`🔍 DRY RUN - Main task ${task.title} would be completed after all subtasks`));
-    }
-}
+const task_execution_core_1 = require("./task-execution-core");
+/**
+ * Execute a task using an external coding assistant
+ * This is the simplified entry point that delegates to the unified core
+ */
 async function executeTask(options) {
-    const { taskId, tool = "opencode", message, model, continueSession, dry = false, validate = [], } = options;
-    // Build executor config from options
-    const executorConfig = model || continueSession
-        ? {
+    const { taskId, tool = "opencode", message, model, continueSession, dry = false, validate = [], maxRetries, tryModels, plan, planModel, reviewPlan, review, reviewModel, autoCommit, } = options;
+    // Build unified task execution config
+    const config = {
+        tool,
+        executorConfig: {
             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);
-        if (!task) {
-            throw new Error(`Task with ID ${taskId} not found`);
-        }
-        console.log(chalk_1.default.blue(`🎯 ${dry ? "DRY RUN - Would execute" : "Executing"} task with custom message: ${task.title} (${taskId})`));
-        if (!dry) {
-            await tasks_1.taskService.setTaskStatus(taskId, "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, tool });
-        try {
-            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"));
-            }
-            // Emit execution:end event
-            await hooks_1.hooks.emit("execution:end", { taskId, success: true });
-            // Run validations after task completion
-            await (0, validation_1.runValidations)(validate, dry);
-        }
-        catch (error) {
-            if (!dry) {
-                await tasks_1.taskService.setTaskStatus(taskId, "todo");
-                console.log(chalk_1.default.red("❌ Task execution failed, status reset to todo"));
-            }
-            // Emit execution:error event
-            await hooks_1.hooks.emit("execution:error", {
-                taskId,
-                error: error instanceof Error ? error : new Error(String(error)),
-            });
-            throw error;
-        }
-        return;
+        },
+        customMessage: message,
+        verificationCommands: validate,
+        enableRetry: maxRetries !== undefined && maxRetries > 0, // Opt-in retry
+        maxRetries: maxRetries || 3,
+        tryModels,
+        enablePlanPhase: plan,
+        planModel,
+        reviewPlan,
+        enableReviewPhase: review,
+        reviewModel,
+        autoCommit,
+        executeSubtasks: true, // Always execute subtasks in execute command
+        dry,
+    };
+    // Delegate to unified core execution
+    const result = await (0, task_execution_core_1.executeTaskCore)(taskId, config);
+    // Throw error if execution failed (maintains backward compatibility)
+    if (!result.success) {
+        const lastAttempt = result.attempts[result.attempts.length - 1];
+        throw new Error(lastAttempt?.error || "Task execution failed");
     }
-    // No custom message - execute recursively with subtasks
-    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

@@ -1,25 +1,7 @@
 import { ExecuteLoopOptions, ExecuteLoopResult } from "../types";
-/**
- * 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
- */
-export declare function extractCommitInfo(taskId: string, taskTitle: string, executionMessage: string, gitState: {
-    beforeHead: string;
-    afterHead: string;
-    hasUncommittedChanges: boolean;
-}, execFn?: (command: string) => Promise<{
-    stdout: string;
-    stderr: string;
-}>, aiOps?: any): Promise<{
-    message: string;
-    files: string[];
-}>;
 /**
  * Execute multiple tasks in a loop with retry and verification
+ * This delegates to the unified executeTaskCore for each task
  */
 export declare function executeTaskLoop(options: ExecuteLoopOptions): Promise<ExecuteLoopResult>;
 //# sourceMappingURL=task-loop-execution.d.ts.map

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,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"}
+{"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;AAIlB;;;GAGG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC,CAgL5B"}