fix(xai): enhance error logging and support dynamic model context window overrides

Author: hannesrudolph

src/api/providers/fetchers/xai.ts

@@ -90,11 +90,14 @@ export async function getXaiModels(apiKey?: string, baseUrl?: string): Promise<R
 			// Users should use the primary model ID; xAI API will handle alias resolution
 		}
 	} catch (error) {
-		try {
-			const err = JSON.stringify(error, Object.getOwnPropertyNames(error), 2)
-			console.error(`[xAI] models fetch failed: ${err}`)
-		} catch {
-			console.error("[xAI] models fetch failed.")
+		// Avoid logging sensitive data like Authorization headers
+		if (axios.isAxiosError(error)) {
+			const status = error.response?.status
+			const statusText = error.response?.statusText
+			const url = (error as any)?.config?.url
+			console.error(`[xAI] models fetch failed: ${status ?? "unknown"} ${statusText ?? ""} ${url ?? ""}`.trim())
+		} else {
+			console.error("[xAI] models fetch failed.", error instanceof Error ? error.message : String(error))
 		}
 		throw error
 	}

src/api/providers/xai.ts

@@ -35,22 +35,19 @@ export class XAIHandler extends BaseProvider implements SingleCompletionHandler
 	}
 
 	override getModel() {
-		const id =
-			this.options.apiModelId && this.options.apiModelId in xaiModels
-				? (this.options.apiModelId as XAIModelId)
-				: xaiDefaultModelId
+		// Allow any model ID (dynamic discovery) and augment with static info when available
+		const id = this.options.apiModelId ?? xaiDefaultModelId
 
-		const staticInfo = xaiModels[id]
+		const staticInfo = (xaiModels as Record<string, any>)[id as any]
 
-		// Build complete ModelInfo with all required fields
-		// Dynamic data (pricing, cache support) will come from router models, this is just for type safety
+		// Build complete ModelInfo with required fields; dynamic data comes from router models
 		const info: ModelInfo = {
-			contextWindow: this.options.xaiModelContextWindow ?? staticInfo.contextWindow,
-			maxTokens: staticInfo.maxTokens ?? undefined,
+			contextWindow: this.options.xaiModelContextWindow ?? staticInfo?.contextWindow,
+			maxTokens: staticInfo?.maxTokens ?? undefined,
 			supportsPromptCache: false, // Placeholder - actual value comes from dynamic API call
-			description: staticInfo.description,
+			description: staticInfo?.description,
 			supportsReasoningEffort:
-				"supportsReasoningEffort" in staticInfo ? staticInfo.supportsReasoningEffort : undefined,
+				staticInfo && "supportsReasoningEffort" in staticInfo ? staticInfo.supportsReasoningEffort : undefined,
 		}
 
 		const params = getModelParams({ format: "openai", modelId: id, model: info, settings: this.options })

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

@@ -166,7 +166,13 @@ function getSelectedModel({
 			const id = apiConfiguration.apiModelId ?? xaiDefaultModelId
 			const dynamicInfo = routerModels.xai?.[id]
 			if (dynamicInfo) {
-				return { id, info: dynamicInfo }
+				// If router-provided model lacks contextWindow, apply manual override when provided
+				const overrideCw = apiConfiguration.xaiModelContextWindow
+				const info =
+					dynamicInfo.contextWindow === undefined && typeof overrideCw === "number"
+						? { ...dynamicInfo, contextWindow: overrideCw }
+						: dynamicInfo
+				return { id, info }
 			}
 			const staticInfo = xaiModels[id as keyof typeof xaiModels]
 			// Build a complete ModelInfo fallback to satisfy UI expectations until dynamic models load