foobara-agent-cli 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02c3d2e1a47200eb3a55ed6b80634f30dbaf04c7f5b9e0927098bf3866f9d841
-  data.tar.gz: 467d2fe2e191095ae57685faf1ea3bf5cd0edd39412d2731ee8876bac991f89f
+  metadata.gz: ec206db778ad18c2a54abe667f5f008bedc9c7e29d4dd380f5dab800993a5092
+  data.tar.gz: 608aac583d84f28e30aac7da763281cb3631dc1bb35d70cbe4e3cf2082e5ee9d
 SHA512:
-  metadata.gz: 80609b7d266e727fb9ce1b70e267bae1c14d423ab6ffb898db5704f5e401457458ef829bc554c286b4d867583c15b59a9ded0caee96b10e46c80e7dfc01740ed
-  data.tar.gz: 6fea8df456f11fbbdc48c4d45c695c0a671a5460165a9bbc9149c6f4a4e364c4c1984ff09a640bb9ae77193414c3936d605dd06b6cb9a29f370954958c8de24d
+  metadata.gz: 0f552536d87b5350ff91331d72f8a305d0135bdb9fd0d67982bef75c8a7f03aac73ffffde1350cfe022f97095ad48e622840b3b4794cfb38990658a28833832f
+  data.tar.gz: ba88235162d3d3744342ee3170f30247b4fbf047e409deb399c2ae0abefa1faa3272ce94c3d9258543de55e8121b68afaeadd1a7c749eefbaf2a0b4ce3dd24ad

data/CHANGELOG.md

@@ -1,7 +1,19 @@
-## [Unreleased]
+## [0.0.4] - 2025-06-19
 
-- Move version.rb.erb to top-level
+- Support cuter ways to exit
 
-## [0.0.1] - 2025-05-21
+## [0.0.3] - 2025-05-30
+
+- Decompose #run_cli a bit, add a way to quit, and improve output
+
+## [0.0.2] - 2025-05-30
+
+- Improve test concurrency issues, test ollama, extract #run_cli to CliRunner and add improvements
+
+## [0.0.1] - 2025-06-19
 
 - Initial release
+
+## [0.0.0] - 2025-05-19
+
+- Project birth

data/src/foobara/agent.rb

@@ -1,7 +1,7 @@
 require "io/wait"
 
 module Foobara
-  class Agent
+  class Agent < CommandConnector
     def run_cli(io_in: $stdin, io_out: $stdout, io_err: $stderr)
       CliRunner.new(self, io_in:, io_out:, io_err:).run
     end

data/src/foobara/cli_runner.rb

@@ -1,5 +1,5 @@
 module Foobara
-  class Agent
+  class Agent < CommandConnector
     class CliRunner
       attr_accessor :io_in, :io_out, :io_err, :agent
 
@@ -11,10 +11,8 @@ module Foobara
       end
 
       def run
-        Util.pipe_write_with_flush(
-          io_out,
-          "\nWelcome to the Foobara Agent CLI! Type your goal and press enter to get started.\n\n> "
-        )
+        print_welcome_message
+        print_prompt
 
         loop do
           ready = Util.pipe_wait_readable(io_in, 1)
@@ -30,22 +28,19 @@ module Foobara
 
           goal = line.strip
 
-          break if goal =~ /\A(exit|quit|bye)\z/i
+          if user_wants_to_quit?(goal)
+            print_agent_message("Goodbye for now!\n")
+            agent.kill!
+            break
+          end
+
           next if goal.empty?
 
           begin
+            print_agent_message("On it...")
             outcome = agent.accomplish_goal(goal)
-
-            if outcome.success?
-              result = outcome.result
-              Util.pipe_writeline(io_out, "\nAgent says: #{result[:message_to_user]}\n")
-            else
-              # :nocov:
-              Util.pipe_writeline(io_err, "\nError: #{outcome.errors_hash}\n")
-              # :nocov:
-            end
-
-            Util.pipe_write_with_flush(io_out, "\n> ")
+            print_outcome(outcome)
+            print_prompt
           rescue => e
             # :nocov:
             Util.pipe_writeline(io_err, e.message)
@@ -54,6 +49,61 @@ module Foobara
           end
         end
       end
+
+      def print_welcome_message
+        welcome_message = if agent_name
+                            "Welcome! I am #{agent_name}!"
+                          else
+                            "Welcome to the Foobara Agent CLI!"
+                          end
+
+        welcome_message << " What would you like me to attempt to accomplish?"
+
+        Util.pipe_writeline(io_out, "\n#{welcome_message}\n")
+      end
+
+      def print_prompt
+        Util.pipe_write_with_flush(io_out, "\n> ")
+      end
+
+      def print_outcome(outcome)
+        message, stream = if outcome.success?
+                            [outcome.result[:message_to_user], io_out]
+                          else
+                            # :nocov:
+                            ["ERROR: #{outcome.errors_hash}", io_err]
+                            # :nocov:
+                          end
+
+        print_agent_message(message, stream)
+      end
+
+      def print_agent_message(message, stream = io_out)
+        name = agent_name || "Agent"
+        Util.pipe_writeline(stream, "\n#{name} says: #{message}\n")
+      end
+
+      def user_wants_to_quit?(goal)
+        if goal =~ /\/?(exit|quit|(good)?.?bye)/i
+          remainder = "#{::Regexp.last_match.pre_match}#{::Regexp.last_match.post_match}."
+          remainder.strip!
+
+          remainder.gsub!(/thanks?.?(you)?[\.!]*/i, "")
+          remainder.gsub!(/\A\s*\w+[\.!]*/i, "")
+          remainder.gsub!(/[\.!]*\z/i, "")
+
+          remainder.strip!
+          remainder.empty?
+        end
+      end
+
+      def agent_name
+        name = agent.agent_name
+
+        if name && !name.empty?
+          name
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-agent-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Miles Georgi
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Enables a Foobara::Agent to be ran as a CLI tool
 test_files: []