Shipped agent/skill tool manifests still list Grep/Glob after native builds removed them (2.1.117+), causing agents to invoke nonexistent tools

Summary

On native macOS/Linux builds, the Grep and Glob tools were removed in 2.1.117 (search now routes through Bash + embedded ugrep/bfs; confirmed intentional in #52004, and #51921). However, agent and skill definitions shipped with Claude Code and its official plugins still enumerate Grep and Glob as available tools. On a build where those tools don't exist, this leads the model to invoke them, receive a "no such tool" error, and re-plan — a wasted round-trip and a confusing trace for users.

Environment

• Claude Code 2.1.215 / 2.1.216 / 2.1.217, native darwin-arm64 (VS Code extension and CLI)
• Grep/Glob absent from both the top-level tool list and the ToolSearch deferred registry (ToolSearch select:Grep,Glob → no match), consistent with #51921 / #52004

The inconsistency

First-party agent definitions still list the removed tools. For example, the feature-dev@claude-plugins-official code-architect agent advertises:

Tools: Glob, Grep, LS, Read, NotebookRead, WebFetch, TodoWrite, WebSearch, KillShell, BashOutput

Other official-plugin agents (e.g. pr-review-toolkit@claude-plugins-official) and various skill instructions similarly reference Grep/Glob. These manifests are handed to the model as the tools it may use, but on this build the tools aren't registered. Because they ship in Anthropic's own claude-plugins-official marketplace, this isn't a third-party manifest problem.

Observed behavior

The model calls Grep and gets:

Error: No such tool available: Grep. Grep is not available in this session — search file contents with grep via the Bash tool instead.

then reasons for several seconds and falls back to Bash grep. The fallback works, but the attempt is avoidable: the model was advertised Grep as available.

Expected

On builds where Grep/Glob are removed, they should not appear in any shipped agent/skill tool manifest or prompt guidance — ideally the harness filters removed tools out of agent tool-lists so definitions don't have to be edited per-build. At minimum, the model shouldn't be advertised tools that aren't registered.

Impact

Low severity but broad: every agent/plugin whose manifest lists Grep/Glob incurs a failed tool call + re-plan on native builds, and the traces confuse users into thinking their config is broken.

Related

• #52004 (removal confirmed intended)
• #51921 (tools absent from registry; closed NOT_PLANNED, new issue invited)