Skip to content

Commit b05bdd1

Browse files
t3dotggclaude
andcommitted
Default Claude context window to 1M
The 200k default dates to the era when 1M context was entitlement-gated and carried a long-context pricing premium. Anthropic has since made 1M the default for every model that supports it, with no beta header, tier gate, or premium. Most users run Opus 4.8 or Fable 5, which are already 1M-default upstream, so the conservative default only added a stale mismatch for the toggle-capable models. - Flip the contextWindow default to 1m for Fable 5, Opus 4.6, Sonnet 5, and Sonnet 4.6; 200k remains selectable. - Add resolveClaudeContextWindow so option-less selections resolve to the descriptor default instead of implicitly meaning 200k; both resolveClaudeApiModelId ([1m] suffix) and the adapter's token accounting now share it. Co-Authored-By: Claude Fable 5 <[email protected]>
1 parent f61fa94 commit b05bdd1

3 files changed

Lines changed: 38 additions & 28 deletions

File tree

‎apps/server/src/provider/Layers/ClaudeAdapter.test.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3042,7 +3042,7 @@ describe("ClaudeAdapterLive", () => {
30423042
attachments: [],
30433043
});
30443044

3045-
assert.deepEqual(harness.query.setModelCalls, ["claude-opus-4-6"]);
3045+
assert.deepEqual(harness.query.setModelCalls, ["claude-opus-4-6[1m]"]);
30463046
}).pipe(
30473047
Effect.provideService(Random.Random, makeDeterministicRandomService()),
30483048
Effect.provide(harness.layer),
@@ -3140,10 +3140,11 @@ describe("ClaudeAdapterLive", () => {
31403140
yield* adapter.sendTurn({
31413141
threadId: session.threadId,
31423142
input: "hello again",
3143-
modelSelection: {
3144-
instanceId: ProviderInstanceId.make("claudeAgent"),
3145-
model: "claude-opus-4-6",
3146-
},
3143+
modelSelection: createModelSelection(
3144+
ProviderInstanceId.make("claudeAgent"),
3145+
"claude-opus-4-6",
3146+
[{ id: "contextWindow", value: "200k" }],
3147+
),
31473148
attachments: [],
31483149
});
31493150

‎apps/server/src/provider/Layers/ClaudeAdapter.ts‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ import {
7676
isClaudeUltracodeEffort,
7777
normalizeClaudeCliEffort,
7878
resolveClaudeApiModelId,
79+
resolveClaudeContextWindow,
7980
resolveClaudeEffort,
8081
} from "./ClaudeProvider.ts";
8182
import {
@@ -340,24 +341,18 @@ function selectedClaudeContextWindow(
340341
switch (modelSelection?.model) {
341342
case "claude-opus-4-8":
342343
case "claude-opus-4-7":
344+
// Always 1M at the API; these models expose no contextWindow option.
343345
return 1_000_000;
344346
}
345347

346-
const optionValue = getModelSelectionStringOptionValue(modelSelection, "contextWindow");
347-
if (optionValue === "1m") {
348-
return 1_000_000;
349-
}
350-
if (optionValue === "200k") {
351-
return 200_000;
352-
}
353-
const caps = getClaudeModelCapabilities(modelSelection?.model);
354-
const hasContextWindowOption = getProviderOptionDescriptors({ caps }).some(
355-
(descriptor) => descriptor.type === "select" && descriptor.id === "contextWindow",
356-
);
357-
if (hasContextWindowOption) {
358-
return 200_000;
348+
switch (resolveClaudeContextWindow(modelSelection)) {
349+
case "1m":
350+
return 1_000_000;
351+
case "200k":
352+
return 200_000;
353+
default:
354+
return undefined;
359355
}
360-
return undefined;
361356
}
362357

363358
function finiteNonNegativeInteger(value: unknown): number | undefined {

‎apps/server/src/provider/Layers/ClaudeProvider.ts‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
7777
id: "contextWindow",
7878
label: "Context Window",
7979
options: [
80-
{ value: "200k", label: "200k", isDefault: true },
81-
{ value: "1m", label: "1M" },
80+
{ value: "200k", label: "200k" },
81+
{ value: "1m", label: "1M", isDefault: true },
8282
],
8383
}),
8484
],
@@ -163,8 +163,8 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
163163
id: "contextWindow",
164164
label: "Context Window",
165165
options: [
166-
{ value: "200k", label: "200k", isDefault: true },
167-
{ value: "1m", label: "1M" },
166+
{ value: "200k", label: "200k" },
167+
{ value: "1m", label: "1M", isDefault: true },
168168
],
169169
}),
170170
],
@@ -216,8 +216,8 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
216216
id: "contextWindow",
217217
label: "Context Window",
218218
options: [
219-
{ value: "200k", label: "200k", isDefault: true },
220-
{ value: "1m", label: "1M" },
219+
{ value: "200k", label: "200k" },
220+
{ value: "1m", label: "1M", isDefault: true },
221221
],
222222
}),
223223
],
@@ -245,8 +245,8 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
245245
id: "contextWindow",
246246
label: "Context Window",
247247
options: [
248-
{ value: "200k", label: "200k", isDefault: true },
249-
{ value: "1m", label: "1M" },
248+
{ value: "200k", label: "200k" },
249+
{ value: "1m", label: "1M", isDefault: true },
250250
],
251251
}),
252252
],
@@ -370,8 +370,22 @@ export function isClaudeUltracodeEffort(effort: string | null | undefined): bool
370370
return effort === "ultracode";
371371
}
372372

373+
export function resolveClaudeContextWindow(
374+
modelSelection: ModelSelection | undefined,
375+
): string | undefined {
376+
const caps = getClaudeModelCapabilities(modelSelection?.model);
377+
const raw = getModelSelectionStringOptionValue(modelSelection, "contextWindow");
378+
const descriptors = getProviderOptionDescriptors({
379+
caps,
380+
...(raw ? { selections: [{ id: "contextWindow", value: raw }] } : {}),
381+
});
382+
const descriptor = descriptors.find((candidate) => candidate.id === "contextWindow");
383+
const value = getProviderOptionCurrentValue(descriptor);
384+
return typeof value === "string" ? value : undefined;
385+
}
386+
373387
export function resolveClaudeApiModelId(modelSelection: ModelSelection): string {
374-
switch (getModelSelectionStringOptionValue(modelSelection, "contextWindow")) {
388+
switch (resolveClaudeContextWindow(modelSelection)) {
375389
case "1m":
376390
return `${modelSelection.model}[1m]`;
377391
default:

0 commit comments

Comments
 (0)