@litmers/cursorflow-orchestrator 0.1.31 → 0.1.34

package/src/utils/git.ts

@@ -6,6 +6,16 @@ import { execSync, spawnSync } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 import { safeJoin } from './path';
+import * as logger from './logger';
+
+let verboseGitEnabled = true;
+
+/**
+ * Enable or disable verbose git logging
+ */
+export function setVerboseGit(enabled: boolean): void {
+  verboseGitEnabled = enabled;
+}
 
 /**
  * Acquire a file-based lock for Git operations
@@ -132,8 +142,11 @@ function filterGitStderr(stderr: string): string {
 export function runGit(args: string[], options: GitRunOptions = {}): string {
   const { cwd, silent = false } = options;
   
-  if (process.env['DEBUG_GIT']) {
-    console.log(`[DEBUG_GIT] Running: git ${args.join(' ')} (cwd: ${cwd || process.cwd()})`);
+  if (verboseGitEnabled || process.env['DEBUG_GIT']) {
+    logger.debug(`Running: git ${args.join(' ')}`, { context: 'git', emoji: '🛠️' });
+    if (cwd) {
+      logger.debug(`  cwd: ${cwd}`, { context: 'git' });
+    }
   }
   
   try {
@@ -182,8 +195,11 @@ export function runGit(args: string[], options: GitRunOptions = {}): string {
 export function runGitResult(args: string[], options: GitRunOptions = {}): GitResult {
   const { cwd } = options;
   
-  if (process.env['DEBUG_GIT']) {
-    console.log(`[DEBUG_GIT] Running: git ${args.join(' ')} (result mode, cwd: ${cwd || process.cwd()})`);
+  if (verboseGitEnabled || process.env['DEBUG_GIT']) {
+    logger.debug(`Running: git ${args.join(' ')} (result mode)`, { context: 'git', emoji: '🛠️' });
+    if (cwd) {
+      logger.debug(`  cwd: ${cwd}`, { context: 'git' });
+    }
   }
 
   const result = spawnSync('git', args, {
@@ -267,7 +283,8 @@ export function createWorktree(worktreePath: string, branchName: string, options
   }
 
   // Ensure baseBranch is unambiguous (branch name rather than tag)
-  const unambiguousBase = (baseBranch.startsWith('refs/') || baseBranch.includes('/')) 
+  // Special case: HEAD should not be prefixed with refs/heads/
+  const unambiguousBase = (baseBranch === 'HEAD' || baseBranch.startsWith('refs/') || baseBranch.includes('/')) 
     ? baseBranch 
     : `refs/heads/${baseBranch}`;
 
@@ -588,6 +605,129 @@ export interface SafeMergeResult {
   aborted: boolean;
 }
 
+/**
+ * Check if merging a branch would cause conflicts (dry-run)
+ * This does NOT actually perform the merge - it only checks for potential conflicts
+ */
+export function checkMergeConflict(branchName: string, options: { cwd?: string } = {}): {
+  willConflict: boolean;
+  conflictingFiles: string[];
+  error?: string;
+} {
+  const { cwd } = options;
+  
+  // Use merge-tree to check for conflicts without actually merging
+  // First, get the merge base
+  const mergeBaseResult = runGitResult(['merge-base', 'HEAD', branchName], { cwd });
+  if (!mergeBaseResult.success) {
+    return { willConflict: false, conflictingFiles: [], error: `Cannot find merge base: ${mergeBaseResult.stderr}` };
+  }
+  
+  const mergeBase = mergeBaseResult.stdout.trim();
+  
+  // Use merge-tree to simulate the merge
+  const mergeTreeResult = runGitResult(['merge-tree', mergeBase, 'HEAD', branchName], { cwd });
+  
+  // Check for conflict markers in the output
+  const output = mergeTreeResult.stdout;
+  const hasConflict = output.includes('<<<<<<<') || output.includes('>>>>>>>') || output.includes('=======');
+  
+  if (hasConflict) {
+    // Extract conflicting file names from merge-tree output
+    const conflictingFiles: string[] = [];
+    const lines = output.split('\n');
+    let currentFile = '';
+    
+    for (const line of lines) {
+      // merge-tree output format includes file paths
+      if (line.startsWith('changed in both')) {
+        const match = line.match(/changed in both\s+(.+)/);
+        if (match) {
+          conflictingFiles.push(match[1]!.trim());
+        }
+      } else if (line.match(/^[a-f0-9]+ [a-f0-9]+ [a-f0-9]+\t(.+)$/)) {
+        const match = line.match(/\t(.+)$/);
+        if (match) {
+          currentFile = match[1]!;
+        }
+      } else if (line.includes('<<<<<<<') && currentFile) {
+        if (!conflictingFiles.includes(currentFile)) {
+          conflictingFiles.push(currentFile);
+        }
+      }
+    }
+    
+    return { willConflict: true, conflictingFiles };
+  }
+  
+  return { willConflict: false, conflictingFiles: [] };
+}
+
+/**
+ * Sync local branch with remote before starting work
+ * Fetches the latest from remote and fast-forwards if possible
+ */
+export function syncBranchWithRemote(branchName: string, options: { 
+  cwd?: string;
+  createIfMissing?: boolean;
+} = {}): { 
+  success: boolean; 
+  updated: boolean;
+  error?: string;
+  ahead?: number;
+  behind?: number;
+} {
+  const { cwd, createIfMissing = false } = options;
+  
+  // Fetch the branch from origin
+  const fetchResult = runGitResult(['fetch', 'origin', branchName], { cwd });
+  
+  if (!fetchResult.success) {
+    // Branch might not exist on remote yet
+    if (createIfMissing || fetchResult.stderr.includes("couldn't find remote ref")) {
+      return { success: true, updated: false };
+    }
+    return { success: false, updated: false, error: fetchResult.stderr };
+  }
+  
+  // Check if we're ahead/behind
+  const statusResult = runGitResult(['rev-list', '--left-right', '--count', `${branchName}...origin/${branchName}`], { cwd });
+  
+  if (!statusResult.success) {
+    // Remote tracking branch might not exist
+    return { success: true, updated: false };
+  }
+  
+  const [aheadStr, behindStr] = statusResult.stdout.trim().split(/\s+/);
+  const ahead = parseInt(aheadStr || '0');
+  const behind = parseInt(behindStr || '0');
+  
+  if (behind === 0) {
+    // Already up to date or ahead
+    return { success: true, updated: false, ahead, behind };
+  }
+  
+  if (ahead > 0 && behind > 0) {
+    // Diverged - cannot fast-forward
+    return { 
+      success: false, 
+      updated: false, 
+      ahead, 
+      behind,
+      error: `Branch has diverged: ${ahead} commits ahead, ${behind} commits behind. Manual resolution required.`
+    };
+  }
+  
+  // Can fast-forward
+  const mergeResult = runGitResult(['merge', '--ff-only', `origin/${branchName}`], { cwd });
+  
+  if (mergeResult.success) {
+    return { success: true, updated: true, ahead: 0, behind: 0 };
+  }
+  
+  return { success: false, updated: false, error: mergeResult.stderr };
+}
+
 /**
  * Safely merge a branch with conflict detection and auto-abort
  */

package/src/utils/state.ts

@@ -333,7 +333,6 @@ export function repairLaneState(statePath: string): LaneState | null {
     error: null,
     dependencyRequest: null,
     tasksFile: state.tasksFile,
-    dependsOn: state.dependsOn || [],
     completedTasks: state.completedTasks || [],
     updatedAt: Date.now(),
   };
@@ -465,7 +464,6 @@ export function createLaneState(
     error: null,
     dependencyRequest: null,
     tasksFile,
-    dependsOn: config.dependsOn || [],
   };
 }
 

package/src/utils/task-service.ts

@@ -106,7 +106,6 @@ export class TaskService {
         
         const laneName = this.extractLaneName(fileName);
         const tasks = content.tasks || [];
-        const dependsOn = content.dependsOn || [];
         const preset = this.detectPreset(tasks);
         const taskFlow = this.generateTaskFlow(tasks);
 
@@ -116,7 +115,6 @@ export class TaskService {
           preset,
           taskCount: tasks.length,
           taskFlow,
-          dependsOn,
         });
       } catch (error) {
         logger.debug(`Failed to parse lane file ${fileName}: ${error}`);
@@ -224,16 +222,6 @@ export class TaskService {
         errors.push(`Lane ${lane.fileName} has no tasks defined`);
       }
 
-      // Check dependencies exist
-      for (const dep of lane.dependsOn) {
-        const depExists = taskInfo.lanes.some(l => 
-          l.laneName === dep || l.fileName === dep || l.fileName === `${dep}.json`
-        );
-        if (!depExists) {
-          warnings.push(`Lane ${lane.fileName} depends on unknown lane: ${dep}`);
-        }
-      }
-
       // Validate lane file structure
       try {
         const filePath = path.join(taskInfo.path, lane.fileName);
@@ -259,10 +247,10 @@ export class TaskService {
       }
     }
 
-    // Check for circular dependencies
-    const circularDeps = this.detectCircularDependencies(taskInfo.lanes);
+    // Check for circular task-level dependencies
+    const circularDeps = this.detectTaskCircularDependencies(taskInfo);
     if (circularDeps.length > 0) {
-      errors.push(`Circular dependencies detected: ${circularDeps.join(' -> ')}`);
+      errors.push(`Circular task dependencies detected: ${circularDeps.join(' -> ')}`);
     }
 
     // Determine overall status
@@ -289,45 +277,65 @@ export class TaskService {
   }
 
   /**
-   * Detect circular dependencies in lane dependency graph
+   * Detect circular dependencies in task-level dependency graph
    */
-  private detectCircularDependencies(lanes: LaneFileInfo[]): string[] {
+  private detectTaskCircularDependencies(taskInfo: TaskDirInfo): string[] {
+    // Build task graph from all lane files
+    const taskGraph = new Map<string, string[]>(); // taskId -> dependencies
+    
+    for (const lane of taskInfo.lanes) {
+      try {
+        const filePath = path.join(taskInfo.path, lane.fileName);
+        const content = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+        const laneName = lane.fileName.replace('.json', '');
+        
+        if (Array.isArray(content.tasks)) {
+          for (const task of content.tasks) {
+            const taskId = `${laneName}:${task.name}`;
+            const deps = task.dependsOn || [];
+            taskGraph.set(taskId, deps);
+          }
+        }
+      } catch {
+        // Skip invalid files
+      }
+    }
+    
+    // DFS to detect cycles
     const visited = new Set<string>();
     const stack = new Set<string>();
     const cycle: string[] = [];
-
-    const dfs = (laneName: string): boolean => {
-      if (stack.has(laneName)) {
-        cycle.push(laneName);
-        return true; // Cycle found
+    
+    const dfs = (taskId: string): boolean => {
+      if (stack.has(taskId)) {
+        cycle.push(taskId);
+        return true;
       }
-      if (visited.has(laneName)) {
+      if (visited.has(taskId)) {
         return false;
       }
-
-      visited.add(laneName);
-      stack.add(laneName);
-
-      const lane = lanes.find(l => l.laneName === laneName);
-      if (lane) {
-        for (const dep of lane.dependsOn) {
-          if (dfs(dep)) {
-            cycle.unshift(laneName);
-            return true;
-          }
+      
+      visited.add(taskId);
+      stack.add(taskId);
+      
+      const deps = taskGraph.get(taskId) || [];
+      for (const dep of deps) {
+        if (dfs(dep)) {
+          cycle.unshift(taskId);
+          return true;
         }
       }
-
-      stack.delete(laneName);
+      
+      stack.delete(taskId);
       return false;
     };
-
-    for (const lane of lanes) {
-      if (dfs(lane.laneName)) {
+    
+    for (const taskId of taskGraph.keys()) {
+      if (dfs(taskId)) {
         break;
       }
     }
-
+    
     return cycle;
   }
 

package/commands/cursorflow-review.md

@@ -1,56 +0,0 @@
-# CursorFlow Automatic Review
-
-## Overview
-CursorFlow features an integrated AI-powered code review system. It automatically validates task results against your defined acceptance criteria and can provide feedback to the agent for iterative improvements.
-
-## Configuration
-
-### Project-wide Settings
-Enable and configure the review process in your `cursorflow.config.js`:
-
-```javascript
-module.exports = {
-  enableReview: true,               // Enable automatic reviews
-  reviewModel: 'sonnet-4.5-thinking', // Model to use for reviewing
-  maxReviewIterations: 3,           // Number of fix/re-review cycles
-  // ...
-};
-```
-
-### Task-level Criteria
-Add `acceptanceCriteria` to your task JSON to guide the reviewer:
-
-```json
-{
-  "tasks": [
-    {
-      "name": "implement-logic",
-      "acceptanceCriteria": [
-        "No build errors",
-        "Tests in src/tests/ pass",
-        "Code follows project style guide"
-      ],
-      "prompt": "..."
-    }
-  ]
-}
-```
-
-## The Review Process
-
-1. **Completion**: When an agent finishes a task, CursorFlow spawns a reviewer agent.
-2. **Analysis**: The reviewer checks the worktree against the `acceptanceCriteria` using the `reviewModel`.
-3. **Verdict**:
-   - **Approved**: The lane proceeds to the next task.
-   - **Needs Changes**: The reviewer's feedback is sent back to the original agent.
-4. **Fix Loop**: The agent attempts to fix the issues based on the feedback. This repeats up to `maxReviewIterations`.
-
-## Monitoring Reviews
-You can track the review process in real-time using `cursorflow monitor`.
-- The lane status will change to **`reviewing`** (`👀`).
-- Reviewer feedback appears in the conversation history as a **`REVIEWER`** message.
-
-## Best Practices
-- **Specific Criteria**: Use clear, measurable criteria (e.g., "Build succeeds with `npm run build`").
-- **Thinking Models**: Use reasoning-heavy models like `sonnet-4.5-thinking` for reviews to get better results.
-- **Reasonable Iterations**: Set `maxReviewIterations` to 2 or 3 to prevent infinite loops.

package/commands/cursorflow-runs.md

@@ -1,59 +0,0 @@
-# CursorFlow Runs
-
-## Overview
-List and view detailed information about CursorFlow runs.
-
-## Usage
-
-```bash
-cursorflow runs [run-id] [options]
-```
-
-## Options
-
-| Option | Description |
-|--------|-------------|
-| `[run-id]` | View details of a specific run |
-| `--running` | Filter to show only running runs |
-| `--status <status>` | Filter by status: `running`, `completed`, `failed`, `partial`, `pending` |
-| `--json` | Output in JSON format |
-| `--help`, `-h` | Show help |
-
-## Examples
-
-### List all runs
-```bash
-cursorflow runs
-```
-
-### List only running runs
-```bash
-cursorflow runs --running
-```
-
-### View details of a specific run
-```bash
-cursorflow runs run-1734873132
-```
-
-### Export runs to JSON
-```bash
-cursorflow runs --json > runs.json
-```
-
-## Output Format
-
-### List View
-```
-    Run ID              Task            Status     Lanes     Duration
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-  ▶ run-20251222-153012 AuthSystem      🔄 running  2/3       15m 23s
-    run-20251222-143052 UserProfile     ✅ done     3/3       45m 12s
-```
-
-### Detail View
-The detail view includes:
-- Task name and overall status
-- Start time and duration
-- Individual lane statuses and PIDs
-- Associated Git branches and worktrees

package/dist/cli/runs.d.ts

@@ -1,5 +0,0 @@
-/**
- * CursorFlow runs command - List and view run details
- */
-declare function runs(args: string[]): Promise<void>;
-export = runs;

package/dist/cli/runs.js

@@ -1,214 +0,0 @@
-"use strict";
-/**
- * CursorFlow runs command - List and view run details
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-const fs = __importStar(require("fs"));
-const logger = __importStar(require("../utils/logger"));
-const config_1 = require("../utils/config");
-const run_service_1 = require("../utils/run-service");
-const path_1 = require("../utils/path");
-function printHelp() {
-    console.log(`
-Usage: cursorflow runs [run-id] [options]
-
-List all runs or view details of a specific run.
-
-Options:
-  [run-id]               View details of a specific run
-  --running              Filter to show only running runs
-  --status <status>      Filter by status: running, completed, failed, partial, pending
-  --json                 Output in JSON format
-  --help, -h             Show help
-
-Examples:
-  cursorflow runs              # List all runs
-  cursorflow runs --running    # List only running runs
-  cursorflow runs run-123      # View details of run-123
-  `);
-}
-function parseArgs(args) {
-    const statusIdx = args.indexOf('--status');
-    const running = args.includes('--running');
-    // Find run ID (first non-option argument)
-    const runId = args.find((arg, i) => {
-        if (arg.startsWith('--') || arg.startsWith('-'))
-            return false;
-        // Skip values for options
-        const prevArg = args[i - 1];
-        if (prevArg && ['--status'].includes(prevArg)) {
-            return false;
-        }
-        return true;
-    });
-    return {
-        runId,
-        status: running ? 'running' : (statusIdx >= 0 ? args[statusIdx + 1] : undefined),
-        json: args.includes('--json'),
-        help: args.includes('--help') || args.includes('-h'),
-    };
-}
-/**
- * Format duration in a human-readable way
- */
-function formatDuration(ms) {
-    if (ms < 1000)
-        return `${ms}ms`;
-    const seconds = Math.floor(ms / 1000);
-    if (seconds < 60)
-        return `${seconds}s`;
-    const minutes = Math.floor(seconds / 60);
-    const remainingSeconds = seconds % 60;
-    if (minutes < 60)
-        return `${minutes}m ${remainingSeconds}s`;
-    const hours = Math.floor(minutes / 60);
-    const remainingMinutes = minutes % 60;
-    return `${hours}h ${remainingMinutes}m`;
-}
-/**
- * Get status color and emoji
- */
-function getStatusDisplay(status) {
-    switch (status) {
-        case 'running':
-            return `${logger.COLORS.blue}🔄 running${logger.COLORS.reset}`;
-        case 'completed':
-            return `${logger.COLORS.green}✅ done   ${logger.COLORS.reset}`;
-        case 'failed':
-            return `${logger.COLORS.red}❌ failed ${logger.COLORS.reset}`;
-        case 'partial':
-            return `${logger.COLORS.yellow}⚠️ partial${logger.COLORS.reset}`;
-        case 'pending':
-            return `${logger.COLORS.gray}⏳ pending${logger.COLORS.reset}`;
-        default:
-            return status;
-    }
-}
-/**
- * Display list of runs
- */
-function displayRunList(runs) {
-    if (runs.length === 0) {
-        console.log('No runs found.');
-        return;
-    }
-    console.log(`    Run ID              Task            Status     Lanes     Duration`);
-    console.log(`${logger.COLORS.cyan}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${logger.COLORS.reset}`);
-    for (const run of runs) {
-        const isRunning = run.status === 'running';
-        const prefix = isRunning ? `${logger.COLORS.blue}  ▶${logger.COLORS.reset}` : '   ';
-        const id = run.id.padEnd(20);
-        const task = (run.taskName || 'unnamed').substring(0, 15).padEnd(15);
-        const status = getStatusDisplay(run.status);
-        const completedLanes = run.lanes.filter(l => l.status === 'completed').length;
-        const totalLanes = run.lanes.length;
-        const lanes = `${completedLanes}/${totalLanes}`.padEnd(10);
-        const duration = formatDuration(run.duration);
-        console.log(`${prefix} ${id} ${task} ${status} ${lanes} ${duration}`);
-    }
-}
-/**
- * Display detailed information for a single run
- */
-function displayRunDetail(run) {
-    logger.section(`Run Details: ${run.id}`);
-    console.log(`${logger.COLORS.bold}Task:${logger.COLORS.reset}      ${run.taskName}`);
-    console.log(`${logger.COLORS.bold}Status:${logger.COLORS.reset}    ${getStatusDisplay(run.status)}`);
-    console.log(`${logger.COLORS.bold}Start Time:${logger.COLORS.reset} ${new Date(run.startTime).toLocaleString()}`);
-    console.log(`${logger.COLORS.bold}Duration:${logger.COLORS.reset}   ${formatDuration(run.duration)}`);
-    console.log(`${logger.COLORS.bold}Path:${logger.COLORS.reset}       ${run.path}`);
-    console.log(`\n${logger.COLORS.bold}Lanes:${logger.COLORS.reset}`);
-    for (const lane of run.lanes) {
-        const statusColor = lane.status === 'completed' ? logger.COLORS.green :
-            lane.status === 'failed' ? logger.COLORS.red :
-                lane.status === 'running' ? logger.COLORS.blue : logger.COLORS.reset;
-        console.log(`  - ${lane.name.padEnd(20)} [${statusColor}${lane.status.toUpperCase()}${logger.COLORS.reset}] Task ${lane.currentTask}/${lane.totalTasks} (PID: ${lane.pid || 'N/A'})`);
-    }
-    if (run.branches.length > 0) {
-        console.log(`\n${logger.COLORS.bold}Branches:${logger.COLORS.reset}`);
-        for (const branch of run.branches) {
-            console.log(`  - ${branch}`);
-        }
-    }
-    if (run.worktrees.length > 0) {
-        console.log(`\n${logger.COLORS.bold}Worktrees:${logger.COLORS.reset}`);
-        for (const wt of run.worktrees) {
-            console.log(`  - ${wt}`);
-        }
-    }
-    console.log(`\nView logs: ${logger.COLORS.cyan}cursorflow logs ${run.id} --all${logger.COLORS.reset}`);
-}
-async function runs(args) {
-    const options = parseArgs(args);
-    if (options.help) {
-        printHelp();
-        return;
-    }
-    const config = (0, config_1.loadConfig)();
-    const logsDir = (0, config_1.getLogsDir)(config);
-    const runsDir = (0, path_1.safeJoin)(logsDir, 'runs');
-    if (!fs.existsSync(runsDir)) {
-        if (options.json) {
-            console.log('[]');
-        }
-        else {
-            console.log('No runs found. (Runs directory does not exist)');
-        }
-        return;
-    }
-    const runService = new run_service_1.RunService(runsDir);
-    if (options.runId) {
-        const run = runService.getRunInfo(options.runId);
-        if (!run) {
-            throw new Error(`Run not found: ${options.runId}`);
-        }
-        if (options.json) {
-            console.log(JSON.stringify(run, null, 2));
-        }
-        else {
-            displayRunDetail(run);
-        }
-        return;
-    }
-    const runsList = runService.listRuns({ status: options.status });
-    if (options.json) {
-        console.log(JSON.stringify(runsList, null, 2));
-    }
-    else {
-        displayRunList(runsList);
-    }
-}
-module.exports = runs;
-//# sourceMappingURL=runs.js.map

package/dist/cli/runs.js.map

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