girb 0.1.2 → 0.3.0

data/lib/girb/tools/run_debug_command.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require_relative "base"
+
+module Girb
+  module Tools
+    class RunDebugCommand < Base
+      class << self
+        def description
+          "Execute a debugger command. Use this tool whenever the user asks to step, continue, set breakpoints, or perform any debugger action. " \
+          "For conditional breakpoints, use 'if:' (with colon): e.g., 'break sample.rb:14 if: x == 1'."
+        end
+
+        def parameters
+          {
+            type: "object",
+            properties: {
+              command: {
+                type: "string",
+                description: "The debugger command to execute. Examples: 'n', 's', 'c', 'finish', 'up', 'down', " \
+                             "'break sample.rb:14', 'break sample.rb:14 if: x == 1', 'info locals', 'bt'"
+              },
+              auto_continue: {
+                type: "boolean",
+                description: "Set to true if you want to be re-invoked after the command executes " \
+                             "to see the new state. Use this when you need to check variables or " \
+                             "decide the next action after stepping/continuing."
+              }
+            },
+            required: ["command"]
+          }
+        end
+
+        def available?
+          defined?(DEBUGGER__)
+        end
+      end
+
+      def execute(binding, command:, auto_continue: false)
+        Girb::DebugIntegration.add_pending_debug_command(command)
+        Girb::DebugIntegration.auto_continue = true if auto_continue
+        { success: true, command: command, auto_continue: auto_continue,
+          message: auto_continue ?
+            "Command '#{command}' will be executed. You will be re-invoked with updated context." :
+            "Command '#{command}' will be executed after this response." }
+      end
+    end
+  end
+end

data/lib/girb/tools/run_irb_debug_command.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require_relative "base"
+
+module Girb
+  module Tools
+    class RunIrbDebugCommand < Base
+      class << self
+        def name
+          "run_debug_command"
+        end
+
+        def description
+          "Execute a debug command in IRB. IRB integrates with debug gem, allowing step-by-step debugging. " \
+          "Use this when the user asks to step through code, set breakpoints, or navigate execution."
+        end
+
+        def parameters
+          {
+            type: "object",
+            properties: {
+              command: {
+                type: "string",
+                description: "The debug command to execute. Examples: 'next', 'step', 'continue', 'finish', " \
+                             "'break sample.rb:14', 'break sample.rb:14 if: x == 1', 'info', 'backtrace'"
+              },
+              auto_continue: {
+                type: "boolean",
+                description: "Set to true to be re-invoked after the command executes to see the new state."
+              }
+            },
+            required: ["command"]
+          }
+        end
+
+        def available?
+          # Available in IRB mode (not in active debug session)
+          # DEBUGGER__::SESSION indicates an active debug session
+          defined?(IRB) && !defined?(DEBUGGER__::SESSION)
+        end
+      end
+
+      def execute(binding, command:, auto_continue: false)
+        Girb::IrbIntegration.add_pending_irb_command(command)
+        Girb::AutoContinue.request! if auto_continue
+
+        {
+          success: true,
+          command: command,
+          auto_continue: auto_continue,
+          message: auto_continue ?
+            "Command '#{command}' will be executed. You will be re-invoked with updated context." :
+            "Command '#{command}' will be executed after this response."
+        }
+      end
+    end
+  end
+end

data/lib/girb/tools/session_history_tool.rb

@@ -2,6 +2,8 @@
 
 require_relative "base"
 require_relative "../session_history"
+require_relative "../conversation_history"
+require_relative "../session_persistence"
 
 module Girb
   module Tools
@@ -12,7 +14,13 @@ module Girb
         end
 
         def description
-          "Get IRB session history. Can retrieve specific lines, line ranges, method definitions, AI conversation details, or full history."
+          "Get IRB session history including AI conversations from previous sessions (if persisted). " \
+          "Can retrieve specific lines, line ranges, method definitions, AI conversation details, or full history."
+        end
+
+        def available?
+          # Only available in IRB mode, not in debug mode
+          !defined?(DEBUGGER__)
         end
 
         def parameters
@@ -146,21 +154,51 @@ module Girb
       end
 
       def list_ai_conversations
-        conversations = SessionHistory.ai_conversations
-        if conversations.any?
+        all_conversations = []
+
+        # 永続化されたセッションからの会話
+        persisted = get_persisted_conversations
+        all_conversations.concat(persisted)
+
+        # 現在のセッションの会話
+        current = SessionHistory.ai_conversations.map do |c|
           {
-            count: conversations.size,
-            conversations: conversations.map do |c|
+            line: c[:line_no],
+            question: c[:question],
+            response: c[:response] || "",
+            source: "current_session"
+          }
+        end
+        all_conversations.concat(current)
+
+        if all_conversations.any?
+          {
+            count: all_conversations.size,
+            conversations: all_conversations.map do |c|
+              response = c[:response] || ""
               {
-                line: c[:line_no],
+                line: c[:line],
                 question: c[:question],
-                response_preview: c[:response][0, 200] + (c[:response].length > 200 ? "..." : "")
+                response_preview: response.length > 200 ? "#{response[0, 200]}..." : response,
+                source: c[:source] || "persisted"
               }
             end
           }
         else
-          { message: "No AI conversations in this session" }
+          { message: "No AI conversations in session history" }
+        end
+      end
+
+      def get_persisted_conversations
+        conversations = []
+        ConversationHistory.messages.each do |msg|
+          if msg.role == "user"
+            conversations << { question: msg.content, source: "persisted" }
+          elsif msg.role == "model" && conversations.last && !conversations.last[:response]
+            conversations.last[:response] = msg.content
+          end
         end
+        conversations
       end
 
       def get_ai_detail(line)

data/lib/girb/tools.rb

@@ -8,15 +8,36 @@ require_relative "tools/evaluate_code"
 require_relative "tools/read_file"
 require_relative "tools/find_file"
 require_relative "tools/session_history_tool"
+require_relative "tools/debug_session_history_tool"
 require_relative "tools/environment_tools"
+require_relative "tools/continue_analysis"
+require_relative "tools/run_irb_debug_command"
 
 module Girb
   module Tools
-    CORE_TOOLS = [InspectObject, GetSource, ListMethods, EvaluateCode, ReadFile, FindFile, SessionHistoryTool, GetCurrentDirectory].freeze
+    # Shared tools available in both IRB and debug modes
+    SHARED_TOOLS = [InspectObject, GetSource, ListMethods, EvaluateCode, ReadFile, FindFile, GetCurrentDirectory].freeze
+
+    # IRB-only tools
+    IRB_TOOLS = [SessionHistoryTool, ContinueAnalysis, RunIrbDebugCommand].freeze
+
+    # Debug-only tools (RunDebugCommand is registered separately in DebugIntegration)
+    DEBUG_TOOLS = [DebugSessionHistoryTool].freeze
+
+    # All core tools (used for backward compatibility)
+    CORE_TOOLS = (SHARED_TOOLS + IRB_TOOLS + DEBUG_TOOLS).freeze
 
     class << self
+      def registered_tools
+        @registered_tools ||= []
+      end
+
+      def register(tool_class)
+        registered_tools << tool_class unless registered_tools.include?(tool_class)
+      end
+
       def available_tools
-        tools = CORE_TOOLS.dup
+        tools = CORE_TOOLS.dup + registered_tools
 
         # Rails tools are loaded conditionally
         if defined?(Rails)

data/lib/girb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Girb
-  VERSION = "0.1.2"
+  VERSION = "0.3.0"
 end

data/lib/girb.rb

@@ -17,7 +17,7 @@ module Girb
   class ApiError < Error; end
 
   class << self
-    attr_accessor :configuration
+    attr_accessor :configuration, :debug_session
 
     def configure
       self.configuration ||= Configuration.new
@@ -41,17 +41,34 @@ end
 # Rails がロードされていたら Railtie を組み込む
 require_relative "girb/railtie" if defined?(Rails::Railtie)
 
+# debug gem がロードされていたら DebugIntegration を組み込む
+if defined?(DEBUGGER__)
+  Girb.configure unless Girb.configuration
+  Girb::GirbrcLoader.load_girbrc
+  require_relative "girb/debug_integration"
+  Girb::DebugIntegration.setup
+end
+
 # binding.girb サポート
 class Binding
-  def girb
+  def girb(show_code: true)
     require "irb"
     Girb.setup! unless defined?(IRB::Command::Qq)
 
-    # IRB.start with this binding
-    IRB.setup(source_location[0], argv: [])
+    # .girbrcを読み込む（プロバイダー設定）
+    Girb::GirbrcLoader.load_girbrc unless Girb.configuration&.provider
+
+    # キーバインドを再設定（IRBセッション開始前に確実に設定）
+    Girb::IrbIntegration.install_ai_keybinding
+
+    # 標準のbinding.irbと同じ方法でIRBを起動
+    IRB.setup(source_location[0], argv: []) unless IRB.initialized?
     workspace = IRB::WorkSpace.new(self)
-    irb = IRB::Irb.new(workspace)
-    IRB.conf[:MAIN_CONTEXT] = irb.context
-    irb.run(IRB.conf)
+    STDOUT.print(workspace.code_around_binding) if show_code
+
+    binding_irb = IRB::Irb.new(workspace, from_binding: true)
+    binding_irb.context.irb_path = File.expand_path(source_location[0])
+    binding_irb.run(IRB.conf)
+    binding_irb.debug_break
   end
 end

data/lib/irb/command/qq.rb

@@ -12,17 +12,29 @@ module IRB
         question = question.to_s.strip
         if question.empty?
           puts "[girb] Usage: qq \"your question here\""
+          puts "[girb]        qq session clear  - Clear current session"
+          puts "[girb]        qq session list   - List saved sessions"
           return
         end
 
-        unless Girb.configuration&.gemini_api_key
-          puts "[girb] Error: GEMINI_API_KEY not set"
-          puts "[girb] Run: export GEMINI_API_KEY=your-key"
-          puts "[girb] Or configure in your .irbrc:"
-          puts "[girb]   Girb.configure { |c| c.gemini_api_key = 'your-key' }"
+        # セッション管理コマンド
+        if question.start_with?("session ")
+          handle_session_command(question.sub(/^session\s+/, ""))
           return
         end
 
+        unless Girb.configuration&.provider
+          puts "[girb] Error: No LLM provider configured."
+          puts "[girb] Install a provider gem and configure it:"
+          puts "[girb]   gem install girb-ruby_llm"
+          puts "[girb]   export GIRB_MODEL=gemini-2.5-flash"
+          puts "[girb]   export GEMINI_API_KEY=your-key"
+          return
+        end
+
+        # セッションが有効なら開始
+        Girb::IrbIntegration.start_session! if Girb::SessionPersistence.enabled?
+
         current_binding = irb_context.workspace.binding
 
         # AI質問を履歴に記録
@@ -41,13 +53,43 @@ module IRB
         end
 
         client = Girb::AiClient.new
-        client.ask(question, context, binding: current_binding, line_no: line_no)
+        client.ask(question, context, binding: current_binding, line_no: line_no, irb_context: irb_context)
       rescue Girb::Error => e
         puts "[girb] Error: #{e.message}"
       rescue StandardError => e
         puts "[girb] Error: #{e.message}"
         puts e.backtrace.first(5).join("\n") if Girb.configuration&.debug
       end
+
+      private
+
+      def handle_session_command(cmd)
+        case cmd.strip
+        when "clear"
+          Girb::SessionPersistence.clear_session
+        when "list"
+          sessions = Girb::SessionPersistence.list_sessions
+          if sessions.empty?
+            puts "[girb] No saved sessions"
+          else
+            puts "[girb] Saved sessions:"
+            sessions.each do |s|
+              puts "  - #{s[:id]} (#{s[:message_count]} messages, saved: #{s[:saved_at]})"
+            end
+          end
+        when "status"
+          if Girb::SessionPersistence.current_session_id
+            puts "[girb] Current session: #{Girb::SessionPersistence.current_session_id}"
+          elsif Girb.debug_session
+            puts "[girb] Session configured: #{Girb.debug_session} (not started)"
+          else
+            puts "[girb] No session configured (use Girb.debug_session = 'name' to enable)"
+          end
+        else
+          puts "[girb] Unknown session command: #{cmd}"
+          puts "[girb] Available: clear, list, status"
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: girb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.3.0
 platform: ruby
 authors:
 - rira100000000
@@ -84,9 +84,14 @@ files:
 - exe/girb
 - lib/girb.rb
 - lib/girb/ai_client.rb
+- lib/girb/auto_continue.rb
 - lib/girb/configuration.rb
 - lib/girb/context_builder.rb
 - lib/girb/conversation_history.rb
+- lib/girb/debug_context_builder.rb
+- lib/girb/debug_integration.rb
+- lib/girb/debug_prompt_builder.rb
+- lib/girb/debug_session_history.rb
 - lib/girb/exception_capture.rb
 - lib/girb/girbrc_loader.rb
 - lib/girb/irb_integration.rb
@@ -94,8 +99,11 @@ files:
 - lib/girb/providers/base.rb
 - lib/girb/railtie.rb
 - lib/girb/session_history.rb
+- lib/girb/session_persistence.rb
 - lib/girb/tools.rb
 - lib/girb/tools/base.rb
+- lib/girb/tools/continue_analysis.rb
+- lib/girb/tools/debug_session_history_tool.rb
 - lib/girb/tools/environment_tools.rb
 - lib/girb/tools/evaluate_code.rb
 - lib/girb/tools/find_file.rb
@@ -104,6 +112,8 @@ files:
 - lib/girb/tools/list_methods.rb
 - lib/girb/tools/rails_tools.rb
 - lib/girb/tools/read_file.rb
+- lib/girb/tools/run_debug_command.rb
+- lib/girb/tools/run_irb_debug_command.rb
 - lib/girb/tools/session_history_tool.rb
 - lib/girb/version.rb
 - lib/irb/command/qq.rb