Zoo-Code-Org
diff --git a/‎packages/types/src/__tests__/mode-allowedMcpServers.spec.ts‎
Lines changed: 56 additions & 0 deletions b/‎packages/types/src/__tests__/mode-allowedMcpServers.spec.ts‎
Lines changed: 56 additions & 0 deletions
diff --git a/‎packages/types/src/mode.ts‎
Lines changed: 6 additions & 0 deletions b/‎packages/types/src/mode.ts‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎schemas/roomodes.json‎
Lines changed: 7 additions & 0 deletions b/‎schemas/roomodes.json‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎src/core/prompts/__tests__/sections.spec.ts‎
Lines changed: 35 additions & 2 deletions b/‎src/core/prompts/__tests__/sections.spec.ts‎
Lines changed: 35 additions & 2 deletions
diff --git a/‎src/core/prompts/__tests__/system-prompt.spec.ts‎
Lines changed: 64 additions & 0 deletions b/‎src/core/prompts/__tests__/system-prompt.spec.ts‎
Lines changed: 64 additions & 0 deletions
diff --git a/‎src/core/prompts/sections/capabilities.ts‎
Lines changed: 31 additions & 2 deletions b/‎src/core/prompts/sections/capabilities.ts‎
Lines changed: 31 additions & 2 deletions
diff --git a/‎src/core/prompts/system.ts‎
Lines changed: 20 additions & 2 deletions b/‎src/core/prompts/system.ts‎
Lines changed: 20 additions & 2 deletions
@@ -0,0 +1,56 @@
+import { modeConfigSchema } from "../mode.js"
+
+describe("modeConfigSchema allowedMcpServers", () => {
+	const baseModeConfig = {
+		slug: "test-mode",
+		name: "Test Mode",
+		roleDefinition: "A test mode",
+		groups: ["read" as const],
+	}
+
+	it("should accept valid allowedMcpServers array of strings", () => {
+		const result = modeConfigSchema.safeParse({
+			...baseModeConfig,
+			allowedMcpServers: ["server1", "server2"],
+		})
+		expect(result.success).toBe(true)
+		if (result.success) {
+			expect(result.data.allowedMcpServers).toEqual(["server1", "server2"])
+		}
+	})
+
+	it("should accept missing/undefined allowedMcpServers", () => {
+		const result = modeConfigSchema.safeParse(baseModeConfig)
+		expect(result.success).toBe(true)
+		if (result.success) {
+			expect(result.data.allowedMcpServers).toBeUndefined()
+		}
+	})
+
+	it("should accept empty allowedMcpServers array", () => {
+		const result = modeConfigSchema.safeParse({
+			...baseModeConfig,
+			allowedMcpServers: [],
+		})
+		expect(result.success).toBe(true)
+		if (result.success) {
+			expect(result.data.allowedMcpServers).toEqual([])
+		}
+	})
+
+	it("should reject non-string array items", () => {
+		const result = modeConfigSchema.safeParse({
+			...baseModeConfig,
+			allowedMcpServers: [123, 456],
+		})
+		expect(result.success).toBe(false)
+	})
+
+	it("should reject non-array value", () => {
+		const result = modeConfigSchema.safeParse({
+			...baseModeConfig,
+			allowedMcpServers: "server1",
+		})
+		expect(result.success).toBe(false)
+	})
+})
@@ -102,6 +102,12 @@ export const modeConfigSchema = z.object({
 	customInstructions: z.string().optional(),
 	groups: groupEntryArraySchema,
 	source: z.enum(["global", "project"]).optional(),
+	allowedMcpServers: z
+		.array(z.string())
+		.describe(
+			"Optional list of MCP server names to include. When omitted, all servers are available. When set, only the listed servers are injected.",
+		)
+		.optional(),
 })
 
 export type ModeConfig = z.infer<typeof modeConfigSchema>
 
@@ -31,6 +31,13 @@
 						"type": "string",
 						"enum": ["global", "project"]
 					},
+					"allowedMcpServers": {
+						"type": "array",
+						"items": {
+							"type": "string"
+						},
+						"description": "Optional list of MCP server names to include. When omitted, all servers are available. When set, only the listed servers are injected."
+					},
 					"groups": {
 						"type": "array",
 						"items": {
 
@@ -43,8 +43,13 @@ describe("getCapabilitiesSection", () => {
 		expect(result).toContain("read and write files")
 	})
 
-	it("includes MCP reference when mcpHub is provided", () => {
-		const mockMcpHub = {} as McpHub
+	const createMockMcpHub = (serverNames: string[]): McpHub =>
+		({
+			getServers: () => serverNames.map((name) => ({ name })),
+		}) as unknown as McpHub
+
+	it("includes MCP reference when mcpHub exposes at least one server", () => {
+		const mockMcpHub = createMockMcpHub(["test-server"])
 		const result = getCapabilitiesSection(cwd, mockMcpHub)
 
 		expect(result).toContain("MCP servers")
@@ -55,6 +60,34 @@ describe("getCapabilitiesSection", () => {
 
 		expect(result).not.toContain("MCP servers")
 	})
+
+	it("excludes MCP reference when mcpHub exposes no servers", () => {
+		const mockMcpHub = createMockMcpHub([])
+		const result = getCapabilitiesSection(cwd, mockMcpHub)
+
+		expect(result).not.toContain("MCP servers")
+	})
+
+	it("includes MCP reference when allowedMcpServers matches a connected server", () => {
+		const mockMcpHub = createMockMcpHub(["allowed-server", "other-server"])
+		const result = getCapabilitiesSection(cwd, mockMcpHub, ["allowed-server"])
+
+		expect(result).toContain("MCP servers")
+	})
+
+	it("excludes MCP reference when allowedMcpServers is an empty array", () => {
+		const mockMcpHub = createMockMcpHub(["test-server"])
+		const result = getCapabilitiesSection(cwd, mockMcpHub, [])
+
+		expect(result).not.toContain("MCP servers")
+	})
+
+	it("excludes MCP reference when allowedMcpServers matches no connected server", () => {
+		const mockMcpHub = createMockMcpHub(["test-server"])
+		const result = getCapabilitiesSection(cwd, mockMcpHub, ["nonexistent-server"])
+
+		expect(result).not.toContain("MCP servers")
+	})
 })
 
 describe("getRulesSection", () => {
 
@@ -571,6 +571,70 @@ describe("SYSTEM_PROMPT", () => {
 		expect(prompt).toContain("OBJECTIVE")
 	})
 
+	describe("allowedMcpServers filtering in system prompt", () => {
+		it("should exclude MCP capability text when allowedMcpServers is empty array", async () => {
+			mockMcpHub = createMockMcpHub(true)
+
+			const customModes: ModeConfig[] = [
+				{
+					slug: "filtered-mode",
+					name: "Filtered Mode",
+					roleDefinition: "A filtered mode",
+					groups: ["read", "mcp"] as const,
+					allowedMcpServers: [],
+				},
+			]
+
+			const prompt = await SYSTEM_PROMPT(
+				mockContext,
+				"/test/path",
+				false,
+				mockMcpHub, // mcpHub with servers
+				undefined, // diffStrategy
+				"filtered-mode", // mode
+				undefined, // customModePrompts
+				customModes, // customModes
+				undefined, // globalCustomInstructions
+				experiments,
+				undefined, // language
+				undefined, // rooIgnoreInstructions
+			)
+
+			expect(prompt).not.toContain("MCP servers")
+		})
+
+		it("should include MCP capability text when allowedMcpServers matches connected servers", async () => {
+			mockMcpHub = createMockMcpHub(true) // has "test-server"
+
+			const customModes: ModeConfig[] = [
+				{
+					slug: "mcp-mode",
+					name: "MCP Mode",
+					roleDefinition: "A mode with MCP",
+					groups: ["read", "mcp"] as const,
+					allowedMcpServers: ["test-server"],
+				},
+			]
+
+			const prompt = await SYSTEM_PROMPT(
+				mockContext,
+				"/test/path",
+				false,
+				mockMcpHub,
+				undefined,
+				"mcp-mode",
+				undefined,
+				customModes,
+				undefined,
+				experiments,
+				undefined,
+				undefined,
+			)
+
+			expect(prompt).toContain("MCP servers")
+		})
+	})
+
 	afterAll(() => {
 		vi.restoreAllMocks()
 	})
 
@@ -1,14 +1,43 @@
 import { McpHub } from "../../../services/mcp/McpHub"
 
-export function getCapabilitiesSection(cwd: string, mcpHub?: McpHub): string {
+/**
+ * Builds the CAPABILITIES section of the system prompt.
+ *
+ * The MCP availability line is only emitted when at least one MCP server is actually
+ * exposed to the current mode. When `allowedMcpServers` is provided, the hub's server
+ * list is filtered by that allowlist BEFORE deciding whether to advertise MCP, so the
+ * capability text matches the per-mode tool exposure:
+ *   - `undefined` allowlist  → all connected servers count (backward compatible)
+ *   - empty `[]` allowlist   → no servers count ⇒ MCP line omitted
+ *   - populated allowlist    → only listed servers count
+ *
+ * @param cwd Current working directory used in the prompt text.
+ * @param mcpHub Optional MCP hub. When omitted, the MCP line is never emitted.
+ * @param allowedMcpServers Optional per-mode allowlist of MCP server names. When provided,
+ *   the hub's servers are filtered to this set before determining MCP availability.
+ */
+export function getCapabilitiesSection(cwd: string, mcpHub?: McpHub, allowedMcpServers?: string[]): string {
+	// Determine whether any MCP server is actually available to the current mode.
+	// Filtering the hub's servers by the allowlist (when provided) keeps the capability
+	// text consistent with the tools that are exposed for the mode.
+	let hasMcpServers = false
+	if (mcpHub) {
+		let servers = mcpHub.getServers()
+		if (allowedMcpServers) {
+			const allowSet = new Set(allowedMcpServers)
+			servers = servers.filter((server) => allowSet.has(server.name))
+		}
+		hasMcpServers = servers.length > 0
+	}
+
 	return `====
 
 CAPABILITIES
 
 - You have access to tools that let you execute CLI commands on the user's computer, list files, view source code definitions, regex search, read and write files, and ask follow-up questions. These tools help you effectively accomplish a wide range of tasks, such as writing code, making edits or improvements to existing files, understanding the current state of a project, performing system operations, and much more.
 - When the user initially gives you a task, a recursive list of all filepaths in the current workspace directory ('${cwd}') will be included in environment_details. This provides an overview of the project's file structure, offering key insights into the project from directory/file names (how developers conceptualize and organize their code) and file extensions (the language used). This can also guide decision-making on which files to explore further. If you need to further explore directories such as outside the current workspace directory, you can use the list_files tool. If you pass 'true' for the recursive parameter, it will list files recursively. Otherwise, it will list files at the top level, which is better suited for generic directories where you don't necessarily need the nested structure, like the Desktop.
 - You can use the execute_command tool to run commands on the user's computer whenever you feel it can help accomplish the user's task. When you need to execute a CLI command, you must provide a clear explanation of what the command does. Prefer to execute complex CLI commands over creating executable scripts, since they are more flexible and easier to run. Interactive and long-running commands are allowed, since the commands are run in the user's VSCode terminal. The user may keep commands running in the background and you will be kept updated on their status along the way. Each command you execute is run in a new terminal instance.${
-		mcpHub
+		hasMcpServers
 			? `
 - You have access to MCP servers that may provide additional tools and resources. Each server may provide different capabilities that you can use to accomplish tasks more effectively.
 `
 
@@ -66,7 +66,17 @@ async function generatePrompt(
 
 	// Check if MCP functionality should be included
 	const hasMcpGroup = modeConfig.groups.some((groupEntry) => getGroupName(groupEntry) === "mcp")
-	const hasMcpServers = mcpHub && mcpHub.getServers().length > 0
+	const allowedMcpServers = modeConfig.allowedMcpServers
+
+	// Hoist the allowlist Set once (matches the sibling call sites, e.g. mcp_server.ts) instead
+	// of constructing a new Set on every `.filter` iteration.
+	const allowSet = allowedMcpServers ? new Set(allowedMcpServers) : undefined
+
+	let hasMcpServers = false
+	if (mcpHub) {
+		const servers = allowSet ? mcpHub.getServers().filter((s) => allowSet.has(s.name)) : mcpHub.getServers()
+		hasMcpServers = servers.length > 0
+	}
 	const shouldIncludeMcp = hasMcpGroup && hasMcpServers
 
 	const codeIndexManager = CodeIndexManager.getInstance(context, cwd)
@@ -90,7 +100,15 @@ ${getSharedToolUseSection()}${toolsCatalog}
 
 	${getToolUseGuidelinesSection()}
 
-${getCapabilitiesSection(cwd, shouldIncludeMcp ? mcpHub : undefined)}
+${
+	// Forward the hub only when the mode actually exposes the MCP group, and pass the per-mode
+	// allowlist through so the capabilities section filters servers using the SAME convention as
+	// the tool-listing layer (a single source of truth for which servers are visible). This keeps
+	// the capability text consistent with the tools exposed in mixed cases (e.g. one allowed +
+	// one disallowed server), preventing the section from advertising MCP based on a disallowed
+	// server. `shouldIncludeMcp` is still used to short-circuit when no allowed server exists.
+	getCapabilitiesSection(cwd, hasMcpGroup ? mcpHub : undefined, allowedMcpServers)
+}
 
 ${modesSection}
 ${skillsSection ? `\n${skillsSection}` : ""}