Skip to content

fix: await mcp loading in headless #8110

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

fix: await mcp loading in headless #8110

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72782f5
fix: non-lazy loading for mcp
RomneyDa Oct 6, 2025
0df9d04
Merge branch 'main' into dallin/force-headless-mcp
sestinj Oct 8, 2025
55634ba
Merge branch 'main' of https://github.com/continuedev/continue into d…
RomneyDa Oct 9, 2025
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
22 changes: 13 additions & 9 deletions extensions/cli/src/stream/handleToolCalls.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { filterExcludedTools } from "../permissions/index.js";
import {
getServiceSync,
MCPServiceState,
MCPTool,
SERVICE_NAMES,
serviceContainer,
services,
} from "../services/index.js";
import type { ToolPermissionServiceState } from "../services/ToolPermissionService.js";
Expand Down Expand Up @@ -180,17 +180,21 @@ export async function getAllTools() {
const allBuiltinTools = getAllBuiltinTools();
const builtinToolNames = allBuiltinTools.map((tool) => tool.name);

let mcpTools: MCPTool[] = [];
let mcpToolNames: string[] = [];
const mcpServiceResult = getServiceSync<MCPServiceState>(SERVICE_NAMES.MCP);
if (mcpServiceResult.state === "ready") {
mcpTools = mcpServiceResult?.value?.tools ?? [];
mcpToolNames = mcpTools.map((t) => t.name);
let mcpServiceState: MCPServiceState | null = null;

// MCP loading is lazy in TUI mode
if (services.toolPermissions.isHeadless()) {
mcpServiceState = await serviceContainer.get(SERVICE_NAMES.MCP);
} else {
// MCP is lazy
// throw new Error("MCP Service not initialized");
const mcpServiceResult = getServiceSync<MCPServiceState>(SERVICE_NAMES.MCP);
if (mcpServiceResult.state === "ready") {
mcpServiceState = mcpServiceResult?.value;
}
}

const mcpTools = mcpServiceState?.tools ?? [];
const mcpToolNames = mcpTools.map((t) => t.name);

const allToolNames = [...builtinToolNames, ...mcpToolNames];

// Check if the ToolPermissionService is ready
Expand Down
Loading