Simplify response application by replacing temporary checkpoints with standard checkpoint creation and deletion

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/src/commands/apply-chat-response-command/apply-chat-response-command.ts

@@ -2,9 +2,7 @@ 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'
@@ -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/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.')
       }
     }

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

@@ -210,22 +210,18 @@ export const MainView: React.FC<Props> = (props) => {
                       {item.raw_instructions || 'Response without instructions'}
                     </span>
                     <div className={styles['responses__item__right']}>
-                      {(item.lines_added > 0 || item.lines_removed > 0) && (
-                        <div className={styles['responses__item__stats']}>
-                          <span
-                            className={styles['responses__item__stats--added']}
-                          >
-                            +{item.lines_added}
-                          </span>
-                          <span
-                            className={
-                              styles['responses__item__stats--removed']
-                            }
-                          >
-                            -{item.lines_removed}
-                          </span>
-                        </div>
-                      )}
+                      <div className={styles['responses__item__stats']}>
+                        <span
+                          className={styles['responses__item__stats--added']}
+                        >
+                          +{item.lines_added}
+                        </span>
+                        <span
+                          className={styles['responses__item__stats--removed']}
+                        >
+                          -{item.lines_removed}
+                        </span>
+                      </div>
                       <span className={styles['responses__item__date']}>
                         {dayjs(item.created_at).fromNow()}
                       </span>