claude_swarm 0.1.19 → 0.2.0

data/examples/monitoring-demo.yml

@@ -6,7 +6,7 @@ swarm:
     coordinator:
       description: "Main coordinator managing the team"
       directory: .
-      model: haiku
+      model: sonnet
       connections: [analyzer, reporter]
       prompt: "You coordinate analysis and reporting tasks"
       allowed_tools: [Read, Edit]
@@ -14,13 +14,13 @@ swarm:
     analyzer:
       description: "Data analyzer processing information"
       directory: ./data
-      model: haiku  
+      model: sonnet  
       prompt: "You analyze data and provide insights"
       allowed_tools: [Read, Bash]
     
     reporter:
       description: "Report generator creating summaries"
       directory: ./reports
-      model: haiku
+      model: sonnet
       prompt: "You generate reports from analysis"
-      allowed_tools: [Write, Edit]
+      allowed_tools: [Write, Edit]

data/lib/claude_swarm/claude_code_executor.rb

@@ -1,18 +1,12 @@
 # frozen_string_literal: true
 
-require "json"
-require "open3"
-require "logger"
-require "fileutils"
-require_relative "session_path"
-
 module ClaudeSwarm
   class ClaudeCodeExecutor
     attr_reader :session_id, :last_response, :working_directory, :logger, :session_path
 
     def initialize(working_directory: Dir.pwd, model: nil, mcp_config: nil, vibe: false,
-                   instance_name: nil, instance_id: nil, calling_instance: nil, calling_instance_id: nil,
-                   claude_session_id: nil, additional_directories: [])
+      instance_name: nil, instance_id: nil, calling_instance: nil, calling_instance_id: nil,
+      claude_session_id: nil, additional_directories: [])
       @working_directory = working_directory
       @additional_directories = additional_directories
       @model = model
@@ -112,7 +106,7 @@ module ClaudeSwarm
         instance_id: @instance_id,
         claude_session_id: @session_id,
         status: "active",
-        updated_at: Time.now.iso8601
+        updated_at: Time.now.iso8601,
       }
 
       File.write(state_file, JSON.pretty_generate(state_data))
@@ -159,7 +153,7 @@ module ClaudeSwarm
         to_instance: @instance_name,
         to_instance_id: @instance_id,
         prompt: prompt,
-        timestamp: Time.now.iso8601
+        timestamp: Time.now.iso8601,
       }
 
       append_to_session_json(event)
@@ -171,7 +165,7 @@ module ClaudeSwarm
       instance_info = @instance_name
       instance_info += " (#{@instance_id})" if @instance_id
       @logger.info(
-        "($#{response["total_cost"]} - #{response["duration_ms"]}ms) #{instance_info} -> #{caller_info}: \n---\n#{response["result"]}\n---"
+        "($#{response["total_cost"]} - #{response["duration_ms"]}ms) #{instance_info} -> #{caller_info}: \n---\n#{response["result"]}\n---",
       )
     end
 
@@ -208,7 +202,7 @@ module ClaudeSwarm
         instance_info = @instance_name
         instance_info += " (#{@instance_id})" if @instance_id
         @logger.info(
-          "Tool call from #{instance_info} -> Tool: #{tool_call["name"]}, ID: #{tool_call["id"]}, Arguments: #{arguments}"
+          "Tool call from #{instance_info} -> Tool: #{tool_call["name"]}, ID: #{tool_call["id"]}, Arguments: #{arguments}",
         )
       end
 
@@ -239,7 +233,7 @@ module ClaudeSwarm
           calling_instance: @calling_instance,
           calling_instance_id: @calling_instance_id,
           timestamp: Time.now.iso8601,
-          event: event
+          event: event,
         }
 
         # Write as single line JSON (JSONL format)

data/lib/claude_swarm/claude_mcp_server.rb

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require "fast_mcp_annotations"
-require "json"
-require_relative "claude_code_executor"
-require_relative "task_tool"
-require_relative "session_info_tool"
-require_relative "reset_session_tool"
-require_relative "process_tracker"
-
 module ClaudeSwarm
   class ClaudeMcpServer
     # Class variables to share state with tool classes
@@ -19,7 +11,9 @@ module ClaudeSwarm
       @instance_config = instance_config
       @calling_instance = calling_instance
       @calling_instance_id = calling_instance_id
-      @executor = ClaudeCodeExecutor.new(
+
+      # Create appropriate executor based on provider
+      common_params = {
         working_directory: instance_config[:directory],
         model: instance_config[:model],
         mcp_config: instance_config[:mcp_config_path],
@@ -29,8 +23,23 @@ module ClaudeSwarm
         calling_instance: calling_instance,
         calling_instance_id: calling_instance_id,
         claude_session_id: instance_config[:claude_session_id],
-        additional_directories: instance_config[:directories][1..] || []
-      )
+        additional_directories: instance_config[:directories][1..] || [],
+      }
+
+      @executor = if instance_config[:provider] == "openai"
+        OpenAI::Executor.new(
+          **common_params,
+          # OpenAI-specific parameters
+          temperature: instance_config[:temperature],
+          api_version: instance_config[:api_version],
+          openai_token_env: instance_config[:openai_token_env],
+          base_url: instance_config[:base_url],
+          reasoning_effort: instance_config[:reasoning_effort],
+        )
+      else
+        # Default Claude behavior (existing code)
+        ClaudeCodeExecutor.new(**common_params)
+      end
 
       # Set class variables so tools can access them
       self.class.executor = @executor
@@ -50,20 +59,20 @@ module ClaudeSwarm
 
       server = FastMcp::Server.new(
         name: @instance_config[:name],
-        version: "1.0.0"
+        version: "1.0.0",
       )
 
       # Set dynamic description for TaskTool based on instance config
       if @instance_config[:description]
-        TaskTool.description "Execute a task using Agent #{@instance_config[:name]}. #{@instance_config[:description]}"
+        Tools::TaskTool.description("Execute a task using Agent #{@instance_config[:name]}. #{@instance_config[:description]}")
       else
-        TaskTool.description "Execute a task using Agent #{@instance_config[:name]}"
+        Tools::TaskTool.description("Execute a task using Agent #{@instance_config[:name]}")
       end
 
       # Register tool classes (not instances)
-      server.register_tool(TaskTool)
-      server.register_tool(SessionInfoTool)
-      server.register_tool(ResetSessionTool)
+      server.register_tool(Tools::TaskTool)
+      server.register_tool(Tools::SessionInfoTool)
+      server.register_tool(Tools::ResetSessionTool)
 
       # Start the stdio server
       server.start