pwn 0.5.697 → 0.5.698

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4218feff0995079766c3b31b6beec85c9b45b1f971ac0bc78a9794c67ea8016e
-  data.tar.gz: 5a47207b366764a60b8c560bdcf77c5b12288d7fdbeb3e2d74c655a8e92e12e3
+  metadata.gz: c333795b07ea88fb7ea338e6b01faf768c62bd07757328fc1698972d43a6c5e8
+  data.tar.gz: 0cfbe454002f7ffc79571162a96367aaf3d69017d997cb024c4a475ac3bbab7b
 SHA512:
-  metadata.gz: 326c061669305b7069c4a66e68d958b6935ef3a9c3f90e02ee1242ad6bedfed9e5e31170fd4ae8b7b9570ab7c63fb1e7198c0cc97a5a8e3eeb96400bc329c611
-  data.tar.gz: ed8cdb221e58fdb00ae799d902121e0f2b6f629871ceb458a54ef35ee5e2ad326070c431d9c17346db442e0d62374f90f85cba074a00967d3193d41753a091a7
+  metadata.gz: 7a699a8308cb00f04bdf85869647ec381009daf04fe4d8c972c62d5ed57b819b4b719672fe4ad64966c316520a2496bdeb4914c002f526e886b877f7b5d11928
+  data.tar.gz: 5b2d1fa1f979bc4852304ed09b7122817a71689114f4c4f6a1a46798b01e9d3bb186b8af28aa8d08288c470b01d323735fb252ccc9c45426835d8b717ca8e382

data/etc/default_skills/pwn/ai/http_retry/SKILL.md

@@ -35,6 +35,7 @@ PWN::AI::HttpRetry.timeout_s(opts)
 
 - `timeout_s`
 - `max_attempts`
+- `retryable`
 - `retry_after_s`
 - `report_event`
 - `authors`

data/lib/pwn/ai/agent/loop.rb

@@ -851,6 +851,17 @@ module PWN
           opts[:session_id].to_s
         end
 
+        private_class_method def self.engine_transient?(opts = {})
+          err = opts[:error]
+          return false unless err
+
+          return PWN::AI::HttpRetry.retryable?(error: err) if defined?(PWN::AI::HttpRetry) && PWN::AI::HttpRetry.respond_to?(:retryable?)
+
+          err.message.to_s.match?(/HTTP 50[234]|Gateway Time-out|stream absolute timeout/i)
+        rescue StandardError
+          false
+        end
+
         # E1 — did the environment change under this tool? If Metrics CUSUM
         # tripped for it in the last hour AND Extrospection.drift shows a
         # toolchain/net/repo change, blame the WORLD not the AGENT.
@@ -2473,6 +2484,7 @@ module PWN
 
           turn_fails = Hash.new(0)
           escalated  = false
+          engine_blips = 0
           maybe_park_budget_scars!
           maybe_extinguish_parked!
 
@@ -2486,7 +2498,27 @@ module PWN
             inject_task_focus!(messages: messages, state: ts_state, request: request) unless skip_compass
 
             t0 = Time.now
-            msg = call_engine(messages: messages, tools: tools, ts_state: ts_state)
+            begin
+              msg = call_engine(messages: messages, tools: tools, ts_state: ts_state)
+            rescue StandardError => e
+              if engine_transient?(error: e)
+                engine_blips += 1
+                debug_progress(msg: "engine hop failed #{e.class}: #{e.message.to_s[0, 240]} blip=#{engine_blips}")
+                if engine_blips >= 5
+                  txt = "[pwn-ai] engine hop failed after #{engine_blips} tries: #{e.message.to_s[0, 240]}"
+                  debug_final_text!(text: txt)
+                  final_chars = txt.length
+                  return txt
+                end
+                messages << {
+                  role: 'user',
+                  content: '[pwn-ai] engine hop failed (transient). Keep calling CORE_TOOLS. ' \
+                           "Do not stop. (#{e.message.to_s[0, 180]})"
+                }
+                next
+              end
+              raise
+            end
             engine_s += (Time.now - t0)
             PWN::Plugins::TTYSpinner.halt_all! if defined?(PWN::Plugins::TTYSpinner)
             if msg.nil?

data/lib/pwn/ai/agent/task_summarizer.rb

@@ -573,8 +573,8 @@ module PWN
         # model cannot stall the user's real answer, and stay quiet on timeout.
         private_class_method def self.sidecar_timeout
           n = (PWN::Env.dig(:ai, :agent, :sidecar_llm_timeout) if defined?(PWN::Env)).to_i
-          n = 20 if n < 5
-          n = 60 if n > 60
+          n = 180 if n < 30
+          n = 180 if n > 180
           n
         rescue StandardError
           20

data/lib/pwn/ai/http_retry.rb

@@ -27,6 +27,15 @@ module PWN
         DEFAULT_MAX_ATTEMPTS
       end
 
+      public_class_method def self.retryable?(opts = {})
+        err = opts[:error]
+        msg = err.respond_to?(:message) ? err.message.to_s : err.to_s
+        msg = opts[:message].to_s if msg.empty?
+        msg.match?(/HTTP 50[234]|Gateway Time-out|stream absolute timeout|ReadTimeout|Net::ReadTimeout|Timed out reading/i)
+      rescue StandardError
+        false
+      end
+
       public_class_method def self.retry_after_s(opts = {})
         retry_count = [opts[:retry_count].to_i, 1].max
         retry_after = 0

data/lib/pwn/ai/ollama.rb

@@ -198,6 +198,21 @@ module PWN
           retry if retry_count < max_attempts
 
           nil
+        rescue StandardError => e
+          if PWN::AI::HttpRetry.retryable?(error: e) && retry_count + 1 < max_attempts
+            retry_count += 1
+            unless opts[:quiet]
+              PWN::AI::HttpRetry.report_event(
+                label: 'ollama', which_self: self, quiet: opts[:quiet],
+                http_method: http_method, rest_call: rest_call,
+                extra: "retryable attempt=#{retry_count}/#{max_attempts}",
+                error: e
+              )
+            end
+            sleep(PWN::AI::HttpRetry.retry_after_s(retry_count: retry_count) + rand(0.3..2.0))
+            retry
+          end
+          raise e
         end
       rescue RestClient::ExceptionWithResponse => e
         body = begin

data/lib/pwn/plugins/repl.rb

@@ -1284,8 +1284,9 @@ module PWN
                 raise
               rescue StandardError => e
                 PWN::Plugins::Log.note_exception!(error: e, where: 'native agent loop', which_self: PWN::Plugins::REPL) if defined?(PWN::Plugins::Log) && PWN::Plugins::Log.respond_to?(:note_exception!)
-                warn "[pwn-ai] native agent loop failed (#{e.class}: #{e.message}\n#{e.backtrace}); " \
-                     'falling back to legacy regex-ReAct.'
+                warn "[pwn-ai] native agent loop failed (#{e.class}: #{e.message.to_s.split("\n").first})"
+                request.replace('nil')
+                next
               ensure
                 PWN::Plugins::REPL.ready_tty!
               end

data/lib/pwn/version.rb

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

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

@@ -424,9 +424,16 @@ describe PWN::AI::Agent::Loop do # rubocop:disable Metrics/BlockLength
       expect(src).to match(/note_exception!/)
       expect(src).to match(/rescue StandardError/)
       expect(src).to include("debug_progress(msg: 'engine returned no message')")
+      expect(src).to match(/engine_transient|retryable\?/)
       expect(src).not_to match(/dispatch #\{name\} ok_len=/)
     end
 
+    it 'keeps Loop.run going after a transient engine 504' do
+      src = File.read(described_class.method(:run).source_location.first)
+      expect(src).to match(/engine_transient\?|HttpRetry\.retryable\?/)
+      expect(src).to match(/engine hop failed|engine_blip/)
+    end
+
     it 'records a timeout increment mistake instead of treating success:true as ok' do
       tmp = Dir.mktmpdir
       stub_const('PWN::AI::Agent::Mistakes::MISTAKES_FILE', File.join(tmp, 'mistakes.json'))

data/spec/lib/pwn/ai/http_retry_spec.rb

@@ -2,6 +2,7 @@
 
 require 'spec_helper'
 require 'stringio'
+require 'rest-client'
 
 describe PWN::AI::HttpRetry do
   it 'defaults timeout to 180 and max_attempts to 5' do
@@ -14,6 +15,12 @@ describe PWN::AI::HttpRetry do
     expect(described_class.max_attempts(max_attempts: 3)).to eq(3)
   end
 
+  it 'treats gateway 504 and stream absolute timeouts as retryable' do
+    expect(described_class.retryable?(error: 'ERROR: Ollama HTTP 504 for api/chat: Gateway Time-out')).to eq(true)
+    expect(described_class.retryable?(error: 'ERROR: Ollama stream absolute timeout after 20s for api/chat')).to eq(true)
+    expect(described_class.retryable?(error: '400 Bad Request')).to eq(false)
+  end
+
   it 'tees emit lines into the open debug request log' do
     path = PWN::Plugins::Log.start_debug(
       tee: StringIO.new,
@@ -50,6 +57,7 @@ describe PWN::AI::HttpRetry do
       expect(src).not_to match(/timeout \|\|= 900/)
       expect(src).to match(/Exceptions::Timeout/)
       expect(src).to match(/HttpRetry\.report_event/)
+      expect(src).to match(/retryable\?|HTTP 50/) if name == 'PWN::AI::Ollama'
     end
   end
 end

data/spec/lib/pwn/plugins/repl_pwn_vault_spec.rb

@@ -174,4 +174,14 @@ describe 'pwn-ai debug final answer placement' do
     expect(hook).to include('→ pwn-ai →')
     expect(hook).to include('→ result')
   end
+
+  it 'does not fall through to regex-ReAct after a native Loop.run error' do
+    native_start = hook.index('final = PWN::AI::Agent::Loop.run')
+    rescue_at = hook.index('rescue StandardError', native_start)
+    expect(rescue_at).not_to be_nil
+    chunk = hook[rescue_at, 900]
+    expect(chunk).to match(/request\.replace\('nil'\)/)
+    expect(chunk).to match(/\bnext\b/)
+    expect(chunk).not_to include('legacy regex-ReAct')
+  end
 end

data/third_party/pwn_rdoc.jsonl

@@ -339,6 +339,7 @@
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Loop.degrade_text_only Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Loop.degrade_text_only`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Loop.dispatch_fail_n Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Loop.dispatch_fail_n`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Loop.emit_task_summary Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Loop.emit_task_summary`: "}]}
+{"messages":[{"role":"user","content":"PWN::AI::Agent::Loop.engine_transient? Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Loop.engine_transient?`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Loop.escalate Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Loop.escalate`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Loop.evidence_enough_to_finalize? Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Loop.evidence_enough_to_finalize?`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Loop.expose_current_session Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Loop.expose_current_session`: "}]}
@@ -793,6 +794,7 @@
 {"messages":[{"role":"user","content":"PWN::AI::HttpRetry.max_attempts Usage"},{"role":"assistant","content":"`PWN::AI::HttpRetry.max_attempts`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::HttpRetry.report_event Usage"},{"role":"assistant","content":"`PWN::AI::HttpRetry.report_event`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::HttpRetry.retry_after_s Usage"},{"role":"assistant","content":"`PWN::AI::HttpRetry.retry_after_s`: "}]}
+{"messages":[{"role":"user","content":"PWN::AI::HttpRetry.retryable? Usage"},{"role":"assistant","content":"`PWN::AI::HttpRetry.retryable?`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::HttpRetry.timeout_s Usage"},{"role":"assistant","content":"`PWN::AI::HttpRetry.timeout_s`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Ollama.assemble_native_chat_stream Usage"},{"role":"assistant","content":"`PWN::AI::Ollama.assemble_native_chat_stream`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Ollama.assemble_ollama_stream Usage"},{"role":"assistant","content":"`PWN::AI::Ollama.assemble_ollama_stream`: "}]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.697
+  version: 0.5.698
 platform: ruby
 authors:
 - 0day Inc.