TypeScript
fix(server): report Claude settings compaction threshold (#29220)
Lakshmi Tanmay20841cdfb613
diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.tsindex 70f1471ef54..d7d03c779b4 100644--- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts+++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts@@ -7952,12 +7952,116 @@ describe("ClaudeAdapterV2 background wake turns", () => {{ autoCompactWindow: "200000", model: "claude-sonnet-4-6", threshold: undefined },{ autoCompactWindow: "650000", model: "claude-sonnet-4-6", threshold: undefined },{ autoCompactWindow: "650000", model: "uncatalogued-model", threshold: 617_000 },+ {+ autoCompactWindow: "",+ model: "claude-opus-5-5",+ userSettings: '{"autoCompactWindow":500000}',+ threshold: 467_000,+ },+ {+ autoCompactWindow: "300000",+ model: "claude-opus-5-5",+ userSettings: '{"autoCompactWindow":500000}',+ threshold: 267_000,+ },+ {+ autoCompactWindow: "",+ model: "claude-opus-5-5",+ userSettings: '{"autoCompactWindow":500000}',+ projectSettings: '{"autoCompactWindow":400000}',+ threshold: 367_000,+ },+ {+ autoCompactWindow: "",+ model: "claude-opus-5-5",+ userSettings:+ '{"autoCompactWindow":500000,"modelSettings":{"claude-opus-5-5":{"autoCompactWindow":450000}}}',+ threshold: 417_000,+ },+ {+ autoCompactWindow: "",+ model: "claude-opus-5-5",+ userSettings: '{"autoCompactWindow":500000}',+ projectSettings: '{"modelSettings":{"claude-opus-5-5":{"autoCompactWindow":"auto"}}}',+ threshold: undefined,+ },+ {+ autoCompactWindow: "",+ model: "claude-opus-5-5",+ userSettings: '{"autoCompactWindow":500000}',+ launchArgs: `--settings '{"autoCompactWindow":350000}'`,+ threshold: 317_000,+ },+ {+ autoCompactWindow: "",+ model: "claude-opus-5-5",+ userSettings: '{"autoCompactWindow":"invalid"}',+ threshold: undefined,+ },+ {+ autoCompactWindow: "",+ model: "claude-opus-5-5",+ userSettings: '{"autoCompactWindow":500000,}',+ threshold: undefined,+ },+ {+ autoCompactWindow: "",+ model: "claude-opus-5-5",+ userSettings: '{/* invalid */ "autoCompactWindow":500000}',+ threshold: undefined,+ },+ {+ autoCompactWindow: "",+ model: "claude-opus-5-5",+ userSettings: '{"autoCompactWindow":500000,"modelSettings":null}',+ threshold: 467_000,+ },+ {+ autoCompactWindow: "",+ model: "claude-opus-5-5",+ userSettings: '{"autoCompactWindow":500000}',+ projectSettings: '{"autoCompactWindow":"auto"}',+ threshold: 467_000,+ },+ {+ autoCompactWindow: "",+ model: "claude-opus-5-5",+ userSettings: '{"autoCompactWindow":500000}',+ projectSettings: '{"autoCompactWindow":50000}',+ threshold: 467_000,+ },+ {+ autoCompactWindow: "",+ model: "claude-opus-5-5",+ userSettings:+ '{"autoCompactWindow":500000,"modelSettings":{"claude-opus-5-5":{"autoCompactWindow":50000}}}',+ threshold: 467_000,+ },])("ignores stale snapshots after compaction and reports threshold $autoCompactWindow for $model",- ({ autoCompactWindow, model, threshold }) =>+ ({ autoCompactWindow, model, threshold, userSettings, projectSettings, launchArgs }) =>Effect.gen(function* () {+ const fileSystem = yield* FileSystem.FileSystem;+ const path = yield* Path.Path;+ const home = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-compact-" });+ const project = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-compact-" });+ if (userSettings !== undefined) {+ yield* fileSystem.writeFileString(path.join(home, "settings.json"), userSettings);+ }+ if (projectSettings !== undefined) {+ yield* fileSystem.makeDirectory(path.join(project, ".claude"));+ yield* fileSystem.writeFileString(+ path.join(project, ".claude", "settings.json"),+ projectSettings,+ );+ }const harness = yield* makeWakeHarnessWithOptions({- settings: { ...DEFAULT_CLAUDE_SETTINGS, autoCompactWindow },+ settings: {+ ...DEFAULT_CLAUDE_SETTINGS,+ autoCompactWindow,+ homePath: home,+ launchArgs: launchArgs ?? "",+ },});yield* harness.runtime.startTurn(makeClaudeTestTurnInput({@@ -7968,6 +8072,10 @@ describe("ClaudeAdapterV2 background wake turns", () => {text: "Continue.",attachments: [],modelSelection: { ...CLAUDE_TEST_MODEL_SELECTION, model },+ runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({+ ...CLAUDE_TEST_RUNTIME_POLICY,+ cwd: project,+ }),}),);const usage = { ...zeroUsage, input_tokens: 1_000, output_tokens: 75 };@@ -8013,6 +8121,89 @@ describe("ClaudeAdapterV2 background wake turns", () => {),);+ it.effect("reports the settings directory of a reused Claude query", () =>+ Effect.gen(function* () {+ const fileSystem = yield* FileSystem.FileSystem;+ const path = yield* Path.Path;+ const home = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-home-" });+ const first = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-first-" });+ const second = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-second-" });+ for (const [directory, window] of [+ [first, 150_000],+ [second, 180_000],+ ] as const) {+ yield* fileSystem.makeDirectory(path.join(directory, ".claude"));+ yield* fileSystem.writeFileString(+ path.join(directory, ".claude", "settings.json"),+ JSON.stringify({ autoCompactWindow: window }),+ );+ }+ const harness = yield* makeWakeHarnessWithOptions({+ settings: { ...DEFAULT_CLAUDE_SETTINGS, homePath: home },+ });+ let firstOptions: ReturnType<typeof harness.getOpenedOptions>;+ for (const [ordinal, cwd] of [+ [1, first],+ [2, second],+ ] as const) {+ yield* harness.runtime.startTurn(+ makeClaudeTestTurnInput({+ threadId: harness.threadId,+ providerThread: harness.providerThread,+ now: yield* DateTime.now,+ attemptId: RunAttemptId.make(`attempt-compact-cwd-${ordinal}`),+ providerTurnOrdinal: ordinal,+ text: "Continue.",+ attachments: [],+ runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({+ ...CLAUDE_TEST_RUNTIME_POLICY,+ cwd,+ }),+ }),+ );+ if (ordinal === 1) firstOptions = harness.getOpenedOptions();+ else assert.strictEqual(harness.getOpenedOptions(), firstOptions);+ yield* Queue.offer(+ harness.sdkMessages,+ usageSnapshotFrame(+ `msg_cwd_${ordinal}`,+ `00000000-0000-4000-8000-00000000080${ordinal}`,+ {+ ...zeroUsage,+ input_tokens: 1_000,+ output_tokens: 10,+ },+ ),+ );+ yield* Queue.offer(+ harness.sdkMessages,+ makeResultFrame({+ uuid: `00000000-0000-4000-8000-00000000081${ordinal}`,+ result: "Done.",+ }),+ );+ assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "completed");+ }+ assert.deepEqual(+ harness.events.flatMap((event) =>+ event.type === "provider_turn.updated" && event.providerTurn.tokenUsage+ ? [event.providerTurn.tokenUsage.autoCompactThreshold]+ : [],+ ),+ [117_000, 117_000],+ );+ }).pipe(+ Effect.provide(+ Layer.mergeAll(+ IdAllocator.layer,+ McpProviderSessions.layer,+ NodeServices.layer,+ NodeCrypto.layer,+ ),+ ),+ ),+ );+it.effect("shows a hook-dropped Claude prompt once and skips info-level lines", () =>Effect.gen(function* () {const harness = yield* makeWakeHarness;diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.tsindex 331408a21c4..10edb77c501 100644--- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts+++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts@@ -2973,6 +2973,15 @@ const decodeClaudeSubagentCacheSettings = Schema.decodeUnknownEffect(),),);+const decodeClaudeCompactSettings = Schema.decodeUnknownEffect(+ Schema.fromJsonString(+ Schema.Struct({+ autoCompactWindow: Schema.optionalKey(Schema.Unknown),+ modelSettings: Schema.optionalKey(Schema.Unknown),+ }),+ ),+);+const decodeClaudeCompactWindow = Schema.decodeUnknownOption(Schema.Int);const decodeClaudeEnvSettings = Schema.decodeUnknownEffect(fromLenientJson(Schema.StructWithRest(@@ -4317,6 +4326,7 @@ function formatClaudeUsageLimitWait(waitMs: number): string {interface ActiveClaudeTurnContext {readonly queryPolicy: ClaudeRuntimeQueryPolicy;readonly input: ProviderAdapter.ProviderAdapterV2TurnInput;+ readonly autoCompactWindow: string;readonly nativeThreadId: string;readonly nativeTurnId: string;nativeMessageCursor: string | null;@@ -4415,6 +4425,8 @@ interface ActiveClaudeSubagent {interface ClaudeLiveQueryContext {readonly queryPolicy: ClaudeRuntimeQueryPolicy;readonly nativeThreadId: string;+ readonly settingsCwd: string | null;+ readonly launchArgSettings: ClaudeSdkSettings | undefined;readonly query: ClaudeAgentSdkQuerySession;readonly queryPolicyKey: string;selection: CompiledClaudeModelSelection;@@ -4991,15 +5003,10 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (if (path.dirname(directory) === directory) return cwd;}});- // Settings env beats the process env, --settings over local over project over user, and a local- // file an older Claude Code left in cwd applies under the root one. resolveSettings reads local- // from cwd only.- const resolveToolSearchOverride = Effect.fn("ClaudeAdapterV2.resolveToolSearchOverride")(- function* (cwd: string | null, launchArgSettings: ClaudeSdkSettings | undefined) {- const launchValue = launchArgSettings?.env?.ENABLE_TOOL_SEARCH;- if (typeof launchValue === "string") return claudeToolSearchOverride(launchValue);+ const settingsFilesByPrecedence = Effect.fn("ClaudeAdapterV2.settingsFilesByPrecedence")(+ function* (cwd: string | null) {const localDirectory = cwd === null ? null : yield* localSettingsDirectory(cwd);- const settingsFiles = [+ return [...(cwd === null || localDirectory === null? []: [@@ -5009,7 +5016,16 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (]),path.join(homePath, "settings.json"),];- for (const settingsFile of settingsFiles) {+ },+ );+ // Settings env beats the process env, --settings over local over project over user, and a local+ // file an older Claude Code left in cwd applies under the root one. resolveSettings reads local+ // from cwd only.+ const resolveToolSearchOverride = Effect.fn("ClaudeAdapterV2.resolveToolSearchOverride")(+ function* (cwd: string | null, launchArgSettings: ClaudeSdkSettings | undefined) {+ const launchValue = launchArgSettings?.env?.ENABLE_TOOL_SEARCH;+ if (typeof launchValue === "string") return claudeToolSearchOverride(launchValue);+ for (const settingsFile of yield* settingsFilesByPrecedence(cwd)) {const value = yield* readToolSearchSetting(settingsFile);if (value !== undefined) return claudeToolSearchOverride(value);}@@ -5017,6 +5033,46 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (},);+ const resolveAutoCompactWindow = Effect.fn("ClaudeAdapterV2.resolveAutoCompactWindow")(function* (+ cwd: string | null,+ modelSelection: ModelSelection,+ launchArgSettings: ClaudeSdkSettings | undefined,+ ) {+ if (adapterOptions.settings.autoCompactWindow !== "")+ return adapterOptions.settings.autoCompactWindow;+ const model = compileClaudeModelSelection(modelSelection).apiModelId.replace(/\[1m\]$/i, "");+ const windowFrom = (settings: unknown) => {+ if (typeof settings !== "object" || settings === null) return undefined;+ const models = Reflect.get(settings, "modelSettings");+ const modelSetting =+ typeof models === "object" && models !== null ? Reflect.get(models, model) : undefined;+ const modelWindow =+ typeof modelSetting === "object" && modelSetting !== null+ ? Reflect.get(modelSetting, "autoCompactWindow")+ : undefined;+ const validWindow = (value: unknown) => {+ const selected = Option.getOrUndefined(decodeClaudeCompactWindow(value));+ return typeof selected === "number" && selected >= 100_000 && selected <= 1_000_000+ ? String(selected)+ : undefined;+ };+ return modelWindow === "auto"+ ? ""+ : (validWindow(modelWindow) ?? validWindow(Reflect.get(settings, "autoCompactWindow")));+ };+ const launchWindow = windowFrom(launchArgSettings);+ if (launchWindow !== undefined) return launchWindow;+ for (const settingsFile of yield* settingsFilesByPrecedence(cwd)) {+ const settings = yield* fileSystem.readFileString(settingsFile).pipe(+ Effect.flatMap(decodeClaudeCompactSettings),+ Effect.orElseSucceed(() => undefined),+ );+ const value = windowFrom(settings);+ if (value !== undefined) return value;+ }+ return "";+ });+const userInvocableSkills = (cwd: string | null) =>discoverClaudeSkills(adapterOptions.settings,@@ -5405,17 +5461,14 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (? {usedTokens: usage,maxTokens,- ...claudeAutoCompactThreshold(- adapterOptions.settings.autoCompactWindow,- maxTokens,- ),+ ...claudeAutoCompactThreshold(context.autoCompactWindow, maxTokens),updatedAt: DateTime.formatIso(now),}: claudeProviderTurnTokenUsage(usage,maxTokens,DateTime.formatIso(now),- adapterOptions.settings.autoCompactWindow,+ context.autoCompactWindow,context.streamUsage?.requestedAt,);if (typeof usage !== "number") {@@ -10939,6 +10992,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (const context: ClaudeLiveQueryContext = {queryPolicy,nativeThreadId,+ settingsCwd: turnInput.runtimePolicy.cwd,+ launchArgSettings,query: querySession,queryPolicyKey,selection: compiledSelection,@@ -11126,8 +11181,14 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (Effect.provideService(Path.Path, path),);const querySession = yield* openQuery(turnInput, nativeThreadId);+ const autoCompactWindow = yield* resolveAutoCompactWindow(+ querySession.settingsCwd,+ turnInput.modelSelection,+ querySession.launchArgSettings,+ );const context: ActiveClaudeTurnContext = {input: turnInput,+ autoCompactWindow,queryPolicy: querySession.queryPolicy,nativeThreadId,nativeTurnId,