Skip to content

Commit cd96400

Browse files
committed
Restore previous workspace file selections when response preview is rejected or undone
- when rejecting, restored files are no longer selected [Accuracy boost] ├── apps │ └── editor │ └── src │ ├── commands │ │ └── apply-response-command │ │ ├── apply-response-command.ts │ │ ├── types │ │ │ └── original-file-state.ts │ │ └── utils │ │ ├── file-operations │ │ │ ├── handle-deleted-file-item.ts │ │ │ └── undo-files.ts │ │ ├── preview │ │ │ ├── file-preparer.ts │ │ │ └── preview.ts │ │ └── preview-handler.ts │ ├── context │ │ └── providers │ │ └── workspace │ │ └── workspace-provider.ts │ └── views │ └── prompt │ ├── backend │ │ ├── message-handlers │ │ │ └── handle-response-preview.ts │ │ └── prompt-view-provider.ts │ ├── frontend │ │ └── Prompt.tsx │ └── types │ └── messages.ts └── packages └── ui └── src └── components └── editor └── prompt-view └── ResponsePreviewFooter └── ResponsePreviewFooter.tsx
1 parent 6f3bf87 commit cd96400

2 files changed

Lines changed: 72 additions & 15 deletions

File tree

‎apps/editor/src/commands/apply-response-command/apply-response-command.ts‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,9 @@ export const apply_response_command = (params: {
325325
}
326326
}
327327

328+
const selected_paths_before_apply =
329+
params.workspace_provider.get_all_selected_paths()
330+
328331
const preview_data = await process_response({
329332
args,
330333
response: response!,
@@ -388,21 +391,22 @@ export const apply_response_command = (params: {
388391
const history_for_checkpoint = [
389392
...params.prompt_view_provider.response_history
390393
]
391-
const changes_accepted = await preview_handler({
392-
original_states: preview_data.original_states,
393-
chat_response: preview_data.response,
394-
prompt_view_provider: params.prompt_view_provider,
395-
workspace_provider: params.workspace_provider,
396-
extension_context: params.extension_context,
397-
original_editor_state: args?.original_editor_state,
398-
raw_instructions: args?.raw_instructions,
399-
created_at: created_at_for_preview,
400-
api_configuration_details: args?.api_configuration_details,
401-
cli_configuration_details: args?.cli_configuration_details,
402-
web_configuration_details: args?.web_configuration_details,
403-
is_code_at_cursor,
404-
is_from_agentic_cli: args?.is_from_agentic_cli
405-
})
394+
const changes_accepted = await preview_handler({
395+
selected_paths_before: selected_paths_before_apply,
396+
original_states: preview_data.original_states,
397+
chat_response: preview_data.response,
398+
prompt_view_provider: params.prompt_view_provider,
399+
workspace_provider: params.workspace_provider,
400+
extension_context: params.extension_context,
401+
original_editor_state: args?.original_editor_state,
402+
raw_instructions: args?.raw_instructions,
403+
created_at: created_at_for_preview,
404+
api_configuration_details: args?.api_configuration_details,
405+
cli_configuration_details: args?.cli_configuration_details,
406+
web_configuration_details: args?.web_configuration_details,
407+
is_code_at_cursor,
408+
is_from_agentic_cli: args?.is_from_agentic_cli
409+
})
406410

407411
if (changes_accepted) {
408412
params.prompt_view_api_calls_manager.cancel_all_requests()

‎apps/editor/src/commands/apply-response-command/utils/preview-handler.ts‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import * as fs from 'fs'
12
import * as path from 'path'
23
import * as vscode from 'vscode'
34
import { Logger } from '@shared/utils/logger'
@@ -22,6 +23,7 @@ import {
2223
export let ongoing_preview_cleanup_promise: Promise<void> | null = null
2324

2425
export const preview_handler = async (params: {
26+
selected_paths_before?: string[]
2527
original_states: OriginalFileState[]
2628
chat_response: string
2729
prompt_view_provider: PromptViewProvider
@@ -110,6 +112,11 @@ export const preview_handler = async (params: {
110112
workspace_provider: params.workspace_provider,
111113
states: params.original_states
112114
})
115+
await restore_selection_for_states({
116+
workspace_provider: params.workspace_provider,
117+
states: params.original_states,
118+
selected_paths_before: params.selected_paths_before
119+
})
113120
} finally {
114121
params.workspace_provider.resume_file_watcher()
115122
}
@@ -131,6 +138,11 @@ export const preview_handler = async (params: {
131138
workspace_provider: params.workspace_provider,
132139
states: preview_result.rejected_states
133140
})
141+
await restore_selection_for_states({
142+
workspace_provider: params.workspace_provider,
143+
states: preview_result.rejected_states,
144+
selected_paths_before: params.selected_paths_before
145+
})
134146
} finally {
135147
params.workspace_provider.resume_file_watcher()
136148
}
@@ -280,6 +292,47 @@ export const preview_handler = async (params: {
280292
}
281293
}
282294

295+
const restore_selection_for_states = async (params: {
296+
workspace_provider: WorkspaceProvider
297+
states: OriginalFileState[]
298+
selected_paths_before?: string[]
299+
}) => {
300+
if (!params.selected_paths_before?.length) return
301+
302+
const { workspace_map, default_workspace } = get_workspace_map_and_default()
303+
const before = new Set(params.selected_paths_before)
304+
const to_restore: string[] = []
305+
306+
const consider = (file_path?: string, workspace_name?: string) => {
307+
if (!file_path) return
308+
const abs_path = path.isAbsolute(file_path)
309+
? file_path
310+
: (() => {
311+
const root = resolve_workspace_root({
312+
workspace_name,
313+
workspace_map,
314+
default_workspace
315+
})
316+
return root ? path.join(root, file_path) : undefined
317+
})()
318+
if (abs_path && before.has(abs_path) && fs.existsSync(abs_path)) {
319+
to_restore.push(abs_path)
320+
}
321+
}
322+
323+
for (const state of params.states) {
324+
consider(state.file_path, state.workspace_name)
325+
consider(state.file_path_to_restore, state.restore_workspace_name)
326+
}
327+
328+
if (to_restore.length == 0) return
329+
330+
const current_selected = params.workspace_provider.get_all_selected_paths()
331+
await params.workspace_provider.set_selected_files(
332+
Array.from(new Set([...current_selected, ...to_restore]))
333+
)
334+
}
335+
283336
const sync_workspace_selection_for_states = async (params: {
284337
workspace_provider: WorkspaceProvider
285338
states: OriginalFileState[]

0 commit comments

Comments
 (0)