@sylphx/flow 2.1.4 → 2.1.6

package/src/targets/opencode.ts

@@ -7,10 +7,16 @@ import { installFile, installToDirectory } from '../core/installers/file-install
 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 { getAgentsDir, getOutputStylesDir } from '../utils/config/paths.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 {
+  detectTargetConfig,
+  setupSlashCommandsTo,
+  stripFrontMatter,
+  transformMCPConfig as transformMCP,
+} from './shared/index.js';
 
 /**
  * OpenCode target - composition approach with all original functionality
@@ -80,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) =>
@@ -217,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
@@ -380,23 +345,7 @@ 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);
   },
 
   /**

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,146 @@
+/**
+ * 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') {
+    switch (config.type) {
+      case 'local':
+        return localToStdio(config as LocalConfig);
+      case 'remote':
+        return remoteToHttp(config as RemoteConfig);
+      case 'stdio':
+        return normalizeStdio(config as StdioConfig);
+      case 'http':
+        return normalizeHttp(config as HttpConfig);
+      default:
+        return config;
+    }
+  }
+
+  // OpenCode format (local/remote)
+  if (targetFormat === 'opencode') {
+    switch (config.type) {
+      case 'stdio':
+        return stdioToLocal(config as StdioConfig);
+      case 'http':
+        return httpToRemote(config as HttpConfig);
+      case 'local':
+      case 'remote':
+        return config;
+      default:
+        return config;
+    }
+  }
+
+  return config;
+};

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

@@ -0,0 +1,128 @@
+/**
+ * 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 { installToDirectory } from '../../core/installers/file-installer.js';
+import type { CommonOptions, SetupResult, TargetConfig } from '../../types.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/utils/target-selection.ts

@@ -15,7 +15,7 @@ export interface TargetChoice {
   /** Display name of the target */
   name: string;
   /** Target identifier */
-  value: 'claude-code' | 'opencode' | 'cursor';
+  value: 'claude-code' | 'opencode';
   /** Whether the target is currently installed */
   installed: boolean;
 }
@@ -37,11 +37,6 @@ export function buildAvailableTargets(installedTargets: string[]): TargetChoice[
       value: 'opencode',
       installed: installedTargets.includes('opencode'),
     },
-    {
-      name: 'Cursor',
-      value: 'cursor',
-      installed: installedTargets.includes('cursor'),
-    },
   ];
 }