pwn 0.5.759 → 0.5.761

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

@@ -86,6 +86,7 @@ module PWN
 
           def stop
             @stopping = true
+            request_model_cancel
             submit('Stop the active request.')
           end
 
@@ -104,6 +105,8 @@ module PWN
 
         # Read a duplicated terminal rather than stdin, which belongs to tools.
         class Keyboard
+          attr_writer :interval
+
           KEYS = {
             "\e[A" => :up, "\e[B" => :down, "\e[C" => :right, "\e[D" => :left,
             "\eOA" => :up, "\eOB" => :down, "\eOC" => :right, "\eOD" => :left,
@@ -119,7 +122,7 @@ module PWN
           end
 
           def call
-            if @source.wait_readable(@buffer.empty? ? 0.04 : 0)
+            if @source.wait_readable(@buffer.empty? ? (@interval || 0.04) : 0)
               chunk = @source.read_nonblock(4096, exception: false)
               return :eof if chunk.nil? && @buffer.empty?
 
@@ -401,6 +404,7 @@ module PWN
               break if @leaving && !busy?
 
               draw
+              @getch.interval = @focus == :animation && %i[asteroids galaga frogger].include?(@banner_name) ? 0.01 : 0.04 if @getch.is_a?(Keyboard)
               handle(@getch.call)
             rescue Interrupt
               cancel
@@ -524,13 +528,12 @@ module PWN
 
           def cancel
             if busy?
-              return if @cancelling
-
+              first = !@cancelling
               @cancelling = true
               @control&.stop
               @swarm&.cancel_all
               @tool_input.close unless @tool_input.closed?
-              add(:warning, 'Cancellation requested. Waiting for the active tool to finish; work already started is not undone.')
+              add(:warning, 'Cancellation requested. Waiting for a safe boundary; work already started is not undone.') if first
             else
               @editor.replace('')
             end
@@ -681,6 +684,7 @@ module PWN
           def handle(key)
             return if key.nil?
             return handle_system_role(key) if @role_editor && (!@too_small || ["\e", "\u0003", "\u0004", :eof].include?(key))
+            return cancel if key == "\u0003" && busy?
 
             return if @too_small && ![:eof, "\u0003", "\u0004"].include?(key)
             return cancel if @too_small && key == "\u0003" && !@model_prompt
@@ -689,7 +693,7 @@ module PWN
 
             return clear_view if key == "\u000c"
 
-            if ["\u0007", "\u0013"].include?(key)
+            if key == "\u0013" || (key == "\u0007" && (@focus != :animation || @workspace))
               @workspace ? @workspace = nil : open_swarm
               return
             end
@@ -714,7 +718,10 @@ module PWN
 
             if ["\u0018", "\u0014"].include?(key)
               @menu = nil
-              @focus = @focus == :session ? :mission : :session
+              panes = @header_pane_height ? %i[mission session animation] : %i[mission session]
+              @focus = panes[(panes.index(@focus).to_i + 1) % panes.length]
+              @banner_game&.controls
+              @banner_game_tick = nil
               return
             end
 
@@ -726,6 +733,8 @@ module PWN
               @menu = nil
               return
             end
+            return handle_animation(key) if @focus == :animation && ![:eof, "\u0003", "\u0004"].include?(key)
+
             case key
             when :eof, "\u0004"
               @leaving = true
@@ -794,6 +803,34 @@ module PWN
             end
           end
 
+          def handle_animation(key)
+            if key == "\u0007"
+              names = PWN::Banner.mini_names
+              @banner_name = names[(names.index(@banner_name).to_i + 1) % names.length]
+              @banner_frame_seconds = PWN::Banner.mini_frame_seconds(name: @banner_name)
+              @banner_started = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+              @banner_game = @banner_game_key = @banner_game_tick = nil
+            elsif key == :paste_start
+              @focus = :mission
+              @paste = true
+              @banner_game&.controls
+            elsif [:up, :down, :left, :right, ' '].include?(key)
+              return if %i[asteroids galaga frogger].include?(@banner_name) && @banner_game_frame&.dig(:state, :explosion).to_i.positive?
+
+              @banner_game&.key(key)
+              # Paint a discrete control immediately, not after the next idle tick.
+              @banner_game_tick = nil if %i[asteroids galaga frogger].include?(@banner_name)
+            elsif ["\r", "\n", "\e", :newline].include?(key)
+              @focus = :mission
+              @banner_game&.controls
+            elsif key.is_a?(String) && key.ord >= 32
+              @focus = :mission
+              @banner_game&.controls
+              @editor.insert(key)
+              refresh_completion
+            end
+          end
+
           def open_system_role
             return add(:warning, 'System role cannot change while a request or swarm job is running.') if busy?
 
@@ -1029,7 +1066,7 @@ module PWN
             ['REQUEST', state, "Elapsed #{elapsed}", "Completed tools #{@completed_tools}",
              "Events #{@event_count}", '', 'TOKENS', "#{usage[:input_tokens]} in · #{usage[:output_tokens]} out",
              "cached #{usage[:cached_tokens]} · calls #{usage[:calls]}", "Cost #{cost}",
-             '', 'SWARM', swarm[:swarm_id] || 'none', "#{active} active · ^G swarm",
+             '', 'SWARM', swarm[:swarm_id] || 'none', "#{active} active · ^S swarm",
              '', 'VIEW', @verbose ? 'verbose' : 'compact · /verbose', scroll_status,
              '', 'LAST TOOL', @last_tool || 'not observed']
           end
@@ -1201,6 +1238,8 @@ module PWN
             end
             cadence = cells ? @banner_frame_seconds : PWN::Banner::MINI_FRAME_SECONDS
             frame = ((now - @banner_started) / cadence).floor % PWN::Banner::MINI_FRAME_COUNT
+            return playable_banner(size, now) if cells && @focus == :animation
+            return automatic_banner(size, now) if cells && size >= 5 && %i[pacman galaga frogger].include?(@banner_name)
             return PWN::Banner.mini_cells(name: @banner_name, frame: frame, width: size, height: size, seed: @banner_seed, branding: false) if cells
 
             art = PWN::Banner.mini_frame(name: @banner_name, frame: frame, width: size, height: size, branding: false)
@@ -1210,6 +1249,43 @@ module PWN
             canvas
           end
 
+          def automatic_banner(size, now)
+            key = [@banner_session, @banner_name, size, @banner_seed]
+            if @banner_demo_key != key
+              @banner_demo_key = key
+              @banner_demo = PWN::Banner::MiniGame.new(name: @banner_name, width: size, height: size, seed: @banner_seed, demo: true)
+              @banner_demo.step
+              @banner_demo_tick = nil
+            end
+            tick = (now / @banner_frame_seconds).floor
+            if @banner_demo_tick != tick
+              # Advance one frame, never build 1800 or catch up after a modal.
+              @banner_demo_frame = @banner_demo.step
+              @banner_demo_cells = @banner_demo.cells(@banner_demo_frame)
+              @banner_demo_tick = tick
+            end
+            @banner_demo_cells
+          end
+
+          def playable_banner(size, now)
+            key = [@banner_session, @banner_name, size, @banner_seed]
+            if @banner_game_key != key
+              @banner_game_key = key
+              @banner_game = PWN::Banner::MiniGame.new(name: @banner_name, width: size, height: size, seed: @banner_seed)
+              @banner_game_tick = nil
+            end
+            # Human Snake input needs a full reaction interval on its tiny board;
+            # decorative replay cadence is independent of player movement.
+            cadence = @banner_name == :snake ? 0.2 : @banner_frame_seconds
+            tick = (now / cadence).floor
+            if @banner_game_tick != tick
+              @banner_game_frame = @banner_game.step
+              @banner_game_cells = @banner_game.cells(@banner_game_frame)
+              @banner_game_tick = tick
+            end
+            @banner_game_cells
+          end
+
           def draw_banner(size)
             cells = banner_frame(size, cells: true)
             top = [(size - cells.length) / 2, 0].max
@@ -1267,6 +1343,12 @@ module PWN
 
           def footer_text
             text = '/ menu · ^C=cancel · ^D=back · ^L=clear · ^T=toggle pane · ^S=swarm · ^R=search ^O=operations · ↑↓ history · Shift+Enter=newline · Enter=send'
+            if @focus == :animation
+              controls = { pacman: '↑↓←→ start/steer · ● power', snake: '↑↓←→ start/steer', falling_blocks: '←→ move · ↓ faster · Space=rotate',
+                           asteroids: '←→ turn · ↑↓ thrust/reverse · Space=fire', galaga: '↑↓←→ move · Space=fire',
+                           frogger: '↑↓←→ hop · logs → goals' }.fetch(@banner_name, '↑↓←→ play')
+              return text.sub('↑↓ history', "^G=next game · #{controls}").sub('Shift+Enter=newline · Enter=send', 'Enter/Esc=draft')
+            end
             @focus == :session ? text.sub('↑↓ history', '↑↓ scroll · HOME · PGUP · PGDN · END') : text
           end
 
@@ -1295,6 +1377,7 @@ module PWN
             visible.each_with_index { |spans, index| put_spans(2 + index, @header_text_column, spans) }
             if @header_pane_height
               box(0, 0, height, height, '')
+              mark_active(0, 0, height, 'PLAY') if @focus == :animation
               draw_banner(height - 2)
             end
             height
@@ -1338,6 +1421,8 @@ module PWN
             end
             engine = PWN::Env.dig(:ai, :active).to_s
             model = REPL.pwn_ai_engine_model(engine: engine)
+            header_layout(engine, model)
+            @focus = :mission if @focus == :animation && !@header_pane_height
             footer, compose_height, footer_height = layout_chrome
             @compose_height = compose_height
             @footer_height = footer_height
@@ -1359,9 +1444,9 @@ module PWN
             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 - footer_height
-            mission_title = @focus == :session ? 'MISSION CONTROL' : 'MISSION CONTROL · active'
+            mission_title = @focus == :mission ? 'MISSION CONTROL · active' : 'MISSION CONTROL'
             box(compose_y, 0, compose_height, @width - 1, mission_title)
-            mark_active(compose_y, 0, @width - 1, mission_title) if @focus != :session
+            mark_active(compose_y, 0, @width - 1, mission_title) if @focus == :mission
             draw_composer(compose_y, height: compose_height)
             footer_top = @height - footer_height
             footer.first(footer_height).each_with_index { |line, index| put(footer_top + index, 1, line, tone(:footer)) }
@@ -1370,7 +1455,9 @@ module PWN
             draw_details(engine, model) if @details
             draw_swarm if @workspace
             draw_system_role if @role_editor
-            if @focus == :session && !(@details || @workspace || @role_editor)
+            if @focus == :animation && !(@details || @workspace || @role_editor || @model_prompt)
+              @screen.setpos(1, 1)
+            elsif @focus == :session && !(@details || @workspace || @role_editor)
               @screen.setpos(header_height + 1, 2)
             elsif @role_editor || !(@details || @workspace)
               @screen.setpos(*@cursor_position)

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

@@ -15,6 +15,7 @@ module PWN
 
           def stop
             @stopping = true
+            request_model_cancel
             submit('Stop this swarm job.')
           end
 

data/lib/pwn/version.rb

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

data/spec/lib/pwn/ai/agent/loop_spec.rb

@@ -228,7 +228,7 @@ describe PWN::AI::Agent::Loop do # rubocop:disable Metrics/BlockLength
       calls = []
       owner = Thread.current
       allow(described_class).to receive(:call_engine) do |opts|
-        expect(Thread.current).to eq(owner)
+        expect(Thread.current).not_to eq(owner)
         calls << Marshal.load(Marshal.dump(opts[:messages]))
         if calls.length == 1
           entered << true