refactor: extract NATIVE_TOOL_DEFAULTS to shared constant

- Add NATIVE_TOOL_DEFAULTS constant to @roo-code/types/tool.ts
- Update RouterProvider.getModel() to merge defaults for all router providers (LiteLLM, Unbound)
- Update RequestyHandler to use shared constant
- Update useSelectedModel to use shared constant for requesty, unbound, litellm

Author: daniel-lxs

packages/types/src/tool.ts

@@ -71,6 +71,16 @@ export const TOOL_PROTOCOL = {
  */
 export type ToolProtocol = (typeof TOOL_PROTOCOL)[keyof typeof TOOL_PROTOCOL]
 
+/**
+ * Default model info properties for native tool support.
+ * Used to merge with cached model info that may lack these fields.
+ * Router providers (Requesty, Unbound, LiteLLM) assume all models support native tools.
+ */
+export const NATIVE_TOOL_DEFAULTS = {
+	supportsNativeTools: true,
+	defaultToolProtocol: TOOL_PROTOCOL.NATIVE,
+} as const
+
 /**
  * Checks if the protocol is native (non-XML).
  *

src/api/providers/requesty.ts

@@ -1,7 +1,13 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 
-import { type ModelInfo, requestyDefaultModelId, requestyDefaultModelInfo, TOOL_PROTOCOL } from "@roo-code/types"
+import {
+	type ModelInfo,
+	requestyDefaultModelId,
+	requestyDefaultModelInfo,
+	TOOL_PROTOCOL,
+	NATIVE_TOOL_DEFAULTS,
+} from "@roo-code/types"
 
 import type { ApiHandlerOptions, ModelRecord } from "../../shared/api"
 import { resolveToolProtocol } from "../../utils/resolveToolProtocol"
@@ -83,11 +89,7 @@ export class RequestyHandler extends BaseProvider implements SingleCompletionHan
 
 		// Merge native tool defaults for cached models that may lack these fields
 		// The order ensures that cached values (if present) override the defaults
-		let info: ModelInfo = {
-			supportsNativeTools: true,
-			defaultToolProtocol: TOOL_PROTOCOL.NATIVE,
-			...cachedInfo,
-		}
+		let info: ModelInfo = { ...NATIVE_TOOL_DEFAULTS, ...cachedInfo }
 
 		// Apply tool preferences for models accessed through routers (OpenAI, Gemini)
 		info = applyRouterToolPreferences(id, info)

src/api/providers/router-provider.ts

@@ -1,6 +1,6 @@
 import OpenAI from "openai"
 
-import type { ModelInfo } from "@roo-code/types"
+import { type ModelInfo, NATIVE_TOOL_DEFAULTS } from "@roo-code/types"
 
 import { ApiHandlerOptions, RouterName, ModelRecord } from "../../shared/api"
 
@@ -62,10 +62,15 @@ export abstract class RouterProvider extends BaseProvider {
 
 	override getModel(): { id: string; info: ModelInfo } {
 		const id = this.modelId ?? this.defaultModelId
+		const cachedInfo = this.models[id]
 
-		return this.models[id]
-			? { id, info: this.models[id] }
-			: { id: this.defaultModelId, info: this.defaultModelInfo }
+		if (cachedInfo) {
+			// Merge native tool defaults for cached models that may lack these fields
+			// The order ensures that cached values (if present) override the defaults
+			return { id, info: { ...NATIVE_TOOL_DEFAULTS, ...cachedInfo } }
+		}
+
+		return { id: this.defaultModelId, info: this.defaultModelInfo }
 	}
 
 	protected supportsTemperature(modelId: string): boolean {

webview-ui/src/components/ui/hooks/useSelectedModel.ts

@@ -32,6 +32,7 @@ import {
 	BEDROCK_1M_CONTEXT_MODEL_IDS,
 	isDynamicProvider,
 	getProviderDefaultModelId,
+	NATIVE_TOOL_DEFAULTS,
 } from "@roo-code/types"
 
 import type { ModelRecord, RouterModels } from "@roo/api"
@@ -157,34 +158,22 @@ function getSelectedModel({
 		case "requesty": {
 			const id = getValidatedModelId(apiConfiguration.requestyModelId, routerModels.requesty, defaultModelId)
 			const routerInfo = routerModels.requesty?.[id]
-			// Merge native tool call defaults for cached models that may lack these fields
-			const nativeToolDefaults = {
-				supportsNativeTools: true,
-				defaultToolProtocol: "native" as const,
-			}
-			const info = routerInfo ? { ...nativeToolDefaults, ...routerInfo } : undefined
+			// Merge native tool defaults for cached models that may lack these fields
+			const info = routerInfo ? { ...NATIVE_TOOL_DEFAULTS, ...routerInfo } : undefined
 			return { id, info }
 		}
 		case "unbound": {
 			const id = getValidatedModelId(apiConfiguration.unboundModelId, routerModels.unbound, defaultModelId)
 			const routerInfo = routerModels.unbound?.[id]
-			// Merge native tool call defaults for cached models that may lack these fields
-			const nativeToolDefaults = {
-				supportsNativeTools: true,
-				defaultToolProtocol: "native" as const,
-			}
-			const info = routerInfo ? { ...nativeToolDefaults, ...routerInfo } : undefined
+			// Merge native tool defaults for cached models that may lack these fields
+			const info = routerInfo ? { ...NATIVE_TOOL_DEFAULTS, ...routerInfo } : undefined
 			return { id, info }
 		}
 		case "litellm": {
 			const id = getValidatedModelId(apiConfiguration.litellmModelId, routerModels.litellm, defaultModelId)
 			const routerInfo = routerModels.litellm?.[id]
-			// Only merge native tool call defaults, not prices or other model-specific info
-			const nativeToolDefaults = {
-				supportsNativeTools: litellmDefaultModelInfo.supportsNativeTools,
-				defaultToolProtocol: litellmDefaultModelInfo.defaultToolProtocol,
-			}
-			const info = routerInfo ? { ...nativeToolDefaults, ...routerInfo } : litellmDefaultModelInfo
+			// Merge native tool defaults for cached models that may lack these fields
+			const info = routerInfo ? { ...NATIVE_TOOL_DEFAULTS, ...routerInfo } : litellmDefaultModelInfo
 			return { id, info }
 		}
 		case "xai": {