@sylphx/flow 2.1.3 → 2.1.4

package/src/utils/files/sync-utils.ts

@@ -1,18 +1,21 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import chalk from 'chalk';
-import type { Target } from '../../types.js';
 import { MCP_SERVER_REGISTRY } from '../../config/servers.js';
-import { getAgentsDir, getSlashCommandsDir, getRulesDir } from '../config/paths.js';
+import type { Target } from '../../types.js';
+import { getAgentsDir, getRulesDir, getSlashCommandsDir } from '../config/paths.js';
 
 /**
  * Scan directory for .md files and return basenames
  */
 function scanTemplateDir(dir: string): string[] {
-  if (!fs.existsSync(dir)) return [];
+  if (!fs.existsSync(dir)) {
+    return [];
+  }
 
   try {
-    return fs.readdirSync(dir, { withFileTypes: true })
+    return fs
+      .readdirSync(dir, { withFileTypes: true })
       .filter((f) => f.isFile() && f.name.endsWith('.md'))
       .map((f) => f.name);
   } catch {
@@ -31,9 +34,9 @@ const FLOW_RULES = scanTemplateDir(getRulesDir());
  * Categorized files for sync
  */
 interface CategorizedFiles {
-  inFlow: string[];      // Files that exist locally and in Flow templates (will reinstall)
-  unknown: string[];     // Files not in Flow templates (custom or removed)
-  missing: string[];     // Flow templates that don't exist locally (will install)
+  inFlow: string[]; // Files that exist locally and in Flow templates (will reinstall)
+  unknown: string[]; // Files not in Flow templates (custom or removed)
+  missing: string[]; // Flow templates that don't exist locally (will install)
 }
 
 /**
@@ -48,8 +51,8 @@ interface SyncManifest {
     notInRegistry: string[];
   };
   hooks: {
-    inConfig: string[];      // Hooks from config (will be synced)
-    orphaned: string[];      // Hooks that exist locally but not in config (ask user)
+    inConfig: string[]; // Hooks from config (will be synced)
+    orphaned: string[]; // Hooks that exist locally but not in config (ask user)
   };
   preserve: string[];
 }
@@ -151,14 +154,14 @@ export async function buildSyncManifest(cwd: string, target: Target): Promise<Sy
         const installedServers = Object.keys(mcpConfig.mcpServers);
         const registryServers = Object.keys(MCP_SERVER_REGISTRY);
 
-        manifest.mcpServers.inRegistry = installedServers.filter(id =>
+        manifest.mcpServers.inRegistry = installedServers.filter((id) =>
           registryServers.includes(id)
         );
-        manifest.mcpServers.notInRegistry = installedServers.filter(id =>
-          !registryServers.includes(id)
+        manifest.mcpServers.notInRegistry = installedServers.filter(
+          (id) => !registryServers.includes(id)
         );
       }
-    } catch (error) {
+    } catch (_error) {
       console.warn(chalk.yellow('⚠ Failed to read .mcp.json'));
     }
   }
@@ -178,25 +181,21 @@ export async function buildSyncManifest(cwd: string, target: Target): Promise<Sy
           // In the future, this could be read from Flow config
           const expectedHookTypes = ['Notification'];
 
-          manifest.hooks.inConfig = existingHookTypes.filter(type =>
+          manifest.hooks.inConfig = existingHookTypes.filter((type) =>
             expectedHookTypes.includes(type)
           );
-          manifest.hooks.orphaned = existingHookTypes.filter(type =>
-            !expectedHookTypes.includes(type)
+          manifest.hooks.orphaned = existingHookTypes.filter(
+            (type) => !expectedHookTypes.includes(type)
           );
         }
-      } catch (error) {
+      } catch (_error) {
         console.warn(chalk.yellow('⚠ Failed to read settings.json'));
       }
     }
   }
 
   // Files to preserve
-  manifest.preserve = [
-    '.sylphx-flow/',
-    '.secrets/',
-    target.config.configFile || '',
-  ]
+  manifest.preserve = ['.sylphx-flow/', '.secrets/', target.config.configFile || '']
     .filter(Boolean)
     .map((p) => path.join(cwd, p));
 
@@ -379,7 +378,9 @@ export interface SelectedToRemove {
 /**
  * Select unknown files to remove
  */
-export async function selectUnknownFilesToRemove(manifest: SyncManifest): Promise<SelectedToRemove> {
+export async function selectUnknownFilesToRemove(
+  manifest: SyncManifest
+): Promise<SelectedToRemove> {
   const unknownFiles: Array<{ name: string; value: string; type: string }> = [];
 
   // Collect all unknown files
@@ -463,10 +464,7 @@ export async function selectUnknownFilesToRemove(manifest: SyncManifest): Promis
 /**
  * Show final summary before execution
  */
-export function showFinalSummary(
-  manifest: SyncManifest,
-  selectedUnknowns: SelectedToRemove
-): void {
+export function showFinalSummary(manifest: SyncManifest, selectedUnknowns: SelectedToRemove): void {
   console.log(chalk.cyan.bold('\n━━━ 📋 Final Summary\n'));
 
   // Will delete + reinstall
@@ -490,7 +488,10 @@ export function showFinalSummary(
   }
 
   // Will remove (selected unknowns)
-  const totalToRemove = selectedUnknowns.files.length + selectedUnknowns.mcpServers.length + selectedUnknowns.hooks.length;
+  const totalToRemove =
+    selectedUnknowns.files.length +
+    selectedUnknowns.mcpServers.length +
+    selectedUnknowns.hooks.length;
   if (totalToRemove > 0) {
     console.log(chalk.red('Remove (selected):\n'));
     selectedUnknowns.files.forEach((file) => {
@@ -506,7 +507,11 @@ export function showFinalSummary(
   }
 
   // Will preserve
-  const allSelected = [...selectedUnknowns.files, ...selectedUnknowns.mcpServers, ...selectedUnknowns.hooks];
+  const allSelected = [
+    ...selectedUnknowns.files,
+    ...selectedUnknowns.mcpServers,
+    ...selectedUnknowns.hooks,
+  ];
   const preservedUnknowns = [
     ...manifest.agents.unknown,
     ...manifest.slashCommands.unknown,
@@ -618,14 +623,10 @@ export async function removeMCPServers(cwd: string, serversToRemove: string[]):
     }
 
     // Write back
-    await fs.promises.writeFile(
-      mcpPath,
-      JSON.stringify(mcpConfig, null, 2) + '\n',
-      'utf-8'
-    );
+    await fs.promises.writeFile(mcpPath, `${JSON.stringify(mcpConfig, null, 2)}\n`, 'utf-8');
 
     return removedCount;
-  } catch (error) {
+  } catch (_error) {
     console.warn(chalk.yellow('⚠ Failed to update .mcp.json'));
     return 0;
   }
@@ -659,14 +660,10 @@ export async function removeHooks(cwd: string, hooksToRemove: string[]): Promise
     }
 
     // Write back
-    await fs.promises.writeFile(
-      settingsPath,
-      JSON.stringify(settings, null, 2) + '\n',
-      'utf-8'
-    );
+    await fs.promises.writeFile(settingsPath, `${JSON.stringify(settings, null, 2)}\n`, 'utf-8');
 
     return removedCount;
-  } catch (error) {
+  } catch (_error) {
     console.warn(chalk.yellow('⚠ Failed to update settings.json'));
     return 0;
   }

package/src/utils/index.ts

@@ -3,57 +3,49 @@
  * Feature-based organization for better modularity
  */
 
+// ============================================================================
+// SHARED UTILITIES
+// ============================================================================
+export * from '../shared/index.js';
+// ============================================================================
+// AGENTS
+// ============================================================================
+export * from './agent-enhancer.js';
+export * from './config/mcp-config.js';
+export * from './config/paths.js';
 // ============================================================================
 // CONFIG & SETTINGS
 // ============================================================================
 export * from './config/settings.js';
-export * from './config/mcp-config.js';
 export * from './config/target-config.js';
 export * from './config/target-utils.js';
-export * from './config/paths.js';
-
 // ============================================================================
 // DISPLAY & OUTPUT
 // ============================================================================
 export * from './display/banner.js';
-export * from './display/status.js';
 export * from './display/cli-output.js';
 export * from './display/logger.js';
 export * from './display/notifications.js';
-
+export * from './display/status.js';
+// ============================================================================
+// ERROR HANDLING
+// ============================================================================
+export * from './error-handler.js';
 // ============================================================================
 // FILES & SYNC
 // ============================================================================
 export * from './files/file-operations.js';
 export * from './files/sync-utils.js';
-
 // ============================================================================
-// SECURITY
+// FUNCTIONAL PROGRAMMING
 // ============================================================================
-export * from './security/security.js';
+export * from './functional.js';
 export * from './security/secret-utils.js';
-
 // ============================================================================
-// ERROR HANDLING
+// SECURITY
 // ============================================================================
-export * from './error-handler.js';
-
+export * from './security/security.js';
 // ============================================================================
 // VERSIONING
 // ============================================================================
 export * from './version.js';
-
-// ============================================================================
-// AGENTS
-// ============================================================================
-export * from './agent-enhancer.js';
-
-// ============================================================================
-// FUNCTIONAL PROGRAMMING
-// ============================================================================
-export * from './functional.js';
-
-// ============================================================================
-// SHARED UTILITIES
-// ============================================================================
-export * from '../shared/index.js';

package/src/utils/package-manager-detector.ts

@@ -27,10 +27,18 @@ export function detectPackageManagerFromUserAgent(): PackageManager | null {
     return null;
   }
 
-  if (userAgent.includes('bun')) return 'bun';
-  if (userAgent.includes('pnpm')) return 'pnpm';
-  if (userAgent.includes('yarn')) return 'yarn';
-  if (userAgent.includes('npm')) return 'npm';
+  if (userAgent.includes('bun')) {
+    return 'bun';
+  }
+  if (userAgent.includes('pnpm')) {
+    return 'pnpm';
+  }
+  if (userAgent.includes('yarn')) {
+    return 'yarn';
+  }
+  if (userAgent.includes('npm')) {
+    return 'npm';
+  }
 
   return null;
 }
@@ -38,7 +46,9 @@ export function detectPackageManagerFromUserAgent(): PackageManager | null {
 /**
  * Detect package manager from lock files in directory
  */
-export function detectPackageManagerFromLockFiles(dir: string = process.cwd()): PackageManager | null {
+export function detectPackageManagerFromLockFiles(
+  dir: string = process.cwd()
+): PackageManager | null {
   const lockFiles: Record<PackageManager, string[]> = {
     bun: ['bun.lockb', 'bun.lock'],
     pnpm: ['pnpm-lock.yaml'],

package/src/utils/security/security.ts

@@ -209,11 +209,15 @@ export const commandSecurity = {
 
     try {
       return await execFileAsync(command, validatedArgs, secureOptions);
-    } catch (error: any) {
+    } catch (error: unknown) {
       // Sanitize error message to prevent information disclosure
-      const sanitizedError = new Error(`Command execution failed: ${command}`);
-      sanitizedError.code = error.code;
-      sanitizedError.signal = error.signal;
+      const err = error as NodeJS.ErrnoException & { signal?: string };
+      const sanitizedError = new Error(`Command execution failed: ${command}`) as Error & {
+        code?: string;
+        signal?: string;
+      };
+      sanitizedError.code = err.code;
+      sanitizedError.signal = err.signal;
       throw sanitizedError;
     }
   },

package/src/utils/target-selection.ts

@@ -5,7 +5,7 @@
 
 import chalk from 'chalk';
 import inquirer from 'inquirer';
-import { TargetInstaller } from '../services/target-installer.js';
+import type { TargetInstaller } from '../services/target-installer.js';
 import { handlePromptError } from './prompt-helpers.js';
 
 /**
@@ -51,7 +51,10 @@ export function buildAvailableTargets(installedTargets: string[]): TargetChoice[
  * @param context - Context where choice is displayed (affects status message)
  * @returns Formatted string with target name and installation status
  */
-export function formatTargetChoice(target: TargetChoice, context: 'execution' | 'settings'): string {
+export function formatTargetChoice(
+  target: TargetChoice,
+  context: 'execution' | 'settings'
+): string {
   const status = target.installed
     ? chalk.green(' ✓ installed')
     : context === 'execution'

package/src/utils/version.ts

@@ -34,9 +34,11 @@ export function isVersionOutdated(current: string, latest: string): boolean {
 /**
  * Parse version string into components
  */
-export function parseVersion(version: string): { major: number; minor: number; patch: number } | null {
+export function parseVersion(
+  version: string
+): { major: number; minor: number; patch: number } | null {
   const parts = version.split('.').map(Number);
-  if (parts.length < 3 || parts.some(isNaN)) {
+  if (parts.length < 3 || parts.some(Number.isNaN)) {
     return null;
   }
   return {

package/src/commands/flow-orchestrator.ts

@@ -1,328 +0,0 @@
-/**
- * Flow Orchestrator - Simplified flow management
- * Separates concerns and reduces complexity
- */
-
-import chalk from 'chalk';
-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
- */
-export async function checkUpgrades(
-  state: ProjectState,
-  options: FlowOptions
-): Promise<void> {
-  if (options.initOnly || options.runOnly) return;
-
-  const upgradeManager = new UpgradeManager();
-  const updates = await upgradeManager.checkUpdates();
-  const packageManager = detectPackageManager();
-
-  // Check Flow upgrade
-  if (updates.flowUpdate && updates.flowVersion) {
-    const upgradeCmd = getUpgradeCommand('@sylphx/flow', packageManager);
-    console.log(
-      chalk.yellow(
-        `📦 Sylphx Flow update available: ${updates.flowVersion.current} → ${updates.flowVersion.latest}`
-      )
-    );
-    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 (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`));
-  }
-}
-
-
-/**
- * Step 2: Check component integrity and prompt for repair
- */
-export async function checkComponentIntegrity(
-  state: ProjectState,
-  options: FlowOptions
-): Promise<void> {
-  // Skip if not initialized or cleaning or init-only
-  if (!state.initialized || options.clean || options.initOnly) return;
-
-  // Skip in quick mode
-  if (options.quick) return;
-
-  // Find missing components (target-aware)
-  const missing: string[] = [];
-
-  // Agents are always required
-  if (!state.components.agents.installed) missing.push('agents');
-
-  // For OpenCode: check rules (separate AGENTS.md file)
-  // For Claude Code: rules are included in agent files, so skip this check
-  if (state.target === 'opencode' && !state.components.rules.installed) {
-    missing.push('rules');
-  }
-
-  // Hooks are optional - don't check
-  // Claude Code can have hooks in .claude/hooks/*.js but they're optional
-  // OpenCode doesn't have separate hooks
-
-  // MCP is optional now - many users don't use MCP
-  // if (!state.components.mcp.installed) missing.push('mcp');
-
-  // Output styles:
-  // - Claude Code: included in agent files, so skip check
-  // - OpenCode: included in AGENTS.md, so skip check
-
-  // Slash commands are optional
-  // if (!state.components.slashCommands.installed) missing.push('slash commands');
-
-  // If no missing components, we're good
-  if (missing.length === 0) return;
-
-  // Prompt user to repair
-  console.log(chalk.yellow(`\n⚠️  Missing components detected: ${missing.join(', ')}\n`));
-  const { default: inquirer } = await import('inquirer');
-  const { repair } = await inquirer.prompt([
-    {
-      type: 'confirm',
-      name: 'repair',
-      message: 'Install missing components now?',
-      default: true,
-    },
-  ]);
-
-  if (repair) {
-    // Set repair mode - will trigger component installation without full re-init
-    options.repair = true;
-    console.log(chalk.cyan('\n🔧 Repairing components...\n'));
-  } else {
-    console.log(chalk.dim('Skipping repair. Components may not work correctly.\n'));
-  }
-}
-
-/**
- * Step 2.5: Check sync status (new templates available)
- * Only checks for missing templates, ignores unknown files
- */
-export async function checkSyncStatus(
-  state: ProjectState,
-  options: FlowOptions
-): Promise<void> {
-  // Skip if not initialized, syncing, or init-only
-  if (!state.initialized || options.sync || options.initOnly) return;
-
-  // Skip in quick mode
-  if (options.quick) return;
-
-  // Need target to check sync status
-  if (!state.target) return;
-
-  try {
-    const { buildSyncManifest } = await import('../utils/files/sync-utils.js');
-    const target = targetManager.getTarget(state.target);
-
-    if (target._tag === 'None') return;
-
-    const manifest = await buildSyncManifest(process.cwd(), target.value);
-
-    // Count missing templates (new templates not installed locally)
-    const missingCount =
-      manifest.agents.missing.length +
-      manifest.slashCommands.missing.length +
-      manifest.rules.missing.length;
-
-    // Only prompt if there are missing templates
-    if (missingCount > 0) {
-      const missing: string[] = [];
-
-      if (manifest.agents.missing.length > 0) {
-        missing.push(`${manifest.agents.missing.length} agent${manifest.agents.missing.length > 1 ? 's' : ''}`);
-      }
-      if (manifest.slashCommands.missing.length > 0) {
-        missing.push(`${manifest.slashCommands.missing.length} command${manifest.slashCommands.missing.length > 1 ? 's' : ''}`);
-      }
-      if (manifest.rules.missing.length > 0) {
-        missing.push(`${manifest.rules.missing.length} rule${manifest.rules.missing.length > 1 ? 's' : ''}`);
-      }
-
-      console.log(chalk.yellow(`\n📦 New templates available: ${missing.join(', ')}\n`));
-      console.log(chalk.dim(`   Run ${chalk.cyan('sylphx-flow --sync')} to install new templates\n`));
-    }
-  } catch (error) {
-    // Silently ignore sync check errors - don't block execution
-  }
-}
-
-/**
- * Step 3: Handle target selection
- * Returns the selected target ID
- */
-export async function selectTarget(
-  state: ProjectState,
-  options: FlowOptions
-): Promise<string | undefined> {
-  // Force target selection when cleaning
-  if (options.clean) {
-    try {
-      const targetId = await targetManager.promptForTargetSelection();
-      console.log(chalk.green(`✅ Selected target: ${targetId}`));
-      return targetId;
-    } catch (error) {
-      // User cancelled with Ctrl+C - exit gracefully
-      if (error instanceof Error && error.name === 'ExitPromptError') {
-        console.log('\n');
-        process.exit(0);
-      }
-      throw error;
-    }
-  }
-
-  // Use existing target or option
-  return options.target || state.target;
-}
-
-/**
- * Step 3: Initialize project
- */
-export async function initializeProject(
-  targetId: string | undefined,
-  options: FlowOptions
-): Promise<void> {
-  if (options.runOnly && !options.clean) return;
-
-  console.log(chalk.cyan.bold('━ Initializing Project\n'));
-
-  const { runInit } = await import('./init-command.js');
-
-  const initOptions = {
-    target: targetId,
-    verbose: options.verbose,
-    dryRun: options.dryRun,
-    clear: options.clean || false,
-    mcp: options.mcp !== false,
-    agents: options.agents !== false,
-    rules: options.rules !== false,
-    outputStyles: options.outputStyles !== false,
-    slashCommands: options.slashCommands !== false,
-    hooks: options.hooks !== false,
-    helpOption: () => {},
-  };
-
-  try {
-    await runInit(initOptions);
-
-    if (!options.dryRun) {
-      console.log(chalk.green.bold('\n✓ Initialization complete\n'));
-    } else {
-      console.log(chalk.dim('\n✓ Dry run complete - skipping execution\n'));
-    }
-  } catch (error) {
-    console.error(chalk.red.bold('\n✗ Initialization failed:'), error);
-    throw error;
-  }
-}
-
-/**
- * Step 4: Launch target
- */
-export async function launchTarget(
-  targetId: string | undefined,
-  prompt: string | undefined,
-  options: FlowOptions,
-  state: ProjectState
-): Promise<void> {
-  if (options.initOnly) return;
-
-  // Resolve target
-  const resolvedTarget = await targetManager.resolveTarget({
-    target: targetId || state.target,
-    allowSelection: false,
-  });
-
-  console.log(chalk.cyan.bold(`━ Launching ${resolvedTarget}\n`));
-
-  // Check if target supports command execution
-  const { getTargetsWithCommandSupport } = await import('../config/targets.js');
-  const supportedTargets = getTargetsWithCommandSupport().map(t => t.id);
-
-  if (!supportedTargets.includes(resolvedTarget)) {
-    console.log(chalk.red.bold('✗ Unsupported target platform\n'));
-    console.log(
-      chalk.yellow(`Target '${resolvedTarget}' does not support agent execution.`)
-    );
-    console.log(chalk.cyan(`Supported platforms: ${supportedTargets.join(', ')}\n`));
-    throw new Error(`Unsupported target: ${resolvedTarget}`);
-  }
-
-  // Handle Claude Code specific setup
-  if (resolvedTarget === 'claude-code') {
-    await setupClaudeCode(options);
-  }
-
-  // Execute command
-  await executeCommand(resolvedTarget, prompt, options);
-}
-
-/**
- * Setup Claude Code (provider + agent selection)
- */
-async function setupClaudeCode(options: FlowOptions): Promise<void> {
-  const { SmartConfigService } = await import('../services/smart-config-service.js');
-  const { ConfigService } = await import('../services/config-service.js');
-
-  // Check if API keys are configured
-  if (!(await ConfigService.hasInitialSetup())) {
-    console.log(chalk.cyan('\n🔑 First-time setup for Claude Code:\n'));
-    await SmartConfigService.initialSetup();
-    console.log(chalk.green('\n✅ Claude Code setup complete!\n'));
-  }
-
-  // Select provider and agent
-  const runtimeChoices = await SmartConfigService.selectRuntimeChoices({
-    selectProvider: options.selectProvider,
-    selectAgent: options.selectAgent,
-    useDefaults: options.useDefaults,
-    provider: options.provider,
-    agent: options.agent,
-  });
-
-  // Setup environment
-  await SmartConfigService.setupEnvironment(runtimeChoices.provider!);
-
-  // Store selected agent
-  options.agent = runtimeChoices.agent;
-}
-
-/**
- * Execute the target command
- */
-async function executeCommand(
-  targetId: string,
-  prompt: string | undefined,
-  options: FlowOptions
-): Promise<void> {
-  const agent = options.agent || 'coder';
-  const verbose = options.verbose || false;
-
-  if (verbose || options.runOnly) {
-    console.log(`🤖 Agent: ${agent}`);
-    console.log(`🎯 Target: ${targetId}`);
-    if (prompt) {
-      console.log(`💬 Prompt: ${prompt}\n`);
-    }
-  }
-
-  // Run the command
-  const { runCommand } = await import('./run-command.js');
-  await runCommand({ target: targetId, agent, prompt, verbose });
-}