Skip to content

Commit 82839de

Browse files
fix(server): Claude context meter honours CLAUDE_CODE_AUTO_COMPACT_WINDOW (#33806)
1 parent f8372d1 commit 82839de

2 files changed

Lines changed: 58 additions & 20 deletions

File tree

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9083,9 +9083,29 @@ describe("ClaudeAdapterV2 background wake turns", () => {
90839083
'{"autoCompactWindow":500000,"modelSettings":{"claude-opus-5-5":{"autoCompactWindow":50000}}}',
90849084
threshold: 467_000,
90859085
},
9086+
{
9087+
autoCompactWindow: "",
9088+
model: "claude-opus-5-5",
9089+
userSettings: '{"env":{"CLAUDE_CODE_AUTO_COMPACT_WINDOW":"300000"}}',
9090+
threshold: 267_000,
9091+
},
9092+
{
9093+
autoCompactWindow: "",
9094+
model: "claude-opus-5-5",
9095+
environment: { CLAUDE_CODE_AUTO_COMPACT_WINDOW: "300000" },
9096+
threshold: 267_000,
9097+
},
90869098
])(
90879099
"ignores stale snapshots after compaction and reports threshold $autoCompactWindow for $model",
9088-
({ autoCompactWindow, model, threshold, userSettings, projectSettings, launchArgs }) =>
9100+
({
9101+
autoCompactWindow,
9102+
model,
9103+
threshold,
9104+
userSettings,
9105+
projectSettings,
9106+
launchArgs,
9107+
environment,
9108+
}) =>
90899109
Effect.gen(function* () {
90909110
const fileSystem = yield* FileSystem.FileSystem;
90919111
const path = yield* Path.Path;
@@ -9108,6 +9128,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
91089128
homePath: home,
91099129
launchArgs: launchArgs ?? "",
91109130
},
9131+
...(environment === undefined ? {} : { environment }),
91119132
});
91129133
yield* harness.runtime.startTurn(
91139134
makeClaudeTestTurnInput({

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

Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5319,11 +5319,11 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
53195319
},
53205320
);
53215321

5322-
const readToolSearchSetting = (filePath: string) =>
5322+
const readSettingsEnv = (filePath: string, name: string) =>
53235323
fileSystem.readFileString(filePath).pipe(
53245324
Effect.flatMap(decodeClaudeEnvSettings),
53255325
Effect.map((settings) => {
5326-
const value = settings.env?.ENABLE_TOOL_SEARCH;
5326+
const value = settings.env?.[name];
53275327
return typeof value === "string" ? value : undefined;
53285328
}),
53295329
Effect.orElseSucceed(() => undefined),
@@ -5381,17 +5381,26 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
53815381
// Settings env beats the process env, --settings over local over project over user, and a local
53825382
// file an older Claude Code left in cwd applies under the root one. resolveSettings reads local
53835383
// from cwd only.
5384-
const resolveToolSearchOverride = Effect.fn("ClaudeAdapterV2.resolveToolSearchOverride")(
5385-
function* (cwd: string | null, launchArgSettings: ClaudeSdkSettings | undefined) {
5386-
const launchValue = launchArgSettings?.env?.ENABLE_TOOL_SEARCH;
5387-
if (typeof launchValue === "string") return claudeToolSearchOverride(launchValue);
5388-
for (const settingsFile of yield* settingsFilesByPrecedence(cwd)) {
5389-
const value = yield* readToolSearchSetting(settingsFile);
5390-
if (value !== undefined) return claudeToolSearchOverride(value);
5391-
}
5392-
return claudeToolSearchOverride(adapterOptions.environment.ENABLE_TOOL_SEARCH);
5393-
},
5394-
);
5384+
const resolveClaudeEnv = Effect.fn("ClaudeAdapterV2.resolveClaudeEnv")(function* (
5385+
cwd: string | null,
5386+
launchArgSettings: ClaudeSdkSettings | undefined,
5387+
name: string,
5388+
) {
5389+
const launchValue = launchArgSettings?.env?.[name];
5390+
if (typeof launchValue === "string") return launchValue;
5391+
for (const settingsFile of yield* settingsFilesByPrecedence(cwd)) {
5392+
const value = yield* readSettingsEnv(settingsFile, name);
5393+
if (value !== undefined) return value;
5394+
}
5395+
return adapterOptions.environment[name];
5396+
});
5397+
const resolveToolSearchOverride = (
5398+
cwd: string | null,
5399+
launchArgSettings: ClaudeSdkSettings | undefined,
5400+
) =>
5401+
resolveClaudeEnv(cwd, launchArgSettings, "ENABLE_TOOL_SEARCH").pipe(
5402+
Effect.map(claudeToolSearchOverride),
5403+
);
53955404

53965405
const resolveAutoCompactWindow = Effect.fn("ClaudeAdapterV2.resolveAutoCompactWindow")(function* (
53975406
cwd: string | null,
@@ -5400,6 +5409,20 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
54005409
) {
54015410
if (adapterOptions.settings.autoCompactWindow !== "")
54025411
return adapterOptions.settings.autoCompactWindow;
5412+
const validWindow = (value: unknown) => {
5413+
const selected = Option.getOrUndefined(decodeClaudeCompactWindow(value));
5414+
return typeof selected === "number" && selected >= 100_000 && selected <= 1_000_000
5415+
? String(selected)
5416+
: undefined;
5417+
};
5418+
// Claude gives CLAUDE_CODE_AUTO_COMPACT_WINDOW precedence over the autoCompactWindow keys.
5419+
const envValue = yield* resolveClaudeEnv(
5420+
cwd,
5421+
launchArgSettings,
5422+
"CLAUDE_CODE_AUTO_COMPACT_WINDOW",
5423+
);
5424+
const envWindow = envValue === undefined ? undefined : validWindow(Number(envValue));
5425+
if (envWindow !== undefined) return envWindow;
54035426
const model = compileClaudeModelSelection(modelSelection).apiModelId.replace(/\[1m\]$/i, "");
54045427
const windowFrom = (settings: unknown) => {
54055428
if (typeof settings !== "object" || settings === null) return undefined;
@@ -5410,12 +5433,6 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
54105433
typeof modelSetting === "object" && modelSetting !== null
54115434
? Reflect.get(modelSetting, "autoCompactWindow")
54125435
: undefined;
5413-
const validWindow = (value: unknown) => {
5414-
const selected = Option.getOrUndefined(decodeClaudeCompactWindow(value));
5415-
return typeof selected === "number" && selected >= 100_000 && selected <= 1_000_000
5416-
? String(selected)
5417-
: undefined;
5418-
};
54195436
return modelWindow === "auto"
54205437
? ""
54215438
: (validWindow(modelWindow) ?? validWindow(Reflect.get(settings, "autoCompactWindow")));

0 commit comments

Comments
 (0)