@@ -4131,6 +4131,8 @@ interface ActiveClaudeSubagent {
41314131interface ClaudeLiveQueryContext {
41324132 readonly queryPolicy : ClaudeRuntimeQueryPolicy ;
41334133 readonly nativeThreadId : string ;
4134+ readonly settingsCwd : string | null ;
4135+ readonly launchArgSettings : ClaudeSdkSettings | undefined ;
41344136 readonly query : ClaudeAgentSdkQuerySession ;
41354137 readonly queryPolicyKey : string ;
41364138 selection : CompiledClaudeModelSelection ;
@@ -4720,6 +4722,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
47204722 const resolveAutoCompactWindow = Effect . fn ( "ClaudeAdapterV2.resolveAutoCompactWindow" ) ( function * (
47214723 cwd : string | null ,
47224724 modelSelection : ModelSelection ,
4725+ launchArgSettings : ClaudeSdkSettings | undefined ,
47234726 ) {
47244727 if ( adapterOptions . settings . autoCompactWindow !== "" )
47254728 return adapterOptions . settings . autoCompactWindow ;
@@ -4743,13 +4746,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
47434746 } ;
47444747 return validWindow ( modelWindow ) ?? validWindow ( Reflect . get ( settings , "autoCompactWindow" ) ) ;
47454748 } ;
4746- const launch = yield * readClaudeLaunchArgSettings ( {
4747- settings : adapterOptions . settings ,
4748- cwd,
4749- fileSystem,
4750- path,
4751- } ) ;
4752- const launchWindow = windowFrom ( launch ) ;
4749+ const launchWindow = windowFrom ( launchArgSettings ) ;
47534750 if ( launchWindow !== undefined ) return launchWindow ;
47544751 for ( const settingsFile of yield * settingsFilesByPrecedence ( cwd ) ) {
47554752 const settings = yield * fileSystem . readFileString ( settingsFile ) . pipe (
@@ -10480,6 +10477,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1048010477 const context : ClaudeLiveQueryContext = {
1048110478 queryPolicy,
1048210479 nativeThreadId,
10480+ settingsCwd : turnInput . runtimePolicy . cwd ,
10481+ launchArgSettings,
1048310482 query : querySession ,
1048410483 queryPolicyKey,
1048510484 selection : compiledSelection ,
@@ -10642,11 +10641,12 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1064210641 Effect . provideService ( ChildProcessSpawner . ChildProcessSpawner , spawner ) ,
1064310642 Effect . provideService ( Path . Path , path ) ,
1064410643 ) ;
10644+ const querySession = yield * openQuery ( turnInput , nativeThreadId ) ;
1064510645 const autoCompactWindow = yield * resolveAutoCompactWindow (
10646- turnInput . runtimePolicy . cwd ,
10646+ querySession . settingsCwd ,
1064710647 turnInput . modelSelection ,
10648+ querySession . launchArgSettings ,
1064810649 ) ;
10649- const querySession = yield * openQuery ( turnInput , nativeThreadId ) ;
1065010650 const context : ActiveClaudeTurnContext = {
1065110651 input : turnInput ,
1065210652 autoCompactWindow,
0 commit comments