@@ -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