pwn 0.5.754 → 0.5.755

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e01b8e88574a241d780acc3e2c4d70a7e5c07fb1e9e17fa709363a4bfcbc7898
-  data.tar.gz: f50a1f5f35d25f300c396678edb5daa8119f4fca9e1567d71652c7f45bcc1dcb
+  metadata.gz: '088caeab6962a895018847c637332f41ca7033f69c7e8a547862d219c58b162c'
+  data.tar.gz: b0562e89e6cd08079728c7d5f0b2f640b975f482ed028c1cbe6b27a363361172
 SHA512:
-  metadata.gz: c34deaa7b6835b37cacb76a2863cb0759b4dc727301692014702468aa3d4a04ddc1c76fda3893005f58071b9060768ade05401dbbae1cac2fc3dbfc99bcfa9f0
-  data.tar.gz: de481a34a2b3776fa8003094618af168f6a33341fd236e14daa3247694e8e703e0eddb15ea74556e9bd4814a14a3187d48f51c18be90094f1bd4c83ddcd364b8
+  metadata.gz: 2730afce4cd70424a7fb927983bb417c1bb755846cd33113ee522f3b4d1a2e3a227251b7f3e5079b9bf3198224f8d36d5f31bed362acc37b6022fb0da03c417d
+  data.tar.gz: 9ac89ddaeb41583bc8b0db2a98faf9696ae78aae7f8ecc2689f4f8519071e1c284d172245aeb586de4a33c4ad7a81e4dc7ee16a7b849c23f4429e4ee9456e8ca

data/Gemfile

@@ -89,8 +89,8 @@ gem 'ruby-nmap', '1.0.3'
 gem 'ruby-saml', '1.18.1'
 gem 'rvm', '1.11.3.9'
 gem 'savon', '2.17.5'
-gem 'selenium-devtools', '0.153.0'
-gem 'selenium-webdriver', '4.49.0'
+gem 'selenium-devtools', '0.154.0'
+gem 'selenium-webdriver', '4.50.0'
 gem 'slack-ruby-client', '3.2.0'
 gem 'socksify', '1.8.1'
 gem 'spreadsheet', '1.3.5'

data/documentation/pwn-ai-Agent.md

@@ -115,8 +115,10 @@ changes only default values, not the configuration schema; no migration is neede
 | --- | --- |
 | Enter | Submit the mission |
 | Shift+Enter, or trailing `\\` + Enter | Insert a newline. Terminals that cannot distinguish Shift+Enter need `tmux set -s extended-keys on` or the backslash fallback. |
-| Up/Down | Move the completion highlight while the Command menu is visible (wrapping at either end). Otherwise recall requests from `~/.pwn/pwn_history`, including prior runs; Down past the newest restores the draft and cursor. Esc closes the menu to resume history recall. |
-| Ctrl+P / Ctrl+N | Alternative completion selection keys; recall history when no menu is visible. Tab still accepts the highlight. |
+| Up/Down | In MISSION CONTROL, move the completion highlight while the Command menu is visible (wrapping at either end). Otherwise recall requests from `~/.pwn/pwn_history`, including prior runs; Down past the newest restores the draft and cursor. In SESSION, move one transcript row. Esc closes the menu to resume history recall. |
+| Home/End | In MISSION CONTROL, move the composer cursor to the start or end of the line. In SESSION, jump to the top of the transcript or back to the live bottom. |
+| Ctrl+X | Toggle the active pane between SESSION and MISSION CONTROL. The active title is reversed and marked `active`. Typing or Enter returns to MISSION CONTROL; Enter does not submit while SESSION is active. |
+| Ctrl+P / Ctrl+N | Alternative completion selection keys. In MISSION CONTROL they recall history when no menu is visible. In SESSION they scroll one row. Tab still accepts the highlight. |
 | Tab | Accept the highlighted as-you-type parameter |
 | Ctrl+O or `/status` | Inspect full status/settings, including overflowing header text; Esc or Ctrl+O closes |
 | Ctrl+L | Clear only the Session pane, including while a request runs; preserve stored conversation, token totals, and draft |

data/lib/pwn/plugins/repl/ai_console.rb

@@ -279,6 +279,7 @@ module PWN
             @editor = Editor.new
             @timeline = []
             @scroll = nil
+            @focus = :mission
             @event_count = @completed_tools = @unseen = 0
             @verbose = true
             @usage = AIConsoleUsage::Tracker.new
@@ -652,6 +653,28 @@ module PWN
             @menu = nil if @menu.empty?
           end
 
+          # Live view uses a nil scroll. Up from that view pins one row above the bottom.
+          def scroll_session(key)
+            bottom = [@total_rows.to_i - @page_size.to_i, 0].max
+            case key
+            when :up, "\u0010"
+              @scroll = [(@scroll || bottom) - 1, 0].max
+            when :down, "\u000e"
+              return if @scroll.nil?
+
+              @scroll += 1
+              if @scroll >= bottom
+                @scroll = nil
+                @unseen = 0
+              end
+            when :home
+              @scroll = bottom.zero? ? nil : 0
+            when :end
+              @scroll = nil
+              @unseen = 0
+            end
+          end
+
           def handle(key)
             return if key.nil?
             return handle_system_role(key) if @role_editor && (!@too_small || ["\e", "\u0003", "\u0004", :eof].include?(key))
@@ -681,10 +704,17 @@ module PWN
             if key == "\u0012"
               @menu = nil
               @paste = false
+              @focus = :mission
               @editor.search_history
               return
             end
 
+            if key == "\u0018"
+              @menu = nil
+              @focus = @focus == :session ? :mission : :session
+              return
+            end
+
             if key == "\t" && @menu
               accept_completion
               return
@@ -702,7 +732,9 @@ module PWN
             when :paste_end then @paste = false
             when :newline then @editor.insert("\n")
             when "\r", "\n"
-              if @paste
+              if @focus == :session && !@paste
+                @focus = :mission
+              elsif @paste
                 @editor.insert("\n")
               elsif @editor.text.end_with?('\\')
                 @editor.edit("\b")
@@ -718,6 +750,8 @@ module PWN
               direction = [:up, "\u0010"].include?(key) ? :up : :down
               if @menu
                 @menu_index = (@menu_index + (direction == :up ? -1 : 1)) % @menu.length
+              elsif @focus == :session
+                scroll_session(key)
               else
                 @editor.recall(direction)
               end
@@ -727,11 +761,21 @@ module PWN
               @scroll = nil if @scroll >= [@total_rows.to_i - @page_size.to_i, 0].max
               @unseen = 0 unless @scroll
             when "\t" then accept_completion
-            when :left, :right, :home, :end, :delete, "\b", "\u007f", "\u0001", "\u0005", "\u0015"
-              @editor.edit(key)
-              refresh_completion
+            when :home, :end
+              if @focus == :session
+                scroll_session(key)
+              else
+                @editor.edit(key)
+                refresh_completion
+              end
+            when :left, :right, :delete, "\b", "\u007f", "\u0001", "\u0005", "\u0015"
+              unless @focus == :session
+                @editor.edit(key)
+                refresh_completion
+              end
             else
               if key.is_a?(String) && key.ord >= 32
+                @focus = :mission
                 @editor.insert(key)
                 refresh_completion
               end
@@ -1045,6 +1089,13 @@ module PWN
             put(top, left + 2, fit(" #{title} ", box_width - 4), tone(:title)) unless title.empty?
           end
 
+          def mark_active(top, left, box_width, title)
+            return unless @screen.respond_to?(:attron)
+
+            text = fit(" #{title} ", box_width - 4)
+            @screen.attron(Curses::A_REVERSE) { put(top, left + 2, text, tone(:title)) }
+          end
+
           def seed_request_history
             # REPL configures ~/.pwn/pwn_history and Pry loads it at startup.
             # Reuse that owner rather than loading twice or opening another writer.
@@ -1262,21 +1313,36 @@ module PWN
             @total_rows = rows.length
             @scroll = @scroll.clamp(0, [rows.length - @page_size, 0].max) if @scroll
             session_id = @pry.config.pwn_ai_session_id.to_s
-            box(header_height, 0, timeline_height, pane_width, "SESSION #{session_id}")
+            session_title = "SESSION #{session_id}"
+            session_title += ' · active' if @focus == :session
+            box(header_height, 0, timeline_height, pane_width, session_title)
+            mark_active(header_height, 0, pane_width, session_title) if @focus == :session
             start = @scroll || [rows.length - @page_size, 0].max
             rows.slice(start, @page_size).to_a.each_with_index { |(color, row), index| put(header_height + 1 + index, 2, row, color) }
             draw_sidebar(header_height, pane_width + 1, timeline_height) if sidebar.positive?
             compose_y = @height - compose_height - 1
-            box(compose_y, 0, compose_height, @width - 1, 'MISSION CONTROL')
+            mission_title = @focus == :session ? 'MISSION CONTROL' : 'MISSION CONTROL · active'
+            box(compose_y, 0, compose_height, @width - 1, mission_title)
+            mark_active(compose_y, 0, @width - 1, mission_title) if @focus != :session
             draw_composer(compose_y)
-            hint = @menu ? '↑↓/^P/^N select · Tab accept · Esc close' : '↑↓ history · PgUp/PgDn scroll'
+            hint = if @menu
+                     '↑↓/^P/^N select · Tab accept · Esc close'
+                   elsif @focus == :session
+                     '↑↓/Home/End scroll · ^X mission'
+                   else
+                     '↑↓ history · ^X session'
+                   end
             put(@height - 1, 1, "^C cancel ^D back · #{hint} · ^G swarm ^L clear ^R search ^O status · Enter send", tone(:footer))
             draw_menu if @menu
             draw_model_prompt if @model_prompt
             draw_details(engine, model) if @details
             draw_swarm if @workspace
             draw_system_role if @role_editor
-            @screen.setpos(*@cursor_position) if @role_editor || !(@details || @workspace)
+            if @focus == :session && !(@details || @workspace || @role_editor)
+              @screen.setpos(header_height + 1, 2)
+            elsif @role_editor || !(@details || @workspace)
+              @screen.setpos(*@cursor_position)
+            end
             @screen.refresh
           end
 
@@ -1291,7 +1357,7 @@ module PWN
             first = [cursor_row - 2, 0].max
             put(top + 1, 2, '›', tone(:prompt)) if first.zero?
             rows.slice(first, 3).to_a.each_with_index { |row, index| put(top + 1 + index, 4, row, tone(:composer)) }
-            hint = @menu ? 'Tab accept · ↑↓/^P/^N select · Esc close' : '^G swarm · Shift+Enter newline · / commands · ^O status'
+            hint = @menu ? 'Tab accept · ↑↓/^P/^N select · Esc close' : '^X pane · ^G swarm · Shift+Enter newline · / commands · ^O status'
             put(top + 4, 4, fit(hint, @width - 7), tone(:footer))
             @cursor_position = [top + 1 + cursor_row - first, [4 + width(prefix.last), @width - 3].min]
           end
@@ -1557,7 +1623,8 @@ module PWN
         public_class_method def self.help
           puts "USAGE:
             # Ctrl+L clears only the session pane, including while busy.
-            # Up/Down select in menus, otherwise recall ~/.pwn/pwn_history; Ctrl+R searches history.
+            # Ctrl+X switches the active pane between SESSION and MISSION CONTROL.
+            # Up/Down select in menus, recall ~/.pwn/pwn_history in the mission pane, and scroll the session pane when it is active.
             # Search: Enter accepts without sending; Esc restores the draft.
             # Launch the single-owner curses console; non-terminals return unavailable.
             #{self}.run(

data/lib/pwn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PWN
-  VERSION = '0.5.754'
+  VERSION = '0.5.755'
 end

data/spec/lib/pwn/plugins/repl/ai_console_spec.rb

@@ -947,6 +947,62 @@ describe 'pwn-ai curses launch' do # rubocop:disable Metrics/BlockLength -- publ
     expect(console.instance_variable_get(:@scroll)).to be_nil
   end
 
+  it 'toggles the active pane so session arrows, Home and End scroll without changing the draft' do
+    console = PWN::Plugins::REPL::AIConsole::Console.new(pry: Pry.new, input: StringIO.new, curses: nil, getch: nil)
+    editor = console.instance_variable_get(:@editor)
+    editor.place('kept draft', 4)
+    console.instance_variable_set(:@total_rows, 100)
+    console.instance_variable_set(:@page_size, 20)
+    console.instance_variable_set(:@unseen, 3)
+    console.handle(:up)
+    expect(editor.text).to eq('kept draft')
+    expect(console.instance_variable_get(:@scroll)).to be_nil
+    console.handle("\u0018")
+    expect(console.instance_variable_get(:@focus)).to eq(:session)
+    console.handle(:up)
+    expect(console.instance_variable_get(:@scroll)).to eq(79)
+    console.handle("\u0010")
+    expect(console.instance_variable_get(:@scroll)).to eq(78)
+    console.handle(:home)
+    expect(console.instance_variable_get(:@scroll)).to eq(0)
+    console.handle(:end)
+    expect(console.instance_variable_get(:@scroll)).to be_nil
+    expect(console.instance_variable_get(:@unseen)).to eq(0)
+    console.handle(:up)
+    console.handle(:down)
+    expect(console.instance_variable_get(:@scroll)).to be_nil
+    expect([editor.text, editor.cursor]).to eq(['kept draft', 4])
+    console.handle("\n")
+    expect(console.instance_variable_get(:@focus)).to eq(:mission)
+    expect(editor.text).to eq('kept draft')
+    console.handle("\u0018")
+    console.handle('x')
+    expect(console.instance_variable_get(:@focus)).to eq(:mission)
+    expect(editor.text).to eq('keptx draft')
+    console.handle(:up)
+    expect(console.instance_variable_get(:@scroll)).to be_nil
+    expect(console.instance_variable_get(:@focus)).to eq(:mission)
+  end
+
+  it 'marks the active pane and parks the cursor in the session when that pane is selected' do
+    screen = double(erase: nil, refresh: nil, setpos: nil, addstr: nil, attron: nil)
+    allow(screen).to receive(:attron).and_yield
+    curses = double(lines: 36, cols: 120)
+    console = PWN::Plugins::REPL::AIConsole::Console.new(pry: Pry.new, input: StringIO.new, curses: curses, getch: nil)
+    console.instance_variable_set(:@screen, screen)
+    painted = []
+    allow(console).to receive(:put) { |*args| painted << args }
+    console.draw
+    expect(painted.map { |row| row[2] }.join).to include('MISSION CONTROL · active')
+    expect(painted.map { |row| row[2] }.join).not_to include('SESSION  · active')
+    expect(screen).to have_received(:attron).with(Curses::A_REVERSE).at_least(:once)
+    console.handle("\u0018")
+    painted.clear
+    console.draw
+    expect(painted.map { |row| row[2] }.join).to include('SESSION  · active')
+    expect(screen).to have_received(:setpos).with(a_kind_of(Integer), 2)
+  end
+
   it 'wraps at words without discarding code whitespace or splitting graphemes' do
     console = PWN::Plugins::REPL::AIConsole::Console.new(pry: Pry.new, input: StringIO.new, curses: nil, getch: nil)
     expect(console.wrap('some evidence', 12)).to eq(['some ', 'evidence'])

data/third_party/pwn_rdoc.jsonl

@@ -3324,6 +3324,7 @@
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::AIConsole::Console.handle_system_role Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::AIConsole::Console.handle_system_role`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::AIConsole::Console.header_layout Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::AIConsole::Console.header_layout`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::AIConsole::Console.header_lines Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::AIConsole::Console.header_lines`: "}]}
+{"messages":[{"role":"user","content":"PWN::Plugins::REPL::AIConsole::Console.mark_active Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::AIConsole::Console.mark_active`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::AIConsole::Console.move_role_cursor Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::AIConsole::Console.move_role_cursor`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::AIConsole::Console.open_swarm Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::AIConsole::Console.open_swarm`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::AIConsole::Console.open_system_role Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::AIConsole::Console.open_system_role`: "}]}
@@ -3336,6 +3337,7 @@
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::AIConsole::Console.restore_streams Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::AIConsole::Console.restore_streams`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::AIConsole::Console.run Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::AIConsole::Console.run`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::AIConsole::Console.run_swarm Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::AIConsole::Console.run_swarm`: "}]}
+{"messages":[{"role":"user","content":"PWN::Plugins::REPL::AIConsole::Console.scroll_session Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::AIConsole::Console.scroll_session`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::AIConsole::Console.scroll_status Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::AIConsole::Console.scroll_status`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::AIConsole::Console.seed_request_history Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::AIConsole::Console.seed_request_history`: "}]}
 {"messages":[{"role":"user","content":"PWN::Plugins::REPL::AIConsole::Console.send_tool_input Usage"},{"role":"assistant","content":"`PWN::Plugins::REPL::AIConsole::Console.send_tool_input`: "}]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.754
+  version: 0.5.755
 platform: ruby
 authors:
 - 0day Inc.
@@ -1051,28 +1051,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.153.0
+        version: 0.154.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.153.0
+        version: 0.154.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.49.0
+        version: 4.50.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.49.0
+        version: 4.50.0
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
   requirement: !ruby/object:Gem::Requirement