claude-flow 2.0.0-alpha.2 → 2.0.0-alpha.21

package/src/mcp/ruv-swarm-tools.ts

@@ -15,7 +15,7 @@ import { join } from 'path';
 export interface RuvSwarmToolContext extends MCPContext {
   workingDirectory?: string;
   swarmId?: string;
-  sessionId: string;
+  sessionId?: string;
 }
 
 /**
@@ -559,19 +559,9 @@ export async function initializeRuvSwarmIntegration(
   workingDirectory: string,
   logger?: ILogger
 ): Promise<RuvSwarmResponse> {
-  // Create a default logger if none provided
-  const defaultLogger: ILogger = logger || {
-    debug: () => {},
-    info: () => {},
-    warn: () => {},
-    error: () => {},
-    configure: async () => {}
-  };
-  
   const context: RuvSwarmToolContext = {
     workingDirectory,
-    sessionId: `claude-flow-${Date.now()}`,
-    logger: defaultLogger
+    sessionId: `claude-flow-${Date.now()}`
   };
   
   logger?.info('Initializing ruv-swarm integration', { workingDirectory });

package/src/swarm/coordinator.ts

@@ -178,9 +178,9 @@ export class SwarmCoordinator extends EventEmitter implements SwarmEventEmitter
     this.status = 'paused';
     
     // Pause all agents
-    for (const agent of Array.from(this.agents.values())) {
+    for (const agent of this.agents.values()) {
       if (agent.status === 'busy') {
-        await this.pauseAgent(agent.id.id);
+        await this.pauseAgent(agent.id);
       }
     }
     
@@ -204,9 +204,9 @@ export class SwarmCoordinator extends EventEmitter implements SwarmEventEmitter
     this.status = 'executing';
     
     // Resume all paused agents
-    for (const agent of Array.from(this.agents.values())) {
+    for (const agent of this.agents.values()) {
       if (agent.status === 'paused') {
-        await this.resumeAgent(agent.id.id);
+        await this.resumeAgent(agent.id);
       }
     }
     
@@ -254,8 +254,7 @@ export class SwarmCoordinator extends EventEmitter implements SwarmEventEmitter
         requiredApprovals: [],
         allowedFailures: Math.floor(this.config.maxAgents * 0.1),
         recoveryTime: 5 * 60 * 1000, // 5 minutes
-        milestones: [],
-        resourceLimits: {}
+        milestones: []
       },
       tasks: [],
       dependencies: [],
@@ -1423,7 +1422,7 @@ export class SwarmCoordinator extends EventEmitter implements SwarmEventEmitter
     }
     // Stop all execution intervals
     if (this.executionIntervals) {
-      for (const [objectiveId, interval] of Array.from(this.executionIntervals)) {
+      for (const [objectiveId, interval] of this.executionIntervals) {
         clearInterval(interval);
       }
       this.executionIntervals.clear();
@@ -1534,7 +1533,7 @@ export class SwarmCoordinator extends EventEmitter implements SwarmEventEmitter
     const requestsParallelAgents = eachAgentPattern.test(objective.description);
     
     // Create tasks with specific prompts for Claude
-    if (requestsParallelAgents && this.config.mode === 'distributed') {
+    if (requestsParallelAgents && this.config.mode === 'parallel') {
       // Create parallel tasks for each agent type
       const agentTypes = this.determineRequiredAgentTypes(objective.strategy);
       this.logger.info('Creating parallel tasks for each agent type', { 
@@ -1658,7 +1657,7 @@ Make sure the documentation is clear, complete, and helps users understand and u
       tasks.push(task4);
     } else {
       // For other strategies, create a comprehensive single task
-      tasks.push(this.createTaskForObjective('execute-objective', 'coordination', {
+      tasks.push(this.createTaskForObjective('execute-objective', 'generic', {
         title: 'Execute Objective',
         description: objective.description,
         instructions: `Please complete the following request:
@@ -1824,7 +1823,7 @@ Ensure your implementation is complete, well-structured, and follows best practi
       this.emitSwarmEvent({
         id: generateId('event'),
         timestamp: new Date(),
-        type: 'task.created',
+        type: 'task.queued',
         source: this.swarmId.id,
         data: { task },
         broadcast: false,
@@ -1923,7 +1922,7 @@ Ensure your implementation is complete, well-structured, and follows best practi
           this.emitSwarmEvent({
             id: generateId('event'),
             timestamp: new Date(),
-            type: 'task.created',
+            type: 'task.queued',
             source: this.swarmId.id,
             data: { task },
             broadcast: false,
@@ -2015,7 +2014,7 @@ Ensure your implementation is complete, well-structured, and follows best practi
           this.emitSwarmEvent({
             id: generateId('event'),
             timestamp: new Date(),
-            type: objective.status === 'completed' ? 'swarm.completed' : 'swarm.failed',
+            type: objective.status === 'completed' ? 'objective.completed' : 'objective.failed',
             source: this.swarmId.id,
             data: { objective },
             broadcast: true,
@@ -2164,12 +2163,12 @@ Ensure your implementation is complete, well-structured, and follows best practi
     
     try {
       // Use Claude Flow executor for full SPARC system in non-interactive mode
-      const { ClaudeFlowExecutor } = await import('./claude-flow-executor.js');
+      const { ClaudeFlowExecutor } = await import('./claude-flow-executor.ts');
       const executor = new ClaudeFlowExecutor({ 
         logger: this.logger,
         claudeFlowPath: getClaudeFlowBin(),
         enableSparc: true,
-        verbose: (this.config as any).logging?.level === 'debug',
+        verbose: this.config.logging?.level === 'debug',
         timeoutMinutes: this.config.taskTimeoutMinutes
       });
       
@@ -2300,7 +2299,7 @@ Ensure your implementation is complete, well-structured, and follows best practi
     // Set working directory if specified
     if (targetDir) {
       // Ensure directory exists
-      await fs.mkdir(targetDir, { recursive: true });
+      await Deno.mkdir(targetDir, { recursive: true });
       
       // Add directory context to prompt
       const enhancedPrompt = `${prompt}\n\n## Important: Working Directory\nPlease ensure all files are created in: ${targetDir}`;
@@ -2309,31 +2308,22 @@ Ensure your implementation is complete, well-structured, and follows best practi
     
     try {
       // Check if claude command exists
-      const { spawn } = await import('child_process');
-      const { promisify } = await import('util');
-      
-      try {
-        const checkCommand = spawn('which', ['claude'], {
-          stdio: ['pipe', 'pipe', 'pipe']
-        });
-        await new Promise((resolve, reject) => {
-          checkCommand.on('exit', (code) => {
-            if (code !== 0) {
-              reject(new Error('Claude CLI not found. Please ensure claude is installed and in PATH.'));
-            } else {
-              resolve(true);
-            }
-          });
-        });
-      } catch (error) {
+      const checkCommand = new Deno.Command('which', {
+        args: ['claude'],
+        stdout: 'piped',
+        stderr: 'piped',
+      });
+      const checkResult = await checkCommand.output();
+      if (!checkResult.success) {
         throw new Error('Claude CLI not found. Please ensure claude is installed and in PATH.');
       }
       
       // Execute Claude with the prompt
-      const command = spawn("claude", claudeArgs, {
+      const command = new Deno.Command("claude", {
+        args: claudeArgs,
         cwd: targetDir || process.cwd(),
         env: {
-          ...process.env,
+          ...Deno.env.toObject(),
           CLAUDE_INSTANCE_ID: instanceId,
           CLAUDE_SWARM_MODE: "true",
           CLAUDE_SWARM_ID: this.swarmId.id,
@@ -2343,7 +2333,9 @@ Ensure your implementation is complete, well-structured, and follows best practi
           CLAUDE_FLOW_MEMORY_ENABLED: "true",
           CLAUDE_FLOW_MEMORY_NAMESPACE: `swarm-${this.swarmId.id}`,
         },
-        stdio: ['pipe', 'pipe', 'pipe'],
+        stdin: "null",
+        stdout: "piped",
+        stderr: "piped",
       });
       
       this.logger.info('Spawning Claude agent for task', { 
@@ -2353,46 +2345,29 @@ Ensure your implementation is complete, well-structured, and follows best practi
         targetDir 
       });
       
-      // Execute the command and wait for completion
-      const result = await new Promise<{code: number, stdout: string, stderr: string}>((resolve, reject) => {
-        let stdout = '';
-        let stderr = '';
-        
-        command.stdout?.on('data', (data) => {
-          stdout += data.toString();
-        });
-        
-        command.stderr?.on('data', (data) => {
-          stderr += data.toString();
-        });
-        
-        command.on('close', (code) => {
-          resolve({ code: code || 0, stdout, stderr });
-        });
-        
-        command.on('error', (error) => {
-          reject(error);
-        });
-      });
+      const child = command.spawn();
+      const { code, stdout, stderr } = await child.output();
       
-      if (result.code === 0) {
+      if (code === 0) {
+        const output = new TextDecoder().decode(stdout);
         this.logger.info('Claude agent completed task successfully', {
           taskId: task.id.id,
-          outputLength: result.stdout.length
+          outputLength: output.length
         });
         
         return {
           success: true,
-          output: result.stdout,
+          output,
           instanceId,
           targetDir
         };
       } else {
-        this.logger.error(`Claude agent failed with code ${result.code}`, { 
+        const errorOutput = new TextDecoder().decode(stderr);
+        this.logger.error(`Claude agent failed with code ${code}`, { 
           taskId: task.id.id,
-          error: result.stderr 
+          error: errorOutput 
         });
-        throw new Error(`Claude execution failed: ${result.stderr}`);
+        throw new Error(`Claude execution failed: ${errorOutput}`);
       }
       
     } catch (error) {
@@ -2498,7 +2473,7 @@ Ensure your implementation is complete, well-structured, and follows best practi
     
     try {
       // Ensure work directory exists
-      await fs.mkdir(workDir, { recursive: true });
+      await Deno.mkdir(workDir, { recursive: true });
       
       switch (task.type) {
         case 'coding':
@@ -2541,7 +2516,7 @@ Ensure your implementation is complete, well-structured, and follows best practi
       // Create a REST API application
       const projectName = 'rest-api';
       const projectDir = `${workDir}/${projectName}`;
-      await fs.mkdir(projectDir, { recursive: true });
+      await Deno.mkdir(projectDir, { recursive: true });
       
       // Create main API file
       const apiCode = `const express = require('express');
@@ -2731,7 +2706,7 @@ coverage/
     } else if (isHelloWorld) {
       // Create a simple hello world application
       const projectDir = `${workDir}/hello-world`;
-      await fs.mkdir(projectDir, { recursive: true });
+      await Deno.mkdir(projectDir, { recursive: true });
       
       // Create main application file
       const mainCode = `#!/usr/bin/env node
@@ -2812,7 +2787,7 @@ ${task.description}
     
     // For other code generation tasks, create a basic structure
     const projectDir = `${workDir}/generated-code`;
-    await fs.mkdir(projectDir, { recursive: true });
+    await Deno.mkdir(projectDir, { recursive: true });
     
     const code = `// Generated code for: ${task.name}
 // ${task.description}
@@ -2841,7 +2816,7 @@ main();
     this.logger.info('Executing analysis task', { taskId: task.id.id });
     
     const analysisDir = `${workDir}/analysis`;
-    await fs.mkdir(analysisDir, { recursive: true });
+    await Deno.mkdir(analysisDir, { recursive: true });
     
     const analysis = {
       task: task.name,
@@ -2877,7 +2852,7 @@ main();
     this.logger.info('Executing documentation task', { taskId: task.id.id });
     
     const docsDir = `${workDir}/docs`;
-    await fs.mkdir(docsDir, { recursive: true });
+    await Deno.mkdir(docsDir, { recursive: true });
     
     const documentation = `# ${task.name}
 
@@ -2918,7 +2893,7 @@ ${task.instructions}
     this.logger.info('Executing testing task', { taskId: task.id.id });
     
     const testDir = `${workDir}/tests`;
-    await fs.mkdir(testDir, { recursive: true });
+    await Deno.mkdir(testDir, { recursive: true });
     
     const testCode = `// Test suite for: ${task.name}
 // ${task.description}
@@ -2960,7 +2935,7 @@ console.log('Tests completed for: ${task.name}');
     this.logger.info('Executing generic task', { taskId: task.id.id });
     
     const outputDir = `${workDir}/output`;
-    await fs.mkdir(outputDir, { recursive: true });
+    await Deno.mkdir(outputDir, { recursive: true });
     
     const output = {
       task: task.name,
@@ -3028,7 +3003,7 @@ console.log('Tests completed for: ${task.name}');
     const now = new Date();
     const timeout = this.config.monitoring.heartbeatInterval * 10; // Increased multiplier for long-running Claude tasks
     
-    for (const agent of Array.from(this.agents.values())) {
+    for (const agent of this.agents.values()) {
       if (agent.status === 'offline' || agent.status === 'terminated') {
         continue;
       }
@@ -3069,30 +3044,4 @@ console.log('Tests completed for: ${task.name}');
       this.logger.error('Agent error', { agentId, error });
     }
   }
-
-  private async createGradioApp(task: TaskDefinition, workDir: string): Promise<any> {
-    // Implementation for creating Gradio applications
-    // This would contain the logic to scaffold a Gradio app
-    this.logger.info('Creating Gradio application', { taskId: task.id.id, workDir });
-    
-    // Return a placeholder result
-    return {
-      success: true,
-      message: 'Gradio app creation initiated',
-      outputDir: workDir
-    };
-  }
-
-  private async createPythonRestAPI(task: TaskDefinition, workDir: string): Promise<any> {
-    // Implementation for creating Python REST API
-    // This would contain the logic to scaffold a Python REST API
-    this.logger.info('Creating Python REST API', { taskId: task.id.id, workDir });
-    
-    // Return a placeholder result
-    return {
-      success: true,
-      message: 'Python REST API creation initiated',
-      outputDir: workDir
-    };
-  }
 }

package/src/swarm/executor-v2.ts

@@ -7,18 +7,14 @@ import { EventEmitter } from 'node:events';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
 import * as os from 'node:os';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 import { Logger } from '../core/logger.js';
 import { generateId } from '../utils/helpers.js';
-import { detectExecutionEnvironment, applySmartDefaults, type ExecutionEnvironment } from '../cli/utils/environment-detector.js';
+import { detectExecutionEnvironment, applySmartDefaults } from '../cli/utils/environment-detector.js';
 import {
   TaskDefinition, AgentState, TaskResult, SwarmEvent, EventType,
   SWARM_CONSTANTS
 } from './types.js';
-import {
-  TaskExecutor, type ExecutionConfig, type ExecutionContext, type ExecutionResult,
-  type ResourceUsage, type ClaudeExecutionOptions, type ClaudeCommand
-} from './executor.js';
 
 export interface ClaudeExecutionOptionsV2 extends ClaudeExecutionOptions {
   nonInteractive?: boolean;
@@ -26,11 +22,10 @@ export interface ClaudeExecutionOptionsV2 extends ClaudeExecutionOptions {
   promptDefaults?: Record<string, any>;
   environmentOverride?: Record<string, string>;
   retryOnInteractiveError?: boolean;
-  dangerouslySkipPermissions?: boolean;
 }
 
 export class TaskExecutorV2 extends TaskExecutor {
-  private environment: ExecutionEnvironment = detectExecutionEnvironment();
+  private environment = detectExecutionEnvironment();
   
   constructor(config: Partial<ExecutionConfig> = {}) {
     super(config);
@@ -76,7 +71,7 @@ export class TaskExecutorV2 extends TaskExecutor {
         
         // Force non-interactive mode and retry
         enhancedOptions.nonInteractive = true;
-        (enhancedOptions as any).dangerouslySkipPermissions = true;
+        enhancedOptions.dangerouslySkipPermissions = true;
         
         return await this.executeClaudeWithTimeoutV2(
           generateId('claude-execution-retry'),
@@ -99,7 +94,7 @@ export class TaskExecutorV2 extends TaskExecutor {
     options: ClaudeExecutionOptionsV2
   ): Promise<ExecutionResult> {
     const startTime = Date.now();
-    const timeout = (options as any).timeout || this.config.timeoutMs;
+    const timeout = options.timeout || this.config.timeoutMs;
 
     // Build Claude command with v2 enhancements
     const command = this.buildClaudeCommandV2(task, agent, options);
@@ -119,7 +114,7 @@ export class TaskExecutorV2 extends TaskExecutor {
 
     // Add prompt defaults if provided
     if (options.promptDefaults) {
-      (env as any).CLAUDE_PROMPT_DEFAULTS = JSON.stringify(options.promptDefaults);
+      env.CLAUDE_PROMPT_DEFAULTS = JSON.stringify(options.promptDefaults);
     }
 
     this.logger.debug('Executing Claude command v2', {
@@ -162,7 +157,7 @@ export class TaskExecutorV2 extends TaskExecutor {
           cwd: context.workingDirectory,
           env,
           stdio: options.nonInteractive ? ['ignore', 'pipe', 'pipe'] : ['pipe', 'pipe', 'pipe'],
-          detached: (options as any).detached || false,
+          detached: options.detached || false,
           // Disable shell to avoid shell-specific issues
           shell: false
         });
@@ -318,7 +313,7 @@ export class TaskExecutorV2 extends TaskExecutor {
     // Build prompt
     const prompt = this.buildClaudePrompt(task, agent);
     
-    if ((options as any).useStdin) {
+    if (options.useStdin) {
       input = prompt;
     } else {
       args.push('-p', prompt);
@@ -330,22 +325,22 @@ export class TaskExecutorV2 extends TaskExecutor {
     }
 
     // Add model if specified
-    if ((options as any).model) {
-      args.push('--model', (options as any).model);
+    if (options.model) {
+      args.push('--model', options.model);
     }
 
     // Add max tokens if specified
-    if ((options as any).maxTokens) {
-      args.push('--max-tokens', (options as any).maxTokens.toString());
+    if (options.maxTokens) {
+      args.push('--max-tokens', options.maxTokens.toString());
     }
 
     // Add temperature if specified
-    if ((options as any).temperature !== undefined) {
-      args.push('--temperature', (options as any).temperature.toString());
+    if (options.temperature !== undefined) {
+      args.push('--temperature', options.temperature.toString());
     }
 
     // Skip permissions check for non-interactive environments
-    if (options.nonInteractive || (options as any).dangerouslySkipPermissions || 
+    if (options.nonInteractive || options.dangerouslySkipPermissions || 
         this.environment.recommendedFlags.includes('--dangerously-skip-permissions')) {
       args.push('--dangerously-skip-permissions');
     }
@@ -361,8 +356,8 @@ export class TaskExecutorV2 extends TaskExecutor {
     }
 
     // Add output format
-    if ((options as any).outputFormat) {
-      args.push('--output-format', (options as any).outputFormat);
+    if (options.outputFormat) {
+      args.push('--output-format', options.outputFormat);
     } else if (options.nonInteractive) {
       // Default to JSON for non-interactive mode
       args.push('--output-format', 'json');
@@ -376,7 +371,7 @@ export class TaskExecutorV2 extends TaskExecutor {
     }));
 
     return {
-      command: (options as any).claudePath || 'claude',
+      command: options.claudePath || 'claude',
       args,
       input
     };

package/src/swarm/executor.ts

@@ -66,8 +66,8 @@ export interface ExecutionConfig {
 }
 
 export class TaskExecutor extends EventEmitter {
-  protected logger: Logger;
-  protected config: ExecutionConfig;
+  private logger: Logger;
+  private config: ExecutionConfig;
   private activeExecutions: Map<string, ExecutionSession> = new Map();
   private resourceMonitor: ResourceMonitor;
   private processPool: ProcessPool;
@@ -77,7 +77,7 @@ export class TaskExecutor extends EventEmitter {
     
     this.config = this.mergeWithDefaults(config);
     this.logger = new Logger(
-      { level: (this.config.logLevel as any) || 'info', format: 'text', destination: 'console' },
+      { level: this.config.logLevel || 'info', format: 'text', destination: 'console' },
       { component: 'TaskExecutor' }
     );
     this.resourceMonitor = new ResourceMonitor();
@@ -501,7 +501,7 @@ export class TaskExecutor extends EventEmitter {
     };
   }
 
-  protected buildClaudePrompt(task: TaskDefinition, agent: AgentState): string {
+  private buildClaudePrompt(task: TaskDefinition, agent: AgentState): string {
     const sections: string[] = [];
 
     // Agent identification
@@ -608,7 +608,7 @@ export class TaskExecutor extends EventEmitter {
     return sections.join('\n');
   }
 
-  protected async createExecutionContext(
+  private async createExecutionContext(
     task: TaskDefinition,
     agent: AgentState
   ): Promise<ExecutionContext> {
@@ -658,11 +658,11 @@ export class TaskExecutor extends EventEmitter {
     }
   }
 
-  protected async collectResourceUsage(sessionId: string): Promise<ResourceUsage> {
+  private async collectResourceUsage(sessionId: string): Promise<ResourceUsage> {
     return this.resourceMonitor.getUsage(sessionId);
   }
 
-  protected async collectArtifacts(context: ExecutionContext): Promise<Record<string, any>> {
+  private async collectArtifacts(context: ExecutionContext): Promise<Record<string, any>> {
     const artifacts: Record<string, any> = {};
 
     try {
@@ -899,9 +899,9 @@ class ResourceMonitor extends EventEmitter {
 
   async shutdown(): Promise<void> {
     // Stop all monitors
-    this.activeMonitors.forEach((timer, sessionId) => {
+    for (const [sessionId, timer] of this.activeMonitors) {
       clearInterval(timer);
-    });
+    }
     this.activeMonitors.clear();
   }