ruboty-ai_agent 0.1.0 → 0.3.0

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

@@ -0,0 +1,84 @@
+# 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
+          # @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

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Ruboty
+  module AiAgent
+    module ToolDefinitions
+      # Tool
+      class Think < Base
+        self.tool_name = 'think'
+        self.tool_title = 'Think'
+
+        self.tool_description = <<~TEXT
+          Use this tool to think abount something. It will not obtain new information or make any changes, but just log the thought.
+          Use it when completx reasoing or brainstorming is needed.
+        TEXT
+
+        self.tool_input_schema = {
+          type: 'object',
+          properties: {
+            thought: { type: 'string', description: 'Your thought.' }
+          },
+          required: ['thought']
+        }
+
+        # @rbs arguments: Hash[String, untyped]
+        # @rbs return: String?
+        def call(arguments)
+          thought = arguments['thought']
+
+          request.message.reply("Thought:\n#{thought}")
+
+          thought
+        end
+
+        # @rbs override
+        def silent?
+          true
+        end
+      end
+    end
+  end
+end

data/lib/ruboty/ai_agent/tool_definitions.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Ruboty
+  module AiAgent
+    # Tool Definitions for AI Agent
+    module ToolDefinitions
+      autoload :Base, 'ruboty/ai_agent/tool_definitions/base'
+      autoload :Think, 'ruboty/ai_agent/tool_definitions/think'
+
+      # @rbs request: Request
+      # @rbs return: Array[Base]
+      def self.builtins(request:)
+        [
+          Think
+        ].map { |tool_def| tool_def.new(request:) }
+      end
+    end
+  end
+end

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
@@ -68,14 +68,15 @@ module Ruboty
         mcp_client.cleanup_session
       end
 
-      private
-
       # @rbs return: McpConfiguration
       def configuration
         user.mcp_configurations.all_values.find { |config| config.name == mcp_name } ||
           raise("MCP configuration not found: #{mcp_name}")
       end
 
+      private
+
+      # @rbs %a{memorized}
       # @rbs return: HttpMcpClient
       def mcp_client
         @mcp_client ||= case configuration.transport

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.3.0'
   end
 end

data/lib/ruboty/ai_agent.rb

@@ -25,10 +25,13 @@ 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 :Request, 'ruboty/ai_agent/request'
     autoload :TokenUsage, 'ruboty/ai_agent/token_usage'
     autoload :Tool, 'ruboty/ai_agent/tool'
+    autoload :ToolDefinitions, 'ruboty/ai_agent/tool_definitions'
     autoload :User, 'ruboty/ai_agent/user'
     autoload :UserAiMemories, 'ruboty/ai_agent/user_ai_memories'
     autoload :UserAssociations, 'ruboty/ai_agent/user_associations'
@@ -36,5 +39,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

@@ -18,66 +18,78 @@ module Ruboty
 
       on(/add mcp (?<name>\S+)\s+(?<config>.+)\z/, name: 'add_mcp', description: 'Add a new MCP server')
       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(/list mcps?(?<with_headers>\s+with\s+headers)?/, 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

data/script/generate-concern-rbs.rb

@@ -303,7 +303,7 @@ class ConcernRbsGenerator
 
       # Open namespaces
       namespace_parts.each do |part|
-        content << ('  ' * indent_level) + "module #{part}"
+        content << (('  ' * indent_level) + "module #{part}")
         indent_level += 1
       end
 
@@ -315,17 +315,17 @@ class ConcernRbsGenerator
         # Add type parameters if present
         if includer[:type_params] && !includer[:type_params].empty?
           type_params_str = "[#{includer[:type_params].join(', ')}]"
-          content << ('  ' * indent_level) + "#{keyword} #{simple_name}#{type_params_str}"
+          content << (('  ' * indent_level) + "#{keyword} #{simple_name}#{type_params_str}")
         else
-          content << ('  ' * indent_level) + "#{keyword} #{simple_name}"
+          content << (('  ' * indent_level) + "#{keyword} #{simple_name}")
         end
 
         concern = includer[:concern]
         concern_simple_name = concern[:name].sub(/^::/, '').split('::').last
 
-        content << ('  ' * (indent_level + 1)) + "extend #{concern_simple_name}::ClassMethods" if concern[:has_class_methods]
+        content << (('  ' * (indent_level + 1)) + "extend #{concern_simple_name}::ClassMethods") if concern[:has_class_methods]
 
-        content << ('  ' * (indent_level + 1)) + "prepend #{concern_simple_name}::PrependMethods" if concern[:has_prepend_methods]
+        content << (('  ' * (indent_level + 1)) + "prepend #{concern_simple_name}::PrependMethods") if concern[:has_prepend_methods]
 
         content << "#{'  ' * indent_level}end"
         content << ''

data/script/generate-data-rbs.rb

@@ -31,7 +31,7 @@ class Processor
     puts "Scanning Ruby files in #{@lib_path}..."
 
     @lib_path.glob('**/*.rb').map do |file|
-      puts "Processing #{file}..."
+      puts "Processing #{file}..." if ENV['DEBUG']
       content = file.read
 
       parsed = Prism.parse(content)
@@ -127,9 +127,7 @@ class DataClassRbsGenerator
 
     def extract_constant_name(constant_path)
       case constant_path
-      when Prism::ConstantReadNode
-        constant_path.name.to_s
-      when Prism::ConstantPathNode
+      when Prism::ConstantReadNode, Prism::ConstantPathNode
         constant_path.name.to_s
       end
     end
@@ -242,7 +240,7 @@ class DataClassRbsGenerator
     end
 
     def indent(string, level:)
-      '  ' * level + string
+      ('  ' * level) + string
     end
   end
 end

data/script/generate-memorized-ivar-rbs.rb

@@ -101,15 +101,15 @@ class MemorizedIvarRbsGenerator
 
       # Open namespaces
       parts[0...-1].each do |part|
-        content << ('  ' * indent_level) + "module #{part}"
+        content << (('  ' * indent_level) + "module #{part}")
         indent_level += 1
       end
 
       # Class declaration with instance variables
-      content << ('  ' * indent_level) + "class #{parts.last}"
+      content << (('  ' * indent_level) + "class #{parts.last}")
 
       methods.each do |method|
-        content << ('  ' * (indent_level + 1)) + "@#{method.ivar_name}: #{method.return_type}"
+        content << (('  ' * (indent_level + 1)) + "@#{method.ivar_name}: #{method.return_type}")
       end
 
       content << "#{'  ' * indent_level}end"
@@ -188,9 +188,7 @@ class MemorizedIvarRbsGenerator
 
     def extract_constant_name(constant_path)
       case constant_path
-      when Prism::ConstantReadNode
-        constant_path.name.to_s
-      when Prism::ConstantPathNode
+      when Prism::ConstantReadNode, Prism::ConstantPathNode
         constant_path.name.to_s
       end
     end
@@ -248,11 +246,8 @@ class MemorizedIvarRbsGenerator
           return result if result
         end
         nil
-      when Prism::InstanceVariableOperatorWriteNode, Prism::InstanceVariableOrWriteNode
-        # This handles @ivar ||= ...
-        node.name.to_s.delete('@')
-      when Prism::InstanceVariableWriteNode
-        # This handles @ivar = ...
+      when Prism::InstanceVariableOperatorWriteNode, Prism::InstanceVariableOrWriteNode, Prism::InstanceVariableWriteNode
+        # This handles @ivar ||= ... or @ivar = ...
         node.name.to_s.delete('@')
       else
         # Recursively search in child nodes

data/sig/generated/ruboty/ai_agent/actions/add_ai_command.rbs

@@ -10,6 +10,10 @@ module Ruboty
         def name_param: () -> String
 
         def prompt_param: () -> String
+
+        # @rbs str: String
+        # @rbs return: String
+        def undump_string: (String str) -> String
       end
     end
   end

data/sig/generated/ruboty/ai_agent/actions/base.rbs

@@ -28,6 +28,10 @@ module Ruboty
         # @rbs %a{memorized}
         %a{memorized}
         def chat_thread: () -> Ruboty::AiAgent::ChatThread
+
+        private
+
+        def thread_id: () -> String
       end
     end
   end

data/sig/generated/ruboty/ai_agent/actions/chat.rbs

@@ -11,6 +11,16 @@ module Ruboty
         def call: ...
 
         def body_param: () -> String
+
+        # @rbs %a{memorized}
+        %a{memorized}
+        def request: () -> Request
+
+        private
+
+        # @rbs body: String
+        # @rbs return: void
+        def complete_chat: (String body) -> void
       end
     end
   end

data/sig/generated/ruboty/ai_agent/actions/list_mcp.rbs

@@ -6,6 +6,17 @@ module Ruboty
       # ListMcp action for Ruboty::AiAgent
       class ListMcp < Base
         def call: () -> untyped
+
+        private
+
+        # @rbs client: UserMcpClient
+        # @rbs show_headers: bool
+        # @rbs return: String
+        def format_mcp_client: (UserMcpClient client, ?show_headers: bool) -> String
+
+        # @rbs client: UserMcpClient
+        # @rbs return: String
+        def format_tools: (UserMcpClient client) -> String
       end
     end
   end

data/sig/generated/ruboty/ai_agent/agent.rbs

@@ -21,7 +21,7 @@ module Ruboty
 
       def on_tool_call: (tool: untyped, tool_arguments: untyped) ?{ (?) -> untyped } -> untyped
 
-      def on_tool_response: (tool_response: untyped, message: untyped) ?{ (?) -> untyped } -> untyped
+      def on_tool_response: (tool: untyped, tool_response: untyped, message: untyped) ?{ (?) -> untyped } -> untyped
 
       def on_response: (untyped response) ?{ (?) -> untyped } -> untyped
     end