Skip to content

Commit 5f95653

Browse files
fix(server): Claude context meter no longer shows an auto-compact point when auto-compaction is off (#36417)
1 parent 70b0529 commit 5f95653

2 files changed

Lines changed: 36 additions & 0 deletions

File tree

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9109,6 +9109,18 @@ describe("ClaudeAdapterV2 background wake turns", () => {
91099109
environment: { CLAUDE_CODE_AUTO_COMPACT_WINDOW: "300000" },
91109110
threshold: 267_000,
91119111
},
9112+
{
9113+
autoCompactWindow: "",
9114+
model: "claude-opus-5-5",
9115+
userSettings: '{"autoCompactWindow":400000,"autoCompactEnabled":false}',
9116+
threshold: undefined,
9117+
},
9118+
{
9119+
autoCompactWindow: "400000",
9120+
model: "claude-opus-5-5",
9121+
environment: { DISABLE_AUTO_COMPACT: "1" },
9122+
threshold: undefined,
9123+
},
91129124
])(
91139125
"ignores stale snapshots after compaction and reports threshold $autoCompactWindow for $model",
91149126
({

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,11 @@ function claudePromptCacheTtlMs(
270270
// getContextUsage reports a 150,000 window as a 117,000 threshold, for every catalog model.
271271
const CLAUDE_AUTO_COMPACT_RESERVE_TOKENS = 33_000;
272272

273+
// Claude Code's isEnvTruthy.
274+
function isClaudeEnvTruthy(value: string | undefined): boolean {
275+
return value !== undefined && ["1", "true", "yes", "on"].includes(value.trim().toLowerCase());
276+
}
277+
273278
function claudeAutoCompactThreshold(autoCompactWindow: string, maxTokens: number | null) {
274279
const windowTokens = Number(autoCompactWindow);
275280
return windowTokens > 0 && (maxTokens === null || windowTokens < maxTokens)
@@ -3260,6 +3265,7 @@ const decodeClaudeSubagentCacheSettings = Schema.decodeUnknownEffect(
32603265
const decodeClaudeCompactSettings = Schema.decodeUnknownEffect(
32613266
Schema.fromJsonString(
32623267
Schema.Struct({
3268+
autoCompactEnabled: Schema.optionalKey(Schema.Unknown),
32633269
autoCompactWindow: Schema.optionalKey(Schema.Unknown),
32643270
modelSettings: Schema.optionalKey(Schema.Unknown),
32653271
}),
@@ -5473,6 +5479,24 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
54735479
modelSelection: ModelSelection,
54745480
launchArgSettings: ClaudeSdkSettings | undefined,
54755481
) {
5482+
// With auto-compaction off Claude never compacts, so there is no threshold to report.
5483+
for (const name of ["DISABLE_COMPACT", "DISABLE_AUTO_COMPACT"]) {
5484+
const value = yield* resolveClaudeEnv(cwd, launchArgSettings, name);
5485+
if (isClaudeEnvTruthy(value)) return "";
5486+
}
5487+
const launchEnabled = launchArgSettings?.autoCompactEnabled;
5488+
let autoCompactEnabled = typeof launchEnabled === "boolean" ? launchEnabled : undefined;
5489+
for (const settingsFile of yield* settingsFilesByPrecedence(cwd)) {
5490+
if (autoCompactEnabled !== undefined) break;
5491+
const settings = yield* fileSystem.readFileString(settingsFile).pipe(
5492+
Effect.flatMap(decodeClaudeCompactSettings),
5493+
Effect.orElseSucceed(() => undefined),
5494+
);
5495+
if (typeof settings?.autoCompactEnabled === "boolean") {
5496+
autoCompactEnabled = settings.autoCompactEnabled;
5497+
}
5498+
}
5499+
if (autoCompactEnabled === false) return "";
54765500
if (adapterOptions.settings.autoCompactWindow !== "")
54775501
return adapterOptions.settings.autoCompactWindow;
54785502
const validWindow = (value: unknown) => {

0 commit comments

Comments
 (0)