Skip to content

fix(cli): use --tools to actually shrink the built-in tool schema set #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Its-My-Work wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(cli): use --tools to actually shrink the built-in tool schema set #104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion claude-cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,22 @@ class ClaudeCLI {

// --tools: control which built-in tools are available.
// "" disables all tools, "default" enables all, or specify names (e.g. "Bash,Edit,Read").
if (typeof tools === 'string') args.push('--tools', tools);
if (typeof tools === 'string') {
args.push('--tools', tools);
} else if (allowedTools?.length) {
// --allowedTools alone is a permission FILTER on top of whatever tools the
// CLI makes available by default — it does not shrink what gets sent to the
// API. Every caller here passes a short, fixed built-in tool list (9 or
// fewer), but the CLI's actual default built-in set is bigger, so its full
// schemas were being generated and cached on every session regardless of
// this list (measured: ~18.5k tokens default vs ~7k restricted via --tools
// for the same 9 names — real API usage, not a guess). MCP tools
// (mcp__server__tool) aren't part of "the built-in set" --tools restricts;
// they stay governed by mcpServers + allowedTools alone, so filtering them
// out here doesn't touch ask_user/notify_user/etc. availability.
const builtins = allowedTools.filter(t => !/^mcp__/.test(t));
if (builtins.length) args.push('--tools', builtins.join(','));
}

// allowedTools: pass each tool as separate arg (variadic)
if (allowedTools?.length) args.push('--allowedTools', ...allowedTools);
Expand Down
Loading