Skip to content

fix(code): remove mcp tools from haiku (primary sessions) #1474

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
adboio merged 1 commit into from
Apr 3, 2026
+12 −1
Merged

fix(code): remove mcp tools from haiku (primary sessions) #1474

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion packages/agent/src/adapters/claude/claude-agent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ import {
getEffortOptions,
resolveModelPreference,
supports1MContext,
supportsMcpInjection,
toSdkModelId,
} from "./session/models";
import {
Expand Down Expand Up @@ -797,7 +798,11 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
const settingsManager = new SettingsManager(cwd);
await settingsManager.initialize();

const mcpServers = parseMcpServers(params);
const earlyModelId =
settingsManager.getSettings().model || meta?.model || "";
const mcpServers = supportsMcpInjection(earlyModelId)
? parseMcpServers(params)
: {};
const systemPrompt = buildSystemPrompt(meta?.systemPrompt);

this.logger.info(isResume ? "Resuming session" : "Creating new session", {
Expand Down
6 changes: 6 additions & 0 deletions packages/agent/src/adapters/claude/session/models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ export function supportsMaxEffort(modelId: string): boolean {
return MODELS_WITH_MAX_EFFORT.has(modelId);
}

const MODELS_TO_EXCLUDE_MCP_TOOLS = new Set(["claude-haiku-4-5"]);

export function supportsMcpInjection(modelId: string): boolean {
return !MODELS_TO_EXCLUDE_MCP_TOOLS.has(modelId);
}

interface EffortOption {
value: string;
name: string;
Expand Down
Loading