PR1: address review comments — gate Tools catalog in system.ts for XML only; remove unused protocol param from getToolDescriptionsForMode; protocol selection via non-exported code constant; tests pass

Author: daniel-lxs

src/core/prompts/__tests__/toolProtocolResolver.spec.ts

@@ -1,39 +1,10 @@
 // npx vitest core/prompts/__tests__/toolProtocolResolver.spec.ts
 
-import { describe, it, expect, beforeEach } from "vitest"
-import { setToolProtocol, getToolProtocol, resolveToolProtocol } from "../toolProtocolResolver"
+import { describe, it, expect } from "vitest"
+import { resolveToolProtocol } from "../toolProtocolResolver"
 
 describe("toolProtocolResolver", () => {
-	beforeEach(() => {
-		// Reset to default before each test
-		setToolProtocol("xml")
-	})
-
 	it("should default to xml protocol", () => {
 		expect(resolveToolProtocol()).toBe("xml")
-		expect(getToolProtocol()).toBe("xml")
-	})
-
-	it("should allow setting protocol to native", () => {
-		setToolProtocol("native")
-		expect(resolveToolProtocol()).toBe("native")
-		expect(getToolProtocol()).toBe("native")
-	})
-
-	it("should allow setting protocol back to xml", () => {
-		setToolProtocol("native")
-		expect(getToolProtocol()).toBe("native")
-
-		setToolProtocol("xml")
-		expect(getToolProtocol()).toBe("xml")
-	})
-
-	it("should maintain state across multiple calls", () => {
-		setToolProtocol("native")
-
-		expect(resolveToolProtocol()).toBe("native")
-		expect(getToolProtocol()).toBe("native")
-		expect(resolveToolProtocol()).toBe("native")
-		expect(getToolProtocol()).toBe("native")
 	})
 })

src/core/prompts/system.ts

@@ -108,7 +108,6 @@ async function generatePrompt(
 					settings,
 					enableMcpServerCreation,
 					modelId,
-					effectiveProtocol,
 				)}`
 			: ""
 

src/core/prompts/toolProtocolResolver.ts

@@ -1,35 +1,17 @@
 import { ToolProtocol } from "@roo-code/types"
 
 /**
- * Internal tool protocol state management.
+ * Current tool protocol setting.
  * This is code-only and not exposed through VS Code settings.
+ * To switch protocols, edit this constant directly in the source code.
  */
-let currentProtocol: ToolProtocol = "xml"
-
-/**
- * Sets the current tool protocol.
- * This is an internal API and should not be called by external code.
- *
- * @param protocol - The tool protocol to set ('xml' or 'native')
- */
-export function setToolProtocol(protocol: ToolProtocol): void {
-	currentProtocol = protocol
-}
-
-/**
- * Gets the current tool protocol.
- *
- * @returns The current tool protocol
- */
-export function getToolProtocol(): ToolProtocol {
-	return currentProtocol
-}
+const CURRENT_TOOL_PROTOCOL: ToolProtocol = "xml" // change to 'native' to enable native protocol
 
 /**
  * Resolves the effective tool protocol.
  *
  * @returns The effective tool protocol (defaults to "xml")
  */
 export function resolveToolProtocol(): ToolProtocol {
-	return currentProtocol
+	return CURRENT_TOOL_PROTOCOL
 }

src/core/prompts/tools/index.ts

@@ -1,4 +1,4 @@
-import type { ToolName, ModeConfig, ToolProtocol } from "@roo-code/types"
+import type { ToolName, ModeConfig } from "@roo-code/types"
 
 import { TOOL_GROUPS, ALWAYS_AVAILABLE_TOOLS, DiffStrategy } from "../../../shared/tools"
 import { McpHub } from "../../../services/mcp/McpHub"
@@ -74,7 +74,6 @@ export function getToolDescriptionsForMode(
 	settings?: Record<string, any>,
 	enableMcpServerCreation?: boolean,
 	modelId?: string,
-	protocol: ToolProtocol = "xml",
 ): string {
 	const config = getModeConfig(mode, customModes)
 	const args: ToolArgs = {