Eliminate the dedicated workspace copy action and remove explicit directory cleanup from workspace synchronization routines

Author: robertpiosik

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

@@ -1,4 +1,3 @@
-export * from './copy-workspace-to-dir'
 export * from './create-checkpoint'
 export * from './create-temporary-checkpoint'
 export * from './delete-checkpoint'

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

@@ -5,7 +5,7 @@ import type { Checkpoint } from '../types'
 import { create_temporary_checkpoint } from './create-temporary-checkpoint'
 import { delete_checkpoint } from './delete-checkpoint'
 import { sync_workspace_from_dir } from './sync-workspace-from-dir'
-import { get_checkpoint_path } from '../utils'
+import { get_checkpoint_path, sync_directory } from '../utils'
 import { apply_git_diff } from '../utils/git-utils'
 import * as path from 'path'
 
@@ -103,10 +103,19 @@ export const restore_checkpoint = async (params: {
                 throw err
               }
             } else {
-              await sync_workspace_from_dir({
-                source_dir_uri: checkpoint_dir_uri,
-                workspace_provider: params.workspace_provider
-              })
+              const source_folder_uri =
+                workspace_folders.length > 1
+                  ? vscode.Uri.joinPath(checkpoint_dir_uri, folder.name)
+                  : checkpoint_dir_uri
+              try {
+                await vscode.workspace.fs.stat(source_folder_uri)
+                await sync_directory({
+                  source_dir: source_folder_uri,
+                  dest_dir: folder.uri,
+                  root_path: folder.uri.fsPath,
+                  workspace_provider: params.workspace_provider
+                })
+              } catch {}
             }
           }
         } else {

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

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode'
 import { WorkspaceProvider } from '../../../context/providers/workspace-provider'
-import { clean_directory, sync_directory } from '../utils'
+import { sync_directory } from '../utils'
 
 export const sync_workspace_from_dir = async (params: {
   source_dir_uri: vscode.Uri
@@ -27,11 +27,6 @@ export const sync_workspace_from_dir = async (params: {
           workspace_provider: params.workspace_provider
         })
       } else {
-        await clean_directory({
-          dir_uri: folder.uri,
-          root_path: folder.uri.fsPath,
-          workspace_provider: params.workspace_provider
-        })
       }
     }
   } else {