@sylphx/flow 2.1.2 → 2.1.4

package/src/core/attach-manager.ts

@@ -4,15 +4,17 @@
  * Strategy: Direct override with backup, restore on cleanup
  */
 
+import { createHash } from 'node:crypto';
+import { existsSync } from 'node:fs';
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { existsSync } from 'node:fs';
-import { createHash } from 'node:crypto';
 import chalk from 'chalk';
-import { ProjectManager } from './project-manager.js';
-import type { BackupManifest } from './backup-manager.js';
-import { GlobalConfigService } from '../services/global-config.js';
 import { MCP_SERVER_REGISTRY } from '../config/servers.js';
+import { GlobalConfigService } from '../services/global-config.js';
+import type { Target } from '../types/target.types.js';
+import type { BackupManifest } from './backup-manager.js';
+import type { ProjectManager } from './project-manager.js';
+import { targetManager } from './target-manager.js';
 
 export interface AttachResult {
   agentsAdded: string[];
@@ -39,13 +41,12 @@ export interface FlowTemplates {
   agents: Array<{ name: string; content: string }>;
   commands: Array<{ name: string; content: string }>;
   rules?: string;
-  mcpServers: Array<{ name: string; config: any }>;
+  mcpServers: Array<{ name: string; config: Record<string, unknown> }>;
   hooks: Array<{ name: string; content: string }>;
   singleFiles: Array<{ path: string; content: string }>;
 }
 
 export class AttachManager {
-  private projectManager: ProjectManager;
   private configService: GlobalConfigService;
 
   constructor(projectManager: ProjectManager) {
@@ -66,26 +67,25 @@ export class AttachManager {
   }
 
   /**
-   * Get target-specific directory names
+   * Resolve target from ID string to Target object
    */
-  private getTargetDirs(target: 'claude-code' | 'opencode'): {
-    agents: string;
-    commands: string;
-  } {
-    return target === 'claude-code'
-      ? { agents: 'agents', commands: 'commands' }
-      : { agents: 'agent', commands: 'command' };
+  private resolveTarget(targetId: string): Target {
+    const targetOption = targetManager.getTarget(targetId);
+    if (targetOption._tag === 'None') {
+      throw new Error(`Unknown target: ${targetId}`);
+    }
+    return targetOption.value;
   }
 
   /**
    * Load global MCP servers from ~/.sylphx-flow/mcp-config.json
    */
   private async loadGlobalMCPServers(
-    target: 'claude-code' | 'opencode'
-  ): Promise<Array<{ name: string; config: any }>> {
+    _target: Target
+  ): Promise<Array<{ name: string; config: Record<string, unknown> }>> {
     try {
       const enabledServers = await this.configService.getEnabledMCPServers();
-      const servers: Array<{ name: string; config: any }> = [];
+      const servers: Array<{ name: string; config: Record<string, unknown> }> = [];
 
       for (const [serverKey, serverConfig] of Object.entries(enabledServers)) {
         // Lookup server definition in registry
@@ -97,7 +97,7 @@ export class AttachManager {
         }
 
         // Clone the server config from registry
-        let config: any = { ...serverDef.config };
+        const config: Record<string, unknown> = { ...serverDef.config };
 
         // Merge environment variables from global config
         if (serverConfig.env && Object.keys(serverConfig.env).length > 0) {
@@ -110,7 +110,7 @@ export class AttachManager {
       }
 
       return servers;
-    } catch (error) {
+    } catch (_error) {
       // If global config doesn't exist or fails to load, return empty array
       return [];
     }
@@ -119,15 +119,21 @@ export class AttachManager {
   /**
    * Attach Flow templates to project
    * Strategy: Override with warning, backup handles restoration
+   * @param projectPath - Project root path
+   * @param _projectHash - Project hash (unused but kept for API compatibility)
+   * @param targetOrId - Target object or target ID string
+   * @param templates - Flow templates to attach
+   * @param manifest - Backup manifest to track changes
    */
   async attach(
     projectPath: string,
-    projectHash: string,
-    target: 'claude-code' | 'opencode',
+    _projectHash: string,
+    targetOrId: Target | string,
     templates: FlowTemplates,
     manifest: BackupManifest
   ): Promise<AttachResult> {
-    const targetDir = this.projectManager.getTargetConfigDir(projectPath, target);
+    // Resolve target from ID if needed
+    const target = typeof targetOrId === 'string' ? this.resolveTarget(targetOrId) : targetOrId;
 
     const result: AttachResult = {
       agentsAdded: [],
@@ -143,18 +149,17 @@ export class AttachManager {
       conflicts: [],
     };
 
-    // Ensure target directory exists
-    await fs.mkdir(targetDir, { recursive: true });
+    // All paths are relative to projectPath, using target.config.* directly
 
     // 1. Attach agents
-    await this.attachAgents(targetDir, target, templates.agents, result, manifest);
+    await this.attachAgents(projectPath, target, templates.agents, result, manifest);
 
     // 2. Attach commands
-    await this.attachCommands(targetDir, target, templates.commands, result, manifest);
+    await this.attachCommands(projectPath, target, templates.commands, result, manifest);
 
     // 3. Attach rules (if applicable)
     if (templates.rules) {
-      await this.attachRules(targetDir, target, templates.rules, result, manifest);
+      await this.attachRules(projectPath, target, templates.rules, result, manifest);
     }
 
     // 4. Attach MCP servers (merge global + template servers)
@@ -162,18 +167,12 @@ export class AttachManager {
     const allMCPServers = [...globalMCPServers, ...templates.mcpServers];
 
     if (allMCPServers.length > 0) {
-      await this.attachMCPServers(
-        targetDir,
-        target,
-        allMCPServers,
-        result,
-        manifest
-      );
+      await this.attachMCPServers(projectPath, target, allMCPServers, result, manifest);
     }
 
     // 5. Attach hooks
     if (templates.hooks.length > 0) {
-      await this.attachHooks(targetDir, templates.hooks, result, manifest);
+      await this.attachHooks(projectPath, target, templates.hooks, result, manifest);
     }
 
     // 6. Attach single files
@@ -191,14 +190,14 @@ export class AttachManager {
    * Attach agents (override strategy)
    */
   private async attachAgents(
-    targetDir: string,
-    target: 'claude-code' | 'opencode',
+    projectPath: string,
+    target: Target,
     agents: Array<{ name: string; content: string }>,
     result: AttachResult,
     manifest: BackupManifest
   ): Promise<void> {
-    const dirs = this.getTargetDirs(target);
-    const agentsDir = path.join(targetDir, dirs.agents);
+    // Use full path from target config
+    const agentsDir = path.join(projectPath, target.config.agentDir);
     await fs.mkdir(agentsDir, { recursive: true });
 
     for (const agent of agents) {
@@ -233,14 +232,14 @@ export class AttachManager {
    * Attach commands (override strategy)
    */
   private async attachCommands(
-    targetDir: string,
-    target: 'claude-code' | 'opencode',
+    projectPath: string,
+    target: Target,
     commands: Array<{ name: string; content: string }>,
     result: AttachResult,
     manifest: BackupManifest
   ): Promise<void> {
-    const dirs = this.getTargetDirs(target);
-    const commandsDir = path.join(targetDir, dirs.commands);
+    // Use full path from target config
+    const commandsDir = path.join(projectPath, target.config.slashCommandsDir);
     await fs.mkdir(commandsDir, { recursive: true });
 
     for (const command of commands) {
@@ -275,19 +274,18 @@ export class AttachManager {
    * Attach rules (append strategy for AGENTS.md)
    */
   private async attachRules(
-    targetDir: string,
-    target: 'claude-code' | 'opencode',
+    projectPath: string,
+    target: Target,
     rules: string,
     result: AttachResult,
     manifest: BackupManifest
   ): Promise<void> {
-    // Claude Code: .claude/agents/AGENTS.md
-    // OpenCode: .opencode/AGENTS.md
-    const dirs = this.getTargetDirs(target);
-    const rulesPath =
-      target === 'claude-code'
-        ? path.join(targetDir, dirs.agents, 'AGENTS.md')
-        : path.join(targetDir, 'AGENTS.md');
+    // Use full paths from target config:
+    // - rulesFile defined (e.g., OpenCode): projectPath/rulesFile
+    // - rulesFile undefined (e.g., Claude Code): projectPath/agentDir/AGENTS.md
+    const rulesPath = target.config.rulesFile
+      ? path.join(projectPath, target.config.rulesFile)
+      : path.join(projectPath, target.config.agentDir, 'AGENTS.md');
 
     if (existsSync(rulesPath)) {
       // User has AGENTS.md, append Flow rules
@@ -332,34 +330,43 @@ ${rules}
 
   /**
    * Attach MCP servers (merge strategy)
+   * Uses target.config.configFile and target.config.mcpConfigPath
+   * Note: configFile is relative to project root, not targetDir
    */
   private async attachMCPServers(
-    targetDir: string,
-    target: 'claude-code' | 'opencode',
-    mcpServers: Array<{ name: string; config: any }>,
+    projectPath: string,
+    target: Target,
+    mcpServers: Array<{ name: string; config: Record<string, unknown> }>,
     result: AttachResult,
     manifest: BackupManifest
   ): Promise<void> {
-    // Claude Code: .claude/settings.json (mcp.servers)
-    // OpenCode: .opencode/.mcp.json
-    const configPath =
-      target === 'claude-code'
-        ? path.join(targetDir, 'settings.json')
-        : path.join(targetDir, '.mcp.json');
+    // Use target config for file path and MCP config structure
+    // Claude Code: .mcp.json at project root with mcpServers key
+    // OpenCode: opencode.jsonc at project root with mcp key
+    const configPath = path.join(projectPath, target.config.configFile);
+    const mcpPath = target.config.mcpConfigPath;
 
-    let config: any = {};
+    let config: Record<string, unknown> = {};
 
     if (existsSync(configPath)) {
       config = JSON.parse(await fs.readFile(configPath, 'utf-8'));
     }
 
-    // Ensure mcp.servers exists
-    if (!config.mcp) config.mcp = {};
-    if (!config.mcp.servers) config.mcp.servers = {};
+    // Get or create the MCP servers object at the correct path
+    // Claude Code: config.mcpServers = {}
+    // OpenCode: config.mcp = {}
+    let mcpContainer = config[mcpPath] as Record<string, unknown> | undefined;
+    if (!mcpContainer) {
+      mcpContainer = {};
+      config[mcpPath] = mcpContainer;
+    }
 
     // Add Flow MCP servers
     for (const server of mcpServers) {
-      if (config.mcp.servers[server.name]) {
+      // Transform the server config for this target
+      const transformedConfig = target.transformMCPConfig(server.config as any, server.name);
+
+      if (mcpContainer[server.name]) {
         // Conflict: user has same MCP server
         result.mcpServersOverridden.push(server.name);
         result.conflicts.push({
@@ -372,8 +379,8 @@ ${rules}
         result.mcpServersAdded.push(server.name);
       }
 
-      // Override with Flow config
-      config.mcp.servers[server.name] = server.config;
+      // Override with Flow config (transformed for target)
+      mcpContainer[server.name] = transformedConfig;
     }
 
     // Write updated config
@@ -383,7 +390,7 @@ ${rules}
     manifest.backup.config = {
       path: configPath,
       hash: await this.calculateFileHash(configPath),
-      mcpServersCount: Object.keys(config.mcp.servers).length,
+      mcpServersCount: Object.keys(mcpContainer).length,
     };
   }
 
@@ -391,12 +398,14 @@ ${rules}
    * Attach hooks (override strategy)
    */
   private async attachHooks(
-    targetDir: string,
+    projectPath: string,
+    target: Target,
     hooks: Array<{ name: string; content: string }>,
     result: AttachResult,
-    manifest: BackupManifest
+    _manifest: BackupManifest
   ): Promise<void> {
-    const hooksDir = path.join(targetDir, 'hooks');
+    // Hooks are in configDir/hooks
+    const hooksDir = path.join(projectPath, target.config.configDir, 'hooks');
     await fs.mkdir(hooksDir, { recursive: true });
 
     for (const hook of hooks) {
@@ -430,13 +439,16 @@ ${rules}
     result: AttachResult,
     manifest: BackupManifest
   ): Promise<void> {
-    // Get target from manifest to determine correct directory
-    const target = manifest.target;
-    const targetDir = this.projectManager.getTargetConfigDir(projectPath, target);
+    // Get target from manifest to determine config directory
+    const targetOption = targetManager.getTarget(manifest.target);
+    if (targetOption._tag === 'None') {
+      return; // Unknown target, skip
+    }
+    const target = targetOption.value;
 
     for (const file of singleFiles) {
-      // Write to target config directory, not project root
-      const filePath = path.join(targetDir, file.path);
+      // Write to target config directory (e.g., .claude/ or .opencode/)
+      const filePath = path.join(projectPath, target.config.configDir, file.path);
       const existed = existsSync(filePath);
 
       if (existed) {
@@ -474,13 +486,9 @@ ${rules}
     console.log(chalk.yellow('\n⚠️  Conflicts detected:\n'));
 
     for (const conflict of result.conflicts) {
-      console.log(
-        chalk.yellow(`   • ${conflict.type}: ${conflict.name} - ${conflict.action}`)
-      );
+      console.log(chalk.yellow(`   • ${conflict.type}: ${conflict.name} - ${conflict.action}`));
     }
 
-    console.log(
-      chalk.dim('\n   Don\'t worry! All overridden content will be restored on exit.\n')
-    );
+    console.log(chalk.dim("\n   Don't worry! All overridden content will be restored on exit.\n"));
   }
 }

package/src/core/backup-manager.ts

@@ -4,17 +4,19 @@
  * Supports multi-project isolation in ~/.sylphx-flow/backups/
  */
 
+import { existsSync } from 'node:fs';
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { existsSync } from 'node:fs';
 import ora from 'ora';
-import { ProjectManager } from './project-manager.js';
+import type { Target } from '../types/target.types.js';
+import type { ProjectManager } from './project-manager.js';
+import { targetManager } from './target-manager.js';
 
 export interface BackupInfo {
   sessionId: string;
   timestamp: string;
   projectPath: string;
-  target: 'claude-code' | 'opencode';
+  target: string;
   backupPath: string;
 }
 
@@ -22,7 +24,7 @@ export interface BackupManifest {
   sessionId: string;
   timestamp: string;
   projectPath: string;
-  target: 'claude-code' | 'opencode';
+  target: string;
   backup: {
     config?: {
       path: string;
@@ -64,14 +66,27 @@ export class BackupManager {
     this.projectManager = projectManager;
   }
 
+  /**
+   * Resolve target from ID string to Target object
+   */
+  private resolveTarget(targetId: string): Target {
+    const targetOption = targetManager.getTarget(targetId);
+    if (targetOption._tag === 'None') {
+      throw new Error(`Unknown target: ${targetId}`);
+    }
+    return targetOption.value;
+  }
+
   /**
    * Create full backup of project environment
    */
   async createBackup(
     projectPath: string,
     projectHash: string,
-    target: 'claude-code' | 'opencode'
+    targetOrId: Target | string
   ): Promise<BackupInfo> {
+    const target = typeof targetOrId === 'string' ? this.resolveTarget(targetOrId) : targetOrId;
+    const targetId = target.id;
     const sessionId = `session-${Date.now()}`;
     const timestamp = new Date().toISOString();
 
@@ -89,19 +104,17 @@ export class BackupManager {
 
       // Backup entire target directory if it exists
       if (existsSync(targetConfigDir)) {
-        const backupTargetDir = path.join(
-          backupPath,
-          target === 'claude-code' ? '.claude' : '.opencode'
-        );
+        // Use configDir from target config (e.g., '.claude', '.opencode')
+        const backupTargetDir = path.join(backupPath, target.config.configDir);
         await this.copyDirectory(targetConfigDir, backupTargetDir);
       }
 
-      // Create manifest
+      // Create manifest (store target ID as string for JSON serialization)
       const manifest: BackupManifest = {
         sessionId,
         timestamp,
         projectPath,
-        target,
+        target: targetId,
         backup: {
           agents: { user: [], flow: [] },
           commands: { user: [], flow: [] },
@@ -113,10 +126,7 @@ export class BackupManager {
         },
       };
 
-      await fs.writeFile(
-        path.join(backupPath, 'manifest.json'),
-        JSON.stringify(manifest, null, 2)
-      );
+      await fs.writeFile(path.join(backupPath, 'manifest.json'), JSON.stringify(manifest, null, 2));
 
       // Create symlink to latest
       const latestLink = paths.latestBackup;
@@ -131,7 +141,7 @@ export class BackupManager {
         sessionId,
         timestamp,
         projectPath,
-        target,
+        target: targetId,
         backupPath,
       };
     } catch (error) {
@@ -156,12 +166,13 @@ export class BackupManager {
     try {
       // Read manifest
       const manifestPath = path.join(backupPath, 'manifest.json');
-      const manifest: BackupManifest = JSON.parse(
-        await fs.readFile(manifestPath, 'utf-8')
-      );
+      const manifest: BackupManifest = JSON.parse(await fs.readFile(manifestPath, 'utf-8'));
 
       const projectPath = manifest.projectPath;
-      const target = manifest.target;
+      const targetId = manifest.target;
+
+      // Resolve target to get config
+      const target = this.resolveTarget(targetId);
 
       // Get target config directory
       const targetConfigDir = this.projectManager.getTargetConfigDir(projectPath, target);
@@ -171,11 +182,8 @@ export class BackupManager {
         await fs.rm(targetConfigDir, { recursive: true, force: true });
       }
 
-      // Restore from backup
-      const backupTargetDir = path.join(
-        backupPath,
-        target === 'claude-code' ? '.claude' : '.opencode'
-      );
+      // Restore from backup using target config's configDir
+      const backupTargetDir = path.join(backupPath, target.config.configDir);
 
       if (existsSync(backupTargetDir)) {
         await this.copyDirectory(backupTargetDir, targetConfigDir);
@@ -232,7 +240,7 @@ export class BackupManager {
       .filter((e) => e.isDirectory() && e.name.startsWith('session-'))
       .map((e) => ({
         name: e.name,
-        timestamp: parseInt(e.name.replace('session-', '')),
+        timestamp: parseInt(e.name.replace('session-', ''), 10),
       }))
       .sort((a, b) => b.timestamp - a.timestamp);
 
@@ -290,9 +298,7 @@ export class BackupManager {
 
       const manifestPath = path.join(paths.backupsDir, entry.name, 'manifest.json');
       if (existsSync(manifestPath)) {
-        const manifest: BackupManifest = JSON.parse(
-          await fs.readFile(manifestPath, 'utf-8')
-        );
+        const manifest: BackupManifest = JSON.parse(await fs.readFile(manifestPath, 'utf-8'));
         backups.push({
           sessionId: manifest.sessionId,
           timestamp: manifest.timestamp,

package/src/core/cleanup-handler.ts

@@ -5,12 +5,11 @@
  */
 
 import chalk from 'chalk';
-import { ProjectManager } from './project-manager.js';
-import { SessionManager } from './session-manager.js';
-import { BackupManager } from './backup-manager.js';
+import type { BackupManager } from './backup-manager.js';
+import type { ProjectManager } from './project-manager.js';
+import type { SessionManager } from './session-manager.js';
 
 export class CleanupHandler {
-  private projectManager: ProjectManager;
   private sessionManager: SessionManager;
   private backupManager: BackupManager;
   private registered = false;
@@ -82,14 +81,16 @@ export class CleanupHandler {
     }
 
     try {
-      const { shouldRestore, session } = await this.sessionManager.endSession(this.currentProjectHash);
+      const { shouldRestore, session } = await this.sessionManager.endSession(
+        this.currentProjectHash
+      );
 
       if (shouldRestore && session) {
         // Last session - restore backup silently on normal exit
         await this.backupManager.restoreBackup(this.currentProjectHash, session.sessionId);
         await this.backupManager.cleanupOldBackups(this.currentProjectHash, 3);
       }
-    } catch (error) {
+    } catch (_error) {
       // Silent fail on exit
     }
   }
@@ -97,7 +98,7 @@ export class CleanupHandler {
   /**
    * Signal-based cleanup (SIGINT, SIGTERM, etc.) with multi-session support
    */
-  private async onSignal(signal: string): Promise<void> {
+  private async onSignal(_signal: string): Promise<void> {
     if (!this.currentProjectHash) {
       return;
     }
@@ -105,7 +106,9 @@ export class CleanupHandler {
     try {
       console.log(chalk.cyan('🧹 Cleaning up...'));
 
-      const { shouldRestore, session } = await this.sessionManager.endSession(this.currentProjectHash);
+      const { shouldRestore, session } = await this.sessionManager.endSession(
+        this.currentProjectHash
+      );
 
       if (shouldRestore && session) {
         // Last session - restore environment