@sylphx/flow 2.1.3 → 2.1.5

package/src/core/attach/file-attacher.ts

@@ -0,0 +1,172 @@
+/**
+ * Pure functions for file attachment operations
+ * Generic utilities for attaching files with conflict tracking
+ */
+
+import { existsSync } from 'node:fs';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+
+// ============================================================================
+// Types
+// ============================================================================
+
+export interface AttachItem {
+  name: string;
+  content: string;
+}
+
+export interface ConflictInfo {
+  type: string;
+  name: string;
+  action: 'overridden' | 'added' | 'skipped';
+  message: string;
+}
+
+export interface AttachStats {
+  added: string[];
+  overridden: string[];
+  conflicts: ConflictInfo[];
+}
+
+export interface ManifestTracker {
+  user: string[];
+  flow: string[];
+}
+
+// ============================================================================
+// Pure Functions
+// ============================================================================
+
+/**
+ * Create conflict info object
+ */
+export const createConflict = (
+  type: string,
+  name: string,
+  action: 'overridden' | 'added' | 'skipped' = 'overridden'
+): ConflictInfo => ({
+  type,
+  name,
+  action,
+  message: `${type.charAt(0).toUpperCase() + type.slice(1)} '${name}' ${action} (will be restored on exit)`,
+});
+
+/**
+ * Check if file exists at path
+ */
+export const fileExists = (filePath: string): boolean => existsSync(filePath);
+
+/**
+ * Ensure directory exists
+ */
+export const ensureDir = (dirPath: string): Promise<void> =>
+  fs.mkdir(dirPath, { recursive: true }).then(() => {});
+
+/**
+ * Write file content
+ */
+export const writeFile = (filePath: string, content: string): Promise<void> =>
+  fs.writeFile(filePath, content);
+
+/**
+ * Read file content
+ */
+export const readFile = (filePath: string): Promise<string> =>
+  fs.readFile(filePath, 'utf-8');
+
+// ============================================================================
+// Generic Attach Function
+// ============================================================================
+
+/**
+ * Attach multiple items to a directory with conflict tracking
+ * Pure function that returns stats and manifest updates
+ */
+export const attachItemsToDir = async (
+  items: AttachItem[],
+  targetDir: string,
+  itemType: string
+): Promise<{ stats: AttachStats; manifest: ManifestTracker }> => {
+  await ensureDir(targetDir);
+
+  const stats: AttachStats = {
+    added: [],
+    overridden: [],
+    conflicts: [],
+  };
+
+  const manifest: ManifestTracker = {
+    user: [],
+    flow: [],
+  };
+
+  for (const item of items) {
+    const itemPath = path.join(targetDir, item.name);
+    const existed = fileExists(itemPath);
+
+    if (existed) {
+      stats.overridden.push(item.name);
+      stats.conflicts.push(createConflict(itemType, item.name, 'overridden'));
+      manifest.user.push(item.name);
+    } else {
+      stats.added.push(item.name);
+    }
+
+    await writeFile(itemPath, item.content);
+    manifest.flow.push(item.name);
+  }
+
+  return { stats, manifest };
+};
+
+// ============================================================================
+// Rules Attachment (Append Strategy)
+// ============================================================================
+
+const FLOW_RULES_START = '<!-- ========== Sylphx Flow Rules (Auto-injected) ========== -->';
+const FLOW_RULES_END = '<!-- ========== End of Sylphx Flow Rules ========== -->';
+const FLOW_RULES_MARKER = '<!-- Sylphx Flow Rules -->';
+
+/**
+ * Check if content already has Flow rules appended
+ */
+export const hasFlowRules = (content: string): boolean =>
+  content.includes(FLOW_RULES_MARKER);
+
+/**
+ * Wrap rules content with markers
+ */
+export const wrapRulesContent = (rules: string): string =>
+  `\n\n${FLOW_RULES_START}\n\n${rules}\n\n${FLOW_RULES_END}\n`;
+
+/**
+ * Append rules to existing content
+ */
+export const appendRules = (existingContent: string, rules: string): string =>
+  existingContent + wrapRulesContent(rules);
+
+/**
+ * Attach rules file with append strategy
+ */
+export const attachRulesFile = async (
+  rulesPath: string,
+  rules: string
+): Promise<{ originalSize: number; flowContentAdded: boolean }> => {
+  if (fileExists(rulesPath)) {
+    const existingContent = await readFile(rulesPath);
+
+    // Skip if already appended
+    if (hasFlowRules(existingContent)) {
+      return { originalSize: existingContent.length, flowContentAdded: false };
+    }
+
+    await writeFile(rulesPath, appendRules(existingContent, rules));
+    return { originalSize: existingContent.length, flowContentAdded: true };
+  }
+
+  // Create new file
+  await ensureDir(path.dirname(rulesPath));
+  await writeFile(rulesPath, rules);
+  return { originalSize: 0, flowContentAdded: true };
+};

package/src/core/attach/index.ts

@@ -0,0 +1,5 @@
+/**
+ * Attach module - Pure functions for file attachment
+ */
+
+export * from './file-attacher.js';

package/src/core/attach-manager.ts

@@ -4,15 +4,18 @@
  * 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 { attachItemsToDir, attachRulesFile } from './attach/index.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 +42,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 +68,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 +98,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 +111,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 +120,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 +150,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 +168,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
@@ -189,177 +189,122 @@ export class AttachManager {
 
   /**
    * Attach agents (override strategy)
+   * Uses shared attachItemsToDir function
    */
   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);
-    await fs.mkdir(agentsDir, { recursive: true });
-
-    for (const agent of agents) {
-      const agentPath = path.join(agentsDir, agent.name);
-      const existed = existsSync(agentPath);
-
-      if (existed) {
-        // Conflict: user has same agent
-        result.agentsOverridden.push(agent.name);
-        result.conflicts.push({
-          type: 'agent',
-          name: agent.name,
-          action: 'overridden',
-          message: `Agent '${agent.name}' overridden (will be restored on exit)`,
-        });
-
-        // Track in manifest
-        manifest.backup.agents.user.push(agent.name);
-      } else {
-        result.agentsAdded.push(agent.name);
-      }
-
-      // Write Flow agent (override)
-      await fs.writeFile(agentPath, agent.content);
+    const agentsDir = path.join(projectPath, target.config.agentDir);
+    const { stats, manifest: itemManifest } = await attachItemsToDir(agents, agentsDir, 'agent');
+
+    // Update result
+    result.agentsAdded.push(...stats.added);
+    result.agentsOverridden.push(...stats.overridden);
+    result.conflicts.push(
+      ...stats.conflicts.map((c) => ({ ...c, type: 'agent' as const }))
+    );
 
-      // Track Flow agent
-      manifest.backup.agents.flow.push(agent.name);
-    }
+    // Update manifest
+    manifest.backup.agents.user.push(...itemManifest.user);
+    manifest.backup.agents.flow.push(...itemManifest.flow);
   }
 
   /**
    * Attach commands (override strategy)
+   * Uses shared attachItemsToDir function
    */
   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);
-    await fs.mkdir(commandsDir, { recursive: true });
-
-    for (const command of commands) {
-      const commandPath = path.join(commandsDir, command.name);
-      const existed = existsSync(commandPath);
-
-      if (existed) {
-        // Conflict: user has same command
-        result.commandsOverridden.push(command.name);
-        result.conflicts.push({
-          type: 'command',
-          name: command.name,
-          action: 'overridden',
-          message: `Command '${command.name}' overridden (will be restored on exit)`,
-        });
-
-        // Track in manifest
-        manifest.backup.commands.user.push(command.name);
-      } else {
-        result.commandsAdded.push(command.name);
-      }
-
-      // Write Flow command (override)
-      await fs.writeFile(commandPath, command.content);
+    const commandsDir = path.join(projectPath, target.config.slashCommandsDir);
+    const { stats, manifest: itemManifest } = await attachItemsToDir(commands, commandsDir, 'command');
+
+    // Update result
+    result.commandsAdded.push(...stats.added);
+    result.commandsOverridden.push(...stats.overridden);
+    result.conflicts.push(
+      ...stats.conflicts.map((c) => ({ ...c, type: 'command' as const }))
+    );
 
-      // Track Flow command
-      manifest.backup.commands.flow.push(command.name);
-    }
+    // Update manifest
+    manifest.backup.commands.user.push(...itemManifest.user);
+    manifest.backup.commands.flow.push(...itemManifest.flow);
   }
 
   /**
    * Attach rules (append strategy for AGENTS.md)
+   * Uses shared attachRulesFile function
    */
   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');
-
-    if (existsSync(rulesPath)) {
-      // User has AGENTS.md, append Flow rules
-      const userRules = await fs.readFile(rulesPath, 'utf-8');
-
-      // Check if already appended (avoid duplicates)
-      if (userRules.includes('<!-- Sylphx Flow Rules -->')) {
-        // Already appended, skip
-        return;
-      }
-
-      const merged = `${userRules}
-
-<!-- ========== Sylphx Flow Rules (Auto-injected) ========== -->
-
-${rules}
-
-<!-- ========== End of Sylphx Flow Rules ========== -->
-`;
+    const rulesPath = target.config.rulesFile
+      ? path.join(projectPath, target.config.rulesFile)
+      : path.join(projectPath, target.config.agentDir, 'AGENTS.md');
 
-      await fs.writeFile(rulesPath, merged);
+    const { originalSize, flowContentAdded } = await attachRulesFile(rulesPath, rules);
 
+    if (flowContentAdded) {
       manifest.backup.rules = {
         path: rulesPath,
-        originalSize: userRules.length,
-        flowContentAdded: true,
-      };
-    } else {
-      // User doesn't have AGENTS.md, create new
-      await fs.mkdir(path.dirname(rulesPath), { recursive: true });
-      await fs.writeFile(rulesPath, rules);
-
-      manifest.backup.rules = {
-        path: rulesPath,
-        originalSize: 0,
+        originalSize,
         flowContentAdded: true,
       };
+      result.rulesAppended = true;
     }
-
-    result.rulesAppended = true;
   }
 
   /**
    * 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 +317,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 +328,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 +336,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 +377,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 +424,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"));
   }
 }