diff --git a/desktop/src-tauri/src/managed_agents/readiness.rs b/desktop/src-tauri/src/managed_agents/readiness.rs
index ca987d24e..c46a06235 100644
--- a/desktop/src-tauri/src/managed_agents/readiness.rs
+++ b/desktop/src-tauri/src/managed_agents/readiness.rs
@@ -50,6 +50,8 @@ use crate::managed_agents::{
     types::{ManagedAgentRecord, PersonaRecord},
 };
 
+mod cli_probe;
+
 // ── EffectiveAgentEnv ─────────────────────────────────────────────────────────
 
 /// The resolved environment that a spawn of `record` would actually receive.
@@ -145,7 +147,7 @@ pub enum Requirement {
         /// Arguments for the login-status probe (e.g. `["claude", "auth", "status"]`).
         probe_args: Vec<String>,
         /// Human-readable instruction for completing the login
-        /// (e.g. `"run \`codex login --with-api-key\`"`).
+        /// (e.g. `"run \`codex login\`"`).
         setup_copy: String,
     },
 }
@@ -248,10 +250,7 @@ fn collect_missing_requirements(
             &["claude", "auth", "status"],
             "complete Claude Code authentication by running the Claude CLI",
         ),
-        "codex" => cli_login_requirements(
-            &["codex", "login", "status"],
-            "run `codex login --with-api-key`",
-        ),
+        "codex" => cli_login_requirements(&["codex", "login", "status"], "run `codex login`"),
         _ => vec![],
     }
 }
@@ -450,12 +449,9 @@ fn cli_login_requirements(probe_args: &[&str], setup_copy: &str) -> Vec<Requirem
         }];
     };
 
-    // Run the probe at the resolved absolute path so the GUI-PATH gap is bypassed.
-    let logged_in = std::process::Command::new(&binary_path)
-        .args(&probe_args[1..])
-        .output()
-        .map(|o| o.status.success())
-        .unwrap_or(false);
+    let augmented_path = cli_probe::augmented_path();
+    let logged_in =
+        cli_probe::login_probe_succeeds(&binary_path, probe_args, augmented_path.as_deref());
 
     if logged_in {
         vec![]
@@ -811,14 +807,11 @@ mod tests {
 
     #[test]
     fn codex_not_ready_copy_does_not_mention_openai_api_key() {
-        // codex uses its own credential store via `codex login --with-api-key`.
+        // codex uses its own credential store via `codex login`.
         // The nudge copy must NOT say "set OPENAI_API_KEY".
         // We test the static not-logged-in path by constructing the requirement
         // directly (the binary may or may not be installed in CI).
-        let reqs = cli_login_requirements(
-            &["codex", "login", "status"],
-            "run `codex login --with-api-key`",
-        );
+        let reqs = cli_login_requirements(&["codex", "login", "status"], "run `codex login`");
         // Whether codex is installed or not, the copy (if any) must not mention OPENAI_API_KEY.
         for req in &reqs {
             if let Requirement::CliLogin { setup_copy, .. } = req {
@@ -938,7 +931,7 @@ mod tests {
                 "login".to_string(),
                 "status".to_string(),
             ],
-            setup_copy: "run `codex login --with-api-key`".to_string(),
+            setup_copy: "run `codex login`".to_string(),
         };
         let json = serde_json::to_value(&r).unwrap();
         assert_eq!(json["surface"], "cli_login");
diff --git a/desktop/src-tauri/src/managed_agents/readiness/cli_probe.rs b/desktop/src-tauri/src/managed_agents/readiness/cli_probe.rs
new file mode 100644
index 000000000..16b338940
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/readiness/cli_probe.rs
@@ -0,0 +1,99 @@
+use std::path::Path;
+
+use crate::managed_agents::runtime::build_augmented_path;
+
+pub(super) fn augmented_path() -> Option<String> {
+    build_augmented_path(
+        dirs::home_dir(),
+        std::env::current_exe()
+            .ok()
+            .and_then(|exe| exe.parent().map(std::path::Path::to_path_buf)),
+        crate::managed_agents::login_shell_path(),
+    )
+}
+
+pub(super) fn login_probe_succeeds(
+    binary_path: &Path,
+    probe_args: &[&str],
+    augmented_path: Option<&str>,
+) -> bool {
+    // Run the probe at the resolved absolute path so the GUI-PATH gap is
+    // bypassed. Inject the same augmented PATH used for launched agents so
+    // script shims with `/usr/bin/env <interpreter>` shebangs can find runtimes
+    // such as node/python when the app was launched with a bare GUI PATH.
+    let mut command = std::process::Command::new(binary_path);
+    command.args(&probe_args[1..]);
+    if let Some(path) = augmented_path {
+        command.env("PATH", path);
+    }
+    command
+        .output()
+        .map(|o| o.status.success())
+        .unwrap_or(false)
+}
+
+#[cfg(test)]
+mod tests {
+    #[cfg(unix)]
+    #[test]
+    fn login_probe_uses_augmented_path_for_env_shebang_interpreter() {
+        use std::fs;
+        use std::os::unix::fs::PermissionsExt;
+        use std::process::Command;
+
+        let temp = tempfile::tempdir().expect("temp dir");
+        let script_dir = temp.path().join("script-bin");
+        let interpreter_dir = temp.path().join("interpreter-bin");
+        let empty_path_dir = temp.path().join("empty-bin");
+        fs::create_dir_all(&script_dir).expect("script dir");
+        fs::create_dir_all(&interpreter_dir).expect("interpreter dir");
+        fs::create_dir_all(&empty_path_dir).expect("empty path dir");
+
+        let interpreter_path = interpreter_dir.join("node");
+        let marker_path = temp.path().join("fake-node-ran");
+        fs::write(
+            &interpreter_path,
+            format!(
+                "#!/bin/sh\nprintf 'fake node ran\\n' > '{}' || exit 1\nexit 0\n",
+                marker_path.display()
+            ),
+        )
+        .expect("write interpreter");
+        fs::set_permissions(&interpreter_path, fs::Permissions::from_mode(0o755))
+            .expect("chmod interpreter");
+
+        let script_path = script_dir.join("fake-codex");
+        fs::write(&script_path, "#!/usr/bin/env node\n").expect("write script");
+        fs::set_permissions(&script_path, fs::Permissions::from_mode(0o755)).expect("chmod script");
+
+        let scrubbed_path = std::env::join_paths([empty_path_dir.as_path()])
+            .expect("join scrubbed PATH")
+            .to_string_lossy()
+            .into_owned();
+        let without_augmented_path = Command::new(&script_path)
+            .args(["login", "status"])
+            .env("PATH", &scrubbed_path)
+            .output()
+            .expect("run script with scrubbed PATH");
+        assert!(
+            !without_augmented_path.status.success(),
+            "with a scrubbed PATH, /usr/bin/env should not find node"
+        );
+
+        let augmented_path =
+            std::env::join_paths([interpreter_dir.as_path()]).expect("join augmented PATH");
+        let augmented_path = augmented_path.to_string_lossy().into_owned();
+        assert!(
+            super::login_probe_succeeds(
+                &script_path,
+                &["fake-codex", "login", "status"],
+                Some(&augmented_path),
+            ),
+            "the injected augmented PATH should allow /usr/bin/env to find the interpreter"
+        );
+        assert!(
+            marker_path.exists(),
+            "the fake node from the injected PATH should have run"
+        );
+    }
+}
diff --git a/desktop/src-tauri/src/managed_agents/runtime.rs b/desktop/src-tauri/src/managed_agents/runtime.rs
index db093d11d..e16fcf192 100644
--- a/desktop/src-tauri/src/managed_agents/runtime.rs
+++ b/desktop/src-tauri/src/managed_agents/runtime.rs
@@ -14,11 +14,10 @@ use crate::{
 };
 
 mod path;
-use path::build_augmented_path;
+pub(in crate::managed_agents) use path::build_augmented_path;
 
 mod sweep;
 pub(crate) use sweep::sweep_untracked_bundle_harnesses;
-pub use sweep::{expected_harness_exe_path, select_untracked_bundle_harnesses, ProcessSnapshot};
 
 type RespondToEnv = (Vec<(&'static str, String)>, Vec<&'static str>);
 
diff --git a/desktop/src-tauri/src/managed_agents/runtime/path.rs b/desktop/src-tauri/src/managed_agents/runtime/path.rs
index 0185e61b8..8dea76942 100644
--- a/desktop/src-tauri/src/managed_agents/runtime/path.rs
+++ b/desktop/src-tauri/src/managed_agents/runtime/path.rs
@@ -15,7 +15,7 @@ use std::path::PathBuf;
 /// error), collapsing the entire augmented `PATH` to `None` — the bug this
 /// guards against, which left managed agents unable to find `buzz`. Returns
 /// `None` only when no entries exist.
-pub(super) fn build_augmented_path(
+pub(in crate::managed_agents) fn build_augmented_path(
     home: Option<PathBuf>,
     exe_parent: Option<PathBuf>,
     shell_path: Option<String>,