@@ -27,16 +27,16 @@ export const invoke_agentic_cli = async (params: {
2727 build_prompt : ( selected_root : string ) => Promise < string >
2828 notification_title : string
2929 last_selected_workspace_state_key : string
30- on_agent_selected : ( name : string ) => void
31- last_used_agent_config_name ?: string
30+ agent_state_key ?: string
31+ on_agent_selected ?: ( name : string ) => void
3232 show_back_button ?: boolean
3333 isolate_in_temp_dir ?: boolean
3434 copy_selected_files ?: boolean
35- run_in_terminal ?: boolean
3635 generate_diff_for_temp_dir ?: boolean
3736 execution_mode ?: 'headless' | 'interactive-terminal'
3837 cli_configuration_name ?: string
3938 use_quick_pick ?: boolean
39+ default_agent_key ?: keyof ConfigAgentConfigurationFormat
4040} ) : Promise <
4141 { agent_output : string ; selected_root : string } | undefined | 'back'
4242> => {
@@ -51,6 +51,7 @@ export const invoke_agentic_cli = async (params: {
5151
5252 let current_agent_config_name = params . cli_configuration_name
5353 let show_quick_pick = params . use_quick_pick
54+ const execution_mode = params . execution_mode ?? 'headless'
5455
5556 while ( true ) {
5657 const config = vscode . workspace . getConfiguration ( 'codeWebChat' )
@@ -64,6 +65,22 @@ export const invoke_agentic_cli = async (params: {
6465 return undefined
6566 }
6667
68+ if (
69+ current_agent_config_name === undefined &&
70+ show_quick_pick === undefined &&
71+ params . default_agent_key
72+ ) {
73+ const default_agent = agents_config . find (
74+ ( c ) => c [ params . default_agent_key ! ]
75+ )
76+ if ( default_agent ) {
77+ current_agent_config_name = default_agent . name
78+ show_quick_pick = false
79+ } else {
80+ show_quick_pick = true
81+ }
82+ }
83+
6784 const close_button = {
6885 iconPath : new vscode . ThemeIcon ( 'close' ) ,
6986 tooltip : t ( 'common.close' )
@@ -86,7 +103,15 @@ export const invoke_agentic_cli = async (params: {
86103 }
87104 }
88105 } else if ( ! show_quick_pick ) {
89- const last_used = params . last_used_agent_config_name
106+ const last_used = params . agent_state_key
107+ ? ( params . extension_context . workspaceState . get < string > (
108+ params . agent_state_key
109+ ) ??
110+ params . extension_context . globalState . get < string > (
111+ params . agent_state_key
112+ ) )
113+ : undefined
114+
90115 if ( last_used ) {
91116 const config_item = agents_config . find ( ( c ) => c . name === last_used )
92117 if ( config_item ) {
@@ -163,7 +188,15 @@ export const invoke_agentic_cli = async (params: {
163188 const agent_quick_pick = vscode . window . createQuickPick < AgentPickItem > ( )
164189 agent_quick_pick . items = build_agent_picks ( )
165190
166- const last_used = params . last_used_agent_config_name
191+ const last_used = params . agent_state_key
192+ ? ( params . extension_context . workspaceState . get < string > (
193+ params . agent_state_key
194+ ) ??
195+ params . extension_context . globalState . get < string > (
196+ params . agent_state_key
197+ ) )
198+ : undefined
199+
167200 if ( last_used ) {
168201 const active_item = agent_quick_pick . items . find (
169202 ( i ) => i . config_name == last_used
@@ -294,7 +327,20 @@ export const invoke_agentic_cli = async (params: {
294327 }
295328
296329 if ( selected_config_name ) {
297- params . on_agent_selected ( selected_config_name )
330+ if ( params . agent_state_key ) {
331+ params . extension_context . workspaceState . update (
332+ params . agent_state_key ,
333+ selected_config_name
334+ )
335+ params . extension_context . globalState . update (
336+ params . agent_state_key ,
337+ selected_config_name
338+ )
339+ }
340+
341+ if ( params . on_agent_selected ) {
342+ params . on_agent_selected ( selected_config_name )
343+ }
298344 }
299345
300346 let go_back_to_agent = false
@@ -479,13 +525,10 @@ export const invoke_agentic_cli = async (params: {
479525 )
480526 await fs . promises . writeFile ( temp_prompt_path , final_prompt , 'utf-8' )
481527
482- if ( params . run_in_terminal ) {
483- const base_args =
484- params . execution_mode === 'interactive-terminal'
485- ? agent_info . get_integrated_terminal_args
486- ? agent_info . get_integrated_terminal_args ( { cwd : selected_root } )
487- : [ ]
488- : agent_info . get_isolated_dir_args ( { cwd : selected_root } )
528+ if ( execution_mode === 'interactive-terminal' ) {
529+ const base_args = agent_info . get_integrated_terminal_args
530+ ? agent_info . get_integrated_terminal_args ( { cwd : selected_root } )
531+ : [ ]
489532
490533 let args = [ ...base_args , ...custom_args ]
491534
@@ -518,10 +561,7 @@ export const invoke_agentic_cli = async (params: {
518561 terminal . show ( )
519562 terminal . sendText ( command )
520563
521- if (
522- params . execution_mode === 'interactive-terminal' &&
523- agent_info . get_post_integrated_terminal_args
524- ) {
564+ if ( agent_info . get_post_integrated_terminal_args ) {
525565 const post_args = agent_info . get_post_integrated_terminal_args ( )
526566 const post_command_args = [
527567 executable ,
@@ -557,14 +597,9 @@ export const invoke_agentic_cli = async (params: {
557597 return
558598 }
559599
560- const base_args =
561- params . execution_mode === 'interactive-terminal'
562- ? agent_info . get_integrated_terminal_args
563- ? agent_info . get_integrated_terminal_args ( {
564- cwd : selected_root
565- } )
566- : [ ]
567- : agent_info . get_isolated_dir_args ( { cwd : selected_root } )
600+ const base_args = agent_info . get_isolated_dir_args ( {
601+ cwd : selected_root
602+ } )
568603
569604 let args = [ ...base_args , ...custom_args ]
570605
0 commit comments