Skip to content

claude: disable tool search on claude if tool surface reduction is disabled #122

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

Merged
CLEMENTINATOR merged 1 commit into from
Jun 29, 2026
Merged

claude: disable tool search on claude if tool surface reduction is disabled #122

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
34 changes: 0 additions & 34 deletions crates/cli/src/commands/launch/claude.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,6 @@ pub async fn run(opts: Options) -> Result<()> {
crate::config::console_api_base_url(),
);

// Claude Code's native tool search shrinks the tool surface the same way the
// gateway's tool-surface-reduction technique does. Running both is redundant
// and can hide tools, so enable tool search only when this key isn't already
// doing surface reduction. Best-effort: if the key's config can't be read,
// fall back to enabling it (the prior default).
if !key_has_tool_surface_reduction(&creds).await {
cmd.env("ENABLE_TOOL_SEARCH", "true");
}

// Step 5: conditionally set up MCP integration
let use_mcp = creds.enable_mcp.unwrap_or(false);
if use_mcp {
Expand Down Expand Up @@ -132,31 +123,6 @@ pub async fn run(opts: Options) -> Result<()> {
Ok(())
}

/// Fetches the Claude key's compression config and reports whether tool-surface
/// reduction is enabled on it. Best-effort: any missing credential, network
/// error, or unreported flag resolves to `false` so launch is never blocked.
async fn key_has_tool_surface_reduction(creds: &crate::config::Credentials) -> bool {
let (Some(token), Some(org_id), Some(key_id)) = (
creds.user_token.as_deref().filter(|t| !t.is_empty()),
creds.org_id.as_deref().filter(|o| !o.is_empty()),
creds.claude.as_ref().and_then(|c| c.api_key_id.as_deref()),
) else {
return false;
};

match crate::api::ApiClient::new(token) {
Ok(client) => client
.get_key_by_id(org_id, key_id)
.await
.ok()
.flatten()
.and_then(|k| k.compression)
.map(|c| c.tool_surface_reduction)
.unwrap_or(false),
Err(_) => false,
}
}

/// Launch Claude Code routed through a local gateway. Session tracking,
/// MCP integration, and version reporting are all skipped — the backend never
/// sees this traffic.
Expand Down