@litmers/cursorflow-orchestrator 0.1.3 → 0.1.6

package/src/core/{runner.js → runner.ts}

@@ -1,31 +1,43 @@
-#!/usr/bin/env node
 /**
  * Core Runner - Execute tasks sequentially in a lane
  * 
  * Adapted from sequential-agent-runner.js
  */
 
-const fs = require('fs');
-const path = require('path');
-const { spawn } = require('child_process');
+import * as fs from 'fs';
+import * as path from 'path';
+import { execSync, spawnSync } from 'child_process';
 
-const git = require('../utils/git');
-const logger = require('../utils/logger');
-const { ensureCursorAgent, checkCursorApiKey } = require('../utils/cursor-agent');
-const { saveState, loadState, appendLog, createConversationEntry, createGitLogEntry } = require('../utils/state');
+import * as git from '../utils/git';
+import * as logger from '../utils/logger';
+import { ensureCursorAgent, checkCursorAuth, printAuthHelp } from '../utils/cursor-agent';
+import { saveState, appendLog, createConversationEntry } from '../utils/state';
+import { 
+  RunnerConfig, 
+  Task, 
+  TaskExecutionResult, 
+  AgentSendResult, 
+  DependencyPolicy, 
+  DependencyRequestPlan,
+  LaneState
+} from '../utils/types';
 
 /**
  * Execute cursor-agent command with timeout and better error handling
  */
-function cursorAgentCreateChat() {
-  const { execSync } = require('child_process');
-  
+export function cursorAgentCreateChat(): string {
   try {
-    const out = execSync('cursor-agent create-chat', {
+    const res = spawnSync('cursor-agent', ['create-chat'], {
       encoding: 'utf8',
       stdio: 'pipe',
       timeout: 30000, // 30 second timeout
     });
+    
+    if (res.error || res.status !== 0) {
+      throw res.error || new Error(res.stderr || 'Failed to create chat');
+    }
+
+    const out = res.stdout;
     const lines = out.split('\n').filter(Boolean);
     const chatId = lines[lines.length - 1] || null;
     
@@ -35,7 +47,7 @@ function cursorAgentCreateChat() {
     
     logger.info(`Created chat session: ${chatId}`);
     return chatId;
-  } catch (error) {
+  } catch (error: any) {
     // Check for common errors
     if (error.message.includes('ENOENT')) {
       throw new Error('cursor-agent CLI not found. Install with: npm install -g @cursor/agent');
@@ -77,14 +89,14 @@ function cursorAgentCreateChat() {
   }
 }
 
-function parseJsonFromStdout(stdout) {
+function parseJsonFromStdout(stdout: string): any {
   const text = String(stdout || '').trim();
   if (!text) return null;
   const lines = text.split('\n').filter(Boolean);
   
   for (let i = lines.length - 1; i >= 0; i--) {
-    const line = lines[i].trim();
-    if (line.startsWith('{') && line.endsWith('}')) {
+    const line = lines[i]?.trim();
+    if (line?.startsWith('{') && line?.endsWith('}')) {
       try {
         return JSON.parse(line);
       } catch {
@@ -95,9 +107,12 @@ function parseJsonFromStdout(stdout) {
   return null;
 }
 
-function cursorAgentSend({ workspaceDir, chatId, prompt, model }) {
-  const { spawnSync } = require('child_process');
-  
+export function cursorAgentSend({ workspaceDir, chatId, prompt, model }: { 
+  workspaceDir: string; 
+  chatId: string; 
+  prompt: string; 
+  model?: string; 
+}): AgentSendResult {
   const args = [
     '--print',
     '--output-format', 'json',
@@ -117,7 +132,7 @@ function cursorAgentSend({ workspaceDir, chatId, prompt, model }) {
   
   // Check for timeout
   if (res.error) {
-    if (res.error.code === 'ETIMEDOUT') {
+    if ((res.error as any).code === 'ETIMEDOUT') {
       return {
         ok: false,
         exitCode: -1,
@@ -166,14 +181,14 @@ function cursorAgentSend({ workspaceDir, chatId, prompt, model }) {
     
     return {
       ok: false,
-      exitCode: res.status,
+      exitCode: res.status ?? -1,
       error: errorMsg,
     };
   }
   
   return {
     ok: !json.is_error,
-    exitCode: res.status,
+    exitCode: res.status ?? 0,
     sessionId: json.session_id || chatId,
     resultText: json.result || '',
   };
@@ -182,12 +197,12 @@ function cursorAgentSend({ workspaceDir, chatId, prompt, model }) {
 /**
  * Extract dependency change request from agent response
  */
-function extractDependencyRequest(text) {
+export function extractDependencyRequest(text: string): { required: boolean; plan?: DependencyRequestPlan; raw: string } {
   const t = String(text || '');
   const marker = 'DEPENDENCY_CHANGE_REQUIRED';
   
   if (!t.includes(marker)) {
-    return { required: false };
+    return { required: false, raw: t };
   }
   
   const after = t.split(marker).slice(1).join(marker);
@@ -197,7 +212,7 @@ function extractDependencyRequest(text) {
     try {
       return {
         required: true,
-        plan: JSON.parse(match[0]),
+        plan: JSON.parse(match[0]!) as DependencyRequestPlan,
         raw: t,
       };
     } catch {
@@ -211,7 +226,7 @@ function extractDependencyRequest(text) {
 /**
  * Wrap prompt with dependency policy
  */
-function wrapPromptForDependencyPolicy(prompt, policy) {
+export function wrapPromptForDependencyPolicy(prompt: string, policy: DependencyPolicy): string {
   if (policy.allowDependencyChange && !policy.lockfileReadOnly) {
     return prompt;
   }
@@ -243,8 +258,8 @@ ${prompt}`;
 /**
  * Apply file permissions based on dependency policy
  */
-function applyDependencyFilePermissions(worktreeDir, policy) {
-  const targets = [];
+export function applyDependencyFilePermissions(worktreeDir: string, policy: DependencyPolicy): void {
+  const targets: string[] = [];
   
   if (!policy.allowDependencyChange) {
     targets.push('package.json');
@@ -271,16 +286,24 @@ function applyDependencyFilePermissions(worktreeDir, policy) {
 /**
  * Run a single task
  */
-async function runTask({
+export async function runTask({
   task,
   config,
   index,
   worktreeDir,
-  pipelineBranch,
   taskBranch,
   chatId,
   runDir,
-}) {
+}: {
+  task: Task;
+  config: RunnerConfig;
+  index: number;
+  worktreeDir: string;
+  pipelineBranch: string;
+  taskBranch: string;
+  chatId: string;
+  runDir: string;
+}): Promise<TaskExecutionResult> {
   const model = task.model || config.model || 'sonnet-4.5';
   const convoPath = path.join(runDir, 'conversation.jsonl');
   
@@ -310,7 +333,7 @@ async function runTask({
     model,
   });
   
-  appendLog(convoPath, createConversationEntry('assistant', r1.resultText || r1.error, {
+  appendLog(convoPath, createConversationEntry('assistant', r1.resultText || r1.error || 'No response', {
     task: task.name,
     model,
   }));
@@ -325,7 +348,7 @@ async function runTask({
   }
   
   // Check for dependency request
-  const depReq = extractDependencyRequest(r1.resultText);
+  const depReq = extractDependencyRequest(r1.resultText || '');
   if (depReq.required && !config.dependencyPolicy.allowDependencyChange) {
     return {
       taskName: task.name,
@@ -348,8 +371,8 @@ async function runTask({
 /**
  * Run all tasks in sequence
  */
-async function runTasks(config, runDir) {
-  const { checkCursorAuth, printAuthHelp } = require('../utils/cursor-agent');
+export async function runTasks(tasksFile: string, config: RunnerConfig, runDir: string, options: { startIndex?: number } = {}): Promise<TaskExecutionResult[]> {
+  const startIndex = options.startIndex || 0;
   
   // Ensure cursor-agent is installed
   ensureCursorAgent();
@@ -379,41 +402,68 @@ async function runTasks(config, runDir) {
   logger.success('✓ Cursor authentication OK');
   
   const repoRoot = git.getRepoRoot();
-  const pipelineBranch = config.pipelineBranch || `${config.branchPrefix}${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: LaneState | null = 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,
-    chatId,
-    totalTasks: config.tasks.length,
-    currentTaskIndex: 0,
-  };
+  // 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
+    };
+  } else {
+    state.status = 'running';
+    state.error = null;
+    state.dependencyRequest = null;
+  }
   
-  saveState(path.join(runDir, 'state.json'), state);
+  saveState(statePath, state);
   
   // Run tasks
-  const results = [];
+  const results: TaskExecutionResult[] = [];
   
-  for (let i = 0; i < config.tasks.length; i++) {
-    const task = config.tasks[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({
@@ -431,20 +481,21 @@ async function runTasks(config, runDir) {
     
     // Update state
     state.currentTaskIndex = i + 1;
-    saveState(path.join(runDir, 'state.json'), state);
+    saveState(statePath, state);
     
     // Handle blocked or error
     if (result.status === 'BLOCKED_DEPENDENCY') {
-      state.status = 'blocked_dependency';
-      state.dependencyRequest = result.dependencyRequest;
-      saveState(path.join(runDir, 'state.json'), state);
+      state.status = 'failed';
+      state.dependencyRequest = result.dependencyRequest || null;
+      saveState(statePath, state);
       logger.warn('Task blocked on dependency change');
       process.exit(2);
     }
     
     if (result.status !== 'FINISHED') {
       state.status = 'failed';
-      saveState(path.join(runDir, 'state.json'), state);
+      state.error = result.error || 'Unknown error';
+      saveState(statePath, state);
       logger.error(`Task failed: ${result.error}`);
       process.exit(1);
     }
@@ -457,17 +508,13 @@ async function runTasks(config, runDir) {
   
   // Complete
   state.status = 'completed';
-  saveState(path.join(runDir, 'state.json'), state);
+  state.endTime = Date.now();
+  saveState(statePath, state);
   
   logger.success('All tasks completed!');
   return results;
 }
 
-module.exports = {
-  runTasks,
-  runTask,
-};
-
 /**
  * CLI entry point
  */
@@ -479,12 +526,14 @@ if (require.main === module) {
     process.exit(1);
   }
   
-  const tasksFile = args[0];
+  const tasksFile = args[0]!;
   const runDirIdx = args.indexOf('--run-dir');
-  const executorIdx = args.indexOf('--executor');
+  const startIdxIdx = args.indexOf('--start-index');
+  // const executorIdx = args.indexOf('--executor');
   
-  const runDir = runDirIdx >= 0 ? args[runDirIdx + 1] : '.';
-  const executor = executorIdx >= 0 ? args[executorIdx + 1] : 'cursor-agent';
+  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}`);
@@ -492,10 +541,10 @@ if (require.main === module) {
   }
   
   // Load tasks configuration
-  let config;
+  let config: RunnerConfig;
   try {
-    config = JSON.parse(fs.readFileSync(tasksFile, 'utf8'));
-  } catch (error) {
+    config = JSON.parse(fs.readFileSync(tasksFile, 'utf8')) as RunnerConfig;
+  } catch (error: any) {
     console.error(`Failed to load tasks file: ${error.message}`);
     process.exit(1);
   }
@@ -507,13 +556,13 @@ if (require.main === module) {
   };
   
   // Run tasks
-  runTasks(config, runDir)
+  runTasks(tasksFile, config, runDir, { startIndex })
     .then(() => {
       process.exit(0);
     })
     .catch(error => {
       console.error(`Runner failed: ${error.message}`);
-      if (process.env.DEBUG) {
+      if (process.env['DEBUG']) {
         console.error(error.stack);
       }
       process.exit(1);

package/src/utils/{config.js → config.ts}

@@ -1,17 +1,18 @@
-#!/usr/bin/env node
 /**
  * Configuration loader for CursorFlow
  * 
  * Finds project root and loads user configuration with defaults
  */
 
-const path = require('path');
-const fs = require('fs');
+import * as path from 'path';
+import * as fs from 'fs';
+import { CursorFlowConfig } from './types';
+export { CursorFlowConfig };
 
 /**
  * Find project root by looking for package.json
  */
-function findProjectRoot(cwd = process.cwd()) {
+export function findProjectRoot(cwd = process.cwd()): string {
   let current = cwd;
   
   while (current !== path.parse(current).root) {
@@ -28,7 +29,7 @@ function findProjectRoot(cwd = process.cwd()) {
 /**
  * Load configuration with defaults
  */
-function loadConfig(projectRoot = null) {
+export function loadConfig(projectRoot: string | null = null): CursorFlowConfig {
   if (!projectRoot) {
     projectRoot = findProjectRoot();
   }
@@ -36,7 +37,7 @@ function loadConfig(projectRoot = null) {
   const configPath = path.join(projectRoot, 'cursorflow.config.js');
   
   // Default configuration
-  const defaults = {
+  const defaults: CursorFlowConfig = {
     // Directories
     tasksDir: '_cursorflow/tasks',
     logsDir: '_cursorflow/logs',
@@ -46,8 +47,8 @@ function loadConfig(projectRoot = null) {
     branchPrefix: 'feature/',
     
     // Execution
-    executor: 'cursor-agent',  // 'cursor-agent' | 'cloud'
-    pollInterval: 60,          // seconds
+    executor: 'cursor-agent',
+    pollInterval: 60,
     
     // Dependencies
     allowDependencyChange: false,
@@ -60,12 +61,12 @@ function loadConfig(projectRoot = null) {
     
     // Lane defaults
     defaultLaneConfig: {
-      devPort: 3001,           // 3000 + laneNumber
+      devPort: 3001,
       autoCreatePr: false,
     },
     
     // Logging
-    logLevel: 'info',          // 'error' | 'warn' | 'info' | 'debug'
+    logLevel: 'info',
     verboseGit: false,
     
     // Advanced
@@ -81,7 +82,7 @@ function loadConfig(projectRoot = null) {
     try {
       const userConfig = require(configPath);
       return { ...defaults, ...userConfig, projectRoot };
-    } catch (error) {
+    } catch (error: any) {
       console.warn(`Warning: Failed to load config from ${configPath}: ${error.message}`);
       console.warn('Using default configuration...');
     }
@@ -93,22 +94,22 @@ function loadConfig(projectRoot = null) {
 /**
  * Get absolute path for tasks directory
  */
-function getTasksDir(config) {
+export function getTasksDir(config: CursorFlowConfig): string {
   return path.join(config.projectRoot, config.tasksDir);
 }
 
 /**
  * Get absolute path for logs directory
  */
-function getLogsDir(config) {
+export function getLogsDir(config: CursorFlowConfig): string {
   return path.join(config.projectRoot, config.logsDir);
 }
 
 /**
  * Validate configuration
  */
-function validateConfig(config) {
-  const errors = [];
+export function validateConfig(config: CursorFlowConfig): boolean {
+  const errors: string[] = [];
   
   if (!config.tasksDir) {
     errors.push('tasksDir is required');
@@ -136,7 +137,7 @@ function validateConfig(config) {
 /**
  * Create default config file
  */
-function createDefaultConfig(projectRoot, force = false) {
+export function createDefaultConfig(projectRoot: string, force = false): string {
   const configPath = path.join(projectRoot, 'cursorflow.config.js');
   
   if (fs.existsSync(configPath) && !force) {
@@ -184,12 +185,3 @@ function createDefaultConfig(projectRoot, force = false) {
   fs.writeFileSync(configPath, template, 'utf8');
   return configPath;
 }
-
-module.exports = {
-  findProjectRoot,
-  loadConfig,
-  getTasksDir,
-  getLogsDir,
-  validateConfig,
-  createDefaultConfig,
-};