pwn 0.5.738 → 0.5.739

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ca56931addf19f59b18ee2776ee84b0af0a75496bcf9bd9d8453b96b9b9eef2
-  data.tar.gz: b9310696c7ae7098d37dc3c8e46b1cd2214ab652a49ef75df281b34c472a738c
+  metadata.gz: 5a7b0a41aca20dc31343279c213c042d7362ff5c0ac59a89150a427111d5b11d
+  data.tar.gz: b4335ec85624abed2dbb25d8941ab1db79d73b07fb8b4eca64b90f56a96d15f7
 SHA512:
-  metadata.gz: d6ec57ded9a7213562cdaf4b4486d680387f8dea1ec1fbf6bfc47a2b4ed40e7c7782c40e3ab80a5164c308c5dae220442956b83cf2c0ccbddbbc2e398b1e6acf
-  data.tar.gz: 7c447c3b9e42779e4ca86038836719dad5b051a872f4bbad2bc704b54596a69644c56a92a6d877681045f3c7000cddb0a51aaa49e79be9ab1afc5de40b7fa8a2
+  metadata.gz: 226c64efa942d21212d5766604c299908118f1be000093204ff1e70b31359d2931e009df8cdc0894696832240d597b687397975fad7437eea288a0254236b6d6
+  data.tar.gz: e2ed95fb25177d41d49cfe3efaef6cb162066eba28a7470d3256c88b74e6e8779b4daf2204836051305a8f7ec20d478fdd82526df046a13bd88eae4bbd68765c

data/Gemfile

@@ -20,7 +20,7 @@ gem 'base32', '0.3.4'
 gem 'bitcoin-ruby', '0.0.20'
 gem 'brakeman', '8.0.6'
 gem 'bson', '5.2.0'
-gem 'bundler', '>=4.0.20'
+gem 'bundler', '>=4.0.21'
 gem 'bundler-audit', '>=0.9.3'
 gem 'bunny', '3.3.0'
 gem 'colorize', '1.1.0'
@@ -50,7 +50,7 @@ gem 'libusb', '0.8.0'
 gem 'luhn', '3.0.0'
 gem 'mail', '2.9.1'
 gem 'mcp', '1.5.1'
-gem 'meshtastic', '0.0.180'
+gem 'meshtastic', '0.0.183'
 gem 'metasm', '1.0.6'
 gem 'mongo', '2.26.0'
 gem 'msfrpc-client', '1.1.2'

data/documentation/Agent-Tool-Registry.md

@@ -50,6 +50,20 @@ protected operator preferences, open mistakes, or gold outcomes.
 
 ## Dynamic tool-set slimming (`ai.agent.tool_router`)
 
+The normal `Loop.run` path uses `core_only: true`. The central registry also
+includes `mcp` when the original request names MCP, a discovered backend, or
+one of its declared tools. Backend names and tool names come from
+`PWN::AI::MCP.backends`, not a ComboNation-specific router. Thus `combo.nation`,
+`combo_nation`, and `PWN::AI::MCP::ComboNation` expose the same broker, even in
+core-only mode or with a zero top-K budget. Unrelated core-only prompts remain
+unchanged, and explicit toolset exclusions and availability checks still apply.
+
+The advertised MCP schema includes the local backend catalog. Use `list_tools`
+for the selected backend's live argument schemas, then `call_tool` with a JSON
+`arguments` object. Sessions persist across calls and menu IDs such as `5.10`
+must stay strings. Catalog discovery reads local metadata only: it does not
+launch a server or enable hardware. Hardware still requires explicit opt-in.
+
 Shipping every schema on every turn overwhelms a small local model - the
 choice space is huge and it mis-routes (for example, picks an RF tool for a git
 question). When `ai.agent.tool_router: true` **and** `Loop.run` passes the

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

@@ -2965,8 +2965,9 @@ module PWN
           # TaskSummarizer.emit_plan! we re-rank using English tangible tasks
           # so generated tasks — not the bare request — drive which tools
           # the model may call.
-          # CORE_TOOLS is the default action space. Extra schemas are
-          # opt-in via enabled_toolsets + core_only: false.
+          # CORE_TOOLS is the default action space, plus the MCP broker when
+          # local client metadata matches the request. Other extra schemas
+          # are opt-in via enabled_toolsets + core_only: false.
           core_only = opts.fetch(:core_only, true)
           if nested && needs_host_work?(request: request) &&
              !(opts.key?(:enabled_toolsets) && Array(opts[:enabled_toolsets]).empty?)
@@ -3441,7 +3442,7 @@ module PWN
               force_tools: 'optional - force tools value consumed by #run',
               nested: 'optional - true for Swarm/child Loop.run (skip RN footer)',
               engine: 'optional - provider name; defaults to PWN::Env ai.active',
-              core_only: 'optional - restrict to CORE_TOOLS when true',
+              core_only: 'optional - restrict to CORE_TOOLS plus relevant MCP discovery when true',
               trace: 'optional - enable TracePoint debug for this run',
               debug_tee: 'optional - IO to tee debug logs'
             )

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

@@ -122,6 +122,8 @@ module PWN
           enabled = enabled.map(&:to_s) if enabled
           pool = @entries.values.select { |e| (enabled.nil? || enabled.include?(e.toolset)) && safe_check(entry: e) }
           pool = pool.select { |e| available?(entry: e, trusted_context: opts[:trusted_context]) }
+          mcp = pool.any? { |entry| entry.name == 'mcp' } ? mcp_routing(query: opts[:relevance]) : {}
+          relevant = mcp[:relevant] ? ['mcp'] : []
 
           pref_fwd = {}
           pref_fwd[:order] = opts[:order] if opts.key?(:order)
@@ -131,16 +133,20 @@ module PWN
           pref_fwd[:trusted_context] = opts[:trusted_context] if opts.key?(:trusted_context)
 
           if opts[:core_only]
-            pool = pool.select { |e| CORE_TOOLS.include?(e.name) }
+            pool = pool.select { |e| (CORE_TOOLS + relevant).include?(e.name) }
           elsif opts[:relevance] && router_enabled?
             keep = rank({ query: opts[:relevance], entries: pool }.merge(pref_fwd)).first(opts[:top_k] || 10).map(&:name)
             pinned = domain_pin_names(query: opts[:relevance])
-            names = (CORE_TOOLS + keep + pinned).uniq
+            names = (CORE_TOOLS + keep + pinned + relevant).uniq
             pool  = pool.select { |e| names.include?(e.name) }
           end
 
           pool = apply_preference({ items: pool }.merge(pref_fwd))
-          pool.map { |e| { type: 'function', function: e.schema } }
+          pool.map do |entry|
+            schema = entry.schema
+            schema = schema.merge(description: "#{schema[:description]} #{mcp[:description]}") if entry.name == 'mcp'
+            { type: 'function', function: schema }
+          end
         end
 
         # Supported Method Parameters::
@@ -361,6 +367,30 @@ module PWN
           end
         end
 
+        # Read only local client metadata: schema discovery must never spawn a
+        # server, connect hardware, or inherit permission from a matching name.
+        private_class_method def self.mcp_routing(opts = {})
+          backends = PWN::AI::MCP.backends
+          normalize = lambda do |text|
+            text.to_s.gsub(/([a-z0-9])([A-Z])/, '\1 \2').downcase.gsub(/[^a-z0-9]+/, ' ').strip
+          end
+          query = " #{normalize.call(opts[:query])} "
+          terms = ['mcp', 'model context protocol'] + backends.flat_map do |backend|
+            [backend[:name], backend[:constant].to_s.split('::').last, *Array(backend[:tools])]
+          end
+          relevant = terms.any? do |term|
+            phrase = normalize.call(term)
+            !phrase.empty? && query.include?(" #{phrase} ")
+          end
+          catalog = backends.map do |backend|
+            "#{backend[:name]} (#{backend[:constant]}): #{Array(backend[:tools]).join(', ')}"
+          end.join('; ')
+          {
+            relevant: relevant,
+            description: "Local backend catalog: #{catalog}. For matching server tasks, use this broker and list_tools to discover live schemas before call_tool. Discovery does not enable hardware."
+          }
+        end
+
         private_class_method def self.safe_check(opts = {})
           entry = opts[:entry]
           entry.check.call
@@ -449,7 +479,7 @@ module PWN
               preference: 'optional - alias of :order; same key-present rule',
               kind: 'optional - kind value consumed by #definitions',
               intent: 'optional - intent value consumed by #definitions',
-              core_only: 'optional - core only value consumed by #definitions',
+              core_only: 'optional - restrict to CORE_TOOLS plus the MCP broker when client metadata matches relevance',
               trusted_context: 'optional - caller observations accepted by Policy.observed_context; defaults to live episode observations'
             )
 

data/lib/pwn/version.rb

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

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

@@ -47,6 +47,56 @@ describe PWN::AI::Agent::Registry do
     expect(names.length).to eq(described_class::CORE_TOOLS.length)
   end
 
+  it 'advertises the MCP broker for a named backend in the normal core-only prompt path' do
+    described_class.discover
+    request = 'Use combo.nation to inspect the menu catalog'
+    enabled = PWN::AI::Agent::Loop.send(:default_interactive_toolsets, request: request)
+    expect(PWN::AI::MCP::ComboNation).not_to receive(:connect)
+    definitions = described_class.definitions(core_only: true, relevance: request, enabled: enabled)
+    tool = definitions.find { |row| row.dig(:function, :name) == 'mcp' }
+    expect(tool).not_to be_nil
+    expect(tool.dig(:function, :description)).to include('combo_nation', 'PWN::AI::MCP::ComboNation', 'menu_catalog')
+  end
+
+  it 'routes MCP names and capabilities without relying on keyword rank or changing unrelated core prompts' do
+    described_class.discover
+    allow(described_class).to receive(:router_enabled?).and_return(true)
+    ['PWN::AI::MCP::ComboNation', 'combo_nation', 'ComboNation', 'combo.nation', 'menu_dial_calibration', 'MCP backends'].each do |query|
+      [true, false].each do |core_only|
+        names = described_class.definitions(core_only: core_only, relevance: query, top_k: 0).map { |row| row.dig(:function, :name) }
+        expect(names).to include('mcp')
+      end
+    end
+    names = described_class.definitions(core_only: true, relevance: 'inspect a local Ruby file').map { |row| row.dig(:function, :name) }
+    expect(names).to eq(described_class::CORE_TOOLS)
+  end
+
+  it 'discovers another MCP client from its metadata and respects explicit toolset exclusion' do
+    described_class.discover
+    client = Module.new
+    %i[connect disconnect list_tools call_tool].each { |method| client.define_singleton_method(method) { |_| {} } }
+    client.const_set(:TOOLS, %w[inspect_widget])
+    stub_const('PWN::AI::MCP::WidgetLab', client)
+    expect(client).not_to receive(:connect)
+    %w[widget_lab inspect_widget].each do |query|
+      tools = described_class.definitions(core_only: true, relevance: query)
+      mcp = tools.find { |row| row.dig(:function, :name) == 'mcp' }
+      expect(mcp.dig(:function, :description)).to include('widget_lab', 'inspect_widget')
+      expect(described_class.definitions(core_only: true, relevance: query, enabled: [])).to eq([])
+      names = described_class.definitions(core_only: true, relevance: query, enabled: ['pwn']).map { |row| row.dig(:function, :name) }
+      expect(names).not_to include('mcp')
+    end
+    expect(described_class.lookup(name: 'mcp').schema[:description]).not_to include('WidgetLab')
+  end
+
+  it 'does not let MCP relevance bypass a failed availability check' do
+    described_class.discover
+    entry = described_class.lookup(name: 'mcp')
+    allow(entry.check).to receive(:call).and_return(false)
+    tools = described_class.definitions(core_only: true, relevance: 'combo.nation')
+    expect(tools.map { |row| row.dig(:function, :name) }).not_to include('mcp')
+  end
+
   it 'applies observed shell and Ruby prerequisites to the existing core tools' do
     described_class.discover
     context = { environment: :local, capabilities: { shell: false, ruby: false } }

data/spec/lib/pwn/ai/agent/tools/mcp_spec.rb

@@ -51,6 +51,37 @@ describe 'PWN::AI::Agent::Tools mcp' do
     expect(PWN::AI::Agent::Registry.lookup(name: 'mcp').toolset).to eq('mcp')
   end
 
+  it 'dispatches the broker advertised for a combo.nation prompt and preserves menu IDs across calls' do
+    registry = PWN::AI::Agent::Registry
+    tools = registry.definitions(core_only: true, relevance: 'Inspect combo.nation menus')
+    schema = tools.find { |tool| tool.dig(:function, :name) == 'mcp' }
+    expect(schema).not_to be_nil
+    fake = start_fake_server
+    # Only replace process spawning; exercise the real protocol client, broker,
+    # schema validation and Dispatch with JSON arguments as returned by a model.
+    allow(PWN::AI::MCP::ComboNation).to receive(:connect).and_wrap_original do |method, opts|
+      expect(opts[:allow_hardware]).not_to eq(true)
+      method.call(opts.merge(reader: fake[:reader], writer: fake[:writer], timeout: 2))
+    end
+    calls = [
+      { action: 'list_tools', backend: 'combo_nation' },
+      { action: 'call_tool', backend: 'combo_nation', name: 'menu_guess', arguments: { option: '5.10' } }
+    ]
+    results = calls.map do |args|
+      JSON.parse(PWN::AI::Agent::Dispatch.call(
+                   scope_policy: { enabled: false },
+                   tool_call: { id: 'mcp-test', type: 'function', function: { name: schema.dig(:function, :name), arguments: JSON.generate(args) } }
+                 ))
+    end
+    expect(results.first.dig('result', 'tools').map { |tool| tool['name'] }).to include('menu_catalog')
+    expect(results.last.dig('result', 'parsed', 'arguments')).to eq('option' => '5.10')
+    expect(results.last.dig('result', 'allow_hardware')).to eq(false)
+    expect(PWN::AI::MCP::ComboNation).to have_received(:connect).once
+  ensure
+    PWN::AI::MCP.reset!
+    fake[:thread].join(2) if fake
+  end
+
   it 'lists MCP backends and drives combo.nation tools through Dispatch-shaped args' do
     entry = PWN::AI::Agent::Registry.lookup(name: 'mcp')
     listed = entry.handler.call(action: 'backends')

data/third_party/pwn_rdoc.jsonl

@@ -671,6 +671,7 @@
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Registry.eager_load! Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Registry.eager_load!`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Registry.help Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Registry.help`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Registry.lookup Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Registry.lookup`: Supported Method Parameters\n\nentry = PWN::AI::Agent::Registry.lookup(\n\nname: 'required - registered tool name'\n\n)\n"}]}
+{"messages":[{"role":"user","content":"PWN::AI::Agent::Registry.mcp_routing Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Registry.mcp_routing`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Registry.metrics_rates Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Registry.metrics_rates`: "}]}
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Registry.preference_order Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Registry.preference_order`: Supported Method Parameters\n\norder = PWN::AI::Agent::Registry.preference_order(\n\norder: 'optional - Array of tool names; explicit nil/[] disables',\npreference: 'optional - alias of :order. Explicit key disables Env/DEFAULT fallback'\n\n)\n"}]}
 {"messages":[{"role":"user","content":"PWN::AI::Agent::Registry.rank Usage"},{"role":"assistant","content":"`PWN::AI::Agent::Registry.rank`: Supported Method Parameters\n\nranked = PWN::AI::Agent::Registry.rank(\n\nquery: 'required - user request text',\nentries: 'optional - Entry pool to rank (default .all)',\norder: 'optional - preference list forwarded to preference_order'\n\n)\n\nC1 advantage-weighted router: score = α·keyword_sim + β·(tool rolling success_rate − global rate) + γ·UCB1(tool). Untried tools get an exploration bonus; tools that outperform the fleet get an exploitation bonus. Thompson sampling is available via Metrics.thompson for stochastic routing.\n"}]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.738
+  version: 0.5.739
 platform: ruby
 authors:
 - 0day Inc.
@@ -141,14 +141,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.20
+        version: 4.0.21
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.20
+        version: 4.0.21
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -519,14 +519,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.180
+        version: 0.0.183
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.180
+        version: 0.0.183
 - !ruby/object:Gem::Dependency
   name: metasm
   requirement: !ruby/object:Gem::Requirement
@@ -7164,7 +7164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.20
+rubygems_version: 4.0.21
 specification_version: 4
 summary: Automated Security Testing for CI/CD Pipelines & Beyond
 test_files: []