foobara-agent 0.0.14 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc32aeaa66ec947920e085944f7948d22d97b4fa3b39d1a4b4fbf58755ca4321
-  data.tar.gz: 0dc7b3d02061bf0a615ab6299ea5f607fff1d703804d5368b57a9157d4edf64a
+  metadata.gz: 786fe4f10e3355da241847e573ff5d80abfb174d5afdedc0cb936d0a08b583ab
+  data.tar.gz: f6ae8472f81c4a7ba98f8daa6dd9998118d3d0dbf0728d5710b0d1b0575264ab
 SHA512:
-  metadata.gz: e1a1d3780d7a3112cff93e7e626ec677ad558ce605e65c60f00ec3b8213b604e248ca4428311303b1902451f2bcc7d2a5f17f3725dde77bbb4725aeb10b9898d
-  data.tar.gz: f6113517024dc34e999fafcb3bc5ee0ec98fb63628f61725b5631e454d6edd4714933a745232e57f2a1c8f686f0d2544b481b1726cfff3e4dbbc47666bdd74c4
+  metadata.gz: d4f150fb79b86ea3e02413bbd2d08e186f08888dd462fd722037d7741d65f7ccfc04d080ac751abcf04cbd2ba3455c240a3a0695699b3b01fd9e3d5ffba96948
+  data.tar.gz: 759813642a132a0f874506af6d5692f820fc62893e76e14bc759b33ebd353541917ad72b8589efa74141dee0fa8866638dd188e8860d7af4a9a412c69c344571

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.0.17] - 2025-07-10
+
+- Prefix verbose output with the agent name if there is one
+
+## [0.0.16] - 2025-07-09
+
+- Tell the llm about previous goals
+- Allow agents to be nameless
+- Improve support for killing a running agent
+
+## [0.0.15] - 2025-07-09
+
+- Make use of Ai.default_llm_model
+
 ## [0.0.14] - 2025-07-08
 
 - Better handle serialization/pre-commit loading for various entity-depth scenarios

data/src/foobara/agent/accomplish_goal.rb

@@ -25,8 +25,8 @@ module Foobara
                               description: "Maximum number of commands to run before giving up"
         llm_model :string,
                   :allow_nil,
-                  one_of: Foobara::Ai::AnswerBot::Types::ModelEnum,
-                  default: "claude-3-7-sonnet-20250219",
+                  one_of: Ai::AnswerBot::Types::ModelEnum,
+                  default: Ai.default_llm_model,
                   description: "The model to use for the LLM"
         max_llm_calls_per_minute :integer, :allow_nil
         user_association_depth :symbol, :allow_nil, one_of: Foobara::AssociationDepth
@@ -48,7 +48,7 @@ module Foobara
         end
         # simulate_describe_command_run_for_all_commands
 
-        until mission_accomplished or given_up
+        until mission_accomplished or given_up or killed
           increment_command_calls
           check_if_too_many_calls
 
@@ -69,7 +69,7 @@ module Foobara
       attr_accessor :next_command_name, :next_command_inputs, :next_command_raw_inputs, :mission_accomplished,
                     :given_up, :next_command_class, :next_command, :command_outcome, :timed_out,
                     :final_result, :final_message, :command_response, :delayed_command_name,
-                    :command_calls
+                    :command_calls, :killed
 
       def list_commands_already_ran?
         context.command_log.any? { |log_entry| log_entry.command_name =~ /\bListCommands\z/ }
@@ -131,6 +131,8 @@ module Foobara
       end
 
       def determine_next_command_and_inputs(retries = 3, error_outcome = nil)
+        return if killed
+
         if retries == 0
           # TODO: test this path by irreparably breaking the needed commands
           # :nocov:
@@ -428,7 +430,10 @@ module Foobara
                    end
                  end
 
-          (io_out || $stdout).puts "#{next_command_name}.run#{args}"
+          agent_name = agent.agent_name
+          prefix = agent_name && !agent_name.empty? ? "#{agent_name}: " : ""
+
+          (io_out || $stdout).puts "#{prefix}#{next_command_name}.run#{args}"
         end
       end
 
@@ -439,6 +444,10 @@ module Foobara
         self.final_message = message
       end
 
+      def kill!
+        self.killed = true
+      end
+
       def give_up!(message)
         self.given_up = true
         self.final_message = message

data/src/foobara/agent/determine_base.rb

@@ -10,7 +10,7 @@ module Foobara
         agent Agent, :required
         llm_model :string,
                   one_of: Foobara::Ai::AnswerBot::Types::ModelEnum,
-                  default: "claude-3-7-sonnet-20250219",
+                  default: Ai.default_llm_model,
                   description: "The model to use for the LLM"
       end
 
@@ -57,7 +57,15 @@ module Foobara
       end
 
       def goal
-        context.current_goal
+        context.current_goal.text
+      end
+
+      def previous_goal_and_status_pairs
+        if context.previous_goals && !context.previous_goals.empty?
+          context.previous_goals.map do |previous_goal|
+            [previous_goal.text, previous_goal.state]
+          end
+        end
       end
 
       def context

data/src/foobara/agent/determine_next_command_name_and_inputs.rb

@@ -4,19 +4,19 @@ module Foobara
   class Agent < CommandConnector
     class DetermineNextCommandNameAndInputs < DetermineBase
       class << self
-        def llm_instructions(assistant_association_depth, goal)
-          key = [assistant_association_depth, goal]
+        def llm_instructions(assistant_association_depth, goal, previous_goals = nil)
+          key = [assistant_association_depth, goal, previous_goals]
 
           @llm_instructions_cache ||= {}
 
           if @llm_instructions_cache.key?(key)
             @llm_instructions_cache[key]
           else
-            @llm_instructions_cache[key] = build_llm_instructions(assistant_association_depth, goal)
+            @llm_instructions_cache[key] = build_llm_instructions(assistant_association_depth, goal, previous_goals)
           end
         end
 
-        def build_llm_instructions(assistant_association_depth, goal)
+        def build_llm_instructions(assistant_association_depth, goal, previous_goals)
           instructions = "You are the implementation of a command called #{scoped_full_name}"
 
           instructions += if description && !description.empty?
@@ -29,7 +29,17 @@ module Foobara
 
           result_schema = result_json_schema(assistant_association_depth)
 
+          if previous_goals && !previous_goals.empty?
+            instructions += "You have previously accomplished the following goals:\n\n"
+
+            previous_goals.each.with_index do |(previous_goal, state), index|
+              instructions += "previous goal #{index + 1}: #{previous_goal}\n"
+              instructions += "status of goal #{index + 1}: #{state}\n\n"
+            end
+          end
+
           instructions += "You are working towards accomplishing the following goal:\n\n#{goal}\n\n"
+
           instructions += "Your response of which command to run next should match the following JSON schema:"
           instructions += "\n\n#{result_schema}\n\n"
           instructions += "You can get more details about the inputs and result schemas for a specific command by " \
@@ -52,7 +62,11 @@ module Foobara
       end
 
       def determine_llm_instructions
-        self.llm_instructions = self.class.llm_instructions(computed_user_association_depth, goal)
+        self.llm_instructions = self.class.llm_instructions(
+          computed_user_association_depth,
+          goal,
+          previous_goal_and_status_pairs
+        )
       end
     end
   end

data/src/foobara/agent/types/context.rb

@@ -1,15 +1,17 @@
+require_relative "goal"
+
 module Foobara
   class Agent < CommandConnector
     class Context < Foobara::Model
       class << self
         def for(goal)
-          new(command_log: [], current_goal: goal)
+          new(command_log: [], current_goal: Goal.new(text: goal))
         end
       end
 
       attributes do
-        current_goal :string, :required, "The current goal the agent needs to accomplish"
-        previous_goals [:string]
+        current_goal Goal, :required, "The current goal the agent needs to accomplish"
+        previous_goals [Goal]
         # TODO: why doesn't this default of [] work as expected on newly created models?
         command_log [CommandLogEntry], default: [],
                                        description: "Log of all commands run so far and their outcomes"
@@ -18,7 +20,7 @@ module Foobara
       def set_new_goal(goal)
         self.previous_goals ||= []
         previous_goals << current_goal
-        self.current_goal = goal
+        self.current_goal = Goal.new(text: goal)
       end
     end
   end

data/src/foobara/agent/types/goal.rb

@@ -0,0 +1,18 @@
+module Foobara
+  class Agent < CommandConnector
+    class Goal < Foobara::Model
+      module States
+        ACCOMPLISHED = :accomplished
+        KILLED = :killed
+        FAILED = :failed
+        ERROR = :error
+        GAVE_UP = :gave_up
+      end
+
+      attributes do
+        text :string, :required
+        state :symbol, :allow_nil, one_of: States
+      end
+    end
+  end
+end

data/src/foobara/agent.rb

@@ -15,6 +15,7 @@ module Foobara
 
     attr_accessor :context,
                   :agent_name,
+                  :agent_id,
                   :llm_model,
                   :current_accomplish_goal_command,
                   :result_type,
@@ -44,8 +45,11 @@ module Foobara
     )
       # TODO: shouldn't have to pass command_log here since it has a default, debug that
       self.context = context
-      self.agent_name = agent_name || "Anon#{SecureRandom.hex(2)}"
-      self.llm_model = llm_model || "claude-opus-4-20250514"
+      if agent_name
+        self.agent_name = agent_name
+      end
+      self.agent_id = agent_name || "Anon#{SecureRandom.hex(2)}"
+      self.llm_model = llm_model || Ai.default_llm_model
       self.result_type = result_type
       self.include_message_to_user_in_result = include_message_to_user_in_result
       self.verbose = verbose
@@ -105,11 +109,16 @@ module Foobara
     end
 
     def kill!
-      state_machine.perform_transition!(:kill)
+      current_accomplish_goal_command&.kill!
+      state_machine.perform_transition!(:kill) do
+        if context
+          context.current_goal.state = Goal::States::KILLED
+        end
+      end
     end
 
     def killed?
-      state_machine.current_state == :killed
+      state_machine.current_state == Goal::States::KILLED
     end
 
     def accomplish_goal(
@@ -149,14 +158,27 @@ module Foobara
           transition = if outcome.success?
                          :goal_accomplished
                        else
-                         :goal_errored
+                         :goal_failed
                        end
 
-          state_machine.perform_transition!(transition)
+          unless killed?
+            state_machine.perform_transition!(transition) do
+              context.current_goal.state = if outcome.success?
+                                             Goal::States::ACCOMPLISHED
+                                           else
+                                             Goal::States::FAILED
+                                           end
+            end
+          end
         end
       rescue
         # :nocov:
-        state_machine.perform_transition!(:goal_failed)
+        unless killed?
+          state_machine.perform_transition!(:goal_errored) do
+            context.current_goal.state = Goal::States::ERROR
+          end
+        end
+
         raise
         # :nocov:
       end
@@ -247,7 +269,7 @@ module Foobara
                            # TODO: Support changing the final result type when the goal changes
                            NotifyUserThatCurrentGoalHasBeenAccomplished.for(
                              result_type:,
-                             agent_id: agent_name,
+                             agent_id:,
                              # TODO: Support changing this flag when the goal changes
                              include_message_to_user_in_result:,
                              result_entity_depth:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-agent
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.17
 platform: ruby
 authors:
 - Miles Georgi
@@ -13,30 +13,42 @@ dependencies:
   name: foobara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.126
+        version: 0.0.136
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.136
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.0.126
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: foobara-llm-backed-command
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 email:
 - azimux@gmail.com
 executables: []
@@ -61,6 +73,7 @@ files:
 - src/foobara/agent/notify_user_that_current_goal_has_been_accomplished.rb
 - src/foobara/agent/types/command_log_entry.rb
 - src/foobara/agent/types/context.rb
+- src/foobara/agent/types/goal.rb
 homepage: https://github.com/foobara/agent
 licenses:
 - MPL-2.0