Track AI changes across agents and bash

Author: Taoidle

.github/workflows/release-desktop.yml

@@ -68,7 +68,7 @@ jobs:
           shopt -u nullglob
           for patch_file in "${patches[@]}"; do
             echo "Applying patch: $(basename "$patch_file")"
-            git -C "$TMP_DIR/upstream" apply --whitespace=nowarn "$patch_file"
+            patch -p0 -d "$TMP_DIR/upstream" < "$patch_file"
           done
 
           rm -rf "$VENDOR_DIR"

desktop/src-tauri/src/commands/browser.rs

@@ -123,6 +123,7 @@ fn make_minimal_ctx() -> crate::services::tools::trait_def::ToolExecutionContext
         task_context: None,
         core_context: None,
         file_change_tracker: None,
+        file_change_turn_index: None,
         permission_gate: None,
         knowledge_pipeline: None,
         knowledge_project_id: None,

desktop/src-tauri/src/commands/claude_code.rs

@@ -116,12 +116,12 @@ pub async fn get_file_change_diff(
     session_id: String,
     project_root: String,
     before_hash: Option<String>,
-    after_hash: String,
+    after_hash: Option<String>,
     state: tauri::State<'_, FileChangesState>,
 ) -> Result<CommandResponse<String>, String> {
     let tracker = state.get_or_create(&session_id, &project_root).await;
     let result = match tracker.lock() {
-        Ok(t) => match t.get_file_diff(before_hash.as_deref(), &after_hash) {
+        Ok(t) => match t.get_file_diff(before_hash.as_deref(), after_hash.as_deref()) {
             Ok(diff) => CommandResponse::ok(diff),
             Err(e) => CommandResponse::err(e),
         },

desktop/src-tauri/src/commands/file_changes.rs

@@ -390,6 +390,7 @@ pub async fn generate_plan(
 pub async fn approve_plan(
     request: ApprovePlanRequest,
     state: tauri::State<'_, PlanModeState>,
+    file_changes_state: tauri::State<'_, crate::commands::file_changes::FileChangesState>,
     app_state: tauri::State<'_, AppState>,
     knowledge_state: tauri::State<'_, crate::commands::knowledge::KnowledgeState>,
     standalone_state: tauri::State<'_, crate::commands::standalone::StandaloneState>,
@@ -546,6 +547,19 @@ pub async fn approve_plan(
         _ => standalone_state.working_directory.read().await.clone(),
     };
     let resolved_project_path = resolved_project_root.to_string_lossy().to_string();
+    let tracker_session_id = kernel_state
+        .inner()
+        .linked_kernel_sessions_for_mode_session(WorkflowMode::Plan, &session_id)
+        .await
+        .into_iter()
+        .next()
+        .unwrap_or_else(|| session_id.clone());
+    let file_change_tracker = file_changes_state
+        .get_or_create(&tracker_session_id, &resolved_project_path)
+        .await;
+    if let Ok(mut tracker) = file_change_tracker.lock() {
+        tracker.set_app_handle(app_handle.clone());
+    }
 
     let selected_skills =
         crate::services::task_mode::context_provider::hydrate_skill_matches_by_ids(
@@ -572,6 +586,7 @@ pub async fn approve_plan(
     let step_runtime = crate::services::plan_mode::step_executor::StepExecutionRuntime {
         provider_config,
         project_root: resolved_project_root,
+        file_change_tracker: Some(file_change_tracker),
         index_store,
         embedding_service,
         embedding_manager,
@@ -751,6 +766,7 @@ pub async fn approve_plan(
 pub async fn retry_plan_step(
     request: RetryPlanStepRequest,
     state: tauri::State<'_, PlanModeState>,
+    file_changes_state: tauri::State<'_, crate::commands::file_changes::FileChangesState>,
     app_state: tauri::State<'_, AppState>,
     knowledge_state: tauri::State<'_, crate::commands::knowledge::KnowledgeState>,
     standalone_state: tauri::State<'_, crate::commands::standalone::StandaloneState>,
@@ -920,6 +936,19 @@ pub async fn retry_plan_step(
         _ => standalone_state.working_directory.read().await.clone(),
     };
     let resolved_project_path = resolved_project_root.to_string_lossy().to_string();
+    let tracker_session_id = kernel_state
+        .inner()
+        .linked_kernel_sessions_for_mode_session(WorkflowMode::Plan, &session_id)
+        .await
+        .into_iter()
+        .next()
+        .unwrap_or_else(|| session_id.clone());
+    let file_change_tracker = file_changes_state
+        .get_or_create(&tracker_session_id, &resolved_project_path)
+        .await;
+    if let Ok(mut tracker) = file_change_tracker.lock() {
+        tracker.set_app_handle(app_handle.clone());
+    }
 
     let selected_skills =
         crate::services::task_mode::context_provider::hydrate_skill_matches_by_ids(
@@ -946,6 +975,7 @@ pub async fn retry_plan_step(
     let step_runtime = crate::services::plan_mode::step_executor::StepExecutionRuntime {
         provider_config,
         project_root: resolved_project_root,
+        file_change_tracker: Some(file_change_tracker),
         index_store,
         embedding_service,
         embedding_manager,

desktop/src-tauri/src/commands/plan_mode/planning_execution_commands.rs

@@ -1532,6 +1532,7 @@ pub async fn execute_standalone(
             let next = t.turn_index() + 1;
             t.set_turn_index(next);
             t.set_app_handle(app.clone());
+            orchestrator = orchestrator.with_file_change_turn_index(next);
         }
         orchestrator = orchestrator.with_file_change_tracker(tracker);
     }
@@ -2117,6 +2118,7 @@ pub async fn execute_standalone_with_session(
             let next = t.turn_index() + 1;
             t.set_turn_index(next);
             t.set_app_handle(app.clone());
+            orchestrator = orchestrator.with_file_change_turn_index(next);
         }
         orchestrator = orchestrator.with_file_change_tracker(tracker);
     }
@@ -2737,6 +2739,7 @@ pub async fn resume_standalone_execution(
             let next = t.turn_index() + 1;
             t.set_turn_index(next);
             t.set_app_handle(app.clone());
+            orchestrator = orchestrator.with_file_change_turn_index(next);
         }
         orchestrator = orchestrator.with_file_change_tracker(tracker);
     }

desktop/src-tauri/src/commands/standalone.rs

@@ -2123,6 +2123,9 @@ fn build_story_executor(
     skills_block: String,
     selected_skill_matches: Vec<crate::services::skills::model::SkillMatch>,
     knowledge_tool_params: Option<KnowledgeToolParams>,
+    file_change_tracker: Option<
+        Arc<std::sync::Mutex<crate::services::file_change_tracker::FileChangeTracker>>,
+    >,
 ) -> impl Fn(StoryExecutionContext) -> Pin<Box<dyn Future<Output = StoryExecutionOutcome> + Send>>
        + Send
        + Sync
@@ -2141,6 +2144,7 @@ fn build_story_executor(
         let skills_block = skills_block.clone();
         let selected_skill_matches = selected_skill_matches.clone();
         let knowledge_tool_params = knowledge_tool_params.clone();
+        let file_change_tracker = file_change_tracker.clone();
         Box::pin(async move {
             eprintln!(
                 "[INFO] Executing story '{}' (attempt {}) with agent '{}' in {} [mode: {:?}]",
@@ -2181,6 +2185,13 @@ fn build_story_executor(
 
             // Build execution prompt from story context
             let prompt = build_story_prompt(&ctx, &knowledge_block, &memory_block, &skills_block);
+            let file_change_turn_index = file_change_tracker.as_ref().and_then(|tracker| {
+                tracker.lock().ok().map(|mut guard| {
+                    let next = guard.turn_index().saturating_add(1);
+                    guard.set_turn_index(next);
+                    next
+                })
+            });
 
             match mode {
                 StoryExecutionMode::Cli => {
@@ -2190,6 +2201,8 @@ fn build_story_executor(
                         &prompt,
                         &ctx.project_path,
                         ctx.cancel_token.clone(),
+                        file_change_tracker.clone(),
+                        file_change_turn_index,
                     )
                     .await
                 }
@@ -2210,6 +2223,8 @@ fn build_story_executor(
                         selected_skill_matches.as_slice(),
                         knowledge_tool_params.as_ref(),
                         ctx.cancel_token.clone(),
+                        file_change_tracker.clone(),
+                        file_change_turn_index,
                     )
                     .await
                 }
@@ -2228,6 +2243,10 @@ async fn execute_story_via_agent(
     prompt: &str,
     project_path: &std::path::Path,
     cancel_token: tokio_util::sync::CancellationToken,
+    file_change_tracker: Option<
+        Arc<std::sync::Mutex<crate::services::file_change_tracker::FileChangeTracker>>,
+    >,
+    file_change_turn_index: Option<u32>,
 ) -> StoryExecutionOutcome {
     use tokio::process::Command;
 
@@ -2266,6 +2285,11 @@ async fn execute_story_via_agent(
         project_path.display()
     );
 
+    let before_workspace_snapshot = file_change_tracker
+        .as_ref()
+        .and_then(|tracker| tracker.lock().ok())
+        .and_then(|tracker| tracker.capture_workspace_snapshot().ok());
+
     let mut process_builder = Command::new(&command);
     process_builder
         .args(&args)
@@ -2288,7 +2312,7 @@ async fn execute_story_via_agent(
 
     let mut wait_handle = tokio::spawn(async move { child.wait_with_output().await });
 
-    tokio::select! {
+    let outcome = tokio::select! {
         _ = cancel_token.cancelled() => {
             wait_handle.abort();
             eprintln!("[INFO] Agent '{}' execution cancelled", command);
@@ -2338,7 +2362,29 @@ async fn execute_story_via_agent(
                 }
             }
         }
+    };
+
+    if let (Some(tracker), Some(before_snapshot)) = (
+        file_change_tracker.as_ref(),
+        before_workspace_snapshot.as_ref(),
+    ) {
+        if let Ok(mut tracker_guard) = tracker.lock() {
+            if let Ok(after_snapshot) = tracker_guard.capture_workspace_snapshot() {
+                let turn_index = file_change_turn_index
+                    .unwrap_or_else(|| tracker_guard.turn_index());
+                tracker_guard.record_workspace_delta_between_at(
+                    turn_index,
+                    &format!("agent-{}", uuid::Uuid::new_v4()),
+                    "Bash",
+                    before_snapshot,
+                    &after_snapshot,
+                    &format!("{} story execution", command),
+                );
+            }
+        }
     }
+
+    outcome
 }
 
 /// Execute a story via the OrchestratorService using direct LLM API.
@@ -2361,6 +2407,10 @@ async fn execute_story_via_llm(
     selected_skill_matches: &[crate::services::skills::model::SkillMatch],
     knowledge_tool_params: Option<&KnowledgeToolParams>,
     cancel_token: tokio_util::sync::CancellationToken,
+    file_change_tracker: Option<
+        Arc<std::sync::Mutex<crate::services::file_change_tracker::FileChangeTracker>>,
+    >,
+    file_change_turn_index: Option<u32>,
 ) -> StoryExecutionOutcome {
     use crate::services::orchestrator::{OrchestratorConfig, OrchestratorService};
     use crate::services::streaming::UnifiedStreamEvent;
@@ -2424,6 +2474,13 @@ async fn execute_story_via_llm(
         .with_search_provider(&search_provider, search_api_key)
         .with_permission_gate(permission_gate.clone());
 
+    if let Some(ref tracker) = file_change_tracker {
+        orchestrator = orchestrator.with_file_change_tracker(Arc::clone(tracker));
+    }
+    if let Some(turn_index) = file_change_turn_index {
+        orchestrator = orchestrator.with_file_change_turn_index(turn_index);
+    }
+
     if !selected_skill_matches.is_empty() {
         let selected_skills =
             std::sync::Arc::new(tokio::sync::RwLock::new(selected_skill_matches.to_vec()));

desktop/src-tauri/src/commands/task_mode.rs

@@ -261,6 +261,7 @@ pub async fn approve_task_prd(
     app: tauri::AppHandle,
     request: ApproveTaskPrdRequest,
     state: tauri::State<'_, TaskModeState>,
+    file_changes_state: tauri::State<'_, crate::commands::file_changes::FileChangesState>,
     kernel_state: tauri::State<'_, WorkflowKernelState>,
     app_state: tauri::State<'_, AppState>,
     permission_state: tauri::State<'_, crate::commands::permissions::PermissionState>,
@@ -462,6 +463,19 @@ pub async fn approve_task_prd(
                 .filter(|path| !path.is_empty())
                 .unwrap_or(".")
                 .to_string();
+            let tracker_session_id = kernel_state
+                .inner()
+                .linked_kernel_sessions_for_mode_session(WorkflowMode::Task, &session_id)
+                .await
+                .into_iter()
+                .next()
+                .unwrap_or_else(|| session_id.clone());
+            let file_change_tracker = file_changes_state
+                .get_or_create(&tracker_session_id, &project_path_str)
+                .await;
+            if let Ok(mut tracker) = file_change_tracker.lock() {
+                tracker.set_app_handle(app.clone());
+            }
             let enriched_ctx = assemble_enriched_context_v2(
                 app_state.inner(),
                 knowledge_state.inner(),
@@ -728,6 +742,7 @@ pub async fn approve_task_prd(
                         skills_block,
                         selected_skill_matches,
                         knowledge_tool_params,
+                        Some(file_change_tracker),
                     );
 
                     let result = executor

desktop/src-tauri/src/commands/task_mode/execution_commands.rs

@@ -1191,6 +1191,7 @@ pub async fn explore_project(
     app_state: tauri::State<'_, AppState>,
     standalone_state: tauri::State<'_, crate::commands::standalone::StandaloneState>,
     knowledge_state: tauri::State<'_, crate::commands::knowledge::KnowledgeState>,
+    file_changes_state: tauri::State<'_, crate::commands::file_changes::FileChangesState>,
     kernel_state: tauri::State<'_, WorkflowKernelState>,
     app_handle: tauri::AppHandle,
 ) -> Result<CommandResponse<ExplorationResult>, String> {
@@ -1443,6 +1444,26 @@ pub async fn explore_project(
                 let (search_provider, search_api_key) = resolve_search_provider_for_tools();
                 let mut coordinator = crate::services::orchestrator::OrchestratorService::new(config)
                     .with_search_provider(&search_provider, search_api_key);
+                let tracker_session_id = kernel_state
+                    .inner()
+                    .linked_kernel_sessions_for_mode_session(WorkflowMode::Task, &session_id)
+                    .await
+                    .into_iter()
+                    .next()
+                    .unwrap_or_else(|| session_id.clone());
+                let file_change_tracker = file_changes_state
+                    .get_or_create(&tracker_session_id, &project_path.to_string_lossy())
+                    .await;
+                let tracker_for_orchestrator = std::sync::Arc::clone(&file_change_tracker);
+                if let Ok(mut tracker) = file_change_tracker.lock() {
+                    tracker.set_app_handle(app_handle.clone());
+                    let next = tracker.turn_index().saturating_add(1);
+                    tracker.set_turn_index(next);
+                    drop(tracker);
+                    coordinator = coordinator
+                        .with_file_change_tracker(tracker_for_orchestrator)
+                        .with_file_change_turn_index(next);
+                }
 
                 // Wire database pool for CodebaseSearch
                 if let Ok(pool) = app_state.with_database(|db| Ok(db.pool().clone())).await {

desktop/src-tauri/src/commands/task_mode/generation_commands.rs

@@ -633,6 +633,7 @@ pub async fn workflow_resume_background_runs(
     state: tauri::State<'_, WorkflowKernelState>,
     plan_mode_state: tauri::State<'_, PlanModeState>,
     task_mode_state: tauri::State<'_, TaskModeState>,
+    file_changes_state: tauri::State<'_, crate::commands::file_changes::FileChangesState>,
     app_state: tauri::State<'_, AppState>,
     knowledge_state: tauri::State<'_, crate::commands::knowledge::KnowledgeState>,
     plugin_state: tauri::State<'_, crate::commands::plugins::PluginState>,
@@ -731,6 +732,7 @@ pub async fn workflow_resume_background_runs(
                                 locale: payload.locale,
                             },
                             plan_mode_state.clone(),
+                            file_changes_state.clone(),
                             app_state.clone(),
                             knowledge_state.clone(),
                             standalone_state.clone(),
@@ -841,6 +843,7 @@ pub async fn workflow_resume_background_runs(
                                 project_path: payload.project_path,
                             },
                             task_mode_state.clone(),
+                            file_changes_state.clone(),
                             state.clone(),
                             app_state.clone(),
                             permission_state.clone(),