foobara-agent 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c8f095d06fb173bc816e83f19755cfe246f15bf2b8ef1f8f91bce08e5960e74
-  data.tar.gz: 15b48a59c43c909070f68bbc58c68ce02635d019f9d3af68f1c3aa4264cd4903
+  metadata.gz: 0e0f6302247bbcc56ed93f61ec3a5d39e5041029e03b20cadea2d1dd0ebd04b6
+  data.tar.gz: baca677e1ea555bcdc908fd2b37dc2d8b016df9888f8f7a69c8cff73774756b2
 SHA512:
-  metadata.gz: f558c74920f9759a98b2605fe2dcbbc52678ff5d90a0977182a75d0949cfd400b07d3d17d4dbfe162b37a3f463c3c55b4e25dee6382f2daeb3256b5df9615f73
-  data.tar.gz: f0588e94676e579c1fd5d7b3b603452d0c283b2b14217511b74a8d341d3126ff42cf7d0cb1cc881048d356525c7b9250f73c1a7631dae556a589f23b8627e1f8
+  metadata.gz: 350feb6d9058009889a342a5dcc4f44befed8a25be71ebc7673bf75b7ceb1f95adcec3a52d2eb53ba9301d0ef2312919a4496a53f2146423dd36c17b122856af
+  data.tar.gz: a91ec6608bc3001f06d3c17562321d2c1a52a537372347593293d57d9d6312126f5116853c8b32b649d7c65a050bbb67bd03b2dbc50247cdc7260013b6d8f3ec

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.0.11] - 2025-07-01
+
+- Fix some bugs with result type/value mismatches
+- Eliminate ability to select command and inputs separately
+
 ## [0.0.10] - 2025-06-30
 
 - Allow more retries

data/lib/foobara/agent.rb

@@ -22,4 +22,4 @@ module Foobara
 end
 
 Foobara::Util.require_directory "#{__dir__}/../../src"
-Foobara::Monorepo.project "agent", project_path: "#{__dir__}/../../"
+Foobara.project "agent", project_path: "#{__dir__}/../../"

data/src/foobara/agent/notify_user_that_current_goal_has_been_accomplished.rb

@@ -4,7 +4,7 @@ module Foobara
       extend Concerns::SubclassCacheable
 
       class << self
-        attr_accessor :command_class
+        attr_accessor :command_class, :returns_message_to_user, :returns_result_data, :result_is_attributes
 
         def for(agent_id: nil, result_type: nil, include_message_to_user_in_result: true)
           agent_id ||= "Anon#{SecureRandom.hex(2)}"
@@ -19,26 +19,36 @@ module Foobara
                               "The user might issue a new goal."
 
             if result_type
+              klass.returns_result_data = true
+
               # TODO: fix this... agent backed command sets these via its own result type.
               # check if message_to_user is already here and also search/fix result_data to be result for consistency.
               if include_message_to_user_in_result
-                klass.add_inputs do
-                  result result_type, :required
-                  message_to_user :string, :required, "Message to the user about what was done"
-                end
+                klass.returns_message_to_user = true
 
                 klass.result do
                   result result_type, :required
                   message_to_user :string, :required, "Message to the user about what was done"
                 end
 
+                klass.add_inputs klass.result_type
+
                 klass.description "Notifies the user that the current goal has been accomplished and returns a final " \
                                   "result formatted according to the " \
                                   "result schema and a message to the user. " \
                                   "The user might issue a new goal."
               else
-                klass.add_inputs do
-                  result result_type, :required
+                unless result_type.is_a?(Types::Type)
+                  result_type = Domain.current.foobara_type_from_declaration(result_type)
+                end
+
+                if result_type.extends?(BuiltinTypes[:attributes])
+                  klass.result_is_attributes = true
+                  klass.add_inputs result_type
+                else
+                  klass.add_inputs do
+                    result result_type, :required
+                  end
                 end
 
                 klass.result result_type
@@ -49,6 +59,8 @@ module Foobara
                                   "The user might issue a new goal."
               end
             elsif include_message_to_user_in_result
+              klass.returns_message_to_user = true
+
               klass.add_inputs do
                 message_to_user :string, :required, "Message to the user about what was done"
               end
@@ -81,24 +93,46 @@ module Foobara
       end
 
       def execute
+        build_result
         mark_mission_accomplished
 
-        parsed_result
+        built_result
       end
 
+      attr_accessor :built_result
+
       def mark_mission_accomplished
-        command_connector.mark_mission_accomplished(inputs[:result], inputs[:message_to_user])
+        result, message_to_user = if returns_message_to_user?
+                                    [built_result[:result], built_result[:message_to_user]]
+                                  elsif returns_result_data?
+                                    [built_result, nil]
+                                  end
+
+        command_connector.mark_mission_accomplished(result, message_to_user)
       end
 
-      def parsed_result
-        inputs_type = self.class.inputs_type
-        element_types = inputs_type.element_types
+      def build_result
+        self.built_result = if returns_message_to_user?
+                              inputs.slice(:result, :message_to_user)
+                            elsif returns_result_data?
+                              if result_is_attributes?
+                                inputs.slice(*self.class.result_type.element_types.keys)
+                              else
+                                inputs[:result]
+                              end
+                            end
+      end
 
-        if element_types.key?(:message_to_user)
-          inputs.slice(:result, :message_to_user)
-        elsif element_types.key?(:result)
-          inputs[:result]
-        end
+      def returns_message_to_user?
+        self.class.returns_message_to_user
+      end
+
+      def returns_result_data?
+        self.class.returns_result_data
+      end
+
+      def result_is_attributes?
+        self.class.result_is_attributes
       end
     end
   end

data/src/foobara/agent.rb

@@ -41,7 +41,7 @@ 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
+      self.llm_model = llm_model || "claude-opus-4-20250514"
       self.result_type = result_type
       self.include_message_to_user_in_result = include_message_to_user_in_result
       self.verbose = verbose

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-agent
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Miles Georgi