fix: validate contextWindow against model capabilities before resolveApiModelId

cursoragent · cursoragent · commit ea54ac641dbc · 2026-03-26T17:36:22.000Z
- ClaudeTextGeneration.ts: pass normalized options (with validated contextWindow)
  to resolveApiModelId instead of raw modelSelection
- ClaudeAdapter.ts: resolve contextWindow against model capabilities before
  computing apiModelId in both startSession and sendTurn paths
- contracts/model.ts: use TrimmedNonEmptyString for ContextWindowOption.value
  to match EffortOption pattern and prevent empty string values
diff --git a/apps/server/src/git/Layers/ClaudeTextGeneration.ts b/apps/server/src/git/Layers/ClaudeTextGeneration.ts
@@ -104,7 +104,10 @@ const makeClaudeTextGeneration = Effect.gen(function* () {
             "--json-schema",
             jsonSchemaStr,
             "--model",
-            resolveApiModelId(modelSelection),
+            resolveApiModelId({
+              ...modelSelection,
+              options: normalizedOptions ?? {},
+            }),
             ...(normalizedOptions?.effort ? ["--effort", normalizedOptions.effort] : []),
             ...(Object.keys(settings).length > 0 ? ["--settings", JSON.stringify(settings)] : []),
             "--dangerously-skip-permissions",
diff --git a/apps/server/src/provider/Layers/ClaudeAdapter.ts b/apps/server/src/provider/Layers/ClaudeAdapter.ts
@@ -44,6 +44,7 @@ import {
   hasEffortLevel,
   applyClaudePromptEffortPrefix,
   resolveApiModelId,
+  resolveContextWindow,
   trimOrNull,
 } from "@t3tools/shared/model";
 import {
@@ -2732,9 +2733,15 @@ function makeClaudeAdapter(options?: ClaudeAdapterLiveOptions) {
         const claudeBinaryPath = claudeSettings.binaryPath;
         const modelSelection =
           input.modelSelection?.provider === "claudeAgent" ? input.modelSelection : undefined;
-        const apiModelId = modelSelection ? resolveApiModelId(modelSelection) : undefined;
-        const requestedEffort = trimOrNull(modelSelection?.options?.effort ?? null);
         const caps = getClaudeModelCapabilities(modelSelection?.model);
+        const contextWindow = resolveContextWindow(caps, modelSelection?.options?.contextWindow);
+        const apiModelId = modelSelection
+          ? resolveApiModelId({
+              ...modelSelection,
+              options: { ...modelSelection.options, contextWindow },
+            })
+          : undefined;
+        const requestedEffort = trimOrNull(modelSelection?.options?.effort ?? null);
         const effort =
           requestedEffort && hasEffortLevel(caps, requestedEffort) ? requestedEffort : null;
         const fastMode = modelSelection?.options?.fastMode === true && caps.supportsFastMode;
@@ -2899,7 +2906,15 @@ function makeClaudeAdapter(options?: ClaudeAdapterLiveOptions) {
         }
 
         if (modelSelection?.model) {
-          const apiModelId = resolveApiModelId(modelSelection);
+          const turnCaps = getClaudeModelCapabilities(modelSelection.model);
+          const turnContextWindow = resolveContextWindow(
+            turnCaps,
+            modelSelection.options?.contextWindow,
+          );
+          const apiModelId = resolveApiModelId({
+            ...modelSelection,
+            options: { ...modelSelection.options, contextWindow: turnContextWindow },
+          });
           yield* Effect.tryPromise({
             try: () => context.query.setModel(apiModelId),
             catch: (cause) => toRequestError(input.threadId, "turn/setModel", cause),
diff --git a/packages/contracts/src/model.ts b/packages/contracts/src/model.ts
@@ -36,7 +36,7 @@ export const EffortOption = Schema.Struct({
 export type EffortOption = typeof EffortOption.Type;
 
 export const ContextWindowOption = Schema.Struct({
-  value: Schema.String,
+  value: TrimmedNonEmptyString,
   label: TrimmedNonEmptyString,
   isDefault: Schema.optional(Schema.Boolean),
 });
