@devries-cameron20 / t3code Mirror · read-only / commits / 82839de094
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 21, 18:30 UTC

fix(server): Claude context meter honours CLAUDE_CODE_AUTO_COMPACT_WINDOW (#33806)

Julius Marminge committed Nov 12, 2026 at 16:09 UTC 82839de0942fbcdd94cc25241e47698bdc82f8e5
2 files changed +58 -20
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
+22 -1
@@ -9083,9 +9083,29 @@ describe("ClaudeAdapterV2 background wake turns", () => {
9083 '{"autoCompactWindow":500000,"modelSettings":{"claude-opus-5-5":{"autoCompactWindow":50000}}}',
9084 threshold: 467_000,
9085 },
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 + },
9098 ])(
9099 "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 + }) =>
9109 Effect.gen(function* () {
9110 const fileSystem = yield* FileSystem.FileSystem;
9111 const path = yield* Path.Path;
@@ -9108,6 +9128,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
9128 homePath: home,
9129 launchArgs: launchArgs ?? "",
9130 },
9131 + ...(environment === undefined ? {} : { environment }),
9132 });
9133 yield* harness.runtime.startTurn(
9134 makeClaudeTestTurnInput({
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
+36 -19
@@ -5319,11 +5319,11 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
5319 },
5320 );
5321
5322 - const readToolSearchSetting = (filePath: string) =>
5322 + const readSettingsEnv = (filePath: string, name: string) =>
5323 fileSystem.readFileString(filePath).pipe(
5324 Effect.flatMap(decodeClaudeEnvSettings),
5325 Effect.map((settings) => {
5326 - const value = settings.env?.ENABLE_TOOL_SEARCH;
5326 + const value = settings.env?.[name];
5327 return typeof value === "string" ? value : undefined;
5328 }),
5329 Effect.orElseSucceed(() => undefined),
@@ -5381,17 +5381,26 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
5381 // Settings env beats the process env, --settings over local over project over user, and a local
5382 // file an older Claude Code left in cwd applies under the root one. resolveSettings reads local
5383 // 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 + );
5404
5405 const resolveAutoCompactWindow = Effect.fn("ClaudeAdapterV2.resolveAutoCompactWindow")(function* (
5406 cwd: string | null,
@@ -5400,6 +5409,20 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
5409 ) {
5410 if (adapterOptions.settings.autoCompactWindow !== "")
5411 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;
5426 const model = compileClaudeModelSelection(modelSelection).apiModelId.replace(/\[1m\]$/i, "");
5427 const windowFrom = (settings: unknown) => {
5428 if (typeof settings !== "object" || settings === null) return undefined;
@@ -5410,12 +5433,6 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
5433 typeof modelSetting === "object" && modelSetting !== null
5434 ? Reflect.get(modelSetting, "autoCompactWindow")
5435 : 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 - };
5436 return modelWindow === "auto"
5437 ? ""
5438 : (validWindow(modelWindow) ?? validWindow(Reflect.get(settings, "autoCompactWindow")));