foobara-agent-cli 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02c3d2e1a47200eb3a55ed6b80634f30dbaf04c7f5b9e0927098bf3866f9d841
-  data.tar.gz: 467d2fe2e191095ae57685faf1ea3bf5cd0edd39412d2731ee8876bac991f89f
+  metadata.gz: 022f075a6a285b82c16fe16b9b275d408420b64a4536bfec012dde9accdf96b5
+  data.tar.gz: 265bb11c607742f5c49313786d3ebc7f131e20ca13653f0fdeac734391a5602f
 SHA512:
-  metadata.gz: 80609b7d266e727fb9ce1b70e267bae1c14d423ab6ffb898db5704f5e401457458ef829bc554c286b4d867583c15b59a9ded0caee96b10e46c80e7dfc01740ed
-  data.tar.gz: 6fea8df456f11fbbdc48c4d45c695c0a671a5460165a9bbc9149c6f4a4e364c4c1984ff09a640bb9ae77193414c3936d605dd06b6cb9a29f370954958c8de24d
+  metadata.gz: e7bbffda354cfee3922569a507944c0b392ac4a1f0b4c123b7a581b3b074fed6a7beb09b70c155f5005f01c0a3bc5293f8188edbccb01bb044b1e95c7d398d1c
+  data.tar.gz: db97a6f637ea354ce4133a445ab587e73b6f697d528ab7015784977dded8f603d4a89cf9b933d8e84fa77fceb81daa1fb3f53ba4ed9189d3bcd94419461b48e4

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 goal =~ /\A\/?(exit|quit|bye)\z/i
+            print_agent_message("Goodbye for now!")
+            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,47 @@ 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 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.3
 platform: ruby
 authors:
 - Miles Georgi