Skip to content

Commit 0fc733e

Browse files
committed
Merge branch 'dev'
2 parents c55cd4f + f52e61f commit 0fc733e

69 files changed

Lines changed: 698 additions & 485 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/editor/package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
"name": "gemini-coder",
33
"displayName": "Code Web Chat",
44
"description": "Markdown prompts for chatbots, APIs, and CLIs with seamless integration",
5+
<<<<<<< HEAD
56
"version": "2026.1116.474",
7+
=======
8+
"version": "2026.1117.474",
9+
>>>>>>> dev
610
"scripts": {
711
"build": "tsx scripts/build.mts && tsx scripts/package.mts",
812
"compile": "tsx scripts/build.mts",

‎apps/editor/src/commands/apply-from-terminal-command.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
22
import * as os from 'os'
33
import * as fs from 'fs'
44
import * as path from 'path'
5-
import { get_response_preview_promise_resolve } from '@/features/apply-response/utils/preview'
5+
import { get_code_review_promise_resolve } from '@/features/apply-response/utils/code-review'
66
import { apply_response } from '@/features/apply-response/apply-response'
77
import { t } from '@/i18n'
88
import { generate_diff_markdown } from '../utils/agentic-cli-invocation/utils/generate-diff-markdown'
@@ -79,7 +79,7 @@ export const apply_from_terminal_command = (): vscode.Disposable => {
7979
return vscode.commands.registerCommand(
8080
'codeWebChat.applyFromTerminal',
8181
async () => {
82-
if (get_response_preview_promise_resolve()) {
82+
if (get_code_review_promise_resolve()) {
8383
vscode.window.showInformationMessage(
8484
t('command.apply-from-terminal-command.disabled-during-preview')
8585
)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { display_token_count } from '@shared/utils/display-token-count'
2525
import { is_prompt_empty_or_only_symbols } from '@shared/utils/simplify-prompt-symbols'
2626
import { show_configurations_quick_pick } from '@/utils/show-configurations-quick-pick'
2727
import { WebSocketManager } from '@/services/websocket-manager'
28-
import { get_response_preview_promise_resolve } from '@/features/apply-response/utils/preview'
28+
import { get_code_review_promise_resolve } from '@/features/apply-response/utils/code-review'
2929
import { normalize_path } from '@/utils/normalize-path'
3030
import { show_incomplete_setup_warning } from '@/utils/show-missing-configuration-notification'
3131
import { ConfigWebConfigurationFormat } from '@/utils/web-configuration-format-converters'
@@ -52,7 +52,7 @@ export const run_generate_action = async (params: {
5252
return
5353
}
5454

55-
if (get_response_preview_promise_resolve()) {
55+
if (get_code_review_promise_resolve()) {
5656
vscode.window.showInformationMessage(
5757
t('command.generate-commit-message-command.disabled-during-preview')
5858
)

‎apps/editor/src/commands/history-command/actions/restore-checkpoint.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import { get_checkpoint_path } from '@/features/checkpoints/utils'
1717
import { restore_workspace_snapshot } from '@/utils/workspace-snapshot'
1818
import { Logger } from '@shared/utils/logger'
1919
import { PromptViewProvider } from '@/views/prompt/backend/prompt-view-provider'
20-
import { response_preview_promise_resolve } from '@/features/apply-response/utils/preview'
21-
import { ongoing_preview_cleanup_promise } from '@/features/apply-response/utils/preview-handler'
20+
import { code_review_promise_resolve } from '@/features/apply-response/utils/code-review'
21+
import { ongoing_preview_cleanup_promise } from '@/features/apply-response/utils/code-review-handler'
2222
import { apply_response } from '@/features/apply-response/apply-response'
2323
import { CommitMessageDetails } from '@/utils/commit-message-details'
2424
import { t } from '@/i18n'
@@ -69,8 +69,8 @@ export const restore_checkpoint = async (params: {
6969

7070
let temp_checkpoint: Checkpoint | undefined
7171
try {
72-
if (response_preview_promise_resolve) {
73-
response_preview_promise_resolve({ accepted_files: [] })
72+
if (code_review_promise_resolve) {
73+
code_review_promise_resolve({ accepted_files: [] })
7474
if (ongoing_preview_cleanup_promise) {
7575
await ongoing_preview_cleanup_promise
7676
}
@@ -174,7 +174,7 @@ export const restore_checkpoint = async (params: {
174174
if (loaded_history.length > 0) {
175175
params.prompt_view_provider.response_history = loaded_history
176176
params.prompt_view_provider.update_response_history()
177-
} else if (params.checkpoint.trigger !== 'before-response-previewed') {
177+
} else if (params.checkpoint.trigger !== 'before-code-reviewed') {
178178
params.prompt_view_provider.response_history = []
179179
params.prompt_view_provider.update_response_history()
180180
}
@@ -265,27 +265,27 @@ export const restore_checkpoint = async (params: {
265265

266266
if (
267267
params.checkpoint.trigger === 'response-accepted' &&
268-
params.checkpoint.response_preview_item_created_at &&
268+
params.checkpoint.code_review_item_created_at &&
269269
loaded_history.length > 0
270270
) {
271-
const item_to_preview = loaded_history.find(
271+
const item_to_review = loaded_history.find(
272272
(item) =>
273273
item.created_at ==
274-
params.checkpoint.response_preview_item_created_at
274+
params.checkpoint.code_review_item_created_at
275275
)
276-
if (item_to_preview) {
276+
if (item_to_review) {
277277
apply_response({
278-
response: item_to_preview.response,
279-
raw_instructions: item_to_preview.raw_instructions,
280-
files_with_content: item_to_preview.files,
281-
created_at: item_to_preview.created_at,
278+
response: item_to_review.response,
279+
raw_instructions: item_to_review.raw_instructions,
280+
files_with_content: item_to_review.files,
281+
created_at: item_to_review.created_at,
282282
api_configuration_details:
283-
item_to_preview.api_configuration_details,
283+
item_to_review.api_configuration_details,
284284
cli_configuration_details:
285-
item_to_preview.cli_configuration_details,
285+
item_to_review.cli_configuration_details,
286286
web_configuration_details:
287-
item_to_preview.web_configuration_details,
288-
is_from_agentic_cli: item_to_preview.is_from_agentic_cli
287+
item_to_review.web_configuration_details,
288+
is_from_agentic_cli: item_to_review.is_from_agentic_cli
289289
})
290290
}
291291
}

‎apps/editor/src/commands/history-command/history-command.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
} from './actions/delete-checkpoint-with-undo'
2121
import { PromptViewProvider } from '@/views/prompt/backend/prompt-view-provider'
2222
import { get_checkpoint_path } from '@/features/checkpoints/utils'
23-
import { get_response_preview_promise_resolve } from '@/features/apply-response/utils/preview'
23+
import { get_code_review_promise_resolve } from '@/features/apply-response/utils/code-review'
2424
import { simplify_prompt_symbols } from '@shared/utils/simplify-prompt-symbols'
2525

2626
dayjs.extend(relativeTime)
@@ -37,7 +37,7 @@ export const history_command = (params: {
3737
const create_new_checkpoint_command = vscode.commands.registerCommand(
3838
'codeWebChat.createNewCheckpoint',
3939
async () => {
40-
if (get_response_preview_promise_resolve()) {
40+
if (get_code_review_promise_resolve()) {
4141
vscode.window.showInformationMessage(
4242
t('command.history-command.disabled-during-preview')
4343
)
@@ -69,7 +69,7 @@ export const history_command = (params: {
6969
const history_cmd = vscode.commands.registerCommand(
7070
'codeWebChat.history',
7171
async (args?: { highlight_checkpoint?: Checkpoint }) => {
72-
if (get_response_preview_promise_resolve()) {
72+
if (get_code_review_promise_resolve()) {
7373
vscode.window.showWarningMessage(
7474
t('command.history-command.disabled-during-preview')
7575
)

‎apps/editor/src/context/providers/workspace/workspace-provider.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ export class WorkspaceProvider
293293
const is_now_preview = !!tab.isPreview
294294

295295
if (was_preview && !is_now_preview) {
296-
this._handle_file_out_preview(file_path)
296+
this._handle_file_out_code_review(file_path)
297297
}
298298

299299
this._preview_tabs.set(file_path, is_now_preview)
@@ -307,7 +307,7 @@ export class WorkspaceProvider
307307
}
308308
}
309309

310-
private _handle_file_out_preview(file_path: string) {
310+
private _handle_file_out_code_review(file_path: string) {
311311
const workspace_root = this.get_workspace_root_for_file(file_path)
312312
if (!workspace_root) return
313313

‎apps/editor/src/features/apply-response/apply-response.ts‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import {
88
import { restore_checkpoint } from '@/commands/history-command/actions/restore-checkpoint'
99
import { PromptViewProvider } from '@/views/prompt/backend/prompt-view-provider'
1010
import { WorkspaceProvider } from '@/context/providers/workspace/workspace-provider'
11-
import { get_response_preview_promise_resolve } from './utils/preview'
12-
import { build_history_files } from './utils/preview/build-history-files'
11+
import { get_code_review_promise_resolve } from './utils/code-review'
12+
import { build_history_files } from './utils/code-review/build-history-files'
1313
import {
14-
preview_handler,
14+
code_review_handler,
1515
ongoing_preview_cleanup_promise
16-
} from './utils/preview-handler'
16+
} from './utils/code-review-handler'
1717
import {
1818
process_response,
1919
ApplyResponseArgs,
@@ -25,7 +25,7 @@ import { t } from '@/i18n'
2525
import {
2626
preview_document_provider,
2727
CwcPreviewProvider
28-
} from './utils/preview/virtual-document-provider'
28+
} from './utils/code-review/virtual-document-provider'
2929
import { get_all_workspace_files } from '@/context/helpers/get-all-workspace-files'
3030
import { parse_response, PatchRepairItem } from './utils/response-parser'
3131
import { Checkpoint } from '@/features/checkpoints/types'
@@ -72,8 +72,8 @@ export const setup_apply_response = (params: {
7272
)
7373

7474
const checkpoints = await get_checkpoints(params.extension_context)
75-
const preview_checkpoints = checkpoints.filter(
76-
(c) => c.trigger === 'before-response-previewed'
75+
const code_review_checkpoints = checkpoints.filter(
76+
(c) => c.trigger === 'before-code-reviewed'
7777
)
7878

7979
for (const tab_group of vscode.window.tabGroups.all) {
@@ -94,8 +94,8 @@ export const setup_apply_response = (params: {
9494
}
9595
}
9696

97-
preview_checkpoints.reverse()
98-
for (const cp of preview_checkpoints) {
97+
code_review_checkpoints.reverse()
98+
for (const cp of code_review_checkpoints) {
9999
try {
100100
await restore_checkpoint({
101101
checkpoint: cp,
@@ -105,7 +105,7 @@ export const setup_apply_response = (params: {
105105
options: { skip_confirmation: true, hide_notification: true }
106106
})
107107
} catch (err) {
108-
console.error('Failed to restore interrupted preview checkpoint', err)
108+
console.error('Failed to restore interrupted code review checkpoint', err)
109109
} finally {
110110
await delete_checkpoint({
111111
extension_context: params.extension_context,
@@ -171,16 +171,16 @@ export const setup_apply_response = (params: {
171171
return false
172172
}
173173

174-
while (in_progress && !get_response_preview_promise_resolve()) {
174+
while (in_progress && !get_code_review_promise_resolve()) {
175175
await new Promise((resolve) => setTimeout(resolve, 100))
176176
}
177177

178-
const resolve_fn = get_response_preview_promise_resolve()
178+
const resolve_fn = get_code_review_promise_resolve()
179179

180180
if (!resolve_fn) {
181181
params.prompt_view_provider.send_message({
182182
command: 'SHOW_PROGRESS',
183-
title: t('common.progress.response-preview'),
183+
title: t('common.progress.code-review'),
184184
subtitle: t('common.progress.preparing'),
185185
delay_visibility: true
186186
})
@@ -351,7 +351,7 @@ export const setup_apply_response = (params: {
351351
if (choice === 'Switch') {
352352
params.prompt_view_provider.send_message({
353353
command: 'SHOW_PROGRESS',
354-
title: t('common.progress.response-preview'),
354+
title: t('common.progress.code-review'),
355355
subtitle: t('common.progress.preparing')
356356
})
357357
args = { ...args, created_at: created_at_for_switch }
@@ -399,7 +399,7 @@ export const setup_apply_response = (params: {
399399

400400
try {
401401
if (!is_intelligent_file_search_results) {
402-
// Save current tab groups before entering preview
402+
// Save current tab groups before entering code review
403403
saved_tab_groups = capture_tab_groups()
404404

405405
const has_valid_blocks =
@@ -411,15 +411,15 @@ export const setup_apply_response = (params: {
411411
if (has_valid_blocks && !is_code_at_cursor) {
412412
params.prompt_view_provider.send_message({
413413
command: 'SHOW_PROGRESS',
414-
title: t('common.progress.response-preview'),
414+
title: t('common.progress.code-review'),
415415
subtitle: t('common.progress.creating-checkpoint')
416416
})
417417

418418
before_checkpoint = await create_checkpoint({
419419
workspace_provider: params.workspace_provider,
420420
extension_context: params.extension_context,
421421
prompt_view_provider: params.prompt_view_provider,
422-
trigger: 'before-response-previewed',
422+
trigger: 'before-code-reviewed',
423423
description: args?.raw_instructions,
424424
hide_notification: true
425425
})
@@ -429,7 +429,7 @@ export const setup_apply_response = (params: {
429429
const selected_paths_before_apply =
430430
params.workspace_provider.get_all_selected_paths()
431431

432-
const preview_data = await process_response({
432+
const code_review_data = await process_response({
433433
args,
434434
response: response!,
435435
response_items,
@@ -439,18 +439,18 @@ export const setup_apply_response = (params: {
439439
websocket_manager: params.websocket_manager
440440
})
441441

442-
if (!preview_data) {
442+
if (!code_review_data) {
443443
params.prompt_view_provider.send_message({
444444
command: 'HIDE_PROGRESS'
445445
})
446446
}
447447

448-
if (preview_data) {
449-
let created_at_for_preview = args?.created_at
448+
if (code_review_data) {
449+
let created_at_for_code_review = args?.created_at
450450
if (!args?.files_with_content) {
451451
const { files_for_history, total_lines_added, total_lines_removed } =
452452
await build_history_files({
453-
original_states: preview_data.original_states
453+
original_states: code_review_data.original_states
454454
})
455455
const history = params.prompt_view_provider.response_history
456456

@@ -463,11 +463,11 @@ export const setup_apply_response = (params: {
463463
item_to_update.lines_added = total_lines_added
464464
item_to_update.lines_removed = total_lines_removed
465465
} else {
466-
created_at_for_preview = Date.now()
466+
created_at_for_code_review = Date.now()
467467
const new_item: ResponseHistoryItem = {
468-
response: preview_data.response,
468+
response: code_review_data.response,
469469
raw_instructions: args?.raw_instructions,
470-
created_at: created_at_for_preview,
470+
created_at: created_at_for_code_review,
471471
lines_added: total_lines_added,
472472
lines_removed: total_lines_removed,
473473
files: files_for_history,
@@ -486,16 +486,16 @@ export const setup_apply_response = (params: {
486486
const history_for_checkpoint = [
487487
...params.prompt_view_provider.response_history
488488
]
489-
const changes_accepted = await preview_handler({
489+
const changes_accepted = await code_review_handler({
490490
selected_paths_before: selected_paths_before_apply,
491-
original_states: preview_data.original_states,
492-
chat_response: preview_data.response,
491+
original_states: code_review_data.original_states,
492+
chat_response: code_review_data.response,
493493
prompt_view_provider: params.prompt_view_provider,
494494
workspace_provider: params.workspace_provider,
495495
extension_context: params.extension_context,
496496
original_editor_state: args?.original_editor_state,
497497
raw_instructions: args?.raw_instructions,
498-
created_at: created_at_for_preview,
498+
created_at: created_at_for_code_review,
499499
api_configuration_details: args?.api_configuration_details,
500500
cli_configuration_details: args?.cli_configuration_details,
501501
web_configuration_details: args?.web_configuration_details,
@@ -510,7 +510,7 @@ export const setup_apply_response = (params: {
510510
extension_context: params.extension_context,
511511
checkpoint: before_checkpoint,
512512
history_for_checkpoint,
513-
created_at_for_preview
513+
created_at_for_code_review
514514
})
515515
}
516516

‎apps/editor/src/features/apply-response/response-processor/handlers/patch-repair-handler.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { create_safe_path } from '@/utils/path-sanitizer'
44
import { PatchRepairItem } from '../../utils/response-parser'
55
import { PromptViewProvider } from '@/views/prompt/backend/prompt-view-provider'
66
import { WorkspaceProvider } from '@/context/providers/workspace/workspace-provider'
7-
import { set_file_applied_with_patch_repair } from '../../utils/preview/workspace-listener'
7+
import { set_file_applied_with_patch_repair } from '../../utils/code-review/workspace-listener'
88
import {
99
get_workspace_map_and_default,
1010
resolve_workspace_root

0 commit comments

Comments
 (0)