fix(staged): use shell env snapshots for doctor

Signed-off-by: Matt Toohey <contact@matttoohey.com>

Author: matt2e

apps/staged/src-tauri/src/doctor.rs

@@ -2,9 +2,41 @@
 
 pub use doctor::types::{AuthStatus, InstallSource};
 pub use doctor::{
-    AgentVersionInfo, CheckStatus, DoctorCheck, DoctorReport, FixType, RunChecksOptions,
+    AgentVersionInfo, CheckStatus, DoctorCheck, DoctorReport, ExecuteFixOptions, FixType,
+    RunChecksOptions,
 };
 
+async fn doctor_env_vars() -> Vec<(String, String)> {
+    crate::shell_env::home_env_vars_with_extended_path(
+        crate::session_runner::shell_env_cache().as_ref(),
+    )
+    .await
+}
+
+fn run_checks_options(check_freshness: bool, env_vars: Vec<(String, String)>) -> RunChecksOptions {
+    RunChecksOptions {
+        check_freshness,
+        offline: false,
+        // Use the default public registries — Staged installs these agents
+        // from public npm/brew/crates.io, not an internal mirror.
+        npm_registry: None,
+        env: None,
+    }
+    .with_env_snapshot(env_vars)
+}
+
+fn execute_fix_options(
+    command_override: Option<String>,
+    env_vars: Vec<(String, String)>,
+) -> ExecuteFixOptions {
+    ExecuteFixOptions {
+        command_override,
+        npm_registry: None,
+        env: None,
+    }
+    .with_env_snapshot(env_vars)
+}
+
 /// Run all health checks and return the report.
 ///
 /// This is the cheap, no-network path: it resolves binaries and reports
@@ -13,7 +45,8 @@ pub use doctor::{
 /// [`run_doctor_freshness`] to fill in version/update information.
 #[tauri::command]
 pub async fn run_doctor() -> DoctorReport {
-    doctor::run_checks().await
+    let env_vars = doctor_env_vars().await;
+    doctor::run_checks_with_options(run_checks_options(false, env_vars)).await
 }
 
 /// Run all health checks with version freshness enabled.
@@ -25,15 +58,8 @@ pub async fn run_doctor() -> DoctorReport {
 /// each readout. Hits the network, so it must never block first paint.
 #[tauri::command]
 pub async fn run_doctor_freshness() -> DoctorReport {
-    doctor::run_checks_with_options(RunChecksOptions {
-        check_freshness: true,
-        offline: false,
-        // Use the default public registries — Staged installs these agents
-        // from public npm/brew/crates.io, not an internal mirror.
-        npm_registry: None,
-        env: None,
-    })
-    .await
+    let env_vars = doctor_env_vars().await;
+    doctor::run_checks_with_options(run_checks_options(true, env_vars)).await
 }
 
 /// Run a fix for a doctor check, identified by check ID and fix type.
@@ -42,7 +68,9 @@ pub async fn run_doctor_freshness() -> DoctorReport {
 /// the caller never sends a raw command string.
 #[tauri::command]
 pub async fn run_doctor_fix(check_id: String, fix_type: FixType) -> Result<(), String> {
-    doctor::execute_fix(check_id, fix_type).await
+    let env_vars = doctor_env_vars().await;
+    doctor::execute_fix_with_env_options(check_id, fix_type, execute_fix_options(None, env_vars))
+        .await
 }
 
 /// Run a source-aware update for a single readout (main CLI or ACP bridge).
@@ -63,7 +91,8 @@ pub async fn run_doctor_update(
     fix_type: FixType,
     command: String,
 ) -> Result<(), String> {
-    let expected = expected_update_command(&check_id, &fix_type).await?;
+    let env_vars = doctor_env_vars().await;
+    let expected = expected_update_command(&check_id, &fix_type, env_vars.clone()).await?;
     if expected != command {
         return Err(format!(
             "Update command mismatch for {check_id}: refusing to run a command \
@@ -74,19 +103,22 @@ pub async fn run_doctor_update(
     // They are equal past the guard above, but executing `expected` makes the
     // command that runs provably the one the backend derived — no dependence on
     // the equality check surviving future edits.
-    doctor::execute_fix_with_options(check_id, fix_type, Some(expected), None).await
+    doctor::execute_fix_with_env_options(
+        check_id,
+        fix_type,
+        execute_fix_options(Some(expected), env_vars),
+    )
+    .await
 }
 
 /// Re-run freshness and return the authoritative update command for the given
 /// check + slot, or an error if no actionable update is derivable.
-async fn expected_update_command(check_id: &str, fix_type: &FixType) -> Result<String, String> {
-    let report = doctor::run_checks_with_options(RunChecksOptions {
-        check_freshness: true,
-        offline: false,
-        npm_registry: None,
-        env: None,
-    })
-    .await;
+async fn expected_update_command(
+    check_id: &str,
+    fix_type: &FixType,
+    env_vars: Vec<(String, String)>,
+) -> Result<String, String> {
+    let report = doctor::run_checks_with_options(run_checks_options(true, env_vars)).await;
 
     let check = report
         .checks