Skip to content

fix(server): Claude 5-series models always run 1M context #16908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusmarminge merged 2 commits into from
Oct 7, 2026
Merged

fix(server): Claude 5-series models always run 1M context #16908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b204093
fix(server): Claude 5-series models always run 1M context
juliusmarminge Oct 7, 2026
f496b59
fix(server): keep the context window option resolver module-private
juliusmarminge Oct 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions apps/server/src/claudeModelOptions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,16 @@ describe("compileClaudeModelSelection", () => {
it("compiles context, effort, and settings together", () => {
expect(
compileClaudeModelSelection(
selection("claude-fable-5", [
selection("claude-opus-4-6", [
{ id: "contextWindow", value: "1m" },
{ id: "effort", value: "ultracode" },
{ id: "effort", value: "max" },
{ id: "fastMode", value: true },
]),
),
).toMatchObject({
apiModelId: "claude-fable-5[1m]",
effort: "xhigh",
settings: { ultracode: true },
apiModelId: "claude-opus-4-6[1m]",
effort: "max",
settings: { fastMode: true },
});
});

Expand Down
10 changes: 3 additions & 7 deletions apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ import {
} from "../../provider/Drivers/ClaudeHome.ts";
import {
BUNDLED_CLAUDE_MODEL_CATALOG,
resolveClaudeCatalogContextWindow,
resolveClaudeCatalogContextWindowTokens,
} from "../../provider/ClaudeModelCatalog.ts";
import {
Expand Down Expand Up @@ -138,12 +137,9 @@ export const CLAUDE_PROVIDER = ProviderDriverKind.make("claudeAgent");
export const CLAUDE_AGENT_SDK_QUERY_PROTOCOL = "claude-agent-sdk.query" as const;

function claudeContextWindow(modelSelection: ModelSelection): number | null {
if (modelSelection.model === "claude-opus-4-6" || modelSelection.model === "claude-opus-4-7") {
return 1_000_000;
}
return resolveClaudeCatalogContextWindow(BUNDLED_CLAUDE_MODEL_CATALOG, modelSelection) === "1m"
? 1_000_000
: 200_000;
return (
resolveClaudeCatalogContextWindowTokens(BUNDLED_CLAUDE_MODEL_CATALOG, modelSelection) ?? null
);
}

export function claudeProviderTurnTokenUsage(
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/provider/ClaudeModelCatalog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ export function isClaudeCatalogUltracodeEffort(effort: string | null | undefined
return effort === "ultracode";
}

export function resolveClaudeCatalogContextWindow(
function resolveClaudeCatalogContextWindow(
catalog: ClaudeModelCatalog,
modelSelection: ModelSelection | undefined,
): string | undefined {
Expand Down
110 changes: 9 additions & 101 deletions apps/server/src/provider/model-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 1,
"updatedAt": "2026-10-07T18:00:00Z",
"updatedAt": "2026-10-07T19:00:00Z",
"compatibility": [
{
"driver": "codex",
Expand Down Expand Up @@ -145,22 +145,6 @@
}
],
"promptInjectedValues": ["ultrathink"]
},
{
"id": "contextWindow",
"label": "Context Window",
"type": "select",
"options": [
{
"id": "200k",
"label": "200k"
},
{
"id": "1m",
"label": "1M",
"isDefault": true
}
]
}
]
},
Expand All @@ -170,15 +154,7 @@
"ultracode": "xhigh",
"ultrathink": null
},
"modelSuffixes": {
"contextWindow": {
"1m": "[1m]"
}
},
"contextWindowTokens": {
"200k": 200000,
"1m": 1000000
}
"fixedContextWindowTokens": 1000000
}
}
},
Expand All @@ -204,23 +180,13 @@
],
"promptInjectedValues": ["ultrathink"]
},
{ "id": "fastMode", "label": "Fast Mode", "type": "boolean" },
{
"id": "contextWindow",
"label": "Context Window",
"type": "select",
"options": [
{ "id": "200k", "label": "200k" },
{ "id": "1m", "label": "1M", "isDefault": true }
]
}
{ "id": "fastMode", "label": "Fast Mode", "type": "boolean" }
]
},
"adapter": {
"claudeCode": {
"effortMap": { "ultracode": "xhigh", "ultrathink": null },
"modelSuffixes": { "contextWindow": { "1m": "[1m]" } },
"contextWindowTokens": { "200k": 200000, "1m": 1000000 }
"fixedContextWindowTokens": 1000000
}
}
},
Expand Down Expand Up @@ -269,22 +235,6 @@
"id": "fastMode",
"label": "Fast Mode",
"type": "boolean"
},
{
"id": "contextWindow",
"label": "Context Window",
"type": "select",
"options": [
{
"id": "200k",
"label": "200k"
},
{
"id": "1m",
"label": "1M",
"isDefault": true
}
]
}
]
},
Expand All @@ -294,15 +244,7 @@
"ultracode": "xhigh",
"ultrathink": null
},
"modelSuffixes": {
"contextWindow": {
"1m": "[1m]"
}
},
"contextWindowTokens": {
"200k": 200000,
"1m": 1000000
}
"fixedContextWindowTokens": 1000000
}
}
},
Expand Down Expand Up @@ -524,7 +466,7 @@
]
},
"adapter": {
"claudeCode": {}
"claudeCode": { "fixedContextWindowTokens": 200000 }
}
},
"sonnet-5": {
Expand Down Expand Up @@ -562,22 +504,6 @@
}
],
"promptInjectedValues": ["ultrathink"]
},
{
"id": "contextWindow",
"label": "Context Window",
"type": "select",
"options": [
{
"id": "200k",
"label": "200k",
"isDefault": true
},
{
"id": "1m",
"label": "1M"
}
]
}
]
},
Expand All @@ -586,15 +512,7 @@
"effortMap": {
"ultrathink": null
},
"modelSuffixes": {
"contextWindow": {
"1m": "[1m]"
}
},
"contextWindowTokens": {
"200k": 200000,
"1m": 1000000
}
"fixedContextWindowTokens": 1000000
}
}
},
Expand Down Expand Up @@ -682,23 +600,13 @@
{ "id": "ultrathink", "label": "Ultrathink" }
],
"promptInjectedValues": ["ultrathink"]
},
{
"id": "contextWindow",
"label": "Context Window",
"type": "select",
"options": [
{ "id": "200k", "label": "200k" },
{ "id": "1m", "label": "1M", "isDefault": true }
]
}
]
},
"adapter": {
"claudeCode": {
"effortMap": { "ultrathink": null },
"modelSuffixes": { "contextWindow": { "1m": "[1m]" } },
"contextWindowTokens": { "200k": 200000, "1m": 1000000 }
"fixedContextWindowTokens": 1000000
}
}
},
Expand All @@ -713,7 +621,7 @@
]
},
"adapter": {
"claudeCode": {}
"claudeCode": { "fixedContextWindowTokens": 200000 }
}
}
},
Expand Down
Loading