close

Author: acunniffe

src/git/repo_storage.rs

@@ -3,7 +3,7 @@ use crate::authorship::authorship_log::PromptRecord;
 use crate::authorship::working_log::{CHECKPOINT_API_VERSION, Checkpoint, CheckpointKind};
 use crate::error::GitAiError;
 use crate::git::rewrite_log::{RewriteLogEvent, append_event_to_file};
-use crate::utils::debug_log;
+use crate::utils::{debug_log, normalize_to_posix};
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use std::collections::{HashMap, HashSet};
@@ -142,11 +142,21 @@ impl PersistedWorkingLog {
     }
 
     pub fn set_dirty_files(&mut self, dirty_files: Option<HashMap<String, String>>) {
-        self.dirty_files = dirty_files.map(|map| {
+        println!("pre_transform dirty_files: {:?}", dirty_files);
+
+        let normalized_dirty_files = dirty_files.map(|map| {
             map.into_iter()
-                .map(|(file_path, content)| (self.to_repo_relative_path(&file_path), content))
-                .collect()
+                .map(|(file_path, content)| {
+                    let relative_path = self.to_repo_relative_path(&file_path);
+                    let normalized_path = normalize_to_posix(&relative_path);
+                    (normalized_path, content)
+                })
+                .collect::<HashMap<_, _>>()
         });
+
+        self.dirty_files = normalized_dirty_files;
+
+        println!("setdirty_files: {:?}", self.dirty_files);
     }
 
     pub fn reset_working_log(&self) -> Result<(), GitAiError> {

tests/ai_tab.rs

@@ -307,6 +307,9 @@ fn test_ai_tab_e2e_handles_dirty_files_map() {
     println!("lib_file_path_str: {}", lib_file_path_str);
     println!("readme_file_path_str: {}", readme_file_path_str);
 
+    let working_logs = repo.current_working_logs();
+    println!("dirty_files: {:?}", working_logs.dirty_files);
+
     // Before edit snapshot includes all dirty files (AI target plus unrelated human edits)
     run_ai_tab_checkpoint(
         &repo,
@@ -329,6 +332,9 @@ fn test_ai_tab_e2e_handles_dirty_files_map() {
             .to_string();
     fs::write(&lib_file_path, &ai_content).unwrap();
 
+    let working_logs = repo.current_working_logs();
+    println!("dirty_files: {:?}", working_logs.dirty_files);
+
     run_ai_tab_checkpoint(
         &repo,
         json!({
@@ -344,17 +350,20 @@ fn test_ai_tab_e2e_handles_dirty_files_map() {
         }),
     );
 
-    // Debug: Check working logs before commit
+    // // Debug: Check working logs before commit
+    // let working_logs = repo.current_working_logs();
+    // if let Ok(checkpoints) = working_logs.read_all_checkpoints() {
+    //     println!("Checkpoints before commit: {}", checkpoints.len());
+    //     for (i, cp) in checkpoints.iter().enumerate() {
+    //         println!("Checkpoint {}: kind={:?}, entries={}", i, cp.kind, cp.entries.len());
+    //         for entry in &cp.entries {
+    //             println!("  File: {}, attributions={}", entry.file, entry.attributions.len());
+    //         }
+    //     }
+    // }
+
     let working_logs = repo.current_working_logs();
-    if let Ok(checkpoints) = working_logs.read_all_checkpoints() {
-        println!("Checkpoints before commit: {}", checkpoints.len());
-        for (i, cp) in checkpoints.iter().enumerate() {
-            println!("Checkpoint {}: kind={:?}, entries={}", i, cp.kind, cp.entries.len());
-            for entry in &cp.entries {
-                println!("  File: {}, attributions={}", entry.file, entry.attributions.len());
-            }
-        }
-    }
+    println!("dirty_files: {:?}", working_logs.dirty_files);
 
     repo.stage_all_and_commit("Record AI tab completion while other files dirty").unwrap();