pwn 0.5.606 → 0.5.612

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dda1231a5f5f7683e7d08172aaffff22a3b7acaa815db6a69e6e9b18cfbeaf13
-  data.tar.gz: aa697b79f429e439446356780e78c3b12c722b409c84954cd7ec01a145bc312c
+  metadata.gz: 8beaa60314e788a7122a92098c1ea4897cf488ef88efd1030f1f704656dbe1ff
+  data.tar.gz: 94fff44f3cdc34c997fb920f63affa133cab0de4d309acf4c09f4451adbbdcf6
 SHA512:
-  metadata.gz: 701991c1248d03dc2076035f23d7d36d07434b36a109eb548c228b350f46b8d1f5be357648f309057c92263a8902405b944063583924ab6895ee5683a9752bb0
-  data.tar.gz: e17d796a1f309d839d37cc452c239444bce25995bf0cc7289576b880e75e8e39016ba43a5ea958da0e9feab6b284b53824e99e5c207eb315dea4df0b727ff7f3
+  metadata.gz: d9869f0a43c78a53238b1ef1ab58f54f27f1da575ad101aff4c172e813ec7878b92465f5d0f8984bce33a1a6227ec3a67c80ee63e1643683deaa45e2860e9c52
+  data.tar.gz: 1407422fb0cc44c84232f37f664a07eb0a80bafaf748e8aadbe310652640ed83526e1ce48d34a1d0302d4537c27ca71983c44595824b39080693157ba038322f

data/Gemfile

@@ -50,7 +50,7 @@ gem 'libusb', '0.7.2'
 gem 'luhn', '3.0.0'
 gem 'mail', '2.9.0'
 gem 'mcp', '0.20.0'
-gem 'meshtastic', '0.0.163'
+gem 'meshtastic', '0.0.165'
 gem 'metasm', '1.0.6'
 gem 'mongo', '2.24.1'
 gem 'msfrpc-client', '1.1.2'
@@ -77,11 +77,11 @@ gem 'rbvmomi2', '3.10.0'
 gem 'rdoc', '7.0.4'
 gem 'rest-client', '2.1.0'
 gem 'rex', '2.0.13'
-gem 'rmagick', '7.0.3'
+gem 'rmagick', '7.0.4'
 gem 'rqrcode', '3.2.0'
 gem 'rspec', '3.13.2'
 gem 'rtesseract', '3.1.4'
-gem 'rubocop', '1.87.0'
+gem 'rubocop', '1.88.0'
 gem 'rubocop-rake', '0.7.1'
 gem 'rubocop-rspec', '3.10.2'
 gem 'ruby-audio', '1.6.1'
@@ -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.2'
-gem 'selenium-devtools', '0.148.0'
-gem 'selenium-webdriver', '4.44.0'
+gem 'selenium-devtools', '0.149.0'
+gem 'selenium-webdriver', '4.45.0'
 gem 'slack-ruby-client', '3.1.0'
 gem 'socksify', '1.8.1'
 gem 'spreadsheet', '1.3.5'

data/README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.5.606]:001 >>> PWN.help
+pwn[v0.5.612]:001 >>> PWN.help
 ```
 
 [![Installing the pwn Security Automation Framework](https://raw.githubusercontent.com/0dayInc/pwn/master/documentation/pwn_install.png)](https://youtu.be/G7iLUY4FzsI)
@@ -52,7 +52,7 @@ $ rvm use ruby-4.0.5@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.5.606]:001 >>> PWN.help
+pwn[v0.5.612]:001 >>> PWN.help
 ```
 
 If you're using a multi-user install of RVM do:
@@ -62,7 +62,7 @@ $ rvm use ruby-4.0.5@pwn
 $ rvmsudo gem uninstall --all --executables pwn
 $ rvmsudo gem install --verbose pwn
 $ pwn
-pwn[v0.5.606]:001 >>> PWN.help
+pwn[v0.5.612]:001 >>> PWN.help
 ```
 
 PWN periodically upgrades to the latest version of Ruby which is reflected in `/opt/pwn/.ruby-version`.  The easiest way to upgrade to the latest version of Ruby from a previous PWN installation is to run the following script:

data/git_commit.sh

@@ -25,8 +25,15 @@ if (( $# == 3 )); then
 
   pwn_autoinc_version
   if [[ $? -ne 0 ]]; then
-    echo 'ERROR: pwn_autoinc_version failed! Investigate and bump pwn version manually.'
-    exit 1
+    echo 'ERROR: pwn_autoinc_version failed! Reinstalling pwn gemset...'
+    rvmsudo ./reinstall_pwn_gemset.sh
+    rvmsudo rake
+    rvmsudo rake install
+    if [[ $? -ne 0 ]]; then
+      echo 'ERROR: Attempt to reinstall pwn gemset failed! Please investigate and fix before trying again.'
+      exit 1
+    fi
+    pwn_autoinc_version
   fi
 
   # Generate RDoc JSONL for fine-tunning LLMs

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

@@ -15,7 +15,7 @@ module PWN
       # externalised — Loop.run is stateless aside from the messages array it
       # builds.
       module Loop
-        DEFAULT_MAX_ITERS = 25
+        DEFAULT_MAX_ITERS = 777
 
         ENGINE_MODS = {
           openai: 'PWN::AI::OpenAI',
@@ -25,60 +25,74 @@ module PWN
           gemini: 'PWN::AI::Gemini'
         }.freeze
 
-        # Supported Method Parameters::
-        # final = PWN::AI::Agent::Loop.run(
-        #   user_text: 'required - what the human typed',
-        #   session_id: 'optional - PWN::Sessions id (transcript is appended to it)',
-        #   enabled_toolsets: 'optional - subset of Registry.toolsets, or nil for all',
-        #   on_tool: 'optional - ->(name, args, result) callback for live UI'
-        # )
+        private_class_method def self.degrade_text_only(opts = {})
+          mod      = opts[:mod]
+          messages = opts[:messages]
 
-        public_class_method def self.run(opts = {})
-          user_text  = opts[:user_text].to_s
-          session_id = opts[:session_id]
-          on_tool    = opts[:on_tool]
+          warn "[pwn-ai] #{mod} has no chat — falling back to text-only (no tool-calling)"
+          sys  = messages.find { |m| m[:role] == 'system' }
+          user = messages.rfind { |m| m[:role] == 'user' }
+          r = mod.chat(
+            request: user[:content],
+            system_role_content: sys&.[](:content),
+            spinner: true
+          )
 
-          Registry.discover
+          txt = r.is_a?(Hash) ? (r.dig(:choices, -1, :content) || r.dig(:choices, -1, :text)).to_s : r.to_s
+          { role: 'assistant', content: txt, tool_calls: [] }
+        end
 
-          tools    = Registry.definitions(enabled: opts[:enabled_toolsets])
-          messages = [
-            { role: 'system', content: PromptBuilder.build(session_id: session_id) },
-            { role: 'user',   content: user_text }
-          ]
-          append_session(session_id: session_id, role: 'user', content: user_text)
+        private_class_method def self.max_iters
+          v = (PWN::Env.dig(:ai, :agent, :max_iters) if defined?(PWN::Env))
+          v.to_i.positive? ? v.to_i : DEFAULT_MAX_ITERS
+        rescue StandardError
+          DEFAULT_MAX_ITERS
+        end
 
-          max_iters.times do |i|
-            msg = call_engine(messages: messages, tools: tools)
-            return '[pwn-ai] engine returned no message' if msg.nil?
+        private_class_method def self.append_session(opts = {})
+          session_id = opts[:session_id]
+          return unless session_id && defined?(PWN::Sessions)
 
-            messages << msg
-            calls = Array(msg[:tool_calls])
+          PWN::Sessions.append(
+            session_id: session_id,
+            role: opts[:role],
+            content: opts[:content]
+          )
+        rescue StandardError
+          nil
+        end
 
-            if calls.empty?
-              text = msg[:content].to_s
-              append_session(session_id: session_id, role: 'assistant', content: text)
-              return text
-            end
+        # Supported Method Parameters::
+        # msg = PWN::AI::Agent::Loop.normalize_llm(
+        #   response: 'required - chat_with_tools response Hash from any provider'
+        # )
 
-            calls.each do |tc|
-              name   = tc.dig(:function, :name).to_s
-              entry  = Registry.lookup(name: name)
-              raw    = Dispatch.call(tool_call: tc)
-              result = Result.condition(content: raw, entry: entry)
+        private_class_method def self.normalize_llm(opts = {})
+          resp = opts[:response]
+          return nil unless resp.is_a?(Hash)
 
-              on_tool&.call(name, tc.dig(:function, :arguments), result)
+          msg = resp.dig(:choices, 0, :message) || resp[:assistant_message]
+          return nil unless msg
 
-              messages << {
-                role: 'tool',
-                tool_call_id: tc[:id] || tc['id'] || "call_#{i}",
-                name: name,
-                content: result
+          out = {
+            role: 'assistant',
+            content: msg[:content],
+            tool_calls: Array(msg[:tool_calls]).map do |tc|
+              {
+                id: tc[:id],
+                type: 'function',
+                function: {
+                  name: tc.dig(:function, :name) || tc[:name],
+                  arguments: tc.dig(:function, :arguments) || tc[:arguments]
+                }
               }
-              append_session(session_id: session_id, role: 'tool', content: "#{name} → #{result[0, 400]}")
             end
-          end
-
-          '[pwn-ai] iteration budget exhausted'
+          }
+          # Preserve provider-native content blocks so chat can round-trip
+          # them exactly on the next iteration (e.g. Anthropic requires the
+          # original tool_use block to precede a tool_result).
+          out[:_native_content] = msg[:_native_content] if msg[:_native_content]
+          out
         end
 
         # Supported Method Parameters::
@@ -92,9 +106,9 @@ module PWN
         #     tool_calls: [ {id:, type:'function', function:{name:, arguments:}} ],
         #     _native_content: <provider raw>  (when adapter needs round-trip) }
 
-        public_class_method def self.call_engine(opts = {})
+        private_class_method def self.call_engine(opts = {})
           messages = opts[:messages]
-          tools    = opts[:tools]
+          tools = opts[:tools]
 
           engine = (PWN::Env.dig(:ai, :active) if defined?(PWN::Env)).to_s.downcase.to_sym
           engine = :openai if engine == :''
@@ -103,72 +117,78 @@ module PWN
           raise "ERROR: Unsupported AI engine for agent loop: #{engine}" unless mod_name
 
           mod = Object.const_get(mod_name)
-          if mod.respond_to?(:chat_raw)
-            normalise_openai(response: mod.chat_raw(messages: messages, tools: tools, spinner: true))
+          if mod.respond_to?(:chat_with_tools)
+            response = mod.chat_with_tools(
+              messages: messages,
+              tools: tools,
+              spinner: true
+            )
+            normalize_llm(response: response)
           else
             degrade_text_only(mod: mod, messages: messages)
           end
         end
 
         # Supported Method Parameters::
-        # msg = PWN::AI::Agent::Loop.normalise_openai(
-        #   response: 'required - raw chat_raw response Hash from any provider'
+        # final = PWN::AI::Agent::Loop.run(
+        #   request: 'required - what the human typed',
+        #   session_id: 'optional - PWN::Sessions id (transcript is appended to it)',
+        #   enabled_toolsets: 'optional - subset of Registry.toolsets, or nil for all',
+        #   on_tool: 'optional - ->(name, args, result) callback for live UI',
+        #   system_role_content: 'optional - override default system prompt (built from session_id if not provided)'
         # )
 
-        public_class_method def self.normalise_openai(opts = {})
-          resp = opts[:response]
-          return nil unless resp.is_a?(Hash)
+        public_class_method def self.run(opts = {})
+          request = opts[:request].to_s
+          session_id = opts[:session_id]
+          on_tool = opts[:on_tool]
+          system_role_content = opts[:system_role_content] ||= PWN::AI::Agent::PromptBuilder.build(session_id: session_id)
 
-          msg = resp.dig(:choices, 0, :message) || resp[:assistant_message]
-          return nil unless msg
+          Registry.discover
 
-          out = {
-            role: 'assistant',
-            content: msg[:content],
-            tool_calls: Array(msg[:tool_calls]).map do |tc|
-              {
-                id: tc[:id],
-                type: 'function',
-                function: {
-                  name: tc.dig(:function, :name) || tc[:name],
-                  arguments: tc.dig(:function, :arguments) || tc[:arguments]
-                }
-              }
-            end
-          }
-          # Preserve provider-native content blocks so chat_raw can round-trip
-          # them exactly on the next iteration (e.g. Anthropic requires the
-          # original tool_use block to precede a tool_result).
-          out[:_native_content] = msg[:_native_content] if msg[:_native_content]
-          out
-        end
+          tools    = Registry.definitions(enabled: opts[:enabled_toolsets])
+          messages = [
+            { role: 'system', content: system_role_content },
+            { role: 'user',   content: request }
+          ]
+          append_session(session_id: session_id, role: 'user', content: request)
 
-        private_class_method def self.degrade_text_only(opts = {})
-          mod      = opts[:mod]
-          messages = opts[:messages]
+          max_iters.times do |i|
+            msg = call_engine(messages: messages, tools: tools)
+            return '[pwn-ai] engine returned no message' if msg.nil?
 
-          warn "[pwn-ai] #{mod} has no chat_raw — falling back to text-only (no tool-calling)"
-          sys  = messages.find { |m| m[:role] == 'system' }
-          user = messages.rfind { |m| m[:role] == 'user' }
-          r = mod.chat(request: user[:content], system_role_content: sys&.[](:content), spinner: true)
-          txt = r.is_a?(Hash) ? (r.dig(:choices, -1, :content) || r.dig(:choices, -1, :text)).to_s : r.to_s
-          { role: 'assistant', content: txt, tool_calls: [] }
-        end
+            messages << msg
+            calls = Array(msg[:tool_calls])
 
-        private_class_method def self.max_iters
-          v = (PWN::Env.dig(:ai, :agent, :max_iters) if defined?(PWN::Env))
-          v.to_i.positive? ? v.to_i : DEFAULT_MAX_ITERS
-        rescue StandardError
-          DEFAULT_MAX_ITERS
-        end
+            if calls.empty?
+              text = msg[:content].to_s
+              append_session(session_id: session_id, role: 'assistant', content: text)
+              return text
+            end
 
-        private_class_method def self.append_session(opts = {})
-          session_id = opts[:session_id]
-          return unless session_id && defined?(PWN::Sessions)
+            calls.each do |tc|
+              name   = tc.dig(:function, :name).to_s
+              entry  = Registry.lookup(name: name)
+              raw    = Dispatch.call(tool_call: tc)
+              result = Result.condition(content: raw, entry: entry)
 
-          PWN::Sessions.append(session_id: session_id, role: opts[:role], content: opts[:content])
-        rescue StandardError
-          nil
+              on_tool&.call(name, tc.dig(:function, :arguments), result)
+
+              messages << {
+                role: 'tool',
+                tool_call_id: tc[:id] || tc['id'] || "call_#{i}",
+                name: name,
+                content: result
+              }
+              append_session(
+                session_id: session_id,
+                role: 'tool',
+                content: "#{name} → #{result[0, 1_024]}"
+              )
+            end
+          end
+
+          '[pwn-ai] iteration budget exhausted'
         end
 
         # Author(s):: 0day Inc. <support@0dayinc.com>
@@ -183,10 +203,11 @@ module PWN
           puts <<~USAGE
             USAGE:
               final = PWN::AI::Agent::Loop.run(
-                user_text: 'what does `id` return on this host?',
+                request: 'what does `id` return on this host?',
                 session_id: PWN::Sessions.create[:id],
                 enabled_toolsets: %w[terminal pwn memory skills],
-                on_tool: ->(name, args, result) { puts "→ \#{name}: \#{result[0,80]}" }
+                on_tool: ->(name, args, result) { puts "→ \#{name}: \#{result[0,1_024]}" },
+                system_role_content: 'You are a helpful assistant that can call tools to answer questions.'
               )
 
               Supported engines: #{ENGINE_MODS.keys.join(', ')}

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

@@ -19,10 +19,9 @@ module PWN
         public_class_method def self.build(opts = {})
           session_id = opts[:session_id]
           engine = active_engine
-          base   = (PWN::Env.dig(:ai, engine, :system_role_content) if defined?(PWN::Env)) ||
-                   'You are an offensive-security AI named Sonny operating inside the pwn REPL.'
+          base = (PWN::Env.dig(:ai, engine, :system_role_content) if defined?(PWN::Env)) || 'You are a world-class introspective offensive cyber security and research engineer.  You specialize in discovering zero day vulnerabilities focused on responsible disclosure prior to threat actors discovering and exploiting.  You are self-aware of your harness, pwn which begins with the ruby namespace `PWN` operating inside the pwn REPL.  For every request you first begin by determining if PWN has a module capable of satisfying the request.'
 
-          <<~SYS.rstrip
+          "
             #{base}
 
             ENVIRONMENT
@@ -37,7 +36,7 @@ module PWN
               no tool_calls is treated as your FINAL answer to the user.
               Prefer `pwn_eval` for anything in the PWN:: namespace and `shell`
               for OS commands. Save durable facts with `memory_remember`.
-          SYS
+          "
         end
 
         private_class_method def self.active_engine

data/lib/pwn/ai/agent/tools/ruby_eval.rb

@@ -34,10 +34,24 @@ PWN::AI::Agent::Registry.register(
     buf = StringIO.new
     $stdout = buf
     begin
-      # rubocop:disable Security/Eval -- intentional: this IS the pwn-ai → PWN bridge
-      val = eval(code, TOPLEVEL_BINDING, '(pwn_eval)')
+      # rubocop:disable Security/Eval
+      # rubocop:disable Style/DocumentDynamicEvalDefinition
+      # INTENTIONAL: this IS the pwn-ai → PWN bridge
+      # As YTCracker says, "It ain't a bug, it's a featcha."
+      # https://www.youtube.com/watch?v=2nALqqSqdDw
+      # val = eval(code, TOPLEVEL_BINDING, '(pwn_eval)')
+      proc = eval(
+        "proc { #{code} }",
+        TOPLEVEL_BINDING,
+        __FILE__,
+        __LINE__ - 3
+      )
+      val = proc.call
       # rubocop:enable Security/Eval
+      # rubocop:enable Style/DocumentDynamicEvalDefinition
       { stdout: buf.string, value: val.inspect }
+
+      # TODO: A rescue here may enable self-healing of the agent if the model emits code that raises an exception. The model could then be prompted to fix the code and try again.
     ensure
       $stdout = old_stdout
     end

data/lib/pwn/ai/anthropic.rb

@@ -20,7 +20,7 @@ module PWN
       #   rest_call: 'required rest call to make per the schema',
       #   params: 'optional params passed in the URI or HTTP Headers',
       #   http_body: 'optional HTTP body sent in HTTP methods that support it e.g. POST',
-      #   timeout: 'optional timeout in seconds (defaults to 300)',
+      #   timeout: 'optional timeout in seconds (defaults to 900)',
       #   spinner: 'optional - display spinner (defaults to false)'
       # )
 
@@ -49,7 +49,7 @@ module PWN
         http_body ||= {}
 
         timeout = opts[:timeout]
-        timeout ||= 300
+        timeout ||= 900
 
         spinner = opts[:spinner] || false
 
@@ -149,18 +149,18 @@ module PWN
       # ----------------------------------------------------------------------
 
       # Supported Method Parameters::
-      # response = PWN::AI::Anthropic.chat_raw(
+      # response = PWN::AI::Anthropic.chat_with_tools(
       #   messages: 'required - OpenAI-format messages array (system/user/assistant/tool)',
       #   tools: 'optional - OpenAI tools array [{type:"function", function:{...}}]',
       #   tool_choice: 'optional - "auto" | "none" | "required" | {type:"function", function:{name:..}}',
       #   model: 'optional - overrides PWN::Env[:ai][:anthropic][:model]',
       #   temp: 'optional - temperature (defaults to PWN::Env[:ai][:anthropic][:temp] || 1)',
       #   max_tokens: 'optional - defaults to 4096',
-      #   timeout: 'optional - seconds (default 300)',
+      #   timeout: 'optional - seconds (default 900)',
       #   spinner: 'optional - display spinner (default false)'
       # )
 
-      public_class_method def self.chat_raw(opts = {})
+      public_class_method def self.chat_with_tools(opts = {})
         engine   = PWN::Env[:ai][:anthropic]
         messages = opts[:messages]
         raise 'ERROR: messages array is required' if messages.nil? || messages.empty?
@@ -234,7 +234,7 @@ module PWN
             out << { role: 'user', content: (m[:content] || m['content']).to_s }
           when 'assistant'
             flush_tool_results.call
-            # Prefer the raw content-block array if a prior chat_raw round
+            # Prefer the raw content-block array if a prior chat_with_tools round
             # attached it — guarantees byte-exact tool_use round-trip.
             raw = m[:_native_content] || m['_native_content']
             if raw.is_a?(Array) && !raw.empty?
@@ -338,7 +338,7 @@ module PWN
       #   system_role_content: 'optional - context to set up the model behavior for conversation (Default: PWN::Env[:ai][:anthropic][:system_role_content])',
       #   response_history: 'optional - pass response back in to have a conversation',
       #   speak_answer: 'optional speak answer using PWN::Plugins::Voice.text_to_speech (Default: nil)',
-      #   timeout: 'optional timeout in seconds (defaults to 300)',
+      #   timeout: 'optional timeout in seconds (defaults to 900)',
       #   spinner: 'optional - display spinner (defaults to false)'
       # )
 
@@ -468,7 +468,7 @@ module PWN
             system_role_content: 'optional - context to set up the model behavior for conversation (Default: PWN::Env[:ai][:anthropic][:system_role_content])',
             response_history: 'optional - pass response back in to have a conversation',
             speak_answer: 'optional speak answer using PWN::Plugins::Voice.text_to_speech (Default: nil)',
-            timeout: 'optional - timeout in seconds (defaults to 300)',
+            timeout: 'optional - timeout in seconds (defaults to 900)',
             spinner: 'optional - display spinner (defaults to false)'
           )
 

data/lib/pwn/ai/gemini.rb

@@ -9,7 +9,7 @@ module PWN
   module AI
     # This plugin interacts with Google's Gemini API (Generative Language).
     # It provides methods to list models, generate completions, and chat,
-    # plus a native tool-calling adapter (`chat_raw`) for PWN::AI::Agent::Loop.
+    # plus a native tool-calling adapter (`chat_with_tools`) for PWN::AI::Agent::Loop.
     #
     # API documentation: https://ai.google.dev/api
     # Obtain an API key from https://aistudio.google.com/app/apikey
@@ -20,7 +20,7 @@ module PWN
       #   rest_call: 'required rest call to make per the schema',
       #   params: 'optional params passed in the URI or HTTP Headers',
       #   http_body: 'optional HTTP body sent in HTTP methods that support it e.g. POST',
-      #   timeout: 'optional timeout in seconds (defaults to 300)',
+      #   timeout: 'optional timeout in seconds (defaults to 900)',
       #   spinner: 'optional - display spinner (defaults to false)'
       # )
 
@@ -48,7 +48,7 @@ module PWN
         http_body ||= {}
 
         timeout = opts[:timeout]
-        timeout ||= 300
+        timeout ||= 900
 
         spinner = opts[:spinner] || false
 
@@ -135,18 +135,18 @@ module PWN
       # ----------------------------------------------------------------------
 
       # Supported Method Parameters::
-      # response = PWN::AI::Gemini.chat_raw(
+      # response = PWN::AI::Gemini.chat_with_tools(
       #   messages: 'required - OpenAI-format messages array (system/user/assistant/tool)',
       #   tools: 'optional - OpenAI tools array [{type:"function", function:{...}}]',
       #   tool_choice: 'optional - "auto" | "none" | "required" | {type:"function", function:{name:..}}',
       #   model: 'optional - overrides PWN::Env[:ai][:gemini][:model]',
       #   temp: 'optional - temperature (defaults to PWN::Env[:ai][:gemini][:temp] || 1)',
       #   max_tokens: 'optional - maxOutputTokens (defaults to 8192)',
-      #   timeout: 'optional - seconds (default 300)',
+      #   timeout: 'optional - seconds (default 900)',
       #   spinner: 'optional - display spinner (default false)'
       # )
 
-      public_class_method def self.chat_raw(opts = {})
+      public_class_method def self.chat_with_tools(opts = {})
         engine   = PWN::Env[:ai][:gemini]
         messages = opts[:messages]
         raise 'ERROR: messages array is required' if messages.nil? || messages.empty?
@@ -332,7 +332,7 @@ module PWN
       #   system_role_content: 'optional - context to set up the model behavior for conversation (Default: PWN::Env[:ai][:gemini][:system_role_content])',
       #   response_history: 'optional - pass response back in to have a conversation',
       #   speak_answer: 'optional speak answer using PWN::Plugins::Voice.text_to_speech (Default: nil)',
-      #   timeout: 'optional timeout in seconds (defaults to 300)',
+      #   timeout: 'optional timeout in seconds (defaults to 900)',
       #   spinner: 'optional - display spinner (defaults to false)'
       # )
 
@@ -356,7 +356,7 @@ module PWN
         response_history ||= { choices: [system_role] }
 
         # Build the OpenAI-shape messages array, then reuse the Gemini
-        # translator so .chat and .chat_raw share one wire path.
+        # translator so .chat and .chat_with_tools share one wire path.
         messages = [system_role]
         if response_history[:choices].length > 1
           response_history[:choices][1..].each do |msg|
@@ -439,11 +439,11 @@ module PWN
             system_role_content: 'optional - context to set up the model behavior for conversation (Default: PWN::Env[:ai][:gemini][:system_role_content])',
             response_history: 'optional - pass response back in to have a conversation',
             speak_answer: 'optional speak answer using PWN::Plugins::Voice.text_to_speech (Default: nil)',
-            timeout: 'optional - timeout in seconds (defaults to 300)',
+            timeout: 'optional - timeout in seconds (defaults to 900)',
             spinner: 'optional - display spinner (defaults to false)'
           )
 
-          response = #{self}.chat_raw(
+          response = #{self}.chat_with_tools(
             messages: 'required - OpenAI-format messages array',
             tools: 'optional - OpenAI tools array',
             tool_choice: 'optional - auto | none | required | {function:{name:..}}',