reverts and fixes

Author: Evyatar Mitrani

src/core/prompts/tools/access-mcp-resource.ts

@@ -1,61 +1,14 @@
 import { ToolArgs } from "./types"
-import { getModeBySlug, isServerAllowedForMode } from "../../../shared/modes"
 
 export function getAccessMcpResourceDescription(args: ToolArgs): string | undefined {
 	if (!args.mcpHub) {
 		return undefined
 	}
-
-	let availableServers = args.mcpHub.getServers()
-
-	// Filter servers based on mode restrictions
-	if (args.currentMode && args.customModes) {
-		const mode = getModeBySlug(args.currentMode, args.customModes)
-		const restrictions = mode?.mcpRestrictions || {} // Use empty object if no restrictions defined
-
-		// Always filter based on allowedInModesByDefault, even if no explicit restrictions
-		availableServers = availableServers.filter((server) => {
-			// Get server configuration to check allowedInModesByDefault setting
-			const serverConfig = args.mcpHub?.getServerConfig(server.name)
-			const allowedInModesByDefault = serverConfig?.allowedInModesByDefault ?? true // Default to true if not specified
-
-			return isServerAllowedForMode(server.name, restrictions, allowedInModesByDefault)
-		})
-	}
-
-	// Generate description with filtered servers and their available resources
-	if (availableServers.length === 0) {
-		return `## access_mcp_resource
-Description: Request to access a resource provided by a connected MCP server. Resources represent data sources that can be used as context, such as files, API responses, or system information.
-**Note: No MCP servers are available for the current mode.**
-
-This tool allows you to access resources provided by Model Context Protocol (MCP) servers, but the current mode has restrictions that prevent access to all configured MCP servers.
-
-Parameters:
-- server_name: (required) The name of the MCP server providing the resource
-- uri: (required) The URI identifying the specific resource to access`
-	}
-
-	const serverDescriptions = availableServers
-		.map((server) => {
-			const resourceCount = (server.resources || []).length
-			const resourceTemplateCount = (server.resourceTemplates || []).length
-			const totalResources = resourceCount + resourceTemplateCount
-
-			return `**${server.name}**: ${totalResources} resource${totalResources !== 1 ? "s" : ""} available`
-		})
-		.join("\n")
-
 	return `## access_mcp_resource
 Description: Request to access a resource provided by a connected MCP server. Resources represent data sources that can be used as context, such as files, API responses, or system information.
-
-**Available servers for current mode:**
-${serverDescriptions}
-
 Parameters:
 - server_name: (required) The name of the MCP server providing the resource
 - uri: (required) The URI identifying the specific resource to access
-
 Usage:
 <access_mcp_resource>
 <server_name>server name here</server_name>

src/core/prompts/tools/use-mcp-tool.ts

@@ -1,82 +1,15 @@
 import { ToolArgs } from "./types"
-import { getModeBySlug, isServerAllowedForMode, isToolAllowedForModeAndServer } from "../../../shared/modes"
 
 export function getUseMcpToolDescription(args: ToolArgs): string | undefined {
 	if (!args.mcpHub) {
 		return undefined
 	}
-
-	let availableServers = args.mcpHub.getServers()
-
-	if (args.currentMode && args.customModes) {
-		const mode = getModeBySlug(args.currentMode, args.customModes)
-		const restrictions = mode?.mcpRestrictions || {} // Use empty object if no restrictions defined
-
-		// Always filter based on allowedInModesByDefault, even if no explicit restrictions
-		availableServers = availableServers.filter((server) => {
-			// Get server configuration to check allowedInModesByDefault setting
-			const serverConfig = args.mcpHub?.getServerConfig(server.name)
-			const allowedInModesByDefault = serverConfig?.allowedInModesByDefault ?? true // Default to true if not specified
-
-			return isServerAllowedForMode(server.name, restrictions, allowedInModesByDefault)
-		})
-	}
-
-	// Generate description with filtered servers and their available tools
-	if (availableServers.length === 0) {
-		return `## use_mcp_tool
-Description: Request to use a tool provided by a connected MCP server. 
-**Note: No MCP servers are available for the current mode.**
-
-This tool allows you to execute tools provided by Model Context Protocol (MCP) servers, but the current mode has restrictions that prevent access to all configured MCP servers.
-
-Parameters:
-- server_name: (required) The name of the MCP server providing the tool
-- tool_name: (required) The name of the tool to execute  
-- arguments: (required) A JSON object containing the tool's input parameters`
-	}
-
-	const serverDescriptions = availableServers
-		.map((server) => {
-			let availableTools = server.tools || []
-
-			// Filter tools based on mode restrictions (only if explicit restrictions exist)
-			if (args.currentMode && args.customModes) {
-				const mode = getModeBySlug(args.currentMode, args.customModes)
-				const restrictions = mode?.mcpRestrictions
-
-				if (restrictions) {
-					availableTools = availableTools.filter((tool) =>
-						isToolAllowedForModeAndServer(server.name, tool.name, restrictions),
-					)
-				}
-			}
-
-			const toolList =
-				availableTools.length > 0
-					? availableTools
-							.map((tool) => {
-								const desc = tool.description ? ` - ${tool.description}` : ""
-								return `  • ${tool.name}${desc}`
-							})
-							.join("\n")
-					: "  (No tools available for current mode)"
-
-			return `**${server.name}**:\n${toolList}`
-		})
-		.join("\n\n")
-
 	return `## use_mcp_tool
 Description: Request to use a tool provided by a connected MCP server. Each MCP server can provide multiple tools with different capabilities. Tools have defined input schemas that specify required and optional parameters.
-
-**Available servers and tools for current mode:**
-${serverDescriptions}
-
 Parameters:
 - server_name: (required) The name of the MCP server providing the tool
 - tool_name: (required) The name of the tool to execute
 - arguments: (required) A JSON object containing the tool's input parameters, following the tool's input schema
-
 Usage:
 <use_mcp_tool>
 <server_name>server name here</server_name>

src/core/tools/__tests__/useMcpToolTool.spec.ts

@@ -40,8 +40,15 @@ describe("useMcpToolTool", () => {
 			deref: vi.fn().mockReturnValue({
 				getMcpHub: vi.fn().mockReturnValue({
 					callTool: vi.fn(),
+					getServerConfig: vi.fn().mockReturnValue({
+						allowedInModesByDefault: true,
+					}),
 				}),
 				postMessageToWebview: vi.fn(),
+				getState: vi.fn().mockReturnValue({
+					mode: "code",
+					customModes: [],
+				}),
 			}),
 		}
 
@@ -192,8 +199,15 @@ describe("useMcpToolTool", () => {
 			mockProviderRef.deref.mockReturnValue({
 				getMcpHub: () => ({
 					callTool: vi.fn().mockResolvedValue(mockToolResult),
+					getServerConfig: vi.fn().mockReturnValue({
+						allowedInModesByDefault: true,
+					}),
 				}),
 				postMessageToWebview: vi.fn(),
+				getState: vi.fn().mockReturnValue({
+					mode: "code",
+					customModes: [],
+				}),
 			})
 
 			await useMcpToolTool(