swarm_sdk 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aba64a75c41f9957bb3e11afbe0dd5a5fc6422793fda5d3fb829ac0042cbe18
-  data.tar.gz: 4f403fb7d107fa712a8b847775fea1140a03904cf066b8e848b914f4b3c573e3
+  metadata.gz: c2b0a4dbb64785b7fc12ad6a461acfb4502135cbf06a86f08de6ae7b2df05e21
+  data.tar.gz: c118e7fb996b6ce679d1feb80e359f246ca5741d4d2ae1dbbece537796502b0c
 SHA512:
-  metadata.gz: 204b9d889968b2d582557b06169d02828abd4c365b00e2a6551cc7f4c44a2ec7ae452a55d1e25b59fdc8a0b10c486c365cce2b2332d02f0d54b502ec6667af75
-  data.tar.gz: ae46da01755ef0c98b162c7c2be3c51ba8831dbbdd10301f937e0eed0260f9694b7514658d437e9d65d9cc58e06d7a877600ec29fd48eb773eec8514d74440b1
+  metadata.gz: 9fe12e5956c41623e43b0f7b69d8bce442052c180aaf89e787b1163836f013a45435a8147ce749eaaf2809799cb0c17f3ac2942ed5fdff048805d8ab21d1924d
+  data.tar.gz: 526374b16146e8721c2b1a7370bf58843fa7bd03b36b5f1cd6a5a23e263446171005dec50ce5ec979d6aa42f5a07886f27f09939aacd76c45c922478782624bb

data/lib/swarm_sdk/agent/builder.rb

@@ -2,6 +2,32 @@
 
 module SwarmSDK
   module Agent
+    # Configuration for agent memory
+    class MemoryConfig
+      def initialize
+        @adapter = :filesystem # Default adapter
+        @directory = nil
+      end
+
+      # DSL method to set/get adapter
+      def adapter(value = nil)
+        return @adapter if value.nil?
+
+        @adapter = value.to_sym
+      end
+
+      # DSL method to set/get directory
+      def directory(value = nil)
+        return @directory if value.nil?
+
+        @directory = value
+      end
+
+      def enabled?
+        !@directory.nil?
+      end
+    end
+
     # Builder provides fluent API for configuring agents
     #
     # This class offers a Ruby DSL for defining agents with a clean, readable syntax.
@@ -51,6 +77,7 @@ module SwarmSDK
         @hooks = []
         @permissions_config = {}
         @default_permissions = {} # Set by SwarmBuilder from all_agents
+        @memory_config = nil
       end
 
       # Set/get agent model
@@ -218,6 +245,19 @@ module SwarmSDK
         @directory = dir
       end
 
+      # Configure persistent memory for this agent
+      #
+      # @example
+      #   memory do
+      #     adapter :filesystem  # default
+      #     directory ".swarm/agent-memory"
+      #   end
+      def memory(&block)
+        @memory_config = MemoryConfig.new
+        @memory_config.instance_eval(&block) if block_given?
+        @memory_config
+      end
+
       # Set delegation targets
       def delegates_to(*agent_names)
         @delegates_to.concat(agent_names)
@@ -359,6 +399,7 @@ module SwarmSDK
         agent_config[:assume_model_exists] = @assume_model_exists unless @assume_model_exists.nil?
         agent_config[:permissions] = @permissions_config if @permissions_config.any?
         agent_config[:default_permissions] = @default_permissions if @default_permissions.any?
+        agent_config[:memory] = @memory_config if @memory_config
 
         # Convert DSL hooks to HookDefinition format
         agent_config[:hooks] = convert_hooks_to_definitions if @hooks.any?

data/lib/swarm_sdk/agent/chat/logging_helpers.rb

@@ -70,20 +70,37 @@ module SwarmSDK
         def calculate_cost(message)
           return zero_cost unless message.input_tokens && message.output_tokens
 
-          model_info = RubyLLM.models.find(message.model_id)
+          # Use SwarmSDK's model registry (not RubyLLM's) for up-to-date pricing
+          model_info = SwarmSDK::Models.find(message.model_id)
           return zero_cost unless model_info
 
-          # Prices are per million tokens (USD)
-          input_cost = (message.input_tokens / 1_000_000.0) * model_info.input_price_per_million
-          output_cost = (message.output_tokens / 1_000_000.0) * model_info.output_price_per_million
+          # Extract pricing from SwarmSDK's models.json structure
+          pricing = model_info["pricing"] || model_info[:pricing]
+          return zero_cost unless pricing
+
+          text_pricing = pricing["text_tokens"] || pricing[:text_tokens]
+          return zero_cost unless text_pricing
+
+          standard_pricing = text_pricing["standard"] || text_pricing[:standard]
+          return zero_cost unless standard_pricing
+
+          input_price = standard_pricing["input_per_million"] || standard_pricing[:input_per_million]
+          output_price = standard_pricing["output_per_million"] || standard_pricing[:output_per_million]
+
+          return zero_cost unless input_price && output_price
+
+          # Calculate costs (prices are per million tokens in USD)
+          input_cost = (message.input_tokens / 1_000_000.0) * input_price
+          output_cost = (message.output_tokens / 1_000_000.0) * output_price
 
           {
             input_cost: input_cost,
             output_cost: output_cost,
             total_cost: input_cost + output_cost,
           }
-        rescue StandardError
+        rescue StandardError => e
           # Model not found in registry or pricing not available
+          RubyLLM.logger.debug("Cost calculation failed for #{message.model_id}: #{e.message}")
           zero_cost
         end
 

data/lib/swarm_sdk/agent/definition.rb

@@ -43,7 +43,8 @@ module SwarmSDK
         :default_permissions,
         :agent_permissions,
         :assume_model_exists,
-        :hooks
+        :hooks,
+        :memory
 
       attr_accessor :bypass_permissions, :max_concurrent_tools
 
@@ -91,7 +92,11 @@ module SwarmSDK
         # Parse directory first so it can be used in system prompt rendering
         @directory = parse_directory(config[:directory])
 
-        # Build system prompt after directory is set
+        # Parse memory configuration BEFORE building system prompt
+        # (memory prompt needs to be appended if memory is enabled)
+        @memory = parse_memory_config(config[:memory])
+
+        # Build system prompt after directory and memory are set
         @system_prompt = build_full_system_prompt(config[:system_prompt])
 
         # Parse tools with permissions support
@@ -116,6 +121,30 @@ module SwarmSDK
         validate!
       end
 
+      # Check if memory is enabled for this agent
+      #
+      # @return [Boolean]
+      def memory_enabled?
+        @memory&.respond_to?(:enabled?) && @memory.enabled?
+      end
+
+      # Parse memory configuration from Hash or MemoryConfig object
+      #
+      # @param memory_config [Hash, Agent::MemoryConfig, nil] Memory configuration
+      # @return [Agent::MemoryConfig, nil]
+      def parse_memory_config(memory_config)
+        return if memory_config.nil?
+        return memory_config if memory_config.is_a?(Agent::MemoryConfig)
+
+        # Convert hash (from YAML) to MemoryConfig object
+        config = Agent::MemoryConfig.new
+        adapter_value = memory_config[:adapter] || memory_config["adapter"] || :filesystem
+        config.adapter(adapter_value.to_sym)
+        directory_value = memory_config[:directory] || memory_config["directory"]
+        config.directory(directory_value) if directory_value
+        config
+      end
+
       def to_h
         {
           name: @name,
@@ -216,9 +245,8 @@ module SwarmSDK
       end
 
       def build_full_system_prompt(custom_prompt)
-        # If coding_agent is false (default), return custom prompt with optional TODO/Scratchpad info
-        # If coding_agent is true, include full base prompt for coding tasks
-        if @coding_agent
+        # Build the base prompt based on coding_agent setting
+        prompt = if @coding_agent
           # Coding agent: include full base prompt
           rendered_base = render_base_system_prompt
 
@@ -238,11 +266,22 @@ module SwarmSDK
             # No custom prompt: just return TODO/Scratchpad info
             non_coding_base
           end
-        # Default tools available: include TODO/Scratchpad instructions
         else
           # No default tools: return only custom prompt
           (custom_prompt || "").to_s
         end
+
+        # Append memory instructions if memory is enabled
+        if memory_enabled?
+          memory_prompt = render_memory_prompt
+          prompt = if prompt && !prompt.strip.empty?
+            "#{prompt}\n\n#{memory_prompt}"
+          else
+            memory_prompt
+          end
+        end
+
+        prompt
       end
 
       # Check if default tools are enabled (i.e., not disabled)
@@ -266,6 +305,13 @@ module SwarmSDK
         ERB.new(template_content).result(binding)
       end
 
+      def render_memory_prompt
+        # Load and render the memory system prompt
+        memory_prompt_path = File.expand_path("../prompts/memory.md.erb", __dir__)
+        template_content = File.read(memory_prompt_path)
+        ERB.new(template_content).result(binding)
+      end
+
       def render_non_coding_base_prompt
         # Simplified base prompt for non-coding agents
         # Includes environment info, TODO, and Scratchpad tool information

data/lib/swarm_sdk/configuration.rb

@@ -4,7 +4,7 @@ module SwarmSDK
   class Configuration
     ENV_VAR_WITH_DEFAULT_PATTERN = /\$\{([^:}]+)(:=([^}]*))?\}/
 
-    attr_reader :config_path, :swarm_name, :lead_agent, :agents, :all_agents_config, :swarm_hooks, :all_agents_hooks
+    attr_reader :config_path, :swarm_name, :lead_agent, :agents, :all_agents_config, :swarm_hooks, :all_agents_hooks, :scratchpad_enabled
 
     class << self
       def load(path)
@@ -62,6 +62,7 @@ module SwarmSDK
         name: @swarm_name,
         global_concurrency: Swarm::DEFAULT_GLOBAL_CONCURRENCY,
         default_local_concurrency: Swarm::DEFAULT_LOCAL_CONCURRENCY,
+        scratchpad_enabled: @scratchpad_enabled,
       )
 
       # Add all agents - pass definitions directly
@@ -146,6 +147,7 @@ module SwarmSDK
 
       @swarm_name = swarm[:name]
       @lead_agent = swarm[:lead].to_sym # Convert to symbol for consistency
+      @scratchpad_enabled = swarm[:use_scratchpad].nil? ? true : swarm[:use_scratchpad] # Default: enabled
     end
 
     def load_agents