Skip to content

feat: auto-omit MCP content when no servers are configured #5889

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
merged 6 commits into from
Jul 20, 2025
Merged

feat: auto-omit MCP content when no servers are configured #5889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
84fd183
feat: auto-omit MCP content when no servers are configured
roomote Jul 18, 2025
622694b
fix: add missing Uri and RelativePattern exports to VSCode mocks
roomote Jul 18, 2025
9d5be80
fix: add proper TypeScript typing for RelativePattern in McpHub test …
roomote Jul 18, 2025
df781ab
fix: resolve unit test failures in PR #5889
roomote Jul 18, 2025
0842a38
chore: remove package-lock.json as project uses npm
roomote Jul 18, 2025
9229ca5
fix: remove unrelated mock changes from PR
daniel-lxs Jul 19, 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
62 changes: 0 additions & 62 deletions ...prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-disabled.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .../prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-enabled.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/core/prompts/__tests__/__snapshots__/system-prompt/with-mcp-hub-provided.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/core/prompts/__tests__/add-custom-instructions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ const mockContext = {
} as unknown as vscode.ExtensionContext

// Instead of extending McpHub, create a mock that implements just what we need
const createMockMcpHub = (): McpHub =>
const createMockMcpHub = (withServers: boolean = false): McpHub =>
({
getServers: () => [],
getServers: () => (withServers ? [{ name: "test-server", disabled: false }] : []),
getMcpServersPath: async () => "/mock/mcp/path",
getMcpSettingsFilePath: async () => "/mock/settings/path",
dispose: async () => {},
Expand Down Expand Up @@ -236,7 +236,7 @@ describe("addCustomInstructions", () => {
})

it("should include MCP server creation info when enabled", async () => {
const mockMcpHub = createMockMcpHub()
const mockMcpHub = createMockMcpHub(true)

const prompt = await SYSTEM_PROMPT(
mockContext,
Expand All @@ -262,7 +262,7 @@ describe("addCustomInstructions", () => {
})

it("should exclude MCP server creation info when disabled", async () => {
const mockMcpHub = createMockMcpHub()
const mockMcpHub = createMockMcpHub(false)

const prompt = await SYSTEM_PROMPT(
mockContext,
Expand Down
6 changes: 3 additions & 3 deletions src/core/prompts/__tests__/system-prompt.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ const mockContext = {
} as unknown as vscode.ExtensionContext

// Instead of extending McpHub, create a mock that implements just what we need
const createMockMcpHub = (): McpHub =>
const createMockMcpHub = (withServers: boolean = false): McpHub =>
({
getServers: () => [],
getServers: () => (withServers ? [{ name: "test-server", disabled: false }] : []),
getMcpServersPath: async () => "/mock/mcp/path",
getMcpSettingsFilePath: async () => "/mock/settings/path",
dispose: async () => {},
Expand Down Expand Up @@ -250,7 +250,7 @@ describe("SYSTEM_PROMPT", () => {
})

it("should include MCP server info when mcpHub is provided", async () => {
mockMcpHub = createMockMcpHub()
mockMcpHub = createMockMcpHub(true)

const prompt = await SYSTEM_PROMPT(
mockContext,
Expand Down
11 changes: 8 additions & 3 deletions src/core/prompts/system.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,14 @@ async function generatePrompt(
const modeConfig = getModeBySlug(mode, customModeConfigs) || modes.find((m) => m.slug === mode) || modes[0]
const { roleDefinition, baseInstructions } = getModeSelection(mode, promptComponent, customModeConfigs)

// Check if MCP functionality should be included
const hasMcpGroup = modeConfig.groups.some((groupEntry) => getGroupName(groupEntry) === "mcp")
const hasMcpServers = mcpHub && mcpHub.getServers().length > 0
const shouldIncludeMcp = hasMcpGroup && hasMcpServers

const [modesSection, mcpServersSection] = await Promise.all([
getModesSection(context),
modeConfig.groups.some((groupEntry) => getGroupName(groupEntry) === "mcp")
shouldIncludeMcp
? getMcpServersSection(mcpHub, effectiveDiffStrategy, enableMcpServerCreation)
: Promise.resolve(""),
])
Expand All @@ -93,7 +98,7 @@ ${getToolDescriptionsForMode(
codeIndexManager,
effectiveDiffStrategy,
browserViewportSize,
mcpHub,
shouldIncludeMcp ? mcpHub : undefined,
customModeConfigs,
experiments,
partialReadsEnabled,
Expand All @@ -104,7 +109,7 @@ ${getToolUseGuidelinesSection(codeIndexManager)}

${mcpServersSection}

${getCapabilitiesSection(cwd, supportsComputerUse, mcpHub, effectiveDiffStrategy, codeIndexManager)}
${getCapabilitiesSection(cwd, supportsComputerUse, shouldIncludeMcp ? mcpHub : undefined, effectiveDiffStrategy, codeIndexManager)}

${modesSection}

Expand Down
1 change: 0 additions & 1 deletion src/services/mcp/__tests__/McpHub.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ describe("McpHub", () => {
// Mock console.error to suppress error messages during tests
console.error = vi.fn()


const mockUri: Uri = {
scheme: "file",
authority: "",
Expand Down