Repository navigation
refactor: separate tool discovery from request preparation - #339
Conversation
Deploying with
|
| Status | Name | Latest Commit | Preview URL | Updated (UTC) |
|---|---|---|---|---|
| ✅ Deployment successful! View logs |
bub | 52fb7d0 | Commit Preview URL Branch Preview URL |
Oct 07 2026, 08:24 AM |
|
I suggest keeping the original ToolProvider = Callable[[list[Tool], Tape], Awaitable[tuple[list[Tool], str]]]
Knowing tool names before For preparation order, run caller-supplied providers in their supplied order, then the builtin preparation (including code mode) last. Keep duplicate-name precedence separate from preparation order. This preserves the simpler extension API and lets builtin preparation operate on the final toolset without introducing catalogs for every processing stage. |
PsiACE
changed the title
| known_tools = self.known_tools | ||
| if name in known_tools: | ||
| self.tools[name] = known_tools[name] |
There was a problem hiding this comment.
I think it's better to allow _run_command to use all known_tools, instead of populating self.tools list.
Record the model aliases of the tools left after providers in the turn state and let the unknown-tool interceptor check them, instead of registering selected tools on the shared Agent.tools. Commands resolve through known_tools without mutating Agent.tools either. This keeps Agent.tools stable across sessions: tools loaded in one session no longer pass the interceptor in another, and code mode no longer registers every discovered tool permanently. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Replace the tool_sources/known_tools/tool_providers mechanism from #339 with a deferred flag on Tool. Deferred tools are listed by name in the system prompt and loaded through tool.describe, which records a tool.loaded tape event; each request appends loaded tools after the direct tools. Code mode sees every allowed tool, deferred ones included. Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2 participants
Keep the existing
ToolProviderabstraction and call signatures. Register discovery inventories separately, resolve allowlists against known names, run caller providers in supplied order, and prepare builtin code mode last. Source registration determines duplicate-name precedence independently of provider order.Register selected original declarations for execution while using provider-transformed definitions for each request. Builtins stay immediate; commands and subagents can resolve unloaded tools.
Relative to main, production changes are limited to
builtin/agent.pyand the subagent resolver (26 additions, 6 deletions). ToolProvider, code-mode implementation, skills and system prompt remain unchanged. Independent prompt/cache experiments are excluded.Validation: 572 core tests, 701 contrib tests against this core, Ruff, mypy, lock validation and EN/ZH docs build passed. Behavioral ablations cover discovery, execution registration, final builtin preparation and transformed provider definitions.
Companion: bubbuild/bub-contrib#74.