Merge branch 'dev'

Author: robertpiosik

packages/ui/src/components/editor/panel/ResponsePreview/ResponsePreview.module.scss

@@ -1,7 +1,7 @@
 .container {
   display: flex;
   flex-direction: column;
-  padding-top: var(--padding-4px);
+  padding: var(--padding-4px) 0 var(--padding-8px) 0;
   gap: var(--padding-8px);
 }
 
@@ -23,10 +23,9 @@
 .instructions {
   position: relative;
   padding: var(--padding-5px) var(--padding-7px);
-  color: var(--vscode-descriptionForeground);
   border: 1px solid var(--vscode-sideBarSectionHeader-border);
   margin: 0 var(--padding-12px);
-  border-radius: var(--border-radius-5px);
+  border-radius: var(--border-radius-10px);
   word-wrap: break-word;
   overflow: hidden;
   display: -webkit-box;
@@ -48,8 +47,12 @@
   display: block;
 
   &__text {
+    color: var(--vscode-descriptionForeground);
     font-size: var(--font-size-12px);
     margin: var(--padding-6px) var(--padding-12px);
+    background: var(--vscode-list-hoverBackground);
+    padding: var(--padding-5px) var(--padding-7px);
+    border-radius: var(--border-radius-8px);
   }
 
   > div:first-child {

packages/vscode/package.json

@@ -2,7 +2,7 @@
   "name": "gemini-coder",
   "displayName": "Code Web Chat",
   "description": "Blazing fast AI pair programming for production-grade code. Select context as you go for game-changing accuracy and speed. (CWC)",
-  "version": "1.501.0",
+  "version": "1.502.0",
   "scripts": {
     "build": "npx vsce package --no-dependencies",
     "vscode:prepublish": "rimraf out && npm run compile",

packages/vscode/src/commands/apply-chat-response-command/apply-chat-response-command.ts

@@ -2,15 +2,13 @@ import * as vscode from 'vscode'
 import * as fs from 'fs'
 import {
   create_checkpoint,
-  create_temporary_checkpoint,
-  delete_checkpoint,
-  promote_temporary_checkpoint
+  delete_checkpoint
 } from '../checkpoints-command/actions'
 import { FileInPreview } from '@shared/types/file-in-preview'
 import { PanelProvider } from '@/views/panel/backend/panel-provider'
 import { dictionary } from '@shared/constants/dictionary'
 import { WorkspaceProvider } from '@/context/providers/workspace-provider'
-import { code_review_promise_resolve } from './utils/preview/preview'
+import { response_preview_promise_resolve } from './utils/preview/preview'
 import { get_diff_stats } from './utils/preview/diff-utils'
 import { create_safe_path } from '@/utils/path-sanitizer'
 import {
@@ -51,15 +49,15 @@ export const apply_chat_response_command = (
         return
       }
 
-      if (code_review_promise_resolve) {
+      if (response_preview_promise_resolve) {
         const choice = await vscode.window.showWarningMessage(
           dictionary.warning_message.REVIEW_ONGOING,
           { modal: true },
           'Switch'
         )
 
         if (choice == 'Switch') {
-          code_review_promise_resolve({ accepted_files: [] })
+          response_preview_promise_resolve({ accepted_files: [] })
           if (ongoing_review_cleanup_promise) {
             await ongoing_review_cleanup_promise
           }
@@ -69,10 +67,18 @@ export const apply_chat_response_command = (
         }
       }
 
-      let temp_checkpoint: Checkpoint | undefined
+      let before_checkpoint: Checkpoint | undefined
       try {
-        temp_checkpoint = await create_temporary_checkpoint(workspace_provider)
+        before_checkpoint = await create_checkpoint(
+          workspace_provider,
+          context,
+          'Before applying changes',
+          args?.raw_instructions
+        )
 
+        if (!before_checkpoint) {
+          return
+        }
         const review_data = await process_chat_response(
           args,
           chat_response,
@@ -165,35 +171,24 @@ export const apply_chat_response_command = (
           })
 
           if (changes_accepted) {
-            try {
-              if (temp_checkpoint) {
-                await promote_temporary_checkpoint({
-                  context,
-                  temp_checkpoint,
-                  title: 'Before changes approved',
-                  description: args?.raw_instructions
-                })
-                temp_checkpoint = undefined
-              }
-            } finally {
-              await create_checkpoint(
-                workspace_provider,
-                context,
-                'After changes approved',
-                args?.raw_instructions
-              )
-            }
+            await create_checkpoint(
+              workspace_provider,
+              context,
+              'After changes approved',
+              args?.raw_instructions
+            )
+            before_checkpoint = undefined
           }
         }
       } catch (err: any) {
         vscode.window.showErrorMessage(
           `An error occurred while applying changes: ${err.message}`
         )
       } finally {
-        if (temp_checkpoint) {
+        if (before_checkpoint) {
           await delete_checkpoint({
             context,
-            checkpoint_to_delete: temp_checkpoint
+            checkpoint_to_delete: before_checkpoint
           })
         }
       }

packages/vscode/src/commands/apply-chat-response-command/utils/preview/preview.ts

@@ -13,7 +13,7 @@ import { close_review_diff_editors, show_diff_with_actions } from './vscode-ui'
 import { PreparedFile, ReviewableFile } from './types'
 import { ItemInPreview } from '@shared/types/file-in-preview'
 
-export { code_review_promise_resolve } from './vscode-ui'
+export { response_preview_promise_resolve } from './vscode-ui'
 export { toggle_file_review_state } from './workspace-listener'
 
 export const preview = async (params: {

packages/vscode/src/commands/apply-chat-response-command/utils/preview/vscode-ui.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
 import * as path from 'path'
 import { CodeReviewDecision, CodeReviewResult, PreparedFile } from './types'
 
-export let code_review_promise_resolve:
+export let response_preview_promise_resolve:
   | ((decision: CodeReviewDecision) => void)
   | undefined
 
@@ -45,7 +45,7 @@ export const show_diff_with_actions = async (
   )
 
   return new Promise<CodeReviewResult>((resolve) => {
-    code_review_promise_resolve = async (decision) => {
+    response_preview_promise_resolve = async (decision) => {
       let final_content = ''
       try {
         const right_doc = await vscode.workspace.openTextDocument(right_doc_uri)
@@ -59,6 +59,6 @@ export const show_diff_with_actions = async (
       })
     }
   }).finally(() => {
-    code_review_promise_resolve = undefined
+    response_preview_promise_resolve = undefined
   })
 }

packages/vscode/src/commands/apply-chat-response-command/utils/preview/workspace-listener.ts

@@ -117,7 +117,7 @@ export const setup_workspace_listeners = (
           .createHash('md5')
           .update(sanitized_file_path)
           .digest('hex')
-        const temp_filename = `cwc-review-${hash}.tmp`
+        const temp_filename = `cwc-${hash}.tmp`
         const temp_file_path = path.join(os.tmpdir(), temp_filename)
         const is_deleted =
           !is_new && new_content == '' && original_content != ''
@@ -194,7 +194,7 @@ export const setup_workspace_listeners = (
           .createHash('md5')
           .update(sanitized_file_path)
           .digest('hex')
-        const temp_filename = `cwc-review-${hash}.tmp`
+        const temp_filename = `cwc-${hash}.tmp`
         const temp_file_path = path.join(os.tmpdir(), temp_filename)
 
         const reviewable_file: ReviewableFile = {
@@ -286,7 +286,7 @@ export const setup_workspace_listeners = (
         .createHash('md5')
         .update(sanitized_file_path)
         .digest('hex')
-      const temp_filename = `cwc-review-${hash}.tmp`
+      const temp_filename = `cwc-${hash}.tmp`
       const temp_file_path = path.join(os.tmpdir(), temp_filename)
 
       const reviewable_file: ReviewableFile = {
@@ -386,7 +386,7 @@ export const setup_workspace_listeners = (
           .createHash('md5')
           .update(oldSanitized)
           .digest('hex')
-        const oldTemp = path.join(os.tmpdir(), `cwc-review-${oldHash}.tmp`)
+        const oldTemp = path.join(os.tmpdir(), `cwc-${oldHash}.tmp`)
 
         const deleted_diff_stats = get_diff_stats({
           original_content: existing.original_content,
@@ -447,7 +447,7 @@ export const setup_workspace_listeners = (
           .createHash('md5')
           .update(newSanitized)
           .digest('hex')
-        const newTemp = path.join(os.tmpdir(), `cwc-review-${newHash}.tmp`)
+        const newTemp = path.join(os.tmpdir(), `cwc-${newHash}.tmp`)
 
         const create_diff_stats = get_diff_stats({
           original_content: '',
@@ -478,7 +478,7 @@ export const setup_workspace_listeners = (
           .createHash('md5')
           .update(oldSanitized)
           .digest('hex')
-        const oldTemp = path.join(os.tmpdir(), `cwc-review-${oldHash}.tmp`)
+        const oldTemp = path.join(os.tmpdir(), `cwc-${oldHash}.tmp`)
 
         const deleted_diff_stats = get_diff_stats({
           original_content: new_content,

packages/vscode/src/commands/checkpoints-command/actions/create-checkpoint.ts

@@ -20,7 +20,7 @@ export const create_checkpoint = async (
   context: vscode.ExtensionContext,
   title: string = 'Created by user',
   description?: string
-): Promise<boolean> => {
+): Promise<Checkpoint | undefined> => {
   try {
     const timestamp = Date.now()
     const workspace_folders = vscode.workspace.workspaceFolders!
@@ -30,6 +30,8 @@ export const create_checkpoint = async (
     )
     const all_folders_use_git = folder_git_statuses.every((status) => status)
 
+    let new_checkpoint: Checkpoint | undefined
+
     const create_checkpoint_task = async () => {
       await vscode.workspace.saveAll()
       const checkpoint_dir_path = get_checkpoint_path(timestamp)
@@ -98,16 +100,17 @@ export const create_checkpoint = async (
         checkpoints
       )
 
-      const new_checkpoint: Checkpoint = {
+      const checkpoint_object: Checkpoint = {
         title,
         timestamp,
         description: final_description,
         uses_git,
         git_data: Object.keys(git_data).length > 0 ? git_data : undefined
       }
 
-      checkpoints.unshift(new_checkpoint)
+      checkpoints.unshift(checkpoint_object)
       await context.workspaceState.update(CHECKPOINTS_STATE_KEY, checkpoints)
+      new_checkpoint = checkpoint_object
     }
 
     if (all_folders_use_git) {
@@ -122,11 +125,11 @@ export const create_checkpoint = async (
         create_checkpoint_task
       )
     }
-    return true
+    return new_checkpoint
   } catch (err: any) {
     vscode.window.showErrorMessage(
       `Failed to create checkpoint: ${err.message}`
     )
-    return false
+    return undefined
   }
 }

packages/vscode/src/commands/checkpoints-command/actions/index.ts

@@ -2,6 +2,5 @@ export * from './create-checkpoint'
 export * from './create-temporary-checkpoint'
 export * from './delete-checkpoint'
 export * from './get-checkpoints'
-export * from './promote-temporary-checkpoint'
 export * from './restore-checkpoint'
 export * from './sync-workspace-from-dir'

packages/vscode/src/commands/checkpoints-command/actions/promote-temporary-checkpoint.ts

@@ -40,8 +40,8 @@ export const checkpoints_command = (
         )
         return
       }
-      const success = await create_checkpoint(workspace_provider, context)
-      if (success) {
+      const checkpoint = await create_checkpoint(workspace_provider, context)
+      if (checkpoint) {
         vscode.window.showInformationMessage('Checkpoint created successfully.')
       }
     }