ruboty-ai_agent 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ee903a1f588ede1c0b6e68bea298457b3ee2fbe826494f036f9c6482288475a
-  data.tar.gz: 9acf203be78f86b2eeaf1f6810606a4a5b0f0a05709aba6c52b7194a589ed533
+  metadata.gz: ab07f82523eaf799691d9b03457bfa01751d0b0d1864e69bbbfc8661d34a0fef
+  data.tar.gz: 9e51ee2e35c00010df295626b8749019feefc67eab4d5fe396913eb1f468e433
 SHA512:
-  metadata.gz: a59e8c688b63d055d59389a95b95a6a5637bac86d917e35a4bd90b7260bc2028b2defd00c6e7bd3a5b26d5cfdb22536de5e4a1428b4e597c29ae573898021922
-  data.tar.gz: 1daed254a4b194c16b3b9dda2180c59e21cb5597d7c965e20905c302523b1f3a9f2a2829528e7746370fa567de487389c5846b392167c7331d8e00422a45a73e
+  metadata.gz: beda5fe21c74e2def519c4e7d9bef74144fffb5daa7ea2334debc065218ab319eead0be9db7a36fda3ed4909bd16b54dab8f289dfd94da77b971c20b20f5a40e
+  data.tar.gz: 1b7a5ff752355974c23a807c6360d2a8454d19e0afc7e0546e253c99e9ed79a2731aa32a02963471449052c81f7e1635babf7e16d093cc8708ba71889638ae4c

data/AGENTS.md

@@ -20,3 +20,11 @@
 ## PR instructions
 
 - Always run `rake autocorrect` before committing.
+
+## CHANGELOG instructions
+
+- When you make changes, please update `CHANGELOG.md` accordingly.
+- Add to the `Unreleased` section at the top.
+- Follow the format used in previous entries.
+- Use English for the changelog entries
+

data/CHANGELOG.md

@@ -1,3 +1,22 @@
-# Changelog
+## Unreleased
+## 0.4.0
 
-All notable changes to this project will be documented in this file.
+- Add `bot_help` builtin tool to retrieve Ruboty's help information.
+- Add `fetch` builtin tool for fetching web content.
+- Fix `/usage` command to show token usage of last message.
+- Format tool call logs for better readability.
+
+## 0.3.0
+
+- Add think tool.
+- Different agent threads are prepared for different slack threads.
+
+## 0.2.0
+
+- Support for user defined commends.
+- Agent uses user defined system prompts and memories.
+- Support automatic prompt compaction.
+
+## 0.1.0
+
+- Initial release with basic features and functionality.

data/Gemfile

@@ -19,3 +19,5 @@ gem 'rubocop-rake', '~> 0.7.0'
 gem 'rubocop-rbs_inline', '~> 1.4.0'
 gem 'rubocop-rspec', '~> 3.7.0'
 gem 'steep', require: false
+
+gem 'ruby-readability'

data/README.md

@@ -57,9 +57,11 @@ MCP (Model Context Protocol):
 - `add mcp <NAME> <OPTIONS> <URL>` — Add an MCP server
   - Example (HTTP transport with auth header):
     - `add mcp search --transport http --header 'Authorization: Bearer xxx' https://example.com/mcp`
+    - `add mcp search --transport http --bearer-token xxx https://example.com/mcp`
   - Options:
     - `--transport http|sse` (currently only `http` implemented; `sse` is not yet implemented)
     - `--header 'Key: Value'` (repeatable)
+    - `--bearer-token <TOKEN>` (shorthand for `--header 'Authorization: Bearer <TOKEN>'`)
 - `remove mcp <NAME>` — Remove an MCP server
 - `list mcp` / `list mcps` — List configured MCP servers
 

data/Rakefile

@@ -17,6 +17,8 @@ Steep::RakeTask.new do |t|
   t.watch.verbose
 end
 
+Bump.changelog = true
+
 task default: %i[rubocop steep spec]
 task autocorrect: %i[rubocop:autocorrect rbs steep spec]
 

data/bin/ruboty

@@ -17,6 +17,8 @@ gemfile do
   gem 'ruboty'
   gem 'ruboty-ai_agent', path: '../'
 
+  gem 'ruby-readability'
+
   # You can add other ruboty plugins here for testing.
   # gem 'ruboty-echo'
   # gem 'ruboty-alias'

data/lib/ruboty/ai_agent/actions/add_mcp.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'optparse'
+require 'shellwords'
 
 module Ruboty
   module AiAgent
@@ -58,11 +59,11 @@ module Ruboty
             args: []
           } #: config
 
-          args = config_param.split(/\s+(?=-)/)
+          args = config_param.shellsplit
 
           parser = OptionParser.new do |opts|
             opts.on('--transport TYPE', %w[http sse], 'Transport type (http or sse)') do |t|
-              options[:transport] = t
+              options[:transport] = t.to_sym
             end
 
             opts.on('--header VALUE', 'Add a header (can be specified multiple times)') do |h|
@@ -74,6 +75,10 @@ module Ruboty
 
               options[:headers][key] = value
             end
+
+            opts.on('--bearer-token TOKEN', 'Set Authorization Bearer token (shorthand for --header "Authorization: Bearer TOKEN")') do |token|
+              options[:headers]['Authorization'] = "Bearer #{token}"
+            end
           end
 
           options[:args] = parser.parse(args)

data/lib/ruboty/ai_agent/actions/base.rb

@@ -35,7 +35,17 @@ module Ruboty
 
         # @rbs %a{memorized}
         def chat_thread #: Ruboty::AiAgent::ChatThread
-          @chat_thread ||= database.chat_thread(message.from || 'default')
+          @chat_thread ||= database.chat_thread(thread_id)
+        end
+
+        private
+
+        def thread_id #: String
+          if message.respond_to?(:original) && message.original&.dig(:thread_ts)
+            message.original[:thread_ts]
+          else
+            message.from || 'default'
+          end
         end
       end
     end

data/lib/ruboty/ai_agent/actions/chat.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'json'
+
 module Ruboty
   module AiAgent
     module Actions
@@ -10,14 +12,14 @@ module Ruboty
         # @rbs override
         def call
           user.prompt_command_definitions.all_values.each do |definition|
-            command = Commands::PromptCommand.new(definition:, message:, chat_thread:)
+            command = Commands::PromptCommand.new(definition:, request:)
             if command.match?(body_param)
               new_prompt = command.call(commandline: body_param)
               return complete_chat(new_prompt)
             end
           end
 
-          builtin_commands = Commands.builtins(message:, chat_thread:)
+          builtin_commands = Commands.builtins(request:)
           builtin_commands.each do |command|
             return command.call if command.match?(body_param)
           end
@@ -29,6 +31,11 @@ module Ruboty
           message[:body]
         end
 
+        # @rbs %a{memorized}
+        def request #: Request
+          @request ||= Request.new(message:, chat_thread:)
+        end
+
         private
 
         # @rbs body: String
@@ -56,7 +63,10 @@ module Ruboty
           messages += chat_thread.messages.all_values
 
           llm = LLM::OpenAI.new
-          tools = McpClients.new(user.mcp_clients).available_tools
+          tools = [
+            *McpClients.new(user.mcp_clients).available_tools,
+            *ToolDefinitions.builtins(request:).map(&:to_tool)
+          ]
 
           agent = Agent.new(
             llm:,
@@ -72,11 +82,10 @@ module Ruboty
 
               chat_thread.messages.compact(llm:) if chat_thread.messages.over_auto_compact_threshold?
             when :tool_call
-              message.reply("Calling tool #{event[:tool].name} with arguments #{event[:tool_arguments]}",
-                            streaming: true)
+              message.reply(indent_with_quotation("Calling tool #{event[:tool].name} with arguments #{truncate(event[:tool_arguments]&.to_json, max: 100)}")) unless event[:tool].silent?
             when :tool_response
               chat_thread.messages << event[:message]
-              message.reply("Tool response: #{event[:tool_response].slice(0..100)}")
+              message.reply(indent_with_quotation("Tool response: #{truncate(event[:tool_response], max: 100)}")) unless event[:tool].silent?
             end
           end
         rescue StandardError => e
@@ -86,6 +95,18 @@ module Ruboty
             message.reply("エラーが発生しました: #{e.message}")
           end
         end
+
+        def truncate(text, max:)
+          if text.length > max
+            "#{text.slice(0..max)}..."
+          else
+            text
+          end
+        end
+
+        def indent_with_quotation(text, quota = '> ')
+          text.lines.map { |line| "#{quota}#{line}" }.join
+        end
       end
     end
   end

data/lib/ruboty/ai_agent/actions/list_ai_commands.rb

@@ -7,7 +7,7 @@ module Ruboty
       class ListAiCommands < Base
         # @rbs override
         def call
-          builtin_commands = Commands.builtins(message:, chat_thread:)
+          builtin_commands = Commands.builtins(request: Request.new(message:, chat_thread:))
 
           builtin_list = builtin_commands.flat_map(&:matchers)
                                          .map { |matcher| "#{matcher.pattern.inspect} - #{matcher.description}" }

data/lib/ruboty/ai_agent/actions/list_mcp.rb

@@ -6,11 +6,58 @@ module Ruboty
       # ListMcp action for Ruboty::AiAgent
       class ListMcp < Base
         def call
-          mcp_configurations = (user.mcp_configurations.all || {}).map do |name, mcp_configuration|
-            "#{name}: #{mcp_configuration.to_h.except(:record_type).to_json}"
+          clients = user.mcp_clients
+
+          if clients.empty?
+            message.reply('No MCP servers found.')
+            return
+          end
+
+          show_headers = !message[:with_headers].nil?
+          output = clients.map do |mcp_client|
+            format_mcp_client(mcp_client, show_headers: show_headers)
+          end.join("\n\n")
+
+          message.reply(output)
+        end
+
+        private
+
+        # @rbs client: UserMcpClient
+        # @rbs show_headers: bool
+        # @rbs return: String
+        def format_mcp_client(client, show_headers: false)
+          configuration = client.configuration
+
+          tools_info = format_tools(client)
+          mcp_info = <<~TEXT
+            #{configuration.name}:
+              Transport: #{configuration.transport}
+              URL: #{configuration.url}
+          TEXT
+
+          mcp_info += "  Headers: #{configuration.headers.to_json}\n" if show_headers
+
+          "#{mcp_info}#{tools_info}".chomp
+        end
+
+        # @rbs client: UserMcpClient
+        # @rbs return: String
+        def format_tools(client)
+          tools = client.list_tools
+          return '' if tools.empty?
+
+          tools_output = tools.map do |tool|
+            tool_name = tool['name'] || 'unnamed'
+            description = tool['description'] || 'No description'
+            truncated_description = description.length > 100 ? "#{description[0, 100]}..." : description
+            "  - #{tool_name}: #{truncated_description}"
           end.join("\n")
 
-          message.reply(mcp_configurations.empty? ? 'No memories found.' : mcp_configurations)
+          "  Tools:\n#{tools_output}\n"
+        rescue HttpMcpClient::Error => e
+          warn "Failed to list tools for MCP client: #{e.message}"
+          ''
         end
       end
     end

data/lib/ruboty/ai_agent/agent.rb

@@ -41,7 +41,7 @@ module Ruboty
               tool_arguments: response.tool_arguments,
               tool_response:
             )
-            on_tool_response(tool_response:, message: tool_response_message, &)
+            on_tool_response(tool: response.tool, tool_response:, message: tool_response_message, &)
             messages << tool_response_message
           else
             messages << response.message
@@ -59,8 +59,8 @@ module Ruboty
         callback&.call({ type: :tool_call, tool:, tool_arguments: })
       end
 
-      def on_tool_response(tool_response:, message:, &callback)
-        callback&.call({ type: :tool_response, tool_response:, message: })
+      def on_tool_response(tool:, tool_response:, message:, &callback)
+        callback&.call({ type: :tool_response, tool:, tool_response:, message: })
       end
 
       def on_response(response, &callback)

data/lib/ruboty/ai_agent/chat_thread_messages.rb

@@ -11,12 +11,15 @@ module Ruboty
         store(message, key: (keys.last.to_s.to_i || -1) + 1)
       end
 
+      def token_usage #: TokenUsage?
+        all_values.reverse_each.find(&:token_usage)&.token_usage
+      end
+
       alias << add
 
       # Check if any message's token usage exceeds auto compact threshold
-      # @rbs return: bool
-      def over_auto_compact_threshold?
-        all_values.any? { |message| message.token_usage&.over_auto_compact_threshold? }
+      def over_auto_compact_threshold? #: boolish
+        token_usage&.over_auto_compact_threshold?
       end
 
       # Compact chat messages by summarizing them

data/lib/ruboty/ai_agent/commands/base.rb

@@ -6,18 +6,23 @@ module Ruboty
       # Base class for commands.
       # @abstract
       class Base
-        attr_reader :message #: Ruboty::Message
-        attr_reader :chat_thread #: Ruboty::AiAgent::ChatThread
+        attr_reader :request #: Request
 
-        # @rbs message: Ruboty::Message
-        # @rbs chat_thread: Ruboty::AiAgent::ChatThread
-        def initialize(message:, chat_thread:)
-          @message = message
-          @chat_thread = chat_thread
+        # @rbs request: Request
+        def initialize(request:)
+          @request = request
 
           super()
         end
 
+        def message #: Ruboty::Message
+          request.message
+        end
+
+        def chat_thread #: Ruboty::AiAgent::ChatThread
+          request.chat_thread
+        end
+
         # @rbs *args: untyped
         # @rbs return: untyped
         def call(*args)

data/lib/ruboty/ai_agent/commands/prompt_command.rb

@@ -10,12 +10,11 @@ module Ruboty
         attr_reader :definition #: Ruboty::AiAgent::PromptCommandDefinition
 
         # @rbs definition: Ruboty::AiAgent::PromptCommandDefinition
-        # @rbs message: Ruboty::Message
-        # @rbs chat_thread: Ruboty::AiAgent::ChatThread
-        def initialize(definition:, message:, chat_thread:)
+        # @rbs request: Ruboty::AiAgent::Request
+        def initialize(definition:, request:)
           @definition = definition
 
-          super(message:, chat_thread:)
+          super(request:)
         end
 
         # @rbs commandline: String

data/lib/ruboty/ai_agent/commands/usage.rb

@@ -8,9 +8,7 @@ module Ruboty
         on(%r{/usage}, name: 'show_usage', description: 'Show token usage information for the latest AI response')
 
         def call(*) #: void
-          latest_message = chat_thread.messages.all_values.find(&:token_usage)
-
-          token_usage = latest_message&.token_usage
+          token_usage = chat_thread.messages.token_usage
 
           if token_usage
             usage_text = "Token usage: #{format_number(token_usage.prompt_tokens)} (prompt) + #{format_number(token_usage.completion_tokens)} (completion) = #{format_number(token_usage.total_tokens)} (total)"

data/lib/ruboty/ai_agent/commands.rb

@@ -11,24 +11,14 @@ module Ruboty
       autoload :Usage, 'ruboty/ai_agent/commands/usage'
       autoload :PromptCommand, 'ruboty/ai_agent/commands/prompt_command'
 
-      # @rbs message: Ruboty::Message
-      # @rbs chat_thread: ChatThread
+      # @rbs request: Request
       # @rbs return: Array[Commands::BuiltinBase]
-      def self.builtins(message:, chat_thread:)
+      def self.builtins(request:)
         [
-          Commands::Clear.new(
-            message:,
-            chat_thread:
-          ),
-          Commands::Compact.new(
-            message:,
-            chat_thread:
-          ),
-          Commands::Usage.new(
-            message:,
-            chat_thread:
-          )
-        ]
+          Commands::Clear,
+          Commands::Compact,
+          Commands::Usage
+        ].map { |cmd_class| cmd_class.new(request:) }
       end
     end
   end

data/lib/ruboty/ai_agent/database/query_methods.rb

@@ -22,7 +22,7 @@ module Ruboty
             when Integer
               k
             when NilClass
-              nil
+              ''
             else
               raise ArgumentError, "Invalid key type: #{k.class}"
             end

data/lib/ruboty/ai_agent/llm/openai/model.rb

@@ -19,7 +19,7 @@ module Ruboty
             if name.include?('gpt-5')
               400_000
             else
-              128_000
+              AiAgent.settings.max_tokens || 128_000
             end
           end
         end

data/lib/ruboty/ai_agent/llm/openai.rb

@@ -158,7 +158,7 @@ module Ruboty
                 tool_call #: OpenAI::Models::Chat::ChatCompletionMessageFunctionToolCall
                 .function.arguments
 
-              JSON.parse(arguments, { symbolize_names: true })
+              JSON.parse(arguments)
             end
 
           Response.new(

data/lib/ruboty/ai_agent/mcp_clients.rb

@@ -16,8 +16,9 @@ module Ruboty
         clients.flat_map do |client|
           tool_defs = client.list_tools
           tool_defs.map do |tool_def|
+            tool_name = "mcp_#{client.mcp_name}__#{tool_def['name']}"
             Tool.new(
-              name: tool_def['name'],
+              name: tool_name,
               title: tool_def['title'] || '',
               description: tool_def['description'] || '',
               input_schema: tool_def['inputSchema']
@@ -31,20 +32,6 @@ module Ruboty
         end
       end
 
-      # @rbs function_name: String
-      # @rbs arguments: Hash[String, untyped]
-      # @rbs return: untyped
-      def execute_tool(function_name, arguments)
-        clients.each do |mcp_client|
-          tools = mcp_client.list_tools
-          return mcp_client.call_tool(function_name, arguments) if tools.any? { |t| t['name'] == function_name }
-        end
-        nil
-      rescue HttpMcpClient::Error => e
-        warn "Failed to execute tool '#{function_name}': #{e.message}"
-        nil
-      end
-
       # @rbs return: bool
       def any?
         @clients.any?

data/lib/ruboty/ai_agent/request.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Ruboty
+  module AiAgent
+    Request = Data.define(
+      :message, #: Ruboty::Message
+      :chat_thread #: Ruboty::AiAgent::ChatThread
+    )
+
+    # Request for chat action from user.
+    class Request
+      def message_body #: String
+        message[:body]
+      end
+    end
+  end
+end

data/lib/ruboty/ai_agent/settings.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Ruboty
+  module AiAgent
+    # Provide library-wide settings.
+    class Settings
+      # Provide access to settings instance.
+      module Accessor
+        def settings #: Ruboty::AiAgent::Settings
+          Settings.instance
+        end
+      end
+
+      # @rbs %a{memorized}
+      def self.instance #: Ruboty::AiAgent::Settings
+        @instance ||= Settings.new
+      end
+
+      def max_tokens #: Integer?
+        ENV['AI_AGENT_MAX_TOKENS']&.to_i
+      end
+
+      def auto_compact_threshold #: Float
+        ENV.fetch('AI_AGENT_AUTO_COMPACT_THRESHOLD', '80').to_f
+      end
+    end
+  end
+end

data/lib/ruboty/ai_agent/tool.rb

@@ -6,21 +6,29 @@ module Ruboty
     class Tool
       attr_reader :name, :title, :description #: String
       attr_reader :input_schema #: Hash[untyped, untyped]?
-      attr_reader :on_call #: (^(Hash[String, untyped]) -> String )?
+      attr_reader :silent #: boolish
+      attr_reader :on_call #: (^(Hash[String, untyped]) -> String? )?
 
       # @rbs name: String
       # @rbs title: String
       # @rbs description: String
       # @rbs input_schema: Hash[untyped, untyped]?
-      # @rbs &on_call: ? (Hash[String, untyped]) -> String
-      def initialize(name:, title:, description:, input_schema:, &on_call) #: void
+      # @rbs ?silent: boolish?
+      # @rbs &on_call: ? (Hash[String, untyped]) -> String?
+      def initialize(name:, title:, description:, input_schema:, silent: false, &on_call) #: void
         @name = name
         @title = title
         @description = description
         @input_schema = input_schema
+        @silent = silent
         @on_call = on_call
       end
 
+      # Returns true if the tool should be called silently (without notifying the user).
+      def silent? #: boolish
+        silent
+      end
+
       def call(params) #: String?
         on_call&.call(params)
       end

data/lib/ruboty/ai_agent/tool_definitions/base.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Ruboty
+  module AiAgent
+    module ToolDefinitions
+      # Base class for tool definitions
+      # @abstract
+      class Base
+        # @rbs!
+        #   type input_schema = Hash[String | Symbol, untyped]
+
+        # @rbs!
+        #   def self.tool_name: () -> String?
+        #   def self.tool_name=: (String) -> String
+        #   def self.tool_title: () -> String?
+        #   def self.tool_title=: (String) -> String
+        #   def self.tool_description: () -> String?
+        #   def self.tool_description=: (String) -> String
+        #   def self.tool_input_schema: () -> input_schema?
+        #   def self.tool_input_schema=: (input_schema) -> input_schema
+
+        class << self
+          def available? #: boolish
+            true
+          end
+
+          # @rbs skip
+          attr_accessor :tool_name
+
+          # @rbs skip
+          attr_accessor :tool_title
+
+          # @rbs skip
+          attr_accessor :tool_description
+
+          # @rbs skip
+          attr_accessor :tool_input_schema
+        end
+
+        def tool_name #: String
+          self.class.tool_name || (raise NotImplementedError, "Subclasses must define 'tool_name'")
+        end
+
+        def tool_title #: String
+          self.class.tool_title || ''
+        end
+
+        def tool_description #: String
+          self.class.tool_description || ''
+        end
+
+        def tool_input_schema #: input_schema
+          self.class.tool_input_schema || {} #: input_schema
+        end
+
+        # Return true if you want the tool not to produce call logs in the chat.
+        def silent? #: boolish
+          false
+        end
+
+        attr_reader :request #: Request
+
+        # @rbs request: Request
+        def initialize(request:)
+          @request = request
+        end
+
+        # @abstract
+        # @rbs arguments: Hash[String, untyped]
+        # @rbs return: String?
+        def call(arguments)
+          raise NotImplementedError, "Subclasses must implement the 'call' method"
+        end
+
+        def to_tool #: Tool
+          Tool.new(
+            name: tool_name,
+            title: tool_title,
+            description: tool_description,
+            input_schema: tool_input_schema,
+            silent: silent?,
+            &method(:call) #: ^ (Hash[String, untyped]) -> String?
+          )
+        end
+      end
+    end
+  end
+end