ruboty-ai_agent 0.1.0 → 0.2.0

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

@@ -7,27 +7,49 @@ module Ruboty
       #   interface _WithData
       #     def data: -> Hash[keynable, untyped]
       #   end
+      #
+      #   type query_key = keynable | Symbol | nil
 
       # @rbs module-self _WithData
       module QueryMethods
-        # @rbs *keys: keynable
+        # @rbs keys: Array[query_key]
+        # @rbs return: Array[keynable]
+        def self.keys_to_keynable(keys)
+          keys.map do |k|
+            case k
+            when String, Symbol
+              k.to_s
+            when Integer
+              k
+            when NilClass
+              nil
+            else
+              raise ArgumentError, "Invalid key type: #{k.class}"
+            end
+          end
+        end
+
+        # @rbs *keys: query_key
         # @rbs return: untyped
         def fetch(*keys)
+          keys = QueryMethods.keys_to_keynable(keys)
           item = data.dig(*keys)
 
           Recordable.instantiate_recursively(item)
         end
 
-        # @rbs *keys: keynable
+        # @rbs *keys: query_key
         # @rbs return: Integer
         def len(*keys)
+          keys = QueryMethods.keys_to_keynable(keys)
           item = data.dig(*keys)
           item.respond_to?(:length) ? item.length : 0
         end
 
-        # @rbs *keys: keynable
+        # @rbs *keys: query_key
         # @rbs return: void
         def delete(*keys)
+          keys = QueryMethods.keys_to_keynable(keys)
           namespace_keys = keys[0..-2] || []
           key = keys[-1]
 
@@ -40,9 +62,10 @@ module Ruboty
           end
         end
 
-        # @rbs *keys: keynable
+        # @rbs *keys: query_key
         # @rbs return: Array[keynable]
         def keys(*keys)
+          keys = QueryMethods.keys_to_keynable(keys)
           namespace = keys.empty? ? data : data.dig(*keys) #: top
           case namespace
           when Hash
@@ -54,9 +77,10 @@ module Ruboty
           end
         end
 
-        # @rbs *keys: keynable
+        # @rbs *keys: query_key
         # @rbs return: boolish
         def key?(*keys)
+          keys = QueryMethods.keys_to_keynable(keys)
           namespace_keys = keys[0..-2] || []
           key = keys[-1]
 
@@ -64,10 +88,11 @@ module Ruboty
           namespace&.key?(key)
         end
 
-        # @rbs at: Array[keynable]
+        # @rbs at: Array[query_key]
         # @rbs value: untyped
         # @rbs return: void
         def store(value, at:)
+          at = QueryMethods.keys_to_keynable(at)
           namespace_keys = at[0..-2] || []
           key = at[-1]
 

data/lib/ruboty/ai_agent/database.rb

@@ -5,7 +5,7 @@ module Ruboty
     # Memorize and retrieve information using Ruboty's brain.
     class Database
       # @rbs!
-      #   type keynable = Symbol | String | Integer
+      #   type keynable = String | Integer
 
       autoload :QueryMethods, 'ruboty/ai_agent/database/query_methods'
 
@@ -32,6 +32,7 @@ module Ruboty
         ChatThread.find_or_create(database: self, id: id)
       end
 
+      # @rbs %a{memorized}
       def global_settings #: GlobalSettings
         @global_settings ||= GlobalSettings.find_or_create(database: self)
       end

data/lib/ruboty/ai_agent/http_mcp_client.rb

@@ -51,7 +51,7 @@ module Ruboty
 
       # @rbs name: String
       # @rbs &block: ? (Hash[String, untyped]) -> void
-      def call_tool(name, arguments = {}, &block)
+      def call_tool(name, arguments = {}, &)
         ensure_initialized
         results = send_request(
           method: 'tools/call',
@@ -59,7 +59,7 @@ module Ruboty
             name: name,
             arguments: arguments
           },
-          &block
+          &
         )
 
         results.flat_map { |res| res.dig('result', 'content') || [] }
@@ -166,6 +166,9 @@ module Ruboty
         else
           handle_response(response, &block)
         end
+      rescue Net::HTTPExceptions, SystemCallError => e
+        error_message = e.is_a?(StandardError) ? e.message : "Unknown error (#{e.class.name})"
+        raise Error, "HTTP request failed: #{error_message}"
       end
 
       # @rbs response: Net::HTTPResponse

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

@@ -11,11 +11,11 @@ module Ruboty
         attr_reader :client #: OpenAI::Client
         attr_reader :model #: String
 
-        # @rbs client: OpenAI::Client
-        # @rbs model: String
-        def initialize(client:, model:)
-          @client = client
-          @model = model
+        # @rbs ?client: OpenAI::Client
+        # @rbs ?model: String
+        def initialize(client: nil, model: nil)
+          @client = client || ::OpenAI::Client.new(api_key: ENV.fetch('OPENAI_API_KEY', nil))
+          @model = model || ENV.fetch('OPENAI_MODEL', 'gpt-5-nano')
         end
 
         # @rbs %a{memorized}

data/lib/ruboty/ai_agent/mcp_clients.rb

@@ -25,6 +25,9 @@ module Ruboty
               client.call_tool(tool_def['name'], params).to_json
             end
           end
+        rescue HttpMcpClient::Error => e
+          warn "Failed to list tools for MCP client: #{e.message}"
+          []
         end
       end
 
@@ -37,6 +40,9 @@ module Ruboty
           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

data/lib/ruboty/ai_agent/mcp_configuration.rb

@@ -4,6 +4,7 @@ module Ruboty
   module AiAgent
     # @rbs!
     #   type transports = :http | :websocket
+    #   type transports_str = "http" | "websocket"
 
     McpConfiguration = Data.define(
       :name, #: String
@@ -17,12 +18,12 @@ module Ruboty
       include Recordable
 
       # @rbs name: String
-      # @rbs transport: transports
+      # @rbs transport: transports | transports_str
       # @rbs url: String
       # @rbs headers: Hash[String, String]?
       def initialize(name:, transport:, url:, headers: {})
         # No superclass method `initialize` in RBS.
-        super(name:, transport:, headers:, url:) # steep:ignore UnexpectedKeywordArgument
+        super(name:, transport: transport.to_sym, headers:, url:) # steep:ignore UnexpectedKeywordArgument
       end
 
       register_record_type :mcp_configuration

data/lib/ruboty/ai_agent/prompt_command_definition.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Ruboty
+  module AiAgent
+    PromptCommandDefinition = Data.define(
+      :name, #: String
+      :prompt #: String
+    )
+
+    # User-defined command model
+    class PromptCommandDefinition
+      include Recordable
+
+      register_record_type :user_defined_command
+    end
+  end
+end

data/lib/ruboty/ai_agent/record_set.rb

@@ -11,10 +11,14 @@ module Ruboty
         @database = database
       end
 
-      def namespace_keys #: Array[Database::keynable]
+      def namespace_keys #: Array[Database::query_key]
         raise NotImplementedError, 'Subclasses must implement the namespace_keys method'
       end
 
+      def empty? #: boolish
+        length.zero?
+      end
+
       def length #: Integer
         database.len(*namespace_keys)
       end
@@ -38,26 +42,26 @@ module Ruboty
         database.keys(*namespace_keys)
       end
 
-      # @rbs key: Database::keynable
+      # @rbs key: Database::query_key
       # @rbs return: Record | nil
       def fetch(key)
         database.fetch(*namespace_keys, key)
       end
 
-      # @rbs key: Database::keynable
+      # @rbs key: Database::query_key
       # @rbs record: Record
       # @rbs return: void
       def store(record, key:)
         database.store(record, at: [*namespace_keys, key])
       end
 
-      # @rbs key: Database::keynable
+      # @rbs key: Database::query_key
       # @rbs return: void
       def remove(key)
         database.delete(*namespace_keys, key)
       end
 
-      # @rbs key: Database::keynable
+      # @rbs key: Database::query_key
       # @rbs return: boolish
       def key?(key)
         database.key?(*namespace_keys, key)

data/lib/ruboty/ai_agent/recordable.rb

@@ -4,7 +4,7 @@ module Ruboty
   module AiAgent
     # @rbs!
     #   interface _WithToH
-    #     def to_h: () -> Hash[Database::keynable, untyped]
+    #     def to_h: () -> Hash[Symbol, untyped]
     #   end
 
     # Convertable between Hash and Recordable bidirectionally.
@@ -22,12 +22,12 @@ module Ruboty
           @record_types ||= {}
         end
 
-        # @rbs hash: Hash[Symbol, untyped]?
+        # @rbs hash: Hash[Symbol | String, untyped]?
         # @rbs return: bool
         def convertable?(hash)
           return false unless hash.is_a?(Hash)
 
-          type = hash[:record_type]
+          type = (hash[:record_type] || hash['record_type'])&.to_sym
           type && record_types.include?(type)
         end
 
@@ -54,9 +54,9 @@ module Ruboty
         def hashify_recursively(value)
           case value
           when Recordable
-            hashify_recursively(value.to_h)
+            hashify_recursively(record_to_hash(value))
           when Hash
-            value.transform_values { |v| hashify_recursively(v) }
+            value.transform_values { |v| hashify_recursively(v) }.transform_keys(&:to_s)
           when Array
             value.map { |v| hashify_recursively(v) }
           else
@@ -67,13 +67,15 @@ module Ruboty
         # @rbs record: Recordable
         # @rbs return: Hash[Database::keynable, untyped]
         def record_to_hash(record)
-          record.to_h
+          record.to_h.transform_keys(&:to_s)
         end
 
-        # @rbs hash: Hash[Symbol, untyped]
+        # @rbs hash: Hash[Symbol | String, untyped]
         # @rbs return: Recordable
         def record_from_hash(hash)
-          type = hash[:record_type]
+          hash = hash.transform_keys(&:to_sym)
+
+          type = hash[:record_type]&.to_sym
           klass = record_types[type]
           raise "Unknown record type: #{type}" unless klass
 
@@ -98,7 +100,7 @@ module Ruboty
 
       # @rbs module-self Recordable::ClassMethods.instance
       module PrependMethods
-        def to_h #: Hash[Database::keynable, untyped]
+        def to_h #: Hash[Symbol, untyped]
           {
             record_type: record_type,
             **super

data/lib/ruboty/ai_agent/token_usage.rb

@@ -32,6 +32,16 @@ module Ruboty
         (total_tokens.to_f / token_limit * 100).round(2).to_f
       end
 
+      # Check if usage percentage exceeds auto compact threshold
+      # @rbs return: bool
+      def over_auto_compact_threshold?
+        percentage = usage_percentage
+        return false unless percentage
+
+        threshold = ENV.fetch('AUTO_COMPACT_THRESHOLD', 80).to_f
+        percentage >= threshold
+      end
+
       def to_h #: Hash[Symbol, untyped]
         {
           prompt_tokens:,

data/lib/ruboty/ai_agent/user.rb

@@ -47,6 +47,11 @@ module Ruboty
       def mcp_tools_caches #: UserMcpToolsCaches
         @mcp_tools_caches ||= UserMcpToolsCaches.new(database: database, user_id: id)
       end
+
+      # @rbs %a{memorized}
+      def prompt_command_definitions #: UserPromptCommandDefinitions
+        @prompt_command_definitions ||= UserPromptCommandDefinitions.new(database: database, user_id: id)
+      end
     end
   end
 end

data/lib/ruboty/ai_agent/user_mcp_caches.rb

@@ -57,12 +57,12 @@ module Ruboty
 
       # @rbs override
       def all
-        super().reject { |(_key, cache)| cache.expired? }
+        super.reject { |(_key, cache)| cache.expired? }
       end
 
       # @rbs override
       def fetch(key)
-        cache = super(key)
+        cache = super
 
         if cache&.expired?
           remove(key)

data/lib/ruboty/ai_agent/user_mcp_client.rb

@@ -26,8 +26,8 @@ module Ruboty
       # @rbs arguments: Hash[String, untyped]
       # @rbs &block: ? (Hash[String, untyped]) -> void
       # @rbs return: untyped
-      def call_tool(name, arguments = {}, &block)
-        mcp_client.call_tool(name, arguments, &block)
+      def call_tool(name, arguments = {}, &)
+        mcp_client.call_tool(name, arguments, &)
       end
 
       # @rbs return: untyped

data/lib/ruboty/ai_agent/user_prompt_command_definitions.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Ruboty
+  module AiAgent
+    # User-defined commands record set
+    class UserPromptCommandDefinitions < UserAssociations #[PromptCommandDefinition]
+      self.association_key = :user_prompt_command_definitions
+
+      # @rbs command: PromptCommandDefinition
+      # @rbs return: PromptCommandDefinition
+      def add(command)
+        store(command, key: command.name)
+        command
+      end
+    end
+  end
+end

data/lib/ruboty/ai_agent/version.rb

@@ -2,6 +2,6 @@
 
 module Ruboty
   module AiAgent
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/lib/ruboty/ai_agent.rb

@@ -25,6 +25,7 @@ module Ruboty
     autoload :McpClient, 'ruboty/ai_agent/mcp_client'
     autoload :McpClients, 'ruboty/ai_agent/mcp_clients'
     autoload :McpConfiguration, 'ruboty/ai_agent/mcp_configuration'
+    autoload :PromptCommandDefinition, 'ruboty/ai_agent/prompt_command_definition'
     autoload :Recordable, 'ruboty/ai_agent/recordable'
     autoload :RecordSet, 'ruboty/ai_agent/record_set'
     autoload :TokenUsage, 'ruboty/ai_agent/token_usage'
@@ -36,5 +37,15 @@ module Ruboty
     autoload :UserMcpClient, 'ruboty/ai_agent/user_mcp_client'
     autoload :UserMcpConfigurations, 'ruboty/ai_agent/user_mcp_configurations'
     autoload :UserMcpToolsCaches, 'ruboty/ai_agent/user_mcp_tools_caches'
+    autoload :UserPromptCommandDefinitions, 'ruboty/ai_agent/user_prompt_command_definitions'
+
+    # Ensure all recordables are loaded
+    [
+      CachedValue,
+      ChatMessage,
+      McpConfiguration,
+      PromptCommandDefinition,
+      TokenUsage
+    ]
   end
 end

data/lib/ruboty/handlers/ai_agent.rb

@@ -20,64 +20,76 @@ module Ruboty
       on(/remove mcp (?<name>\S+)/, name: 'remove_mcp', description: 'Remove the specified MCP server')
       on(/list mcps?/, name: 'list_mcp', description: 'List configured MCP servers')
 
-      on(/set system prompt "(?<prompt>.+?)"(?: in (?<scope>user|global) scope)?/, name: 'set_system_prompt', description: 'Set system prompt')
+      on(/set (?:(?<scope>user|global) )?system prompt "(?<prompt>.+?)"/, name: 'set_system_prompt', description: 'Set system prompt')
       on(/show system prompt/, name: 'show_system_prompt', description: 'Show system prompt')
 
       on(/add ai memory "(?<prompt>.+)"/, name: 'add_ai_memory', description: 'Add a new AI memory')
       on(/remove ai memory (?<index>\d+)/, name: 'remove_ai_memory', description: 'Remove the specified AI memory')
       on(/list ai memor(?:y|ies)/, name: 'list_mcp', description: "List AI's memories")
 
-      on(%r{add ai command /(?<name>\S+)\s+"(?<prompt>.+)"}, name: 'add_ai_command',
-                                                             description: 'Add a new AI command')
+      on(%r{add ai command /(?<name>\S+)\s+(?<prompt>.+)}, name: 'add_ai_command',
+                                                           description: 'Add a new AI command')
       on(%r{remove ai command /(?<name>\S+)}, name: 'remove_ai_command', description: 'Remove the specified AI command')
       on(/list ai commands?/, name: 'list_ai_commands', description: 'List AI commands')
 
-      def chat(message)
+      def chat(message) #: true
         Ruboty::AiAgent::Actions::Chat.call(message)
+        true
       end
 
-      def add_mcp(message)
+      def add_mcp(message) #: true
         Ruboty::AiAgent::Actions::AddMcp.call(message)
+        true
       end
 
-      def remove_mcp(message)
+      def remove_mcp(message) #: true
         Ruboty::AiAgent::Actions::RemoveMcp.call(message)
+        true
       end
 
-      def list_mcp(message)
+      def list_mcp(message) #: true
         Ruboty::AiAgent::Actions::ListMcp.call(message)
+        true
       end
 
-      def set_system_prompt(message)
+      def set_system_prompt(message) #: true
         Ruboty::AiAgent::Actions::SetSystemPrompt.call(message)
+        true
       end
 
-      def show_system_prompt(message)
+      def show_system_prompt(message) #: true
         Ruboty::AiAgent::Actions::ShowSystemPrompt.call(message)
+        true
       end
 
-      def add_ai_memory(message)
+      def add_ai_memory(message) #: true
         Ruboty::AiAgent::Actions::AddAiMemory.call(message)
+        true
       end
 
-      def remove_ai_memory(message)
+      def remove_ai_memory(message) #: true
         Ruboty::AiAgent::Actions::RemoveAiMemory.call(message)
+        true
       end
 
-      def list_ai_memories(message)
+      def list_ai_memories(message) #: true
         Ruboty::AiAgent::Actions::ListAiMemories.call(message)
+        true
       end
 
-      def add_ai_command(message)
+      def add_ai_command(message) #: true
         Ruboty::AiAgent::Actions::AddAiCommand.call(message)
+        true
       end
 
-      def remove_ai_command(message)
+      def remove_ai_command(message) #: true
         Ruboty::AiAgent::Actions::RemoveAiCommand.call(message)
+        true
       end
 
-      def list_ai_commands(message)
+      def list_ai_commands(message) #: true
         Ruboty::AiAgent::Actions::ListAiCommands.call(message)
+        true
       end
     end
   end

data/rbs_collection.yaml

@@ -18,6 +18,7 @@ gems:
   - name: net-http
   - name: json
   - name: optparse
+  - name: shellwords
 #   # If you want to avoid installing rbs files for gems, you can specify them here.
 #   - name: GEM_NAME
 #     ignore: true

data/ruboty-ai_agent.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
     spec.metadata['changelog_uri'] = 'https://github.com/tomoasleep/ruboty-ai_agent/blob/main/CHANGELOG.md'
   else
     raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
+          'public gem pushes.'
   end
 
   # Specify which files should be added to the gem when it is released.
@@ -38,12 +38,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 2'
-  spec.add_development_dependency 'rake', '~> 13'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'webmock', '~> 3.0'
-
   spec.add_dependency 'event_stream_parser', '~> 1.0'
   spec.add_dependency 'openai', '~> 0.22.0'
   spec.add_dependency 'ruboty', '~> 1.3'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/script/clean-orphaned-rbs.rb

@@ -0,0 +1,105 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Clean orphaned RBS files from sig/generated
+#
+# This script removes RBS files from sig/generated directory that don't have
+# corresponding Ruby files in the project.
+
+require 'fileutils'
+require 'pathname'
+
+# Remove orphaned RBS files by `rbs-inline`
+class OrphanedRbsCleaner
+  def initialize(project_root: Dir.pwd)
+    @project_root = Pathname.new(project_root)
+    @sig_generated_dir = @project_root / 'sig' / 'generated'
+    @removed_files = []
+    @kept_files = []
+  end
+
+  def run(dry_run: false)
+    return unless @sig_generated_dir.exist?
+
+    puts "Scanning for orphaned RBS files in #{@sig_generated_dir}..."
+
+    rbs_files = find_rbs_files
+    puts "Found #{rbs_files.size} RBS files to check"
+
+    rbs_files.each do |rbs_file|
+      corresponding_ruby_file = find_corresponding_ruby_file(rbs_file)
+
+      if corresponding_ruby_file&.exist?
+        @kept_files << rbs_file
+      else
+        @removed_files << rbs_file
+        if dry_run
+          puts "Would remove: #{rbs_file.relative_path_from(@project_root)}"
+        else
+          puts "Removing: #{rbs_file.relative_path_from(@project_root)}"
+          rbs_file.delete
+        end
+      end
+    end
+
+    cleanup_empty_directories unless dry_run
+
+    print_summary
+  end
+
+  private
+
+  def find_rbs_files
+    @sig_generated_dir.glob('**/*.rbs').sort
+  end
+
+  def find_corresponding_ruby_file(rbs_file)
+    # Convert sig/generated/path/to/file.rbs to possible Ruby file locations
+    relative_path = rbs_file.relative_path_from(@sig_generated_dir)
+    ruby_file_name = relative_path.sub_ext('.rb')
+
+    # Check common Ruby source directories
+    possible_locations = [
+      @project_root / 'lib' / ruby_file_name
+    ]
+
+    possible_locations.find(&:exist?)
+  end
+
+  def cleanup_empty_directories
+    # Remove empty directories in sig/generated
+    @sig_generated_dir.find do |path|
+      next unless path.directory?
+      next if path == @sig_generated_dir
+
+      begin
+        path.rmdir if path.empty?
+      rescue Errno::ENOTEMPTY
+        # Directory is not empty, skip
+      end
+    end
+  end
+
+  def print_summary
+    puts "\nSummary:"
+    puts "  Kept files: #{@kept_files.size}"
+    puts "  Removed files: #{@removed_files.size}"
+
+    return unless @removed_files.any?
+
+    puts "\nRemoved files:"
+    @removed_files.each do |file|
+      puts "  - #{file.relative_path_from(@project_root)}"
+    end
+  end
+end
+
+# Script execution
+if __FILE__ == $PROGRAM_NAME
+  dry_run = ARGV.include?('--dry-run')
+
+  puts 'Running in dry-run mode (no files will be deleted)' if dry_run
+
+  cleaner = OrphanedRbsCleaner.new
+  cleaner.run(dry_run: dry_run)
+end