refactor(browser): centralize canUseBrowserTool computation; add deprecation TODO for supportsComputerUse; remove stray comment in OpenRouter test

Author: hannesrudolph

src/api/providers/fetchers/__tests__/openrouter.spec.ts

@@ -50,8 +50,6 @@ describe("OpenRouter API", () => {
 
 			expect(ourCachingModels.sort()).toEqual(expectedCachingModels)
 
-			// Computer-use specific assertions removed. We no longer track supportsComputerUse.
-
 			expect(
 				Object.entries(models)
 					.filter(([_, model]) => model.supportsReasoningEffort)

src/core/task/Task.ts

@@ -53,7 +53,7 @@ import { ClineApiReqCancelReason, ClineApiReqInfo } from "../../shared/Extension
 import { getApiMetrics, hasTokenUsageChanged } from "../../shared/getApiMetrics"
 import { ClineAskResponse } from "../../shared/WebviewMessage"
 import { defaultModeSlug, getModeBySlug, getGroupName } from "../../shared/modes"
-import { modelSupportsBrowserCapability } from "../../shared/browserCapability"
+import { computeCanUseBrowserTool } from "../../shared/browserCapability"
 import { DiffStrategy } from "../../shared/tools"
 import { EXPERIMENT_IDS, experiments } from "../../shared/experiments"
 import { getModelMaxOutputTokens } from "../../shared/api"
@@ -2420,10 +2420,12 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 			const modeConfig = getModeBySlug(mode ?? defaultModeSlug, customModes)
 			const modeSupportsBrowser = modeConfig?.groups.some((group) => getGroupName(group) === "browser") ?? false
 
-			const canUseBrowserTool =
-				modelSupportsBrowserCapability(this.api.getModel().info, apiConfiguration) &&
-				modeSupportsBrowser &&
-				(browserToolEnabled ?? true)
+			const canUseBrowserTool = computeCanUseBrowserTool(
+				this.api.getModel().info,
+				modeSupportsBrowser,
+				browserToolEnabled,
+				apiConfiguration,
+			)
 
 			return SYSTEM_PROMPT(
 				provider.context,

src/core/webview/generateSystemPrompt.ts

@@ -3,7 +3,7 @@ import { WebviewMessage } from "../../shared/WebviewMessage"
 import { defaultModeSlug, getModeBySlug, getGroupName } from "../../shared/modes"
 import { buildApiHandler } from "../../api"
 import { experiments as experimentsModule, EXPERIMENT_IDS } from "../../shared/experiments"
-import { modelSupportsBrowserCapability } from "../../shared/browserCapability"
+import { computeCanUseBrowserTool } from "../../shared/browserCapability"
 
 import { SYSTEM_PROMPT } from "../prompts/system"
 import { MultiSearchReplaceDiffStrategy } from "../diff/strategies/multi-search-replace"
@@ -46,14 +46,13 @@ export const generateSystemPrompt = async (provider: ClineProvider, message: Web
 	const rooIgnoreInstructions = provider.getCurrentTask()?.rooIgnoreController?.getInstructions()
 
 	// Determine if browser tools can be used based on model support, mode, and user settings
-	let modelSupportsBrowser = false
+	let modelInfo: any = undefined
 
 	// Create a temporary API handler to check if the model supports browser capability
 	// This avoids relying on an active Cline instance which might not exist during preview
 	try {
 		const tempApiHandler = buildApiHandler(apiConfiguration)
-		const info = tempApiHandler.getModel().info
-		modelSupportsBrowser = modelSupportsBrowserCapability(info, apiConfiguration)
+		modelInfo = tempApiHandler.getModel().info
 	} catch (error) {
 		console.error("Error checking if model supports browser capability:", error)
 	}
@@ -64,7 +63,12 @@ export const generateSystemPrompt = async (provider: ClineProvider, message: Web
 
 	// Only enable browser tools if the model supports it, the mode includes browser tools,
 	// and browser tools are enabled in settings
-	const canUseBrowserTool = modelSupportsBrowser && modeSupportsBrowser && (browserToolEnabled ?? true)
+	const canUseBrowserTool = computeCanUseBrowserTool(
+		modelInfo,
+		modeSupportsBrowser,
+		browserToolEnabled,
+		apiConfiguration,
+	)
 
 	const systemPrompt = await SYSTEM_PROMPT(
 		provider.context,

src/shared/browserCapability.ts

@@ -9,10 +9,26 @@ import type { ProviderSettings } from "@roo-code/types"
  * browser-capable if either:
  * - supportsImages === true (new behavior), OR
  * - supportsComputerUse === true (legacy behavior present in some providers)
+ *
+ * TODO(techdebt): Remove legacy supportsComputerUse path by 2025-12-31.
+ *  - Follow-up: purge provider tables and type usages, then delete this fallback.
  */
 export function modelSupportsBrowserCapability(model: ModelInfo, _settings?: ProviderSettings): boolean {
 	const supportsImages = (model as any)?.supportsImages === true
 	// Legacy flag may still exist in some model tables or be read from older code paths
 	const legacyComputerUse = (model as any)?.supportsComputerUse === true
 	return supportsImages || legacyComputerUse
 }
+
+/**
+ * Compute whether browser tools should be enabled given model capability,
+ * mode support, and user settings.
+ */
+export function computeCanUseBrowserTool(
+	model: ModelInfo,
+	modeSupportsBrowser: boolean,
+	browserToolEnabled?: boolean,
+	settings?: ProviderSettings,
+): boolean {
+	return modelSupportsBrowserCapability(model, settings) && modeSupportsBrowser && (browserToolEnabled ?? true)
+}