Refactor checkpoint creation logic to fall back to file copying instead of throwing an error when Git information is unavailable, and standardize logging across context and checkpoint commands using the Logger utility

Author: robertpiosik

packages/vscode/src/commands/apply-context-command.ts

@@ -69,10 +69,11 @@ export async function resolve_glob_patterns(
           }
         })
       } catch (error) {
-        console.warn(
-          `Failed to resolve glob pattern "${normalized_pattern}":`,
-          error
-        )
+        Logger.warn({
+          function_name: 'resolve_glob_patterns',
+          message: `Failed to resolve glob pattern "${normalized_pattern}"`,
+          data: error
+        })
       }
     }
 
@@ -127,9 +128,10 @@ async function apply_saved_context(
       if (root) {
         resolved_path_part = path.join(root, relative_path)
       } else {
-        console.warn(
-          `Unknown workspace prefix "${prefix}" in path "${path_part}". Treating as relative to current workspace root.`
-        )
+        Logger.warn({
+          function_name: 'apply_saved_context',
+          message: `Unknown workspace prefix "${prefix}" in path "${path_part}". Treating as relative to current workspace root.`
+        })
         resolved_path_part = path.join(workspace_root, relative_path)
       }
     } else {
@@ -305,7 +307,11 @@ async function load_and_merge_file_contexts(): Promise<{
         }
       }
     } catch (error: any) {
-      console.error(`Error reading contexts file from ${folder.name}:`, error)
+      Logger.error({
+        function_name: 'load_and_merge_file_contexts',
+        message: `Error reading contexts file from ${folder.name}`,
+        data: error
+      })
     }
   }
 
@@ -665,10 +671,11 @@ export function apply_context_command(
                               error.message
                             )
                           )
-                          console.error(
-                            'Error updating context name in file:',
-                            error
-                          )
+                          Logger.error({
+                            function_name: 'apply_context_command',
+                            message: 'Error updating context name in file',
+                            data: error
+                          })
                           success = false
                           break
                         }
@@ -902,10 +909,11 @@ export function apply_context_command(
                 selected.label
               )
             )
-            console.error(
-              'Could not find selected context after potential edits:',
-              selected.label
-            )
+            Logger.error({
+              function_name: 'apply_context_command',
+              message: 'Could not find selected context after potential edits',
+              data: selected.label
+            })
             return
           }
 
@@ -928,7 +936,11 @@ export function apply_context_command(
               error.message
             )
           )
-          console.error('Error selecting saved context:', error)
+          Logger.error({
+            function_name: 'apply_context_command',
+            message: 'Error selecting saved context',
+            data: error
+          })
         }
       }
     }

packages/vscode/src/commands/checkpoints-command/actions/clear-all-checkpoints.ts

@@ -2,6 +2,7 @@ import * as vscode from 'vscode'
 import { CHECKPOINTS_STATE_KEY } from '../../../constants/state-keys'
 import { get_checkpoint_path } from '../utils'
 import { get_checkpoints } from './get-checkpoints'
+import { Logger } from '@shared/utils/logger'
 
 export const clear_all_checkpoints = async (
   context: vscode.ExtensionContext
@@ -15,7 +16,11 @@ export const clear_all_checkpoints = async (
         recursive: true
       })
     } catch (error) {
-      console.warn(`Could not delete checkpoint file: ${error}`)
+      Logger.warn({
+        function_name: 'clear_all_checkpoints',
+        message: 'Could not delete checkpoint file',
+        data: error
+      })
     }
   }
 

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

@@ -17,6 +17,7 @@ import {
   is_git_repository
 } from '../utils/git-utils'
 import * as path from 'path'
+import { Logger } from '@shared/utils/logger'
 
 export const create_checkpoint = async (
   workspace_provider: WorkspaceProvider,
@@ -37,7 +38,11 @@ export const create_checkpoint = async (
           recursive: true
         })
       } catch (error) {
-        console.warn(`Could not delete old temporary checkpoint file: ${error}`)
+        Logger.warn({
+          function_name: 'create_checkpoint',
+          message: 'Could not delete old temporary checkpoint file',
+          data: error
+        })
       }
       await context.workspaceState.update(
         TEMPORARY_CHECKPOINT_STATE_KEY,
@@ -88,9 +93,28 @@ export const create_checkpoint = async (
               Buffer.from(diff, 'utf8')
             )
           } else {
-            throw new Error(
-              `Failed to get git information for repository in ${folder.name}.`
-            )
+            Logger.warn({
+              function_name: 'create_checkpoint',
+              message: `Failed to get git information for repository in ${folder.name}. Falling back to file copy.`
+            })
+            const dest_folder_path =
+              workspace_folders.length > 1
+                ? path.join(checkpoint_dir_path, folder.name)
+                : checkpoint_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
+              )
+            }
           }
         } else {
           const dest_folder_path =

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

@@ -8,6 +8,7 @@ import {
   is_git_repository
 } from '../utils/git-utils'
 import * as path from 'path'
+import { Logger } from '@shared/utils/logger'
 
 export const create_temporary_checkpoint = async (
   workspace_provider: WorkspaceProvider
@@ -47,9 +48,28 @@ export const create_temporary_checkpoint = async (
           Buffer.from(diff, 'utf8')
         )
       } else {
-        throw new Error(
-          `Failed to get git information for repository in ${folder.name}.`
-        )
+        Logger.warn({
+          function_name: 'create_temporary_checkpoint',
+          message: `Failed to get git information for repository in ${folder.name}. Falling back to file copy.`
+        })
+        const dest_folder_path =
+          workspace_folders.length > 1
+            ? path.join(checkpoint_dir_path, folder.name)
+            : checkpoint_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
+          )
+        }
       }
     } else {
       const dest_folder_path =

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

@@ -2,6 +2,7 @@ import * as vscode from 'vscode'
 import { CHECKPOINTS_STATE_KEY } from '../../../constants/state-keys'
 import type { Checkpoint } from '../types'
 import { get_checkpoint_path } from '../utils'
+import { Logger } from '@shared/utils/logger'
 
 export const delete_checkpoint = async (params: {
   context: vscode.ExtensionContext
@@ -28,6 +29,10 @@ export const delete_checkpoint = async (params: {
       recursive: true
     })
   } catch (error) {
-    console.warn(`Could not delete checkpoint file: ${error}`)
+    Logger.warn({
+      function_name: 'delete_checkpoint',
+      message: 'Could not delete checkpoint file',
+      data: error
+    })
   }
 }

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

@@ -8,6 +8,7 @@ import { sync_workspace_from_dir } from './sync-workspace-from-dir'
 import { get_checkpoint_path, sync_directory } from '../utils'
 import { apply_git_diff } from '../utils/git-utils'
 import * as path from 'path'
+import { Logger } from '@shared/utils/logger'
 
 export const restore_checkpoint = async (params: {
   checkpoint: Checkpoint
@@ -30,9 +31,11 @@ export const restore_checkpoint = async (params: {
             recursive: true
           })
         } catch (error) {
-          console.warn(
-            `Could not delete old temporary checkpoint file: ${error}`
-          )
+          Logger.warn({
+            function_name: 'restore_checkpoint',
+            message: 'Could not delete old temporary checkpoint file',
+            data: error
+          })
         }
       }
 
@@ -99,7 +102,11 @@ export const restore_checkpoint = async (params: {
                   throw new Error(`Failed to apply git diff for ${folder_name}`)
                 }
               } catch (err) {
-                console.error(`Error restoring git checkpoint: ${err}`)
+                Logger.error({
+                  function_name: 'restore_checkpoint',
+                  message: 'Error restoring git checkpoint',
+                  data: err
+                })
                 throw err
               }
             } else {

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

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode'
 import { execSync } from 'child_process'
 import * as path from 'path'
-
+import { Logger } from '@shared/utils/logger'
 export interface GitInfo {
   branch: string
   commit_hash: string
@@ -85,14 +85,22 @@ export const get_git_diff = async (
           // The diff output is in stdout of the error object
           untracked_diff += err.stdout.toString()
         } else {
-          console.warn(`Could not create diff for untracked file: ${file}`, err)
+          Logger.warn({
+            function_name: 'get_git_diff',
+            message: `Could not create diff for untracked file: ${file}`,
+            data: err
+          })
         }
       }
     }
 
     return diff + untracked_diff
   } catch (error) {
-    console.error('Error getting git diff:', error)
+    Logger.error({
+      function_name: 'get_git_diff',
+      message: 'Error getting git diff',
+      data: error
+    })
     return null
   }
 }
@@ -126,7 +134,11 @@ export const apply_git_diff = async (
           try {
             execSync(`git checkout ${target_branch}`, { cwd, stdio: 'pipe' })
           } catch (err) {
-            console.warn(`Could not checkout branch ${target_branch}`)
+            Logger.warn({
+              function_name: 'apply_git_diff',
+              message: `Could not checkout branch ${target_branch}`,
+              data: err
+            })
           }
         }
 
@@ -178,7 +190,11 @@ export const apply_git_diff = async (
 
     return true
   } catch (error) {
-    console.error('Error applying git diff:', error)
+    Logger.error({
+      function_name: 'apply_git_diff',
+      message: 'Error applying git diff',
+      data: error
+    })
     return false
   }
 }