Merge pull request #4 from cardstack/copilot/sub-pr-3

Fix manual checkpoint creation to detect actual workspace changes

Author: christse

src/commands/history.ts

@@ -74,8 +74,9 @@ export async function historyCommand(
       manager.init();
     }
 
-    // Scan workspace to get current files for the checkpoint
-    const changes = scanWorkspaceForChanges(workspaceDir);
+    // Detect current changes to create an accurate checkpoint
+    const changes = manager.detectCurrentChanges();
+
     const checkpoint = manager.createCheckpoint('manual', changes, options.message);
 
     if (checkpoint) {

src/lib/checkpoint-manager.ts

@@ -149,6 +149,73 @@ export class CheckpointManager {
     return files;
   }
 
+  /**
+   * Detect current changes in the workspace by comparing with last checkpoint
+   */
+  detectCurrentChanges(): CheckpointChange[] {
+    if (!this.isInitialized()) {
+      // If not initialized, all files are "added"
+      const files = this.getWorkspaceFiles();
+      return files.map(file => ({ file, status: 'added' as const }));
+    }
+
+    // Sync files to history to get current state
+    this.syncFilesToHistory();
+
+    // Get git status to see what changed
+    const status = spawnSync('git', ['status', '--porcelain'], {
+      cwd: this.gitDir,
+      encoding: 'utf-8',
+    });
+
+    const statusOutput = status.stdout.trim();
+    if (!statusOutput) {
+      return []; // No changes
+    }
+
+    const changes: CheckpointChange[] = [];
+    for (const line of statusOutput.split('\n')) {
+      if (!line) continue;
+      
+      const statusCode = line.substring(0, 2);
+      let file = line.substring(3);
+
+      // Parse git status codes (two-character format)
+      // ' M' or 'M ' = modified
+      // 'A ' or 'AM' = added
+      // 'D ' or ' D' = deleted
+      // '??' = untracked (treat as added)
+      // 'R ' = renamed (format: "R  old -> new")
+      // 'C ' = copied (treat similar to added)
+      // 'UU' or 'AA' or other U combos = unmerged (treat as modified)
+      // 'T ' = type changed (treat as modified)
+      
+      // Handle renamed files - extract the new name
+      if (statusCode.includes('R')) {
+        const arrowIndex = file.indexOf(' -> ');
+        if (arrowIndex !== -1) {
+          const oldFile = file.substring(0, arrowIndex);
+          const newFile = file.substring(arrowIndex + 4);
+          // Record both the deletion of old and addition of new
+          changes.push({ file: oldFile, status: 'deleted' });
+          changes.push({ file: newFile, status: 'added' });
+          continue;
+        }
+      }
+
+      // Classify changes based on status code
+      if (statusCode.includes('D')) {
+        changes.push({ file, status: 'deleted' });
+      } else if (statusCode.includes('A') || statusCode.includes('C') || statusCode === '??') {
+        changes.push({ file, status: 'added' });
+      } else if (statusCode.includes('M') || statusCode.includes('U') || statusCode.includes('T')) {
+        changes.push({ file, status: 'modified' });
+      }
+    }
+
+    return changes;
+  }
+
   /**
    * Create a checkpoint with the current state
    */