fix: correct default context window and preserve contextWindow in client normalization

cursoragent · cursoragent · commit 49f47e3aaed4 · 2026-03-26T17:00:57.000Z
- Set isDefault: true on '200k' (not '1m') in MODEL_OPTIONS_BY_PROVIDER for
  claude-opus-4-6 and claude-sonnet-4-6, matching server-side ClaudeProvider.ts
- Add contextWindow handling to normalizeClaudeModelOptionsWithCapabilities so
  non-default context window selections are preserved in model options dispatch
diff --git a/apps/web/src/providerModels.ts b/apps/web/src/providerModels.ts
@@ -8,7 +8,9 @@ import {
   type ServerProviderModel,
 } from "@t3tools/contracts";
 import {
+  getDefaultContextWindow,
   getDefaultEffort,
+  hasContextWindowOption,
   hasEffortLevel,
   normalizeModelSlug,
   trimOrNull,
@@ -108,10 +110,19 @@ export function normalizeClaudeModelOptionsWithCapabilities(
   const thinking =
     caps.supportsThinkingToggle && modelOptions?.thinking === false ? false : undefined;
   const fastMode = caps.supportsFastMode && modelOptions?.fastMode === true ? true : undefined;
+  const rawContextWindow = modelOptions?.contextWindow;
+  const defaultContextWindow = getDefaultContextWindow(caps);
+  const contextWindow =
+    rawContextWindow &&
+    rawContextWindow !== defaultContextWindow &&
+    hasContextWindowOption(caps, rawContextWindow)
+      ? rawContextWindow
+      : undefined;
   const nextOptions: ClaudeModelOptions = {
     ...(thinking === false ? { thinking: false } : {}),
     ...(effort ? { effort } : {}),
     ...(fastMode ? { fastMode: true } : {}),
+    ...(contextWindow ? { contextWindow } : {}),
   };
   return Object.keys(nextOptions).length > 0 ? nextOptions : undefined;
 }
diff --git a/packages/contracts/src/model.ts b/packages/contracts/src/model.ts
@@ -176,8 +176,8 @@ export const MODEL_OPTIONS_BY_PROVIDER = {
         supportsFastMode: true,
         supportsThinkingToggle: false,
         contextWindowOptions: [
-          { value: "200k", label: "200k" },
-          { value: "1m", label: "1M", isDefault: true },
+          { value: "200k", label: "200k", isDefault: true },
+          { value: "1m", label: "1M" },
         ],
         promptInjectedEffortLevels: ["ultrathink"],
       },
@@ -195,8 +195,8 @@ export const MODEL_OPTIONS_BY_PROVIDER = {
         supportsFastMode: false,
         supportsThinkingToggle: false,
         contextWindowOptions: [
-          { value: "200k", label: "200k" },
-          { value: "1m", label: "1M", isDefault: true },
+          { value: "200k", label: "200k", isDefault: true },
+          { value: "1m", label: "1M" },
         ],
         promptInjectedEffortLevels: ["ultrathink"],
       },
