Skip to content

Commit 2ac51a1

Browse files
committed
Add default commit message agent support and refactor agent invocation handling
- You should remove run_in_terminal entirely and let execution_mode serve as the single source of truth for both argument resolution and execution strategy. - [Pasted text] - allow selecting default agent for commit messages └── apps └── editor ├── package.json └── src ├── commands │ ├── code-at-cursor-command │ │ └── utils │ │ └── perform-code-at-cursor.ts │ └── generate-commit-message-commands │ └── actions │ └── run-generate-action.ts ├── features │ ├── agentic-search │ │ └── agentic-search.ts │ └── search-files │ └── search-modes │ └── perform-intelligent-search-mode.ts ├── services │ └── providers-manager.ts ├── utils │ ├── agentic-cli-invocation │ │ ├── agents │ │ │ ├── antigravity.ts │ │ │ ├── claude.ts │ │ │ ├── codex.ts │ │ │ ├── cursor.ts │ │ │ ├── grok.ts │ │ │ ├── index.ts │ │ │ └── opencode.ts │ │ ├── index.ts │ │ ├── invoke-agentic-cli.ts │ │ ├── types.ts │ │ └── utils │ │ ├── check-command-exists.ts │ │ ├── format-duration.ts │ │ ├── generate-diff-markdown.ts │ │ └── get-progress-dots.ts │ └── cli-configuration-format-converters.ts └── views ├── prompt │ └── backend │ └── message-handlers │ ├── handle-invoke-agentic-cli.ts │ ├── handle-patch-repair.ts │ └── handle-voice-input.ts └── settings ├── backend │ └── message-handlers │ ├── handle-get-cli-configurations.ts │ ├── handle-select-default-cli-configuration.ts │ ├── handle-set-default-cli-configuration.ts │ └── index.ts ├── frontend │ ├── Home │ │ ├── Home.tsx │ │ └── sections │ │ └── CliSection.tsx │ ├── Settings.tsx │ ├── hooks │ │ └── use-settings.ts │ └── i18n │ └── translations │ └── cli.ts └── types └── messages.ts
1 parent 8347312 commit 2ac51a1

15 files changed

Lines changed: 130 additions & 187 deletions

File tree

‎apps/editor/package.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,6 +1069,9 @@
10691069
},
10701070
"isDefaultForVoiceInput": {
10711071
"type": "boolean"
1072+
},
1073+
"isDefaultForCommitMessage": {
1074+
"type": "boolean"
10721075
}
10731076
},
10741077
"required": [

‎apps/editor/src/commands/code-at-cursor-command/utils/perform-code-at-cursor.ts‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -369,37 +369,17 @@ export const perform_code_at_cursor = async (params: {
369369
user_instructions: code_at_cursor_user_instructions
370370
})
371371

372-
const config = vscode.workspace.getConfiguration('codeWebChat')
373-
const agent_configs = config.get<any[]>('agents', []) || []
374-
const default_agent = agent_configs.find((c) => c.isDefaultForCodeAtCursor)
375-
376-
const use_quick_pick = !default_agent
377-
const cli_configuration_name = default_agent
378-
? default_agent.name
379-
: undefined
380-
381372
const invoke_cli_result = await invoke_agentic_cli({
382373
workspace_provider: params.workspace_provider,
383374
extension_context: params.extension_context,
384375
build_prompt: async () => cli_prompt,
385376
notification_title: t('command.code-at-cursor-command.progress.title'),
386377
last_selected_workspace_state_key:
387378
LAST_SELECTED_WORKSPACE_FOR_CODE_AT_CURSOR_STATE_KEY,
388-
last_used_agent_config_name:
389-
params.extension_context.workspaceState.get<string>(
390-
LAST_USED_AGENT_FOR_CODE_AT_CURSOR_STATE_KEY
391-
),
392-
cli_configuration_name,
393-
use_quick_pick,
394-
on_agent_selected: (name) => {
395-
params.extension_context.workspaceState.update(
396-
LAST_USED_AGENT_FOR_CODE_AT_CURSOR_STATE_KEY,
397-
name
398-
)
399-
},
379+
agent_state_key: LAST_USED_AGENT_FOR_CODE_AT_CURSOR_STATE_KEY,
380+
default_agent_key: 'isDefaultForCodeAtCursor',
400381
show_back_button: true,
401-
isolate_in_temp_dir: true,
402-
execution_mode: 'headless'
382+
isolate_in_temp_dir: true
403383
})
404384

405385
if (invoke_cli_result === 'back') {

‎apps/editor/src/commands/generate-commit-message-commands/actions/run-generate-action.ts‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -479,19 +479,10 @@ export const run_generate_action = async (params: {
479479
),
480480
last_selected_workspace_state_key:
481481
LAST_SELECTED_WORKSPACE_FOR_COMMIT_MESSAGE_STATE_KEY,
482-
last_used_agent_config_name:
483-
params.extension_context.workspaceState.get<string>(
484-
LAST_USED_AGENT_FOR_COMMIT_MESSAGE_STATE_KEY
485-
),
486-
on_agent_selected: (name) => {
487-
params.extension_context.workspaceState.update(
488-
LAST_USED_AGENT_FOR_COMMIT_MESSAGE_STATE_KEY,
489-
name
490-
)
491-
},
482+
agent_state_key: LAST_USED_AGENT_FOR_COMMIT_MESSAGE_STATE_KEY,
483+
default_agent_key: 'isDefaultForCommitMessage',
492484
show_back_button: true,
493-
isolate_in_temp_dir: true,
494-
execution_mode: 'headless'
485+
isolate_in_temp_dir: true
495486
})
496487

497488
if (invoke_cli_result === 'back') {

‎apps/editor/src/features/agentic-search/agentic-search.ts‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -62,43 +62,15 @@ export const agentic_search = async (params: {
6262
}
6363
)
6464

65-
const config = vscode.workspace.getConfiguration('codeWebChat')
66-
const agent_configs = config.get<any[]>('agents', []) || []
67-
const default_agent = agent_configs.find((c) => c.isDefaultForAgenticSearch)
68-
69-
const use_quick_pick = !default_agent
70-
const cli_configuration_name = default_agent
71-
? default_agent.name
72-
: undefined
73-
74-
const last_used_agent_config_name =
75-
params.extension_context.workspaceState.get<string>(
76-
LAST_USED_AGENTIC_SEARCH_AGENT_STATE_KEY
77-
) ??
78-
params.extension_context.globalState.get<string>(
79-
LAST_USED_AGENTIC_SEARCH_AGENT_STATE_KEY
80-
)
81-
8265
const result = await invoke_agentic_cli({
8366
workspace_provider: params.workspace_provider,
8467
extension_context: params.extension_context,
8568
notification_title: t('common.title.agentic-search'),
86-
last_used_agent_config_name,
87-
cli_configuration_name,
88-
on_agent_selected: (name: string) => {
89-
params.extension_context.workspaceState.update(
90-
LAST_USED_AGENTIC_SEARCH_AGENT_STATE_KEY,
91-
name
92-
)
93-
params.extension_context.globalState.update(
94-
LAST_USED_AGENTIC_SEARCH_AGENT_STATE_KEY,
95-
name
96-
)
97-
},
69+
agent_state_key: LAST_USED_AGENTIC_SEARCH_AGENT_STATE_KEY,
9870
last_selected_workspace_state_key:
9971
LAST_SELECTED_WORKSPACE_IN_AGENTIC_SEARCH_STATE_KEY,
72+
default_agent_key: 'isDefaultForAgenticSearch',
10073
show_back_button: true,
101-
use_quick_pick,
10274
build_prompt: async () => {
10375
const { instructions: processed_query, skill_definitions } =
10476
await replace_symbols({

‎apps/editor/src/features/search-files/search-modes/perform-intelligent-search-mode.ts‎

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -410,19 +410,6 @@ export const perform_intelligent_search_mode = async (params: {
410410
?.defaultValue ||
411411
''
412412

413-
const config_codeWebChat =
414-
vscode.workspace.getConfiguration('codeWebChat')
415-
const agent_configs =
416-
config_codeWebChat.get<any[]>('agents', []) || []
417-
const default_agent = agent_configs.find(
418-
(c) => c.isDefaultForIntelligentSearch
419-
)
420-
421-
const use_quick_pick = !default_agent
422-
const cli_configuration_name = default_agent
423-
? default_agent.name
424-
: undefined
425-
426413
const cli_prompt = `# Files\n\n${md_files}# Task\n\n${base_instructions}\n\n# Output formatting\n\n${ai_file_search_format_instructions}\n\n# Requirements\n\n- ${cli_edit_ask_requirements.preloaded_context}\n- ${cli_edit_ask_requirements.disable_tool_calling}\n\n# Query\n\n${search_term}`
427414

428415
const invoke_cli_result = await invoke_agentic_cli({
@@ -432,21 +419,10 @@ export const perform_intelligent_search_mode = async (params: {
432419
notification_title: t('common.title.intelligent-search'),
433420
last_selected_workspace_state_key:
434421
LAST_SELECTED_WORKSPACE_FOR_INTELLIGENT_SEARCH_STATE_KEY,
435-
last_used_agent_config_name:
436-
params.extension_context.workspaceState.get<string>(
437-
LAST_USED_AGENT_FOR_INTELLIGENT_SEARCH_STATE_KEY
438-
),
439-
cli_configuration_name,
440-
use_quick_pick,
441-
on_agent_selected: (name) => {
442-
params.extension_context.workspaceState.update(
443-
LAST_USED_AGENT_FOR_INTELLIGENT_SEARCH_STATE_KEY,
444-
name
445-
)
446-
},
422+
agent_state_key: LAST_USED_AGENT_FOR_INTELLIGENT_SEARCH_STATE_KEY,
423+
default_agent_key: 'isDefaultForIntelligentSearch',
447424
show_back_button: true,
448-
isolate_in_temp_dir: true,
449-
execution_mode: 'headless'
425+
isolate_in_temp_dir: true
450426
})
451427

452428
if (invoke_cli_result === 'back') {

‎apps/editor/src/utils/agentic-cli-invocation/invoke-agentic-cli.ts‎

Lines changed: 60 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -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

‎apps/editor/src/utils/cli-configuration-format-converters.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export type ConfigAgentConfigurationFormat = {
1111
isDefaultForIntelligentSearch?: boolean
1212
isDefaultForPatchRepair?: boolean
1313
isDefaultForVoiceInput?: boolean
14+
isDefaultForCommitMessage?: boolean
1415
}
1516

1617
export const config_cli_configuration_to_ui_format = (

‎apps/editor/src/views/prompt/backend/message-handlers/handle-invoke-agentic-cli.ts‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,41 +34,24 @@ export const handle_invoke_agentic_cli = async (
3434

3535
const prompt_type = prompt_view_provider.cli_prompt_type
3636
const last_used_key = get_last_used_cli_configuration_key(prompt_type)
37-
const last_used_agent_config_name =
38-
prompt_view_provider.extension_context.workspaceState.get<string>(
39-
last_used_key
40-
) ??
41-
prompt_view_provider.extension_context.globalState.get<string>(
42-
last_used_key
43-
)
4437

4538
const result = await invoke_agentic_cli({
4639
workspace_provider: prompt_view_provider.workspace_provider,
4740
extension_context: prompt_view_provider.extension_context,
4841
notification_title: t(
4942
'views.prompt.handlers.handle-invoke-agentic-cli.title'
5043
),
51-
last_used_agent_config_name,
44+
agent_state_key: last_used_key,
5245
last_selected_workspace_state_key:
5346
LAST_SELECTED_WORKSPACE_IN_AGENTIC_CLI_STATE_KEY,
5447
isolate_in_temp_dir: true,
5548
copy_selected_files: prompt_type == 'edit-files',
56-
run_in_terminal: prompt_type == 'ask-about-files',
5749
generate_diff_for_temp_dir: prompt_type == 'edit-files',
5850
execution_mode:
5951
prompt_type == 'edit-files' ? 'headless' : 'interactive-terminal',
6052
cli_configuration_name: message.cli_configuration_name,
6153
use_quick_pick: message.use_quick_pick,
6254
on_agent_selected: (name: string) => {
63-
prompt_view_provider.extension_context.workspaceState.update(
64-
last_used_key,
65-
name
66-
)
67-
prompt_view_provider.extension_context.globalState.update(
68-
last_used_key,
69-
name
70-
)
71-
7255
prompt_view_provider.send_message({
7356
command: 'SELECTED_CLI_CONFIGURATION_CHANGED',
7457
prompt_type,

0 commit comments

Comments
 (0)