Refactor checkpoint management code into dedicated action files and remove unnecessary UI focus logic

Author: robertpiosik

README.md

@@ -123,7 +123,7 @@ Generate meaningful summaries of changes adhering to your style.
 ### Handling chat responses
 
 - `Code Web Chat: Apply Chat Response` - Integrate with the codebase a copied to clipboard overall chat response or a single code block.
-- `Code Web Chat: Apply Code Block to Active Editor` - Use Intelligent Update API tool on the active editor.
+- `Code Web Chat: Apply Code Block to Active Editor` - Use Intelligent Update API tool on the active editor with the copied to clipboard.
 - `Code Web Chat: Undo Last Changes` - Revert applied AI-suggested edits.
 
 ### Code completions

packages/ui/src/components/editor/panel/Changes/Changes.tsx

@@ -37,15 +37,6 @@ export const Changes: FC<Props> = ({
   raw_instructions
 }) => {
   const [last_clicked_file_index, set_last_clicked_file_index] = useState(0)
-  const [is_keep_button_focused, set_is_keep_button_focused] = useState(false)
-
-  useEffect(() => {
-    const timer = setTimeout(() => {
-      set_is_keep_button_focused(true)
-    }, 1000)
-
-    return () => clearTimeout(timer)
-  }, [])
 
   const handle_keep = () => {
     const accepted_files = files.filter((f) => f.is_checked)
@@ -217,7 +208,6 @@ export const Changes: FC<Props> = ({
         <Button
           on_click={handle_keep}
           disabled={files.filter((f) => f.is_checked).length == 0}
-          is_focused={is_keep_button_focused}
         >
           <span className="codicon codicon-check" />
           {files.length > 1 ? 'Approve Selected' : 'Approve'}

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

@@ -17,11 +17,6 @@ import {
   ModelProvidersManager,
   get_tool_config_id
 } from '@/services/model-providers-manager'
-import {
-  create_temporary_checkpoint,
-  delete_checkpoint,
-  promote_temporary_checkpoint
-} from '@/commands/checkpoints-command'
 import { apply_git_patch } from './handlers/diff-handler'
 import { PROVIDERS } from '@shared/constants/providers'
 import { LAST_SELECTED_INTELLIGENT_UPDATE_CONFIG_ID_STATE_KEY } from '@/constants/state-keys'
@@ -30,6 +25,11 @@ import { ViewProvider } from '@/views/panel/backend/panel-provider'
 import { review, code_review_promise_resolve } from './utils/review'
 import { dictionary } from '@shared/constants/dictionary'
 import { WorkspaceProvider } from '@/context/providers/workspace-provider'
+import {
+  create_temporary_checkpoint,
+  delete_checkpoint,
+  promote_temporary_checkpoint
+} from '../checkpoints-command/actions'
 
 let ongoing_review_cleanup_promise: Promise<void> | null = null
 

packages/vscode/src/commands/checkpoints-command/actions/copy-workspace-to-dir.ts

@@ -0,0 +1,33 @@
+import * as vscode from 'vscode'
+import * as path from 'path'
+import { WorkspaceProvider } from '../../../context/providers/workspace-provider'
+import { copy_optimised_recursively } from '../utils'
+
+export const copy_workspace_to_dir = async (
+  dest_dir_uri: vscode.Uri,
+  workspace_provider: WorkspaceProvider
+) => {
+  const workspace_folders = vscode.workspace.workspaceFolders!
+  const dest_dir_path = dest_dir_uri.fsPath
+
+  for (const folder of workspace_folders) {
+    const dest_folder_path =
+      workspace_folders.length > 1
+        ? path.join(dest_dir_path, folder.name)
+        : dest_dir_path
+    const dest_folder_uri = vscode.Uri.file(dest_folder_path)
+    if (workspace_folders.length > 1) {
+      await vscode.workspace.fs.createDirectory(dest_folder_uri)
+    }
+
+    const entries = await vscode.workspace.fs.readDirectory(folder.uri)
+    for (const [name] of entries) {
+      await copy_optimised_recursively(
+        vscode.Uri.joinPath(folder.uri, name),
+        vscode.Uri.joinPath(dest_folder_uri, name),
+        folder.uri.fsPath,
+        workspace_provider
+      )
+    }
+  }
+}

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

@@ -0,0 +1,46 @@
+import * as vscode from 'vscode'
+import { CHECKPOINTS_STATE_KEY } from '../../../constants/state-keys'
+import { WorkspaceProvider } from '../../../context/providers/workspace-provider'
+import type { Checkpoint } from '../types'
+import { copy_workspace_to_dir } from './copy-workspace-to-dir'
+import { get_checkpoints } from './get-checkpoints'
+import { get_checkpoint_path } from '../utils'
+
+export const create_checkpoint = async (
+  workspace_provider: WorkspaceProvider,
+  context: vscode.ExtensionContext
+): Promise<boolean> => {
+  try {
+    const timestamp = Date.now()
+    await vscode.window.withProgress(
+      {
+        location: vscode.ProgressLocation.Notification,
+        title: 'Creating checkpoint...',
+        cancellable: false
+      },
+      async () => {
+        await vscode.workspace.saveAll()
+        const checkpoint_dir_path = get_checkpoint_path(timestamp)
+        const checkpoint_dir_uri = vscode.Uri.file(checkpoint_dir_path)
+        await vscode.workspace.fs.createDirectory(checkpoint_dir_uri)
+
+        await copy_workspace_to_dir(checkpoint_dir_uri, workspace_provider)
+
+        const new_checkpoint: Checkpoint = {
+          title: 'Created by user',
+          timestamp
+        }
+
+        const checkpoints = await get_checkpoints(context)
+        checkpoints.push(new_checkpoint)
+        await context.workspaceState.update(CHECKPOINTS_STATE_KEY, checkpoints)
+      }
+    )
+    return true
+  } catch (err: any) {
+    vscode.window.showErrorMessage(
+      `Failed to create checkpoint: ${err.message}`
+    )
+    return false
+  }
+}

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

@@ -0,0 +1,24 @@
+import * as vscode from 'vscode'
+import { WorkspaceProvider } from '../../../context/providers/workspace-provider'
+import type { Checkpoint } from '../types'
+import { copy_workspace_to_dir } from './copy-workspace-to-dir'
+import { get_checkpoint_path } from '../utils'
+
+export const create_temporary_checkpoint = async (
+  workspace_provider: WorkspaceProvider
+): Promise<Checkpoint> => {
+  await vscode.workspace.saveAll()
+  const timestamp = Date.now()
+  const checkpoint_dir_path = get_checkpoint_path(timestamp)
+  const checkpoint_dir_uri = vscode.Uri.file(checkpoint_dir_path)
+  await vscode.workspace.fs.createDirectory(checkpoint_dir_uri)
+
+  await copy_workspace_to_dir(checkpoint_dir_uri, workspace_provider)
+
+  const new_checkpoint: Checkpoint = {
+    timestamp,
+    title: '',
+    is_temporary: true
+  }
+  return new_checkpoint
+}

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

@@ -0,0 +1,72 @@
+import * as vscode from 'vscode'
+import dayjs from 'dayjs'
+import { CHECKPOINTS_STATE_KEY } from '../../../constants/state-keys'
+import type { Checkpoint } from '../types'
+import { get_checkpoint_path } from '../utils'
+
+export const delete_checkpoint = async (params: {
+  context: vscode.ExtensionContext
+  checkpoint_to_delete: Checkpoint
+  options?: { skip_undo_prompt?: boolean }
+}) => {
+  // First, remove checkpoint from state. This makes the deletion immediate from user's perspective.
+  const checkpoints =
+    params.context.workspaceState.get<Checkpoint[]>(
+      CHECKPOINTS_STATE_KEY,
+      []
+    ) ?? []
+  const updated_checkpoints = checkpoints.filter(
+    (c) => c.timestamp != params.checkpoint_to_delete.timestamp
+  )
+  await params.context.workspaceState.update(
+    CHECKPOINTS_STATE_KEY,
+    updated_checkpoints
+  )
+
+  const actually_delete_files = async () => {
+    try {
+      const checkpoint_path = get_checkpoint_path(
+        params.checkpoint_to_delete.timestamp
+      )
+      await vscode.workspace.fs.delete(vscode.Uri.file(checkpoint_path), {
+        recursive: true
+      })
+    } catch (error) {
+      console.warn(`Could not delete checkpoint file: ${error}`)
+    }
+  }
+
+  if (!params.options?.skip_undo_prompt) {
+    vscode.window
+      .showInformationMessage(
+        `Checkpoint from ${dayjs(
+          params.checkpoint_to_delete.timestamp
+        ).fromNow()} deleted successfully.`,
+        'Revert'
+      )
+      .then(async (action) => {
+        if (action == 'Revert') {
+          // User chose to revert. Add the checkpoint back to the state.
+          const current_checkpoints =
+            params.context.workspaceState.get<Checkpoint[]>(
+              CHECKPOINTS_STATE_KEY,
+              []
+            ) ?? []
+          current_checkpoints.push(params.checkpoint_to_delete)
+          await params.context.workspaceState.update(
+            CHECKPOINTS_STATE_KEY,
+            current_checkpoints
+          )
+          vscode.window.showInformationMessage('Checkpoint deletion reverted.')
+        } else {
+          // User dismissed the notification or it timed out.
+          // Proceed with deleting the checkpoint files.
+          await actually_delete_files()
+        }
+      })
+  } else {
+    // This is a silent deletion (e.g. temporary checkpoint cleanup), no need
+    // to ask for revert.
+    await actually_delete_files()
+  }
+}

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

@@ -0,0 +1,33 @@
+import * as vscode from 'vscode'
+import { CHECKPOINTS_STATE_KEY } from '../../../constants/state-keys'
+import type { Checkpoint } from '../types'
+
+export const edit_checkpoint = async (params: {
+  context: vscode.ExtensionContext
+  checkpoint_to_edit: Checkpoint
+}) => {
+  const new_description = await vscode.window.showInputBox({
+    prompt: 'Enter a description for the checkpoint',
+    value: params.checkpoint_to_edit.description || '',
+    placeHolder: 'e.g. Before refactoring the main component'
+  })
+
+  if (new_description === undefined) return
+
+  const checkpoints =
+    params.context.workspaceState.get<Checkpoint[]>(
+      CHECKPOINTS_STATE_KEY,
+      []
+    ) ?? []
+  const checkpoint_to_update = checkpoints.find(
+    (c) => c.timestamp == params.checkpoint_to_edit.timestamp
+  )
+  if (checkpoint_to_update) {
+    checkpoint_to_update.description = new_description
+    await params.context.workspaceState.update(
+      CHECKPOINTS_STATE_KEY,
+      checkpoints
+    )
+    vscode.window.showInformationMessage('Checkpoint description updated.')
+  }
+}

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

@@ -0,0 +1,31 @@
+import * as vscode from 'vscode'
+import { CHECKPOINTS_STATE_KEY } from '../../../constants/state-keys'
+import type { Checkpoint } from '../types'
+import { get_checkpoint_path } from '../utils'
+
+export const get_checkpoints = async (
+  context: vscode.ExtensionContext
+): Promise<Checkpoint[]> => {
+  const checkpoints =
+    context.workspaceState.get<Checkpoint[]>(CHECKPOINTS_STATE_KEY, []) ?? []
+  const valid_checkpoints: Checkpoint[] = []
+  let state_updated = false
+  for (const checkpoint of checkpoints) {
+    try {
+      const checkpoint_path = get_checkpoint_path(checkpoint.timestamp)
+      await vscode.workspace.fs.stat(vscode.Uri.file(checkpoint_path))
+      if (!checkpoint.is_temporary) valid_checkpoints.push(checkpoint)
+    } catch {
+      state_updated = true
+    }
+  }
+
+  if (state_updated) {
+    await context.workspaceState.update(
+      CHECKPOINTS_STATE_KEY,
+      valid_checkpoints
+    )
+  }
+
+  return valid_checkpoints.sort((a, b) => b.timestamp - a.timestamp)
+}

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

@@ -0,0 +1,9 @@
+export * from './copy-workspace-to-dir'
+export * from './create-checkpoint'
+export * from './create-temporary-checkpoint'
+export * from './delete-checkpoint'
+export * from './edit-checkpoint'
+export * from './get-checkpoints'
+export * from './promote-temporary-checkpoint'
+export * from './restore-checkpoint'
+export * from './sync-workspace-from-dir'