Skip to content

Commit 1bdb43e

Browse files
committed
fix(server): use custom context limits for Claude handoffs
1 parent a5e53d6 commit 1bdb43e

4 files changed

Lines changed: 25 additions & 3 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9913,7 +9913,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
99139913
providerSessionId: input.providerSessionId,
99149914
providerSession: session,
99159915
getModelContextWindow: (selection) =>
9916-
resolveClaudeCatalogContextWindowTokens(BUNDLED_CLAUDE_MODEL_CATALOG, selection),
9916+
resolveClaudeCatalogContextWindowTokens(subagentModelCatalog, selection),
99179917
events: Stream.fromEffectRepeat(Queue.take(events)),
99189918
backgroundTasksEndWithProcess: true,
99199919
hasPendingBackgroundWork: Effect.gen(function* () {

‎apps/server/src/provider/ClaudeModelCatalog.test.ts‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,25 @@ describe("Claude model catalog", () => {
225225
}
226226
});
227227

228+
it("only treats a trailing 1M marker as an explicit context window", () => {
229+
const catalog = scopeClaudeModelCatalog(catalogFromManifest(manifest()), [
230+
"route[1m]-revision",
231+
"route[1M]",
232+
]);
233+
for (const [model, expected] of [
234+
["route[1m]-revision", 200_000],
235+
["route[1M]", 1_000_000],
236+
] as const) {
237+
assert.strictEqual(
238+
resolveClaudeCatalogContextWindowTokens(catalog, {
239+
instanceId: ProviderInstanceId.make("claudeAgent"),
240+
model,
241+
}),
242+
expected,
243+
);
244+
}
245+
});
246+
228247
it("appends custom models, defaulting a bare slug and keeping declared descriptors", () => {
229248
const catalog = scopeClaudeModelCatalog(catalogFromManifest(manifest()), [
230249
"synthetic",

‎apps/server/src/provider/ClaudeModelCatalog.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ export function resolveClaudeCatalogContextWindowTokens(
337337
if (entry.runtime.fixedContextWindowTokens) return entry.runtime.fixedContextWindowTokens;
338338
// Claude Code reads `[1m]` off the id itself, so a route the user marked by
339339
// hand runs at 1M whether or not it declares a Context Window control.
340-
if (/\[1m\]/i.test(entry.model.slug)) return 1_000_000;
340+
if (/\[1m\]$/i.test(entry.model.slug)) return 1_000_000;
341341
const contextWindow = resolveClaudeCatalogContextWindow(catalog, modelSelection);
342342
return contextWindow ? entry.runtime.contextWindowTokens?.[contextWindow] : undefined;
343343
}

‎apps/web/src/components/settings/customModelEditor.logic.test.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,10 @@ describe("customModelEditor.logic", () => {
151151
const copied = definitionFromDraft(
152152
draft({ descriptors: descriptorsFromCapabilities(capabilities) }),
153153
);
154-
expect(copied.capabilities?.optionDescriptors).toEqual(capabilities.optionDescriptors);
154+
expect(copied.capabilities?.optionDescriptors).toEqual([
155+
{ ...capabilities.optionDescriptors![0], currentValue: "1m" },
156+
capabilities.optionDescriptors![1],
157+
]);
155158
const presets = definitionFromDraft(
156159
draft({
157160
descriptors: (DESCRIPTOR_PRESETS_BY_KIND[ProviderDriverKind.make("claudeAgent")] ?? []).map(

0 commit comments

Comments
 (0)