@litmers/cursorflow-orchestrator 0.1.5 → 0.1.8

package/dist/core/orchestrator.js

@@ -90,7 +90,7 @@ function waitChild(proc) {
     });
 }
 /**
- * List lane task files in directory
+ * List lane task files in directory and load their configs for dependencies
  */
 function listLaneFiles(tasksDir) {
     if (!fs.existsSync(tasksDir)) {
@@ -100,10 +100,23 @@ function listLaneFiles(tasksDir) {
     return files
         .filter(f => f.endsWith('.json'))
         .sort()
-        .map(f => ({
-        name: path.basename(f, '.json'),
-        path: path.join(tasksDir, f),
-    }));
+        .map(f => {
+        const filePath = path.join(tasksDir, f);
+        const name = path.basename(f, '.json');
+        let dependsOn = [];
+        try {
+            const config = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+            dependsOn = config.dependsOn || [];
+        }
+        catch (e) {
+            logger.warn(`Failed to parse config for lane ${name}: ${e}`);
+        }
+        return {
+            name,
+            path: filePath,
+            dependsOn,
+        };
+    });
 }
 /**
  * Monitor lane states
@@ -116,7 +129,8 @@ function printLaneStatus(lanes, laneRunDirs) {
         const statePath = path.join(dir, 'state.json');
         const state = (0, state_1.loadState)(statePath);
         if (!state) {
-            return { lane: lane.name, status: '(no state)', task: '-' };
+            const isWaiting = lane.dependsOn.length > 0;
+            return { lane: lane.name, status: isWaiting ? 'waiting' : 'pending', task: '-' };
         }
         const idx = (state.currentTaskIndex || 0) + 1;
         return {
@@ -131,7 +145,7 @@ function printLaneStatus(lanes, laneRunDirs) {
     }
 }
 /**
- * Run orchestration
+ * Run orchestration with dependency management
  */
 async function orchestrate(tasksDir, options = {}) {
     const lanes = listLaneFiles(tasksDir);
@@ -143,31 +157,86 @@ async function orchestrate(tasksDir, options = {}) {
     const laneRunDirs = {};
     for (const lane of lanes) {
         laneRunDirs[lane.name] = path.join(runRoot, 'lanes', lane.name);
+        fs.mkdirSync(laneRunDirs[lane.name], { recursive: true });
     }
     logger.section('🧭 Starting Orchestration');
     logger.info(`Tasks directory: ${tasksDir}`);
     logger.info(`Run directory: ${runRoot}`);
     logger.info(`Lanes: ${lanes.length}`);
-    // Spawn all lanes
-    const running = [];
-    for (const lane of lanes) {
-        const { child, logPath } = spawnLane({
-            laneName: lane.name,
-            tasksFile: lane.path,
-            laneRunDir: laneRunDirs[lane.name],
-            executor: options.executor || 'cursor-agent',
-        });
-        running.push({ lane: lane.name, child, logPath });
-        logger.info(`Lane started: ${lane.name}`);
-    }
+    const maxConcurrent = options.maxConcurrentLanes || 10;
+    const running = new Map();
+    const exitCodes = {};
+    const completedLanes = new Set();
+    const failedLanes = new Set();
     // Monitor lanes
     const monitorInterval = setInterval(() => {
         printLaneStatus(lanes, laneRunDirs);
     }, options.pollInterval || 60000);
-    // Wait for all lanes
-    const exitCodes = {};
-    for (const r of running) {
-        exitCodes[r.lane] = await waitChild(r.child);
+    while (completedLanes.size + failedLanes.size < lanes.length) {
+        // 1. Identify lanes ready to start
+        const readyToStart = lanes.filter(lane => {
+            // Not already running or completed
+            if (running.has(lane.name) || completedLanes.has(lane.name) || failedLanes.has(lane.name)) {
+                return false;
+            }
+            // Check dependencies
+            for (const dep of lane.dependsOn) {
+                if (failedLanes.has(dep)) {
+                    // If a dependency failed, this lane fails too
+                    logger.error(`Lane ${lane.name} failed because dependency ${dep} failed`);
+                    failedLanes.add(lane.name);
+                    exitCodes[lane.name] = 1;
+                    return false;
+                }
+                if (!completedLanes.has(dep)) {
+                    return false;
+                }
+            }
+            return true;
+        });
+        // 2. Spawn ready lanes up to maxConcurrent
+        for (const lane of readyToStart) {
+            if (running.size >= maxConcurrent)
+                break;
+            logger.info(`Lane started: ${lane.name}`);
+            const spawnResult = spawnLane({
+                laneName: lane.name,
+                tasksFile: lane.path,
+                laneRunDir: laneRunDirs[lane.name],
+                executor: options.executor || 'cursor-agent',
+            });
+            running.set(lane.name, spawnResult);
+        }
+        // 3. Wait for any running lane to finish
+        if (running.size > 0) {
+            // We need to wait for at least one to finish
+            const promises = Array.from(running.entries()).map(async ([name, { child }]) => {
+                const code = await waitChild(child);
+                return { name, code };
+            });
+            const finished = await Promise.race(promises);
+            running.delete(finished.name);
+            exitCodes[finished.name] = finished.code;
+            if (finished.code === 0 || finished.code === 2) {
+                completedLanes.add(finished.name);
+            }
+            else {
+                failedLanes.add(finished.name);
+            }
+            printLaneStatus(lanes, laneRunDirs);
+        }
+        else {
+            // Nothing running and nothing ready (but not all finished)
+            // This could happen if there's a circular dependency or some logic error
+            if (readyToStart.length === 0 && completedLanes.size + failedLanes.size < lanes.length) {
+                const remaining = lanes.filter(l => !completedLanes.has(l.name) && !failedLanes.has(l.name));
+                logger.error(`Deadlock detected! Remaining lanes cannot start: ${remaining.map(l => l.name).join(', ')}`);
+                for (const l of remaining) {
+                    failedLanes.add(l.name);
+                    exitCodes[l.name] = 1;
+                }
+            }
+        }
     }
     clearInterval(monitorInterval);
     printLaneStatus(lanes, laneRunDirs);

package/dist/core/orchestrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../src/core/orchestrator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../src/core/orchestrator.ts"],"names":[],"mappings":"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"}

package/dist/core/runner.d.ts

@@ -8,12 +8,16 @@ import { RunnerConfig, Task, TaskExecutionResult, AgentSendResult, DependencyPol
  * Execute cursor-agent command with timeout and better error handling
  */
 export declare function cursorAgentCreateChat(): string;
-export declare function cursorAgentSend({ workspaceDir, chatId, prompt, model }: {
+/**
+ * Execute cursor-agent command with streaming and better error handling
+ */
+export declare function cursorAgentSend({ workspaceDir, chatId, prompt, model, signalDir }: {
     workspaceDir: string;
     chatId: string;
     prompt: string;
     model?: string;
-}): AgentSendResult;
+    signalDir?: string;
+}): Promise<AgentSendResult>;
 /**
  * Extract dependency change request from agent response
  */
@@ -46,4 +50,6 @@ export declare function runTask({ task, config, index, worktreeDir, taskBranch,
 /**
  * Run all tasks in sequence
  */
-export declare function runTasks(config: RunnerConfig, runDir: string): Promise<TaskExecutionResult[]>;
+export declare function runTasks(tasksFile: string, config: RunnerConfig, runDir: string, options?: {
+    startIndex?: number;
+}): Promise<TaskExecutionResult[]>;

package/dist/core/runner.js

@@ -123,7 +123,10 @@ function parseJsonFromStdout(stdout) {
     }
     return null;
 }
-function cursorAgentSend({ workspaceDir, chatId, prompt, model }) {
+/**
+ * Execute cursor-agent command with streaming and better error handling
+ */
+async function cursorAgentSend({ workspaceDir, chatId, prompt, model, signalDir }) {
     const args = [
         '--print',
         '--output-format', 'json',
@@ -133,65 +136,93 @@ function cursorAgentSend({ workspaceDir, chatId, prompt, model }) {
         prompt,
     ];
     logger.info('Executing cursor-agent...');
-    const res = (0, child_process_1.spawnSync)('cursor-agent', args, {
-        encoding: 'utf8',
-        stdio: 'pipe',
-        timeout: 300000, // 5 minute timeout for LLM response
-    });
-    // Check for timeout
-    if (res.error) {
-        if (res.error.code === 'ETIMEDOUT') {
-            return {
+    return new Promise((resolve) => {
+        const child = (0, child_process_1.spawn)('cursor-agent', args, {
+            stdio: ['pipe', 'pipe', 'pipe'], // Enable stdin piping
+            env: process.env,
+        });
+        let fullStdout = '';
+        let fullStderr = '';
+        // Watch for "intervention.txt" signal file if any
+        const interventionPath = signalDir ? path.join(signalDir, 'intervention.txt') : null;
+        let interventionWatcher = null;
+        if (interventionPath && fs.existsSync(path.dirname(interventionPath))) {
+            interventionWatcher = fs.watch(path.dirname(interventionPath), (event, filename) => {
+                if (filename === 'intervention.txt' && fs.existsSync(interventionPath)) {
+                    try {
+                        const message = fs.readFileSync(interventionPath, 'utf8').trim();
+                        if (message) {
+                            logger.info(`Injecting intervention: ${message}`);
+                            child.stdin.write(message + '\n');
+                            fs.unlinkSync(interventionPath); // Clear it
+                        }
+                    }
+                    catch (e) {
+                        logger.warn('Failed to read intervention file');
+                    }
+                }
+            });
+        }
+        child.stdout.on('data', (data) => {
+            const str = data.toString();
+            fullStdout += str;
+            // Also pipe to our own stdout so it goes to terminal.log
+            process.stdout.write(data);
+        });
+        child.stderr.on('data', (data) => {
+            fullStderr += data.toString();
+            // Pipe to our own stderr so it goes to terminal.log
+            process.stderr.write(data);
+        });
+        const timeout = setTimeout(() => {
+            child.kill();
+            resolve({
                 ok: false,
                 exitCode: -1,
                 error: 'cursor-agent timed out after 5 minutes. The LLM request may be taking too long or there may be network issues.',
-            };
-        }
-        return {
-            ok: false,
-            exitCode: -1,
-            error: `cursor-agent error: ${res.error.message}`,
-        };
-    }
-    const json = parseJsonFromStdout(res.stdout);
-    if (res.status !== 0 || !json || json.type !== 'result') {
-        let errorMsg = res.stderr?.trim() || res.stdout?.trim() || `exit=${res.status}`;
-        // Check for authentication errors
-        if (errorMsg.includes('not authenticated') ||
-            errorMsg.includes('login') ||
-            errorMsg.includes('auth')) {
-            errorMsg = 'Authentication error. Please:\n' +
-                '  1. Open Cursor IDE\n' +
-                '  2. Sign in to your account\n' +
-                '  3. Verify AI features are working\n' +
-                '  4. Try again\n\n' +
-                `Details: ${errorMsg}`;
-        }
-        // Check for rate limit errors
-        if (errorMsg.includes('rate limit') || errorMsg.includes('quota')) {
-            errorMsg = 'API rate limit or quota exceeded. Please:\n' +
-                '  1. Check your Cursor subscription\n' +
-                '  2. Wait a few minutes and try again\n\n' +
-                `Details: ${errorMsg}`;
-        }
-        // Check for model errors
-        if (errorMsg.includes('model')) {
-            errorMsg = `Model error (requested: ${model || 'default'}). ` +
-                'Please check if the model is available in your Cursor subscription.\n\n' +
-                `Details: ${errorMsg}`;
-        }
-        return {
-            ok: false,
-            exitCode: res.status ?? -1,
-            error: errorMsg,
-        };
-    }
-    return {
-        ok: !json.is_error,
-        exitCode: res.status ?? 0,
-        sessionId: json.session_id || chatId,
-        resultText: json.result || '',
-    };
+            });
+        }, 300000);
+        child.on('close', (code) => {
+            clearTimeout(timeout);
+            if (interventionWatcher)
+                interventionWatcher.close();
+            const json = parseJsonFromStdout(fullStdout);
+            if (code !== 0 || !json || json.type !== 'result') {
+                let errorMsg = fullStderr.trim() || fullStdout.trim() || `exit=${code}`;
+                // Check for common errors
+                if (errorMsg.includes('not authenticated') || errorMsg.includes('login') || errorMsg.includes('auth')) {
+                    errorMsg = 'Authentication error. Please sign in to Cursor IDE.';
+                }
+                else if (errorMsg.includes('rate limit') || errorMsg.includes('quota')) {
+                    errorMsg = 'API rate limit or quota exceeded.';
+                }
+                else if (errorMsg.includes('model')) {
+                    errorMsg = `Model error (requested: ${model || 'default'}). Check your subscription.`;
+                }
+                resolve({
+                    ok: false,
+                    exitCode: code ?? -1,
+                    error: errorMsg,
+                });
+            }
+            else {
+                resolve({
+                    ok: !json.is_error,
+                    exitCode: code ?? 0,
+                    sessionId: json.session_id || chatId,
+                    resultText: json.result || '',
+                });
+            }
+        });
+        child.on('error', (err) => {
+            clearTimeout(timeout);
+            resolve({
+                ok: false,
+                exitCode: -1,
+                error: `Failed to start cursor-agent: ${err.message}`,
+            });
+        });
+    });
 }
 /**
  * Extract dependency change request from agent response
@@ -293,11 +324,12 @@ async function runTask({ task, config, index, worktreeDir, taskBranch, chatId, r
         model,
     }));
     logger.info('Sending prompt to agent...');
-    const r1 = cursorAgentSend({
+    const r1 = await cursorAgentSend({
         workspaceDir: worktreeDir,
         chatId,
         prompt: prompt1,
         model,
+        signalDir: runDir
     });
     (0, state_1.appendLog)(convoPath, (0, state_1.createConversationEntry)('assistant', r1.resultText || r1.error || 'No response', {
         task: task.name,
@@ -332,7 +364,8 @@ async function runTask({ task, config, index, worktreeDir, taskBranch, chatId, r
 /**
  * Run all tasks in sequence
  */
-async function runTasks(config, runDir) {
+async function runTasks(tasksFile, config, runDir, options = {}) {
+    const startIndex = options.startIndex || 0;
     // Ensure cursor-agent is installed
     (0, cursor_agent_1.ensureCursorAgent)();
     // Check authentication before starting
@@ -353,37 +386,96 @@ async function runTasks(config, runDir) {
     }
     logger.success('✓ Cursor authentication OK');
     const repoRoot = git.getRepoRoot();
-    const pipelineBranch = config.pipelineBranch || `${config.branchPrefix || 'cursorflow/'}${Date.now().toString(36)}`;
-    const worktreeDir = path.join(repoRoot, config.worktreeRoot || '_cursorflow/worktrees', pipelineBranch);
-    logger.section('🚀 Starting Pipeline');
+    // Load existing state if resuming
+    const statePath = path.join(runDir, 'state.json');
+    let state = null;
+    if (startIndex > 0 && fs.existsSync(statePath)) {
+        state = JSON.parse(fs.readFileSync(statePath, 'utf8'));
+    }
+    const pipelineBranch = state?.pipelineBranch || config.pipelineBranch || `${config.branchPrefix || 'cursorflow/'}${Date.now().toString(36)}`;
+    const worktreeDir = state?.worktreeDir || path.join(repoRoot, config.worktreeRoot || '_cursorflow/worktrees', pipelineBranch);
+    if (startIndex === 0) {
+        logger.section('🚀 Starting Pipeline');
+    }
+    else {
+        logger.section(`🔁 Resuming Pipeline from task ${startIndex + 1}`);
+    }
     logger.info(`Pipeline Branch: ${pipelineBranch}`);
     logger.info(`Worktree: ${worktreeDir}`);
     logger.info(`Tasks: ${config.tasks.length}`);
-    // Create worktree
-    git.createWorktree(worktreeDir, pipelineBranch, {
-        baseBranch: config.baseBranch || 'main',
-        cwd: repoRoot,
-    });
+    // Create worktree only if starting fresh
+    if (startIndex === 0 || !fs.existsSync(worktreeDir)) {
+        git.createWorktree(worktreeDir, pipelineBranch, {
+            baseBranch: config.baseBranch || 'main',
+            cwd: repoRoot,
+        });
+    }
     // Create chat
     logger.info('Creating chat session...');
     const chatId = cursorAgentCreateChat();
-    // Save initial state
-    const state = {
-        status: 'running',
-        pipelineBranch,
-        worktreeDir,
-        totalTasks: config.tasks.length,
-        currentTaskIndex: 0,
-        label: pipelineBranch,
-        startTime: Date.now(),
-        endTime: null,
-        error: null,
-        dependencyRequest: null,
-    };
-    (0, state_1.saveState)(path.join(runDir, 'state.json'), state);
+    // Initialize state if not loaded
+    if (!state) {
+        state = {
+            status: 'running',
+            pipelineBranch,
+            worktreeDir,
+            totalTasks: config.tasks.length,
+            currentTaskIndex: 0,
+            label: pipelineBranch,
+            startTime: Date.now(),
+            endTime: null,
+            error: null,
+            dependencyRequest: null,
+            tasksFile, // Store tasks file for resume
+            dependsOn: config.dependsOn || [],
+        };
+    }
+    else {
+        state.status = 'running';
+        state.error = null;
+        state.dependencyRequest = null;
+        state.dependsOn = config.dependsOn || [];
+    }
+    (0, state_1.saveState)(statePath, state);
+    // Merge dependencies if any
+    if (startIndex === 0 && config.dependsOn && config.dependsOn.length > 0) {
+        logger.section('🔗 Merging Dependencies');
+        // The runDir for the lane is passed in. Dependencies are in ../<depName> relative to this runDir
+        const lanesRoot = path.dirname(runDir);
+        for (const depName of config.dependsOn) {
+            const depRunDir = path.join(lanesRoot, depName);
+            const depStatePath = path.join(depRunDir, 'state.json');
+            if (!fs.existsSync(depStatePath)) {
+                logger.warn(`Dependency state not found for ${depName} at ${depStatePath}`);
+                continue;
+            }
+            try {
+                const depState = JSON.parse(fs.readFileSync(depStatePath, 'utf8'));
+                if (depState.status !== 'completed') {
+                    logger.warn(`Dependency ${depName} is in status ${depState.status}, merge might be incomplete`);
+                }
+                if (depState.pipelineBranch) {
+                    logger.info(`Merging dependency branch: ${depState.pipelineBranch} (${depName})`);
+                    // Fetch first to ensure we have the branch
+                    git.runGit(['fetch', 'origin', depState.pipelineBranch], { cwd: worktreeDir, silent: true });
+                    // Merge
+                    git.merge(depState.pipelineBranch, {
+                        cwd: worktreeDir,
+                        noFf: true,
+                        message: `chore: merge dependency ${depName} (${depState.pipelineBranch})`
+                    });
+                }
+            }
+            catch (e) {
+                logger.error(`Failed to merge dependency ${depName}: ${e}`);
+            }
+        }
+        // Push the merged state
+        git.push(pipelineBranch, { cwd: worktreeDir });
+    }
     // Run tasks
     const results = [];
-    for (let i = 0; i < config.tasks.length; i++) {
+    for (let i = startIndex; i < config.tasks.length; i++) {
         const task = config.tasks[i];
         const taskBranch = `${pipelineBranch}--${String(i + 1).padStart(2, '0')}-${task.name}`;
         const result = await runTask({
@@ -399,19 +491,19 @@ async function runTasks(config, runDir) {
         results.push(result);
         // Update state
         state.currentTaskIndex = i + 1;
-        (0, state_1.saveState)(path.join(runDir, 'state.json'), state);
+        (0, state_1.saveState)(statePath, state);
         // Handle blocked or error
         if (result.status === 'BLOCKED_DEPENDENCY') {
-            state.status = 'failed'; // Or blocked if we had a blocked status in LaneState
+            state.status = 'failed';
             state.dependencyRequest = result.dependencyRequest || null;
-            (0, state_1.saveState)(path.join(runDir, 'state.json'), state);
+            (0, state_1.saveState)(statePath, state);
             logger.warn('Task blocked on dependency change');
             process.exit(2);
         }
         if (result.status !== 'FINISHED') {
             state.status = 'failed';
             state.error = result.error || 'Unknown error';
-            (0, state_1.saveState)(path.join(runDir, 'state.json'), state);
+            (0, state_1.saveState)(statePath, state);
             logger.error(`Task failed: ${result.error}`);
             process.exit(1);
         }
@@ -423,7 +515,7 @@ async function runTasks(config, runDir) {
     // Complete
     state.status = 'completed';
     state.endTime = Date.now();
-    (0, state_1.saveState)(path.join(runDir, 'state.json'), state);
+    (0, state_1.saveState)(statePath, state);
     logger.success('All tasks completed!');
     return results;
 }
@@ -438,8 +530,10 @@ if (require.main === module) {
     }
     const tasksFile = args[0];
     const runDirIdx = args.indexOf('--run-dir');
+    const startIdxIdx = args.indexOf('--start-index');
     // const executorIdx = args.indexOf('--executor');
     const runDir = runDirIdx >= 0 ? args[runDirIdx + 1] : '.';
+    const startIndex = startIdxIdx >= 0 ? parseInt(args[startIdxIdx + 1] || '0') : 0;
     // const executor = executorIdx >= 0 ? args[executorIdx + 1] : 'cursor-agent';
     if (!fs.existsSync(tasksFile)) {
         console.error(`Tasks file not found: ${tasksFile}`);
@@ -460,7 +554,7 @@ if (require.main === module) {
         lockfileReadOnly: true,
     };
     // Run tasks
-    runTasks(config, runDir)
+    runTasks(tasksFile, config, runDir, { startIndex })
         .then(() => {
         process.exit(0);
     })