fix(droid): match tool names on word boundaries when inferring agent tools#1176
Merged
tmchow merged 2 commits intoJul 19, 2026
Merged
Conversation
…tools mapAgentTools inferred an agent's tool list with bodyLower.includes(), so common words produced phantom tools: "globally" gave Glob, "tools"/"skills" gave LS, "already" gave Read, "tasks" gave Task. An inferred list restricts the droid to those tools, so a false positive silently narrows the agent's access. Match on word boundaries instead, the same way the kiro converter's tool mapping already does.
LukeTheoJohnson
force-pushed
the
fix-droid-phantom-tool-inference
branch
from
July 19, 2026 06:09
a75c7e0 to
dfe8ee7
Compare
LukeTheoJohnson
marked this pull request as ready for review
July 19, 2026 06:11
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: dfe8ee79ea
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
The word-boundary switch stopped `\bquestion\b` matching inside the CamelCase AskUserQuestion, so an agent that used it alongside another tool lost the AskUser mapping (Codex review). Key on the full lowercased tool name instead, which restores the mapping and drops the bare-word "question" false positive.
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
When converting an agent to a Factory Droid,
mapAgentToolsinfers the agent's tool list by scanning its name, description, and body for tool names withbodyLower.includes(claudeTool). A tool name that appears as a substring of an ordinary word is treated as a reference, so a prose only agent that names no tools still gets a list:Each is a false positive:
already-> Read,details-> LS,tasks-> Task,editor-> Edit,globally-> Glob. Because the frontmattertoolslist restricts the droid to those tools, a spurious match silently narrows the agent's access. An agent that should run with full tools gets locked to five it never asked for.Fix
Match tool names on word boundaries (
\bread\b) instead of as substrings. This is the same approach the kiro converter already uses for its tool-name mapping inclaude-to-kiro.ts. Real references still resolve; incidental substrings no longer do.Tests
Two cases added to
tests/droid-converter.test.ts:["Edit", "Glob", "LS", "Read", "Task"])["Execute", "Read"]Full droid suite green (14/14);
tsc --noEmitclean.Note
The draft #358 also touches
mapAgentTools: it adds a fast path for agents that declare an explicittoolsfield. Agents without one (the case above) still fall through to the substring inference.