fix(tools): show v2 capabilities in tool registry & tool_info by gagdiez · Pull Request #2794 · nearai/ironclaw

gagdiez · 2026-04-21T16:17:04Z

tool_info("mission_create") returned "No tool named 'mission_create' is registered" even though mission_create was advertised in the system prompt and executed correctly.

Root cause: two sources of truth for tools: the V1 ToolRegistry and the V2-only CapabilityRegistry (holds engine-native actions like missions).

EffectBridgeAdapter::available_actions merges both when building the system prompt, but the discovery tools only consulted the v1 registry. So the LLM saw mission actions advertised, tried to introspect them, got contradicted, and stopped trusting its own action list.

Taught ToolRegistry to carry an optional Arc<CapabilityRegistry> handle. None on v1, Some after the v2 bootstrap wires it.
Made tool_info and system_tools_list search both sources. On v1 the capability registry is None so the fallback is a no-op; on v2 missions resolve through it.
Factored the dual-consumer wiring (effect adapter + tool registry) into wire_capability_registry in router.rs — one call site, one test, locked in.
Closed the external-tool shadowing risk: ToolRegistry::register() rejects any dynamic tool whose name (including hyphen/underscore aliases) matches a capability action. WASM and MCP tools named mission_create or mission-create can no longer shadow capability actions.

Note for AI reviewers: Capabilities are v2 right now and do not overlap with v1 internal tools, if somebody breaks that invariant in a future commit they can go and fix it. Trying to impose a v2 check when the registry is created, or appended, always ends up in a new error, so please stop requesting it.

Change Type

Linked Issue

closes #2793

Validation

cargo fmt --all -- --check
cargo clippy --all --benches --tests --examples --all-features -- -D warnings
cargo build
Relevant tests pass:

cargo test --lib tools::
cargo test --lib bridge::router::tests

Manual testing: before Ironclaw was not able to call tool_info for mission_create, now it can
If a coding agent was used and supports it, review-pr or pr-shepherd --fix was run before requesting review

Security Impact

I added a guardrail so people cannot register tools that are called as capabilities

Database Impact

None

Blast Radius

Tool discovery

Review Follow-Through

Review track: B?

`tool_info("mission_create")` returned "No tool named 'mission_create' is registered" even though `mission_create` was advertised in the system prompt and executed correctly. Root cause: two sources of truth — the v1 `ToolRegistry` (holds `Tool` trait impls) and the engine-v2 `CapabilityRegistry` (holds engine-native actions like missions). `EffectBridgeAdapter::available_actions` merges both when building the system prompt, but the discovery tools only consulted the v1 registry. So the LLM saw mission actions advertised, tried to introspect them, got contradicted, and stopped trusting its own action list. - Taught `ToolRegistry` to carry an optional `Arc<CapabilityRegistry>` handle. `None` on v1, `Some` after the v2 bootstrap wires it. - Made `tool_info` and `system_tools_list` search both sources. On v1 the capability registry is `None` so the fallback is a no-op; on v2 missions resolve through it. - Factored the dual-consumer wiring (effect adapter + tool registry) into `wire_capability_registry` in `router.rs` — one call site, one test, locked in. - Closed the external-tool shadowing risk: `ToolRegistry::register()` rejects any dynamic tool whose name (including hyphen/underscore aliases) matches a capability action. WASM and MCP tools named `mission_create` or `mission-create` can no longer shadow capability actions. - Debug-assert at wire time catches the reverse: a built-in tool registered before v2 bootstrap that collides with a capability name.

gemini-code-assist

Code Review

This pull request centralizes and enforces the wiring of the engine v2 CapabilityRegistry to both the EffectBridgeAdapter and the ToolRegistry. It introduces a wire_capability_registry helper to ensure both consumers are synchronized and includes a debug-time check to prevent name collisions between built-in tools and capability actions. Additionally, discovery tools such as system_tools_list and tool_info have been updated to introspect and surface capability actions, while the ToolRegistry now prevents dynamic tool registrations from shadowing capability names (including hyphen/underscore aliases). I have no feedback to provide as there were no review comments.

Copilot

Pull request overview

Fixes a split-brain between v1 ToolRegistry and v2-only CapabilityRegistry so discovery tools (notably tool_info and system_tools_list) can introspect engine-native v2 capability actions (e.g. missions) that are already advertised and executable in engine v2.

Changes:

Added resolve_with_aliases helper to consistently resolve hyphen/underscore name variants for capability lookups.
Extended ToolRegistry to optionally hold an Arc<CapabilityRegistry> and updated discovery tools to consult both registries.
Centralized capability-registry wiring via wire_capability_registry and added tests; added guardrails to prevent dynamic tools from shadowing capability actions.

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
src/tools/tool.rs	Adds shared alias-resolution helper for consistent name lookup.
src/tools/registry.rs	Stores optional v2 `CapabilityRegistry` handle; rejects dynamic tools that would shadow capability actions; adds tests.
src/tools/mod.rs	Re-exports alias resolver for debug-only collision checks.
src/tools/builtin/tool_info.rs	Falls back to v2 capability actions when a tool isn’t found in v1 registry; adds tests.
src/tools/builtin/system.rs	Extends `system_tools_list` to include v2 capability actions.
src/bridge/router.rs	Adds `wire_capability_registry` helper + test; uses it during v2 init.
src/bridge/effect_adapter.rs	Restricts capability registry setter visibility and updates comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

…nto fix/unified-tool-info

Copilot

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

…nto fix/unified-tool-info

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

gagdiez · 2026-04-21T22:36:18Z

@henrypark133 until you implement the multi-stage solution for #2767 this PR creates a good fix to expose capabilities so LLMs can query info about them

Copilot

Pull request overview

Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot

Pull request overview

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

gagdiez · 2026-04-22T01:46:35Z

Copilot please stop asking to add a v2 check inside of set_capability_registry, it creates more problems than solutions

Copilot

Pull request overview

Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

serrrfirat · 2026-04-22T14:06:12Z

+        // is a no-op. Assumes v1 tool and v2 capability names don't overlap.
+        // `tool_opt` carries the Tool forward so the `Summary` arm can ask
+        // it for a curated `discovery_summary()`; `None` means the source
+        // was a capability action and only `fallback_summary` applies.


High Severity

This fixes discovery for capability actions, but discovery is still incomplete because EffectBridgeAdapter::available_actions() also advertises latent provider actions from AuthManager::latent_extension_actions(). Those still will not show up in tool_info / system_tools_list, so the original 'the prompt says this action exists, but discovery says it does not' mismatch remains reproducible for inactive MCP/WASM providers.

Can these built-ins enumerate the same shared action source as available_actions() instead of special-casing only capability-registry actions here?

gagdiez · 2026-04-22T15:50:00Z

I think we can close this one as the whole system will be redesigned #2826

Guillermo Alejandro Gallardo Diez added 3 commits April 21, 2026 18:05

chore: cargo fmt

ef7ea3e

chore: gate re-export

1655b8f

Copilot AI review requested due to automatic review settings April 21, 2026 16:17

github-actions Bot added scope: tool Tool infrastructure scope: tool/builtin Built-in tools size: XL 500+ changed lines risk: medium Business logic, config, or moderate-risk modules contributor: regular 2-5 merged PRs labels Apr 21, 2026

Copilot started reviewing on behalf of gagdiez April 21, 2026 16:17 View session

Merge branch 'staging' into fix/unified-tool-info

5640d5c

gemini-code-assist Bot reviewed Apr 21, 2026

View reviewed changes

Copilot AI reviewed Apr 21, 2026

View reviewed changes

Comment thread src/tools/builtin/system.rs Outdated

Comment thread src/bridge/router.rs Outdated

Guillermo Alejandro Gallardo Diez and others added 2 commits April 21, 2026 18:36

chore: remove unnecesary changes

6927670

chore: cast to string

437a3e1

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings April 21, 2026 16:37

Copilot started reviewing on behalf of gagdiez April 21, 2026 16:38 View session

Copilot AI reviewed Apr 21, 2026

View reviewed changes

Comment thread src/tools/builtin/tool_info.rs

Comment thread src/tools/builtin/system.rs

Comment thread src/tools/registry.rs Outdated

Comment thread src/bridge/router.rs Outdated

Guillermo Alejandro Gallardo Diez added 3 commits April 21, 2026 22:17

fix: enforce non-verlap invariant in all builds

3dc4754

Merge branch 'fix/unified-tool-info' of github.com:gagdiez/ironclaw i…

926ca0c

…nto fix/unified-tool-info

chore: add v2 gate on create capability registry

307862f

Copilot AI review requested due to automatic review settings April 21, 2026 20:40

Copilot started reviewing on behalf of gagdiez April 21, 2026 20:40 View session

Copilot AI reviewed Apr 21, 2026

View reviewed changes

Comment thread src/tools/mod.rs Outdated

Comment thread src/tools/registry.rs Outdated

fix: remove unnecesary gate

f34d22b

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings April 21, 2026 20:50

Copilot started reviewing on behalf of gagdiez April 21, 2026 20:51 View session

chore: update docstring

f5fa2b9

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI reviewed Apr 21, 2026

View reviewed changes

Comment thread src/tools/builtin/system.rs

Comment thread src/tools/registry.rs Outdated

Comment thread src/tools/registry.rs Outdated

Comment thread src/tools/builtin/tool_info.rs Outdated

chore: add safety for invariant check

195744c

Copilot AI review requested due to automatic review settings April 21, 2026 22:23

Copilot started reviewing on behalf of gagdiez April 21, 2026 22:23 View session

chore: update docstring

2b6133f

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI reviewed Apr 21, 2026

View reviewed changes

Comment thread src/tools/registry.rs Outdated

Guillermo Alejandro Gallardo Diez and others added 3 commits April 22, 2026 00:31

chore: inline comment

e1a2e3a

Merge branch 'fix/unified-tool-info' of github.com:gagdiez/ironclaw i…

6a89f3a

…nto fix/unified-tool-info

chore: make all_registered_names pub(crate)

3e7910b

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings April 21, 2026 22:31

Copilot started reviewing on behalf of gagdiez April 21, 2026 22:32 View session

gagdiez requested a review from henrypark133 April 21, 2026 22:36

Copilot AI reviewed Apr 21, 2026

View reviewed changes

Comment thread src/bridge/router.rs

Comment thread src/tools/builtin/tool_info.rs Outdated

chore: change order of variables

b430c4c

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings April 21, 2026 23:03

Copilot started reviewing on behalf of gagdiez April 21, 2026 23:03 View session

Copilot AI reviewed Apr 21, 2026

View reviewed changes

Comment thread src/tools/builtin/tool_info.rs

Guillermo Alejandro Gallardo Diez added 2 commits April 22, 2026 02:35

fix: ignore tools that collide with capabilities

8be4e04

chore: cargo fmt

59c59d3

Copilot AI review requested due to automatic review settings April 22, 2026 00:35

Copilot started reviewing on behalf of gagdiez April 22, 2026 00:36 View session

Copilot AI reviewed Apr 22, 2026

View reviewed changes

Comment thread src/bridge/router.rs

Guillermo Alejandro Gallardo Diez added 2 commits April 22, 2026 02:42

fix: change ordering

8902089

chore: drop unnecesary check

8155fca

Copilot AI review requested due to automatic review settings April 22, 2026 01:45

Copilot started reviewing on behalf of gagdiez April 22, 2026 01:45 View session

Copilot AI reviewed Apr 22, 2026

View reviewed changes

Comment thread src/tools/registry.rs

Comment thread src/bridge/router.rs

serrrfirat reviewed Apr 22, 2026

View reviewed changes

gagdiez closed this Apr 22, 2026

Conversation

gagdiez commented Apr 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Change Type

Linked Issue

Validation

Security Impact

Database Impact

Blast Radius

Review Follow-Through

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

gagdiez commented Apr 21, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

gagdiez commented Apr 22, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

serrrfirat Apr 22, 2026

Choose a reason for hiding this comment

Uh oh!

gagdiez commented Apr 22, 2026

Uh oh!

gagdiez commented Apr 21, 2026 •

edited

Loading