@sylphx/flow 1.8.1 → 2.0.0

package/src/commands/flow-command.ts

@@ -11,49 +11,23 @@ import { StateDetector } from '../core/state-detector.js';
 import { UpgradeManager } from '../core/upgrade-manager.js';
 import { showWelcome } from '../utils/display/banner.js';
 import { showStatus } from '../utils/display/status.js';
-import { executeFlow } from './flow/execute.js';
+import { executeFlow } from './flow/execute-v2.js';
 import type { FlowOptions } from './flow/types.js';
 
 /**
- * Smart flow command
+ * Flow command (simplified for attach mode)
  */
 export const flowCommand = new Command('flow')
-  .description('Intelligent development flow (auto-detect state and act accordingly)')
-
-  // Smart options
-  .option('--init-only', 'Only initialize, do not run')
-  .option('--run-only', 'Only run, skip initialization')
-  .option('--sync', 'Synchronize with Flow templates (delete and re-install template files)')
-  .option('--upgrade', 'Upgrade Sylphx Flow to latest version')
-  .option('--upgrade-target', 'Upgrade target platform (Claude Code/OpenCode)')
-
-  // Smart configuration options
-  .option('--quick', 'Quick mode: use saved defaults and skip all prompts')
-  .option('--select-provider', 'Prompt to select provider each run')
-  .option('--select-agent', 'Prompt to select agent each run')
-  .option('--use-defaults', 'Skip prompts, use saved defaults')
-  .option('--provider <provider>', 'Override provider for this run (anthropic|z.ai|kimi)')
-
-  // Init options
-  .option('--target <type>', 'Target platform (opencode, claude-code, auto-detect)')
-  .option('--verbose', 'Show detailed output')
-  .option('--dry-run', 'Show what would be done without making changes')
-  .option('--no-mcp', 'Skip MCP installation')
-  .option('--no-agents', 'Skip agents installation')
-  .option('--no-rules', 'Skip rules installation')
-  .option('--no-output-styles', 'Skip output styles installation')
-  .option('--no-slash-commands', 'Skip slash commands installation')
-  .option('--no-hooks', 'Skip hooks setup')
-
-  // Run options
+  .description('Run Flow with automatic environment attach')
+
+  // Core options
   .option('--agent <name>', 'Agent to use (default: coder)', 'coder')
   .option('--agent-file <path>', 'Load agent from specific file')
+  .option('--verbose', 'Show detailed output')
+  .option('--dry-run', 'Show what would be done without making changes')
   .option('-p, --print', 'Headless print mode (output only, no interactive)')
   .option('-c, --continue', 'Continue previous conversation (requires print mode)')
-
-  // Loop options
-  .option('--loop [interval]', 'Loop mode: run repeatedly (optional cooldown in seconds)')
-  .option('--max-runs <number>', 'Maximum loop iterations (default: infinite)', parseInt)
+  .option('--merge', 'Merge Flow settings with existing settings (default: replace all)')
 
   // Prompt argument
   .argument('[prompt]', 'Prompt to execute with agent (optional, supports @file.txt for file input)')
@@ -63,34 +37,17 @@ export const flowCommand = new Command('flow')
   });
 
 /**
- * Setup command - alias for `flow --init-only`
- * Kept for backward compatibility
+ * Setup command - deprecated (attach mode is automatic)
  */
 export const setupCommand = new Command('setup')
-  .description('Initialize project configuration (alias for: flow --init-only)')
+  .description('[DEPRECATED] No longer needed - Flow uses automatic attach mode')
   .action(async () => {
-    console.log(chalk.yellow('ℹ  The "setup" command is deprecated.'));
-    console.log(chalk.yellow('   Please use: flow --init-only\n'));
-
-    showWelcome();
-
-    const { runInit } = await import('./init-command.js');
-    await runInit({
-      target: undefined,
-      verbose: false,
-      dryRun: false,
-      clear: false,
-      mcp: true,
-      agents: true,
-      rules: true,
-      outputStyles: true,
-      slashCommands: true,
-      hooks: true,
-      helpOption: () => {},
-    });
-
-    console.log(chalk.green('\n✅ Setup complete!'));
-    console.log(chalk.dim('\nNext time, use: flow --init-only'));
+    console.log(chalk.yellow('⚠️  The "setup" command is deprecated.\n'));
+    console.log(chalk.cyan('Flow now uses automatic attach mode:'));
+    console.log(chalk.dim('   • No installation needed'));
+    console.log(chalk.dim('   • Environment attached automatically'));
+    console.log(chalk.dim('   • Restored on exit\n'));
+    console.log(chalk.green('✨ Just run: sylphx-flow "your prompt"\n'));
   });
 
 /**
@@ -193,11 +150,12 @@ export const doctorCommand = new Command('doctor')
 export const upgradeCommand = new Command('upgrade')
   .description('Upgrade Sylphx Flow and components')
   .option('--check', 'Only check for updates, do not upgrade')
+  .option('--auto', 'Automatically install updates via npm')
   .option('--components', 'Upgrade components (agents, rules, etc)', true)
   .option('--target', 'Upgrade target platform (Claude Code/OpenCode)')
   .option('--verbose', 'Show detailed output')
   .action(async (options) => {
-    console.log(chalk.cyan.bold('📦 检查更新\n'));
+    console.log(chalk.cyan.bold('📦 Checking for updates\n'));
 
     const detector = new StateDetector();
     const upgradeManager = new UpgradeManager();
@@ -205,7 +163,7 @@ export const upgradeCommand = new Command('upgrade')
     const updates = await upgradeManager.checkUpdates();
 
     if (!updates.flowUpdate && !updates.targetUpdate) {
-      console.log(chalk.green('✓ 所有组件已是最新版本\n'));
+      console.log(chalk.green('✓ All components are up to date\n'));
       return;
     }
 
@@ -219,7 +177,7 @@ export const upgradeCommand = new Command('upgrade')
 
     // Check only
     if (options.check) {
-      console.log('\n' + chalk.dim('使用 --no-check 或省略参数进行升级'));
+      console.log('\n' + chalk.dim('Run without --check to upgrade'));
       return;
     }
 
@@ -229,13 +187,13 @@ export const upgradeCommand = new Command('upgrade')
       {
         type: 'confirm',
         name: 'confirm',
-        message: '确认升级到最新版本?',
+        message: 'Upgrade to latest version?',
         default: true,
       },
     ]);
 
     if (!confirm) {
-      console.log(chalk.dim('\n升级已取消'));
+      console.log(chalk.dim('\nUpgrade cancelled'));
       return;
     }
 
@@ -243,16 +201,21 @@ export const upgradeCommand = new Command('upgrade')
     console.log('');
 
     const state = await detector.detect();
+    const autoInstall = options.auto || false;
 
     if (updates.flowUpdate) {
-      console.log(chalk.cyan.bold('\n━ 升级 Sylphx Flow\n'));
-      await upgradeManager.upgradeFlow(state);
+      console.log(chalk.cyan.bold('\n━ Upgrading Sylphx Flow\n'));
+      await upgradeManager.upgradeFlow(state, autoInstall);
     }
 
     if (updates.targetUpdate && options.target) {
-      console.log(chalk.cyan.bold('\n━ 升级 Target\n'));
-      await upgradeManager.upgradeTarget(state);
+      console.log(chalk.cyan.bold('\n━ Upgrading Target\n'));
+      await upgradeManager.upgradeTarget(state, autoInstall);
     }
 
-    console.log(chalk.green('\n✓ 升级完成\n'));
+    console.log(chalk.green('\n✓ Upgrade complete\n'));
+
+    if (!autoInstall) {
+      console.log(chalk.dim('💡 Tip: Use --auto flag to automatically install updates via npm\n'));
+    }
   });

package/src/commands/flow-orchestrator.ts

@@ -8,6 +8,7 @@ import type { FlowOptions } from './flow/types.js';
 import { StateDetector, type ProjectState } from '../core/state-detector.js';
 import { UpgradeManager } from '../core/upgrade-manager.js';
 import { targetManager } from '../core/target-manager.js';
+import { detectPackageManager, getUpgradeCommand } from '../utils/package-manager-detector.js';
 
 /**
  * Step 1: Check for available upgrades
@@ -18,71 +19,33 @@ export async function checkUpgrades(
 ): Promise<void> {
   if (options.initOnly || options.runOnly) return;
 
+  const upgradeManager = new UpgradeManager();
+  const updates = await upgradeManager.checkUpdates();
+  const packageManager = detectPackageManager();
+
   // Check Flow upgrade
-  if (await UpgradeManager.isUpgradeAvailable()) {
+  if (updates.flowUpdate && updates.flowVersion) {
+    const upgradeCmd = getUpgradeCommand('@sylphx/flow', packageManager);
     console.log(
       chalk.yellow(
-        `📦 Sylphx Flow update available: ${state.version} → ${state.latestVersion}\n`
+        `📦 Sylphx Flow update available: ${updates.flowVersion.current} → ${updates.flowVersion.latest}`
       )
     );
-    const { default: inquirer } = await import('inquirer');
-    const { upgrade } = await inquirer.prompt([
-      {
-        type: 'confirm',
-        name: 'upgrade',
-        message: 'Upgrade Sylphx Flow now?',
-        default: true,
-      },
-    ]);
-    if (upgrade) {
-      options.upgrade = true;
-    }
+    console.log(chalk.dim(`   Quick upgrade: ${chalk.cyan('sylphx-flow upgrade --auto')}`));
+    console.log(chalk.dim(`   Or run: ${chalk.cyan(upgradeCmd)}\n`));
   }
 
-  // Check target upgrade (if target exists and outdated)
-  if (state.target && state.targetVersion && state.targetLatestVersion &&
-      state.targetVersion !== state.targetLatestVersion) {
-    // Simple version comparison
-    const isOutdated = compareVersions(state.targetVersion, state.targetLatestVersion) < 0;
-
-    if (isOutdated) {
-      console.log(
-        chalk.yellow(
-          `📦 ${state.target} update available: ${state.targetVersion} → ${state.targetLatestVersion}\n`
-        )
-      );
-      const { default: inquirer } = await import('inquirer');
-      const { upgradeTarget } = await inquirer.prompt([
-        {
-          type: 'confirm',
-          name: 'upgradeTarget',
-          message: `Upgrade ${state.target} now?`,
-          default: true,
-        },
-      ]);
-      if (upgradeTarget) {
-        options.upgradeTarget = true;
-      }
-    }
+  // Check target upgrade
+  if (updates.targetUpdate && updates.targetVersion) {
+    console.log(
+      chalk.yellow(
+        `📦 Target update available: ${updates.targetVersion.current} → ${updates.targetVersion.latest}`
+      )
+    );
+    console.log(chalk.dim(`   Run: ${chalk.cyan('sylphx-flow upgrade --target --auto')}\n`));
   }
 }
 
-/**
- * Compare two version strings
- */
-function compareVersions(v1: string, v2: string): number {
-  const parts1 = v1.split('.').map(Number);
-  const parts2 = v2.split('.').map(Number);
-
-  for (let i = 0; i < Math.max(parts1.length, parts2.length); i++) {
-    const p1 = parts1[i] || 0;
-    const p2 = parts2[i] || 0;
-    if (p1 !== p2) {
-      return p1 - p2;
-    }
-  }
-  return 0;
-}
 
 /**
  * Step 2: Check component integrity and prompt for repair

package/src/commands/run-command.ts

@@ -5,14 +5,20 @@ import { targetManager } from '../core/target-manager.js';
 import { CLIError } from '../utils/error-handler.js';
 import { getAgentsDir } from '../utils/config/paths.js';
 
-export async function loadAgentContent(agentName: string, agentFilePath?: string): Promise<string> {
+export async function loadAgentContent(
+  agentName: string,
+  agentFilePath?: string,
+  enabledRules?: string[],
+  enabledOutputStyles?: string[]
+): Promise<string> {
   const { enhanceAgentContent } = await import('../utils/agent-enhancer.js');
 
   try {
     // If specific file path provided, load from there
     if (agentFilePath) {
       const content = await fs.readFile(path.resolve(agentFilePath), 'utf-8');
-      return content;
+      // Enhance with enabled rules and styles
+      return await enhanceAgentContent(content, enabledRules, enabledOutputStyles);
     }
 
     // First try to load from .claude/agents/ directory (processed agents with rules and styles)
@@ -27,16 +33,16 @@ export async function loadAgentContent(agentName: string, agentFilePath?: string
 
       try {
         const content = await fs.readFile(localAgentPath, 'utf-8');
-        // Enhance user-defined agents with rules and styles
-        return await enhanceAgentContent(content);
+        // Enhance user-defined agents with enabled rules and styles
+        return await enhanceAgentContent(content, enabledRules, enabledOutputStyles);
       } catch (_error2) {
         // Try to load from the package's agents directory
         const packageAgentsDir = getAgentsDir();
         const packageAgentPath = path.join(packageAgentsDir, `${agentName}.md`);
 
         const content = await fs.readFile(packageAgentPath, 'utf-8');
-        // Enhance package agents with rules and styles
-        return await enhanceAgentContent(content);
+        // Enhance package agents with enabled rules and styles
+        return await enhanceAgentContent(content, enabledRules, enabledOutputStyles);
       }
     }
   } catch (_error) {