@sylphx/flow 2.1.3 → 2.1.5

package/src/targets/claude-code.ts

@@ -3,14 +3,19 @@ import fs from 'node:fs';
 import fsPromises from 'node:fs/promises';
 import path from 'node:path';
 import chalk from 'chalk';
-import { installToDirectory } from '../core/installers/file-installer.js';
 import { createMCPInstaller } from '../core/installers/mcp-installer.js';
 import type { AgentMetadata } from '../types/target-config.types.js';
 import type { CommonOptions, MCPServerConfigUnion, SetupResult, Target } from '../types.js';
+import { getAgentsDir } from '../utils/config/paths.js';
+import { fileUtils, generateHelpText, pathUtils, yamlUtils } from '../utils/config/target-utils.js';
 import { CLIError } from '../utils/error-handler.js';
-import { getAgentsDir, getSlashCommandsDir } from '../utils/config/paths.js';
 import { sanitize } from '../utils/security/security.js';
-import { fileUtils, generateHelpText, pathUtils, yamlUtils } from '../utils/config/target-utils.js';
+import {
+  transformMCPConfig as transformMCP,
+  detectTargetConfig,
+  stripFrontMatter,
+  setupSlashCommandsTo,
+} from './shared/index.js';
 
 /**
  * Claude Code target - composition approach with all original functionality
@@ -24,6 +29,7 @@ export const claudeCodeTarget: Target = {
   isDefault: false,
 
   config: {
+    configDir: '.claude',
     agentDir: '.claude/agents',
     agentExtension: '.md',
     agentFormat: 'yaml-frontmatter',
@@ -67,50 +73,10 @@ export const claudeCodeTarget: Target = {
 
   /**
    * Transform MCP server configuration for Claude Code
-   * Convert from various formats to Claude Code's optimal format
+   * Uses shared pure function for bidirectional conversion
    */
   transformMCPConfig(config: MCPServerConfigUnion, _serverId?: string): Record<string, unknown> {
-    // Handle legacy OpenCode 'local' type
-    if (config.type === 'local') {
-      // Convert OpenCode 'local' array command to Claude Code format
-      const [command, ...args] = config.command;
-      return {
-        type: 'stdio',
-        command,
-        ...(args && args.length > 0 && { args }),
-        ...(config.environment && { env: config.environment }),
-      };
-    }
-
-    // Handle new stdio format (already optimized for Claude Code)
-    if (config.type === 'stdio') {
-      return {
-        type: 'stdio',
-        command: config.command,
-        ...(config.args && config.args.length > 0 && { args: config.args }),
-        ...(config.env && { env: config.env }),
-      };
-    }
-
-    // Handle legacy OpenCode 'remote' type
-    if (config.type === 'remote') {
-      return {
-        type: 'http',
-        url: config.url,
-        ...(config.headers && { headers: config.headers }),
-      };
-    }
-
-    // Handle new http format (already optimized for Claude Code)
-    if (config.type === 'http') {
-      return {
-        type: 'http',
-        url: config.url,
-        ...(config.headers && { headers: config.headers }),
-      };
-    }
-
-    return config;
+    return transformMCP(config, 'claude-code');
   },
 
   getConfigPath: (cwd: string) =>
@@ -218,8 +184,12 @@ Please begin your response with a comprehensive summary of all the instructions
     if (options.dryRun) {
       // Build the command for display
       const dryRunArgs = ['claude', '--dangerously-skip-permissions'];
-      if (options.print) dryRunArgs.push('-p');
-      if (options.continue) dryRunArgs.push('-c');
+      if (options.print) {
+        dryRunArgs.push('-p');
+      }
+      if (options.continue) {
+        dryRunArgs.push('-c');
+      }
       dryRunArgs.push('--system-prompt', '"<agent content>"');
       if (sanitizedUserPrompt.trim() !== '') {
         dryRunArgs.push(`"${sanitizedUserPrompt}"`);
@@ -297,14 +267,18 @@ Please begin your response with a comprehensive summary of all the instructions
           reject(error);
         });
       });
-    } catch (error: any) {
-      if (error.code === 'ENOENT') {
+    } catch (error: unknown) {
+      const err = error as NodeJS.ErrnoException & { code?: string | number };
+      if (err.code === 'ENOENT') {
         throw new CLIError('Claude Code not found. Please install it first.', 'CLAUDE_NOT_FOUND');
       }
-      if (error.code) {
-        throw new CLIError(`Claude Code exited with code ${error.code}`, 'CLAUDE_ERROR');
+      if (err.code) {
+        throw new CLIError(`Claude Code exited with code ${err.code}`, 'CLAUDE_ERROR');
       }
-      throw new CLIError(`Failed to execute Claude Code: ${error.message}`, 'CLAUDE_ERROR');
+      throw new CLIError(
+        `Failed to execute Claude Code: ${(error as Error).message}`,
+        'CLAUDE_ERROR'
+      );
     }
   },
 
@@ -312,12 +286,7 @@ Please begin your response with a comprehensive summary of all the instructions
    * Detect if this target is being used in the current environment
    */
   detectFromEnvironment(): boolean {
-    try {
-      const cwd = process.cwd();
-      return fs.existsSync(path.join(cwd, '.mcp.json'));
-    } catch {
-      return false;
-    }
+    return detectTargetConfig(process.cwd(), '.mcp.json');
   },
 
   /**
@@ -333,8 +302,9 @@ Please begin your response with a comprehensive summary of all the instructions
       try {
         const content = await fsPromises.readFile(settingsPath, 'utf8');
         settings = JSON.parse(content);
-      } catch (error: any) {
-        if (error.code !== 'ENOENT') {
+      } catch (error: unknown) {
+        const err = error as NodeJS.ErrnoException;
+        if (err.code !== 'ENOENT') {
           throw error;
         }
         // File doesn't exist, will create new
@@ -367,16 +337,16 @@ Please begin your response with a comprehensive summary of all the instructions
    * Transform rules content for Claude Code
    * Claude Code doesn't need front matter in rules files (CLAUDE.md)
    */
-  async transformRulesContent(content: string): Promise<string> {
-    return yamlUtils.stripFrontMatter(content);
-  },
+  transformRulesContent: stripFrontMatter,
 
   /**
    * Setup hooks for Claude Code
    * Configure session and prompt hooks for system information display
    */
   async setupHooks(cwd: string, _options: CommonOptions): Promise<SetupResult> {
-    const { processSettings, generateHookCommands } = await import('./functional/claude-code-logic.js');
+    const { processSettings, generateHookCommands } = await import(
+      './functional/claude-code-logic.js'
+    );
     const { pathExists, createDirectory, readFile, writeFile } = await import(
       '../composables/functional/useFileSystem.js'
     );
@@ -512,23 +482,7 @@ Please begin your response with a comprehensive summary of all the instructions
     if (!this.config.slashCommandsDir) {
       return { count: 0 };
     }
-
-    const slashCommandsDir = path.join(cwd, this.config.slashCommandsDir);
-
-    const results = await installToDirectory(
-      getSlashCommandsDir(),
-      slashCommandsDir,
-      async (content) => {
-        // Slash commands are plain markdown with front matter - no transformation needed
-        return content;
-      },
-      {
-        ...options,
-        showProgress: false, // UI handled by init-command
-      }
-    );
-
-    return { count: results.length };
+    return setupSlashCommandsTo(path.join(cwd, this.config.slashCommandsDir), undefined, options);
   },
 };
 

package/src/targets/opencode.ts

@@ -3,14 +3,20 @@ import path from 'node:path';
 import chalk from 'chalk';
 import { getRulesPath, ruleFileExists } from '../config/rules.js';
 import { MCP_SERVER_REGISTRY } from '../config/servers.js';
-import { installToDirectory, installFile } from '../core/installers/file-installer.js';
+import { installFile, installToDirectory } from '../core/installers/file-installer.js';
 import { createMCPInstaller } from '../core/installers/mcp-installer.js';
 import type { AgentMetadata } from '../types/target-config.types.js';
 import type { CommonOptions, MCPServerConfigUnion, SetupResult, Target } from '../types.js';
 import { getAgentsDir, getOutputStylesDir, getSlashCommandsDir } from '../utils/config/paths.js';
-import { secretUtils } from '../utils/security/secret-utils.js';
 import { fileUtils, generateHelpText, yamlUtils } from '../utils/config/target-utils.js';
 import { CLIError } from '../utils/error-handler.js';
+import { secretUtils } from '../utils/security/secret-utils.js';
+import {
+  transformMCPConfig as transformMCP,
+  detectTargetConfig,
+  stripFrontMatter,
+  setupSlashCommandsTo,
+} from './shared/index.js';
 
 /**
  * OpenCode target - composition approach with all original functionality
@@ -24,6 +30,7 @@ export const opencodeTarget: Target = {
   isDefault: true,
 
   config: {
+    configDir: '.opencode',
     agentDir: '.opencode/agent',
     agentExtension: '.md',
     agentFormat: 'yaml-frontmatter',
@@ -63,7 +70,12 @@ export const opencodeTarget: Target = {
 
     // If additional metadata is provided, merge it (but exclude unsupported fields)
     if (metadata) {
-      const { name: additionalName, mode: additionalMode, rules: additionalRules, ...additionalCleanMetadata } = metadata;
+      const {
+        name: additionalName,
+        mode: additionalMode,
+        rules: additionalRules,
+        ...additionalCleanMetadata
+      } = metadata;
       const mergedMetadata = { ...cleanMetadata, ...additionalCleanMetadata };
       return yamlUtils.addFrontMatter(baseContent, mergedMetadata);
     }
@@ -74,44 +86,10 @@ export const opencodeTarget: Target = {
 
   /**
    * Transform MCP server configuration for OpenCode
-   * Convert from Claude Code's optimal format to OpenCode's format
+   * Uses shared pure function for bidirectional conversion
    */
   transformMCPConfig(config: MCPServerConfigUnion, _serverId?: string): Record<string, unknown> {
-    // Handle new Claude Code stdio format
-    if (config.type === 'stdio') {
-      // Convert Claude Code format to OpenCode format
-      const openCodeConfig: Record<string, unknown> = {
-        type: 'local',
-        command: [config.command],
-      };
-
-      if (config.args && config.args.length > 0) {
-        openCodeConfig.command.push(...config.args);
-      }
-
-      if (config.env) {
-        openCodeConfig.environment = config.env;
-      }
-
-      return openCodeConfig;
-    }
-
-    // Handle new Claude Code http format
-    if (config.type === 'http') {
-      // Claude Code http format is compatible with OpenCode remote format
-      return {
-        type: 'remote',
-        url: config.url,
-        ...(config.headers && { headers: config.headers }),
-      };
-    }
-
-    // Handle legacy OpenCode formats (pass through)
-    if (config.type === 'local' || config.type === 'remote') {
-      return config;
-    }
-
-    return config;
+    return transformMCP(config, 'opencode');
   },
 
   getConfigPath: (cwd: string) =>
@@ -211,21 +189,14 @@ export const opencodeTarget: Target = {
    * Detect if this target is being used in the current environment
    */
   detectFromEnvironment(): boolean {
-    try {
-      const cwd = process.cwd();
-      return fs.existsSync(path.join(cwd, 'opencode.jsonc'));
-    } catch {
-      return false;
-    }
+    return detectTargetConfig(process.cwd(), 'opencode.jsonc');
   },
 
   /**
    * Transform rules content for OpenCode
    * OpenCode doesn't need front matter in rules files (AGENTS.md)
    */
-  async transformRulesContent(content: string): Promise<string> {
-    return yamlUtils.stripFrontMatter(content);
-  },
+  transformRulesContent: stripFrontMatter,
 
   /**
    * Setup agents for OpenCode
@@ -374,32 +345,22 @@ export const opencodeTarget: Target = {
     if (!this.config.slashCommandsDir) {
       return { count: 0 };
     }
-
-    const slashCommandsDir = path.join(cwd, this.config.slashCommandsDir);
-
-    const results = await installToDirectory(
-      getSlashCommandsDir(),
-      slashCommandsDir,
-      async (content) => {
-        // Slash commands are plain markdown with front matter - no transformation needed
-        return content;
-      },
-      {
-        ...options,
-        showProgress: false, // UI handled by init-command
-      }
-    );
-
-    return { count: results.length };
+    return setupSlashCommandsTo(path.join(cwd, this.config.slashCommandsDir), undefined, options);
   },
 
   /**
    * Execute OpenCode CLI
    */
   async executeCommand(
-    systemPrompt: string,
+    _systemPrompt: string,
     userPrompt: string,
-    options: { verbose?: boolean; dryRun?: boolean; print?: boolean; continue?: boolean; agent?: string } = {}
+    options: {
+      verbose?: boolean;
+      dryRun?: boolean;
+      print?: boolean;
+      continue?: boolean;
+      agent?: string;
+    } = {}
   ): Promise<void> {
     if (options.dryRun) {
       // Build the command for display
@@ -492,7 +453,6 @@ export const opencodeTarget: Target = {
           }
         });
       });
-
     } catch (error) {
       if (error instanceof Error) {
         throw new CLIError(`Failed to execute OpenCode: ${error.message}`, 'OPENCODE_ERROR');

package/src/targets/shared/index.ts

@@ -0,0 +1,7 @@
+/**
+ * Shared target utilities
+ * Pure functions for common target operations
+ */
+
+export * from './mcp-transforms.js';
+export * from './target-operations.js';

package/src/targets/shared/mcp-transforms.ts

@@ -0,0 +1,132 @@
+/**
+ * Pure functions for MCP configuration transformations
+ * Bidirectional conversion between Claude Code and OpenCode formats
+ */
+
+import type { MCPServerConfigUnion } from '../../types.js';
+
+// ============================================================================
+// Types
+// ============================================================================
+
+export type MCPFormat = 'claude-code' | 'opencode';
+
+export interface StdioConfig {
+  type: 'stdio';
+  command: string;
+  args?: string[];
+  env?: Record<string, string>;
+}
+
+export interface HttpConfig {
+  type: 'http';
+  url: string;
+  headers?: Record<string, string>;
+}
+
+export interface LocalConfig {
+  type: 'local';
+  command: string[];
+  environment?: Record<string, string>;
+}
+
+export interface RemoteConfig {
+  type: 'remote';
+  url: string;
+  headers?: Record<string, string>;
+}
+
+// ============================================================================
+// Pure Transform Functions
+// ============================================================================
+
+/**
+ * Convert stdio format to local format (Claude Code → OpenCode)
+ */
+export const stdioToLocal = (config: StdioConfig): LocalConfig => ({
+  type: 'local',
+  command: config.args ? [config.command, ...config.args] : [config.command],
+  ...(config.env && { environment: config.env }),
+});
+
+/**
+ * Convert local format to stdio format (OpenCode → Claude Code)
+ */
+export const localToStdio = (config: LocalConfig): StdioConfig => {
+  const [command, ...args] = config.command;
+  return {
+    type: 'stdio',
+    command,
+    ...(args.length > 0 && { args }),
+    ...(config.environment && { env: config.environment }),
+  };
+};
+
+/**
+ * Convert http format to remote format (Claude Code → OpenCode)
+ */
+export const httpToRemote = (config: HttpConfig): RemoteConfig => ({
+  type: 'remote',
+  url: config.url,
+  ...(config.headers && { headers: config.headers }),
+});
+
+/**
+ * Convert remote format to http format (OpenCode → Claude Code)
+ */
+export const remoteToHttp = (config: RemoteConfig): HttpConfig => ({
+  type: 'http',
+  url: config.url,
+  ...(config.headers && { headers: config.headers }),
+});
+
+/**
+ * Normalize stdio config (ensure consistent structure)
+ */
+export const normalizeStdio = (config: StdioConfig): StdioConfig => ({
+  type: 'stdio',
+  command: config.command,
+  ...(config.args && config.args.length > 0 && { args: config.args }),
+  ...(config.env && { env: config.env }),
+});
+
+/**
+ * Normalize http config (ensure consistent structure)
+ */
+export const normalizeHttp = (config: HttpConfig): HttpConfig => ({
+  type: 'http',
+  url: config.url,
+  ...(config.headers && { headers: config.headers }),
+});
+
+// ============================================================================
+// Main Transform Function
+// ============================================================================
+
+/**
+ * Transform MCP config to target format
+ * Pure function - no side effects
+ */
+export const transformMCPConfig = (
+  config: MCPServerConfigUnion,
+  targetFormat: MCPFormat
+): Record<string, unknown> => {
+  // Claude Code format (stdio/http)
+  if (targetFormat === 'claude-code') {
+    if (config.type === 'local') return localToStdio(config as LocalConfig);
+    if (config.type === 'remote') return remoteToHttp(config as RemoteConfig);
+    if (config.type === 'stdio') return normalizeStdio(config as StdioConfig);
+    if (config.type === 'http') return normalizeHttp(config as HttpConfig);
+    return config;
+  }
+
+  // OpenCode format (local/remote)
+  if (targetFormat === 'opencode') {
+    if (config.type === 'stdio') return stdioToLocal(config as StdioConfig);
+    if (config.type === 'http') return httpToRemote(config as HttpConfig);
+    if (config.type === 'local' || config.type === 'remote') return config;
+    return config;
+  }
+
+  return config;
+};

package/src/targets/shared/target-operations.ts

@@ -0,0 +1,135 @@
+/**
+ * Pure functions for common target operations
+ * Shared logic between claude-code and opencode targets
+ */
+
+import fs from 'node:fs';
+import path from 'node:path';
+import type { CommonOptions, SetupResult, TargetConfig } from '../../types.js';
+import { installToDirectory } from '../../core/installers/file-installer.js';
+import { getAgentsDir, getSlashCommandsDir } from '../../utils/config/paths.js';
+import { yamlUtils } from '../../utils/config/target-utils.js';
+
+// ============================================================================
+// Types
+// ============================================================================
+
+export type ContentTransformer = (content: string, sourcePath?: string) => Promise<string>;
+
+export interface SetupOptions extends CommonOptions {
+  showProgress?: boolean;
+}
+
+// ============================================================================
+// Pure Functions - Environment Detection
+// ============================================================================
+
+/**
+ * Check if target config file exists in directory
+ */
+export const detectTargetConfig = (cwd: string, configFile: string): boolean => {
+  try {
+    return fs.existsSync(path.join(cwd, configFile));
+  } catch {
+    return false;
+  }
+};
+
+// ============================================================================
+// Pure Functions - Content Transformation
+// ============================================================================
+
+/**
+ * Strip YAML front matter from content
+ * Used for rules transformation in both targets
+ */
+export const stripFrontMatter = (content: string): Promise<string> =>
+  Promise.resolve(yamlUtils.stripFrontMatter(content));
+
+/**
+ * Identity transformer - returns content unchanged
+ */
+export const identityTransform: ContentTransformer = (content: string) =>
+  Promise.resolve(content);
+
+// ============================================================================
+// Pure Functions - Setup Operations
+// ============================================================================
+
+/**
+ * Setup agents to target directory
+ * Generic function used by both targets
+ */
+export const setupAgentsTo = async (
+  targetDir: string,
+  transformer: ContentTransformer,
+  options: SetupOptions = {}
+): Promise<SetupResult> => {
+  const results = await installToDirectory(
+    getAgentsDir(),
+    targetDir,
+    transformer,
+    { ...options, showProgress: false }
+  );
+  return { count: results.length };
+};
+
+/**
+ * Setup slash commands to target directory
+ * Generic function used by both targets
+ */
+export const setupSlashCommandsTo = async (
+  targetDir: string,
+  transformer: ContentTransformer = identityTransform,
+  options: SetupOptions = {}
+): Promise<SetupResult> => {
+  const results = await installToDirectory(
+    getSlashCommandsDir(),
+    targetDir,
+    transformer,
+    { ...options, showProgress: false }
+  );
+  return { count: results.length };
+};
+
+// ============================================================================
+// Pure Functions - Config Operations
+// ============================================================================
+
+/**
+ * Ensure config has required structure
+ * Returns new object, doesn't mutate input
+ */
+export const ensureConfigStructure = <T extends Record<string, unknown>>(
+  config: T,
+  key: string,
+  defaultValue: unknown = {}
+): T => {
+  if (config[key] !== undefined) return config;
+  return { ...config, [key]: defaultValue };
+};
+
+/**
+ * Get MCP config key for target
+ */
+export const getMCPKey = (targetId: string): string =>
+  targetId === 'claude-code' ? 'mcpServers' : 'mcp';
+
+// ============================================================================
+// Pure Functions - Path Resolution
+// ============================================================================
+
+/**
+ * Resolve target directory paths
+ */
+export const resolveTargetPaths = (cwd: string, config: TargetConfig) => ({
+  configDir: path.join(cwd, config.configDir),
+  agentDir: path.join(cwd, config.agentDir),
+  configFile: path.join(cwd, config.configFile),
+  slashCommandsDir: config.slashCommandsDir
+    ? path.join(cwd, config.slashCommandsDir)
+    : undefined,
+  rulesFile: config.rulesFile
+    ? path.join(cwd, config.rulesFile)
+    : undefined,
+});

package/src/types/cli.types.ts

@@ -82,6 +82,6 @@ export interface RunCommandOptions {
   agent?: string;
   agentFile?: string;
   prompt?: string;
-  print?: boolean;      // Headless print mode
-  continue?: boolean;   // Continue previous conversation
+  print?: boolean; // Headless print mode
+  continue?: boolean; // Continue previous conversation
 }

package/src/types/provider.types.ts

@@ -10,13 +10,7 @@
  * Provider IDs
  * All supported AI providers
  */
-export type ProviderId =
-  | 'anthropic'
-  | 'openai'
-  | 'google'
-  | 'openrouter'
-  | 'claude-code'
-  | 'zai';
+export type ProviderId = 'anthropic' | 'openai' | 'google' | 'openrouter' | 'claude-code' | 'zai';
 
 /**
  * Provider configuration value