console_agent 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 661ab1a997f36d2b10ea9649aa41367aca039c859c3e2afa01c3cbf8b8dd9345
-  data.tar.gz: 5cfe513d78a1785b7199fb0ebbbc70e825092e49e4051caf390e3ccb7ccf23c4
+  metadata.gz: 28a64e6be4f7d39d73e55b67d6e95404324355420293651acf44fd439394eb56
+  data.tar.gz: 8350d0a49d94733c54530debc4d8e184bd0c2774b04f82c68be24b71d32a7457
 SHA512:
-  metadata.gz: 0d7fd63a81886c7abbf4f82db677b6b4bb9151760c378901306e789b3619d7ca31b743f7f4a14a9a28335e775877243b0c4ff8b8bd6cc6acee0c8a02c270eccc
-  data.tar.gz: 3e0308bd89e0421a4a29dbe8c7b7be6afd584a504559a456f830e1c9a268517d131d6dcf00417347f5f3ea80a434bf9211e0515771fc3e43686f0117bf401f9b
+  metadata.gz: 874af072ffd5222c5ef7c782e1b5db18a148ecaf013a6ba8f2e33d863123895235c1d93106551ad5197eb35c17ad2bf65b076a79e74ef091ac76690c59fe4ba8
+  data.tar.gz: c2ba1ece779bf4e12b30c9bc0ed533dc9acabdaa22d6749e8f3f75d0d18fea1cb3895c669c313ec005f1e79a3a72ab7e2d16a2fefdcbc7df8509eac35afaee92

data/lib/console_agent/console_methods.rb

@@ -84,7 +84,7 @@ module ConsoleAgent
       nil
     end
 
-    def ai_resume(identifier)
+    def ai_resume(identifier = nil)
       __ensure_console_agent_user
 
       require 'console_agent/context_builder'
@@ -93,9 +93,16 @@ module ConsoleAgent
       require 'console_agent/repl'
       require 'console_agent/session_logger'
 
-      session = __find_session(identifier)
+      session = if identifier
+                  __find_session(identifier)
+                else
+                  session_class = Object.const_get('ConsoleAgent::Session')
+                  session_class.where(mode: 'interactive', user_name: ConsoleAgent.current_user).recent.first
+                end
+
       unless session
-        $stderr.puts "\e[31mSession not found: #{identifier}\e[0m"
+        msg = identifier ? "Session not found: #{identifier}" : "No interactive sessions found."
+        $stderr.puts "\e[31m#{msg}\e[0m"
         return nil
       end
 

data/lib/console_agent/repl.rb

@@ -106,17 +106,17 @@ module ConsoleAgent
       @total_input_tokens = session.input_tokens || 0
       @total_output_tokens = session.output_tokens || 0
 
-      # Replay stored console output so the user sees previous context
+      # Seed the capture buffer with previous output so it's preserved on save
+      @interactive_console_capture.write(session.console_output.to_s)
+
+      # Replay to the user via the real stdout (bypass TeeIO to avoid double-capture)
       if session.console_output && !session.console_output.strip.empty?
-        $stdout.puts "\e[2m--- Replaying previous session output ---\e[0m"
-        $stdout.puts session.console_output
-        $stdout.puts "\e[2m--- End of previous output ---\e[0m"
-        $stdout.puts
+        @interactive_old_stdout.puts "\e[2m--- Replaying previous session output ---\e[0m"
+        @interactive_old_stdout.puts session.console_output
+        @interactive_old_stdout.puts "\e[2m--- End of previous output ---\e[0m"
+        @interactive_old_stdout.puts
       end
 
-      # Copy replayed output into the capture buffer so it's preserved on save
-      @interactive_console_capture.write(session.console_output.to_s)
-
       interactive_loop
     end
 
@@ -144,8 +144,9 @@ module ConsoleAgent
     def interactive_loop
       auto = ConsoleAgent.configuration.auto_execute
       name_display = @interactive_session_name ? " (#{@interactive_session_name})" : ""
-      $stdout.puts "\e[36mConsoleAgent interactive mode#{name_display}. Type 'exit' or 'quit' to leave.\e[0m"
-      $stdout.puts "\e[2m  Auto-execute: #{auto ? 'ON' : 'OFF'} (Shift-Tab or /auto to toggle) | /usage | /name <label>\e[0m"
+      # Write banner to real stdout (bypass TeeIO) so it doesn't accumulate on resume
+      @interactive_old_stdout.puts "\e[36mConsoleAgent interactive mode#{name_display}. Type 'exit' or 'quit' to leave.\e[0m"
+      @interactive_old_stdout.puts "\e[2m  Auto-execute: #{auto ? 'ON' : 'OFF'} (Shift-Tab or /auto to toggle) | /usage | /name <label>\e[0m"
 
       # Bind Shift-Tab to insert /auto command and submit
       if Readline.respond_to?(:parse_and_bind)
@@ -153,7 +154,7 @@ module ConsoleAgent
       end
 
       loop do
-        input = Readline.readline("\e[33mai> \e[0m", false)
+        input = Readline.readline("\001\e[33m\002ai> \001\e[0m\002", false)
         break if input.nil? # Ctrl-D
 
         input = input.strip
@@ -163,7 +164,7 @@ module ConsoleAgent
         if input == '/auto'
           ConsoleAgent.configuration.auto_execute = !ConsoleAgent.configuration.auto_execute
           mode = ConsoleAgent.configuration.auto_execute ? 'ON' : 'OFF'
-          $stdout.puts "\e[36m  Auto-execute: #{mode}\e[0m"
+          @interactive_old_stdout.puts "\e[36m  Auto-execute: #{mode}\e[0m"
           next
         end
 
@@ -175,7 +176,7 @@ module ConsoleAgent
         if input == '/debug'
           ConsoleAgent.configuration.debug = !ConsoleAgent.configuration.debug
           mode = ConsoleAgent.configuration.debug ? 'ON' : 'OFF'
-          $stdout.puts "\e[36m  Debug: #{mode}\e[0m"
+          @interactive_old_stdout.puts "\e[36m  Debug: #{mode}\e[0m"
           next
         end
 
@@ -183,9 +184,9 @@ module ConsoleAgent
           name = input.sub('/name', '').strip
           if name.empty?
             if @interactive_session_name
-              $stdout.puts "\e[36m  Session name: #{@interactive_session_name}\e[0m"
+              @interactive_old_stdout.puts "\e[36m  Session name: #{@interactive_session_name}\e[0m"
             else
-              $stdout.puts "\e[33m  Usage: /name <label>  (e.g. /name salesforce_user_123)\e[0m"
+              @interactive_old_stdout.puts "\e[33m  Usage: /name <label>  (e.g. /name salesforce_user_123)\e[0m"
             end
           else
             @interactive_session_name = name
@@ -193,7 +194,7 @@ module ConsoleAgent
               require 'console_agent/session_logger'
               SessionLogger.update(@interactive_session_id, name: name)
             end
-            $stdout.puts "\e[36m  Session named: #{name}\e[0m"
+            @interactive_old_stdout.puts "\e[36m  Session named: #{name}\e[0m"
           end
           next
         end
@@ -328,7 +329,20 @@ module ConsoleAgent
           $stdout.puts "\e[2m  Thinking...\e[0m"
         end
 
-        result = provider.chat_with_tools(messages, tools: tools, system_prompt: context)
+        begin
+          result = with_escape_monitoring do
+            provider.chat_with_tools(messages, tools: tools, system_prompt: context)
+          end
+        rescue Interrupt
+          redirect = prompt_for_redirect
+          if redirect
+            messages << { role: :user, content: redirect }
+            new_messages << messages.last
+            next
+          else
+            raise
+          end
+        end
         total_input += result.input_tokens || 0
         total_output += result.output_tokens || 0
 
@@ -390,6 +404,59 @@ module ConsoleAgent
       [final_result, new_messages]
     end
 
+    # Monitors stdin for Escape (or Ctrl+C, since raw mode disables signals)
+    # and raises Interrupt in the main thread when detected.
+    def with_escape_monitoring
+      require 'io/console'
+      return yield unless $stdin.respond_to?(:raw)
+
+      monitor = Thread.new do
+        Thread.current.report_on_exception = false
+        $stdin.raw do |io|
+          loop do
+            break if Thread.current[:stop]
+            ready = IO.select([io], nil, nil, 0.2)
+            next unless ready
+
+            char = io.read_nonblock(1) rescue nil
+            next unless char
+
+            if char == "\x03" # Ctrl+C (raw mode eats the signal)
+              Thread.main.raise(Interrupt)
+              break
+            elsif char == "\e"
+              # Distinguish standalone Escape from escape sequences (arrow keys, etc.)
+              seq = IO.select([io], nil, nil, 0.05)
+              if seq
+                io.read_nonblock(10) rescue nil # consume the sequence
+              else
+                Thread.main.raise(Interrupt)
+                break
+              end
+            end
+          end
+        end
+      rescue IOError, Errno::EIO, Errno::ENODEV, Errno::ENOTTY
+        # stdin is not a TTY (e.g. in tests or piped input) — silently skip
+      end
+
+      begin
+        yield
+      ensure
+        monitor[:stop] = true
+        monitor.join(1) rescue nil
+      end
+    end
+
+    def prompt_for_redirect
+      $stdout.puts "\n\e[33m  Interrupted. What should the AI do differently?\e[0m"
+      $stdout.puts "\e[2m  (Press Enter with no input to abort entirely)\e[0m"
+      $stdout.print "\e[33m  redirect> \e[0m"
+      input = $stdin.gets
+      return nil if input.nil? || input.strip.empty?
+      input.strip
+    end
+
     def format_tool_args(name, args)
       return '' if args.nil? || args.empty?
 

data/lib/console_agent/version.rb

@@ -1,3 +1,3 @@
 module ConsoleAgent
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: console_agent
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Cortfr