@litmers/cursorflow-orchestrator 0.1.31 → 0.1.36

package/src/cli/clean.ts

@@ -165,6 +165,7 @@ async function clean(args: string[]): Promise<void> {
   }
 
   const config = loadConfig();
+  git.setVerboseGit(config.verboseGit || false);
   const repoRoot = git.getRepoRoot();
   const logsDir = getLogsDir(config);
   const runsDir = safeJoin(logsDir, 'runs');

package/src/cli/config.ts

@@ -0,0 +1,177 @@
+/**
+ * CursorFlow 'config' command
+ * 
+ * View and set configuration values
+ */
+
+import * as fs from 'fs';
+import * as path from 'path';
+import * as logger from '../utils/logger';
+import { loadConfig, findProjectRoot } from '../utils/config';
+import { safeJoin } from '../utils/path';
+
+interface ConfigOptions {
+  key: string | null;
+  value: string | null;
+  list: boolean;
+  help: boolean;
+}
+
+function printHelp(): void {
+  console.log(`
+\x1b[1mcursorflow config\x1b[0m - 설정 조회 및 변경
+
+\x1b[1m사용법:\x1b[0m
+  cursorflow config                     # 현재 설정 보기
+  cursorflow config <key>               # 특정 설정 값 보기
+  cursorflow config <key> <value>       # 설정 값 변경
+
+\x1b[1m주요 설정 키:\x1b[0m
+  defaultModel       기본 AI 모델 (예: gemini-3-flash)
+  branchPrefix       브랜치 접두사 (예: feature/)
+  executor           실행기 (cursor-agent | cloud)
+
+\x1b[1m예시:\x1b[0m
+  # 현재 설정 보기
+  cursorflow config
+
+  # 기본 모델 확인
+  cursorflow config defaultModel
+
+  # 기본 모델 변경
+  cursorflow config defaultModel opus-4.5-thinking
+
+\x1b[1m참고:\x1b[0m
+  설정 파일 위치: cursorflow.config.js
+  설정을 영구 저장하려면 cursorflow.config.js 파일을 직접 수정하세요.
+  `);
+}
+
+function parseArgs(args: string[]): ConfigOptions {
+  const result: ConfigOptions = {
+    key: null,
+    value: null,
+    list: false,
+    help: false,
+  };
+
+  let positionalCount = 0;
+  
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    
+    if (arg === '--help' || arg === '-h') {
+      result.help = true;
+    } else if (arg === '--list' || arg === '-l') {
+      result.list = true;
+    } else if (!arg.startsWith('--')) {
+      if (positionalCount === 0) {
+        result.key = arg;
+      } else if (positionalCount === 1) {
+        result.value = arg;
+      }
+      positionalCount++;
+    }
+  }
+
+  return result;
+}
+
+async function config(args: string[]): Promise<void> {
+  const options = parseArgs(args);
+
+  if (options.help) {
+    printHelp();
+    return;
+  }
+
+  const projectRoot = findProjectRoot();
+  const currentConfig = loadConfig(projectRoot);
+  const configPath = safeJoin(projectRoot, 'cursorflow.config.js');
+
+  // If setting a value
+  if (options.key && options.value) {
+    const key = options.key;
+    const value = options.value;
+    
+    // Validate key exists
+    if (!(key in currentConfig)) {
+      logger.error(`알 수 없는 설정 키: ${key}`);
+      console.log('\n사용 가능한 키: defaultModel, branchPrefix, executor, ...');
+      process.exit(1);
+    }
+
+    // Update or create config file
+    let configContent: string;
+    
+    if (fs.existsSync(configPath)) {
+      // Read existing config
+      const existingContent = fs.readFileSync(configPath, 'utf-8');
+      
+      // Simple regex replace for the key
+      const keyRegex = new RegExp(`(${key}\\s*:\\s*)['"]?[^'",\\n]+['"]?`, 'g');
+      if (keyRegex.test(existingContent)) {
+        configContent = existingContent.replace(keyRegex, `$1'${value}'`);
+      } else {
+        // Add the key to the config
+        configContent = existingContent.replace(
+          /module\.exports\s*=\s*\{/,
+          `module.exports = {\n  ${key}: '${value}',`
+        );
+      }
+    } else {
+      // Create new config file
+      configContent = `module.exports = {
+  ${key}: '${value}',
+};
+`;
+    }
+
+    fs.writeFileSync(configPath, configContent);
+    logger.success(`✅ ${key} = '${value}' 설정됨`);
+    console.log(`\n설정 파일: ${configPath}`);
+    return;
+  }
+
+  // If viewing a specific key
+  if (options.key) {
+    const key = options.key;
+    
+    if (!(key in currentConfig)) {
+      logger.error(`알 수 없는 설정 키: ${key}`);
+      process.exit(1);
+    }
+
+    const value = (currentConfig as any)[key];
+    console.log(`${key} = ${JSON.stringify(value)}`);
+    return;
+  }
+
+  // List all config
+  logger.section('CursorFlow 설정');
+  console.log('');
+  
+  const importantKeys = [
+    'defaultModel',
+    'branchPrefix',
+    'executor',
+    'flowsDir',
+    'tasksDir',
+    'logsDir',
+  ];
+
+  console.log('\x1b[1m주요 설정:\x1b[0m');
+  for (const key of importantKeys) {
+    const value = (currentConfig as any)[key];
+    console.log(`  ${key.padEnd(20)} ${JSON.stringify(value)}`);
+  }
+
+  console.log('');
+  console.log(`설정 파일: ${configPath}`);
+  console.log('');
+  console.log('설정 변경: cursorflow config <key> <value>');
+  console.log('예: cursorflow config defaultModel opus-4.5-thinking');
+}
+
+export = config;
+

package/src/cli/doctor.ts

@@ -13,12 +13,18 @@
  */
 
 import * as logger from '../utils/logger';
+import * as path from 'path';
+import * as fs from 'fs';
 import { runDoctor, saveDoctorStatus } from '../utils/doctor';
 import { runInteractiveAgentTest } from '../utils/cursor-agent';
+import { loadConfig, findProjectRoot } from '../utils/config';
+import { safeJoin } from '../utils/path';
+import { findFlowDir } from '../utils/flow';
 
 interface DoctorCliOptions {
   json: boolean;
   tasksDir: string | null;
+  flowOrTaskName: string | null;
   executor: string | null;
   includeCursorAgentChecks: boolean;
   testAgent: boolean;
@@ -26,13 +32,16 @@ interface DoctorCliOptions {
 
 function printHelp(): void {
   console.log(`
-Usage: cursorflow doctor [options]
+Usage: cursorflow doctor [flow-name] [options]
 
 Verify your environment is ready for CursorFlow runs.
 
+Arguments:
+  [flow-name]            Flow or task name to validate (optional)
+
 Options:
   --json                 Output machine-readable JSON
-  --tasks-dir <path>     Also validate lane files (run preflight)
+  --tasks-dir <path>     Validate specific directory (legacy)
   --executor <type>      cursor-agent | cloud
   --no-cursor            Skip Cursor Agent install/auth checks
   --test-agent           Run interactive agent test (to approve MCP/permissions)
@@ -40,18 +49,30 @@ Options:
 
 Examples:
   cursorflow doctor
+  cursorflow doctor TestFeature
   cursorflow doctor --test-agent
-  cursorflow doctor --tasks-dir _cursorflow/tasks/demo-test/
+  cursorflow doctor --tasks-dir _cursorflow/flows/001_TestFeature
   `);
 }
 
 function parseArgs(args: string[]): DoctorCliOptions {
   const tasksDirIdx = args.indexOf('--tasks-dir');
   const executorIdx = args.indexOf('--executor');
+  
+  // Find positional argument (flow/task name)
+  // Exclude args that are values for options
+  const optionValueIndices = new Set<number>();
+  if (tasksDirIdx >= 0 && tasksDirIdx + 1 < args.length) optionValueIndices.add(tasksDirIdx + 1);
+  if (executorIdx >= 0 && executorIdx + 1 < args.length) optionValueIndices.add(executorIdx + 1);
+  
+  const flowOrTaskName = args.find((arg, idx) => 
+    !arg.startsWith('--') && !optionValueIndices.has(idx)
+  ) || null;
 
   const options: DoctorCliOptions = {
     json: args.includes('--json'),
     tasksDir: tasksDirIdx >= 0 ? (args[tasksDirIdx + 1] || null) : null,
+    flowOrTaskName,
     executor: executorIdx >= 0 ? (args[executorIdx + 1] || null) : null,
     includeCursorAgentChecks: !args.includes('--no-cursor'),
     testAgent: args.includes('--test-agent'),
@@ -117,9 +138,32 @@ async function doctor(args: string[]): Promise<void> {
     process.exit(success ? 0 : 1);
   }
 
+  // Resolve tasksDir from flow name if provided
+  let tasksDir = options.tasksDir;
+  if (!tasksDir && options.flowOrTaskName) {
+    try {
+      const config = loadConfig();
+      const flowsDir = safeJoin(config.projectRoot, config.flowsDir);
+      const foundFlow = findFlowDir(flowsDir, options.flowOrTaskName);
+      if (foundFlow) {
+        tasksDir = foundFlow;
+      } else {
+        // Try as a direct path
+        const directPath = path.resolve(process.cwd(), options.flowOrTaskName);
+        if (fs.existsSync(directPath)) {
+          tasksDir = directPath;
+        } else {
+          tasksDir = options.flowOrTaskName;
+        }
+      }
+    } catch {
+      tasksDir = options.flowOrTaskName;
+    }
+  }
+
   const report = runDoctor({
     cwd: process.cwd(),
-    tasksDir: options.tasksDir || undefined,
+    tasksDir: tasksDir || undefined,
     executor: options.executor || undefined,
     includeCursorAgentChecks: options.includeCursorAgentChecks,
   });

package/src/cli/index.ts

@@ -12,6 +12,11 @@ type CommandFn = (args: string[]) => Promise<void>;
  */
 const COMMANDS: Record<string, CommandFn> = {
   init: require('./init'),
+  // New Flow architecture commands
+  new: require('./new'),
+  add: require('./add'),
+  config: require('./config'),
+  // Legacy prepare command (deprecated)
   prepare: require('./prepare'),
   run: require('./run'),
   monitor: require('./monitor'),
@@ -21,7 +26,6 @@ const COMMANDS: Record<string, CommandFn> = {
   signal: require('./signal'),
   models: require('./models'),
   logs: require('./logs'),
-  runs: require('./runs'),
   tasks: require('./tasks'),
   stop: require('./stop'),
   setup: require('./setup-commands').main,
@@ -35,37 +39,37 @@ function printHelp(): void {
 \x1b[1mUSAGE\x1b[0m
   $ \x1b[32mcursorflow\x1b[0m <command> [options]
 
-\x1b[1mCOMMANDS\x1b[0m
-  \x1b[33minit\x1b[0m [options]              Initialize CursorFlow in project
-  \x1b[33msetup\x1b[0m [options]             Install Cursor IDE commands
-  \x1b[33mprepare\x1b[0m <feature> [opts]    Prepare task directory and JSON files
-  \x1b[33mrun\x1b[0m <tasks-dir> [options]   Run orchestration (DAG-based)
-  \x1b[33mmonitor\x1b[0m [run-dir] [options] \x1b[36mInteractive\x1b[0m lane dashboard
-  \x1b[33mtasks\x1b[0m [name] [options]      Browse and validate prepared tasks
-  \x1b[33mruns\x1b[0m [run-id] [options]     List and view run details
-  \x1b[33mstop\x1b[0m [run-id] [options]     Stop running workflows
-  \x1b[33mclean\x1b[0m <type> [options]      Clean branches/worktrees/logs/tasks
-  \x1b[33mresume\x1b[0m [lane] [options]     Resume lane(s) - use --all for batch resume
-  \x1b[33mdoctor\x1b[0m [options]            Check environment and preflight
-  \x1b[33msignal\x1b[0m <lane> <msg>         Directly intervene in a running lane
-  \x1b[33mmodels\x1b[0m [options]            List available AI models
-  \x1b[33mlogs\x1b[0m [run-dir] [options]    View, export, and follow logs
-
-\x1b[1mGLOBAL OPTIONS\x1b[0m
-  --config <path>             Config file path
-  --help, -h                  Show help
-  --version, -v               Show version
-
-\x1b[1mEXAMPLES\x1b[0m
-  $ \x1b[32mcursorflow init --example\x1b[0m
-  $ \x1b[32mcursorflow prepare NewFeature --lanes 3\x1b[0m
-  $ \x1b[32mcursorflow run _cursorflow/tasks/MyFeature/\x1b[0m
-  $ \x1b[32mcursorflow monitor latest\x1b[0m
-  $ \x1b[32mcursorflow logs --all --follow\x1b[0m
-  $ \x1b[32mcursorflow runs --running\x1b[0m
-  $ \x1b[32mcursorflow resume --all\x1b[0m
-  $ \x1b[32mcursorflow doctor\x1b[0m
-  $ \x1b[32mcursorflow models\x1b[0m
+\x1b[1mFLOW COMMANDS (New)\x1b[0m
+  \x1b[33mnew\x1b[0m <flow> --lanes "..."     Create a new Flow with Lanes
+  \x1b[33madd\x1b[0m <flow> <lane> --task    Add Tasks to a Lane
+  \x1b[33mconfig\x1b[0m [key] [value]        View or set config (e.g., defaultModel)
+
+\x1b[1mEXECUTION\x1b[0m
+  \x1b[33mrun\x1b[0m <flow> [options]         Run orchestration (DAG-based)
+  \x1b[33mmonitor\x1b[0m [run-dir] [options]  \x1b[36mInteractive\x1b[0m lane dashboard
+  \x1b[33mstop\x1b[0m [run-id] [options]      Stop running workflows
+  \x1b[33mresume\x1b[0m [lane] [options]      Resume lane(s)
+
+\x1b[1mINSPECTION\x1b[0m
+  \x1b[33mtasks\x1b[0m [name] [options]       Browse and validate prepared tasks
+  \x1b[33mlogs\x1b[0m [run-dir] [options]     View, export, and follow logs
+  \x1b[33mdoctor\x1b[0m [options]             Check environment and preflight
+
+\x1b[1mUTILITY\x1b[0m
+  \x1b[33minit\x1b[0m [options]               Initialize CursorFlow in project
+  \x1b[33msetup\x1b[0m [options]              Install Cursor IDE commands
+  \x1b[33mclean\x1b[0m <type> [options]       Clean branches/worktrees/logs/tasks
+  \x1b[33msignal\x1b[0m <lane> <msg>          Directly intervene in a running lane
+  \x1b[33mmodels\x1b[0m [options]             List available AI models
+
+\x1b[1mLEGACY\x1b[0m
+  \x1b[33mprepare\x1b[0m <feature> [opts]     (deprecated) Use 'new' + 'add' instead
+
+\x1b[1mQUICK START\x1b[0m
+  $ \x1b[32mcursorflow new MyFeature --lanes "backend,frontend"\x1b[0m
+  $ \x1b[32mcursorflow add MyFeature backend --task "name=impl|model=sonnet-4.5|prompt=API 구현"\x1b[0m
+  $ \x1b[32mcursorflow add MyFeature frontend --task "name=ui|model=sonnet-4.5|prompt=UI 구현" --after "backend"\x1b[0m
+  $ \x1b[32mcursorflow run MyFeature\x1b[0m
 
 \x1b[1mDOCUMENTATION\x1b[0m
   https://github.com/eungjin-cigro/cursorflow#readme

package/src/cli/logs.ts

@@ -5,7 +5,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as logger from '../utils/logger';
-import { loadConfig } from '../utils/config';
+import { loadConfig, getLogsDir } from '../utils/config';
 import { safeJoin } from '../utils/path';
 import { 
   readJsonLog, 
@@ -160,17 +160,12 @@ function displayTextLogs(
   let logFile: string;
   const readableLog = safeJoin(laneDir, 'terminal-readable.log');
   const rawLog = safeJoin(laneDir, 'terminal-raw.log');
-  const cleanLog = safeJoin(laneDir, 'terminal.log');
 
   if (options.raw) {
     logFile = rawLog;
-  } else if (options.clean) {
-    logFile = cleanLog;
-  } else if (options.readable && fs.existsSync(readableLog)) {
-    logFile = readableLog;
   } else {
-    // Default or fallback to clean log
-    logFile = cleanLog;
+    // Default to readable log (clean option also uses readable now)
+    logFile = readableLog;
   }
   
   if (!fs.existsSync(logFile)) {
@@ -686,17 +681,12 @@ function followLogs(laneDir: string, options: LogsOptions): void {
   let logFile: string;
   const readableLog = safeJoin(laneDir, 'terminal-readable.log');
   const rawLog = safeJoin(laneDir, 'terminal-raw.log');
-  const cleanLog = safeJoin(laneDir, 'terminal.log');
 
   if (options.raw) {
     logFile = rawLog;
-  } else if (options.clean) {
-    logFile = cleanLog;
-  } else if (options.readable && fs.existsSync(readableLog)) {
-    logFile = readableLog;
   } else {
-    // Default or fallback to clean log
-    logFile = cleanLog;
+    // Default to readable log
+    logFile = readableLog;
   }
   
   if (!fs.existsSync(logFile)) {
@@ -778,16 +768,14 @@ function displaySummary(runDir: string): void {
   
   for (const lane of lanes) {
     const laneDir = safeJoin(runDir, 'lanes', lane);
-    const cleanLog = safeJoin(laneDir, 'terminal.log');
     const rawLog = safeJoin(laneDir, 'terminal-raw.log');
-    const jsonLog = safeJoin(laneDir, 'terminal.jsonl');
     const readableLog = safeJoin(laneDir, 'terminal-readable.log');
     
     console.log(`  ${logger.COLORS.green}📁 ${lane}${logger.COLORS.reset}`);
     
-    if (fs.existsSync(cleanLog)) {
-      const stats = fs.statSync(cleanLog);
-      console.log(`     └─ terminal.log          ${formatSize(stats.size)}`);
+    if (fs.existsSync(readableLog)) {
+      const stats = fs.statSync(readableLog);
+      console.log(`     └─ terminal-readable.log ${formatSize(stats.size)} ${logger.COLORS.yellow}(default)${logger.COLORS.reset}`);
     }
     
     if (fs.existsSync(rawLog)) {
@@ -795,18 +783,6 @@ function displaySummary(runDir: string): void {
       console.log(`     └─ terminal-raw.log      ${formatSize(stats.size)}`);
     }
     
-    if (fs.existsSync(readableLog)) {
-      const stats = fs.statSync(readableLog);
-      console.log(`     └─ terminal-readable.log ${formatSize(stats.size)} ${logger.COLORS.yellow}(parsed AI output)${logger.COLORS.reset}`);
-    }
-    
-    if (fs.existsSync(jsonLog)) {
-      const stats = fs.statSync(jsonLog);
-      const entries = readJsonLog(jsonLog);
-      const errors = entries.filter(e => e.level === 'error' || e.level === 'stderr').length;
-      console.log(`     └─ terminal.jsonl        ${formatSize(stats.size)} (${entries.length} entries, ${errors} errors)`);
-    }
-    
     console.log('');
   }
 }
@@ -832,11 +808,22 @@ async function logs(args: string[]): Promise<void> {
   }
   
   const config = loadConfig();
+  const originalCwd = process.cwd();
+
+  // Change current directory to project root for consistent path handling
+  if (config.projectRoot !== originalCwd) {
+    logger.debug(`Changing directory to project root: ${config.projectRoot}`);
+    process.chdir(config.projectRoot);
+  }
   
   // Find run directory
   let runDir = options.runDir;
+  if (runDir && runDir !== 'latest' && !path.isAbsolute(runDir)) {
+    runDir = path.resolve(originalCwd, runDir);
+  }
+
   if (!runDir || runDir === 'latest') {
-    runDir = findLatestRunDir(config.logsDir) || undefined;
+    runDir = findLatestRunDir(getLogsDir(config)) || undefined;
   }
   
   if (!runDir || !fs.existsSync(runDir)) {