From 1491b7dd9c992ef0ad2b763f3e450befaf25c47f Mon Sep 17 00:00:00 2001 From: JJ Liebig Date: Tue, 28 Jul 2026 03:13:35 +0200 Subject: fix: ignore nested codex session reports (#1927) * fix: ignore nested codex session reports refs #1789 * test: cover matching codex thread id --------- Co-authored-by: Can Celik --- src/pane.rs | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/pane.rs') diff --git a/src/pane.rs b/src/pane.rs index c6d8c003..a26dad6b 100644 --- a/src/pane.rs +++ b/src/pane.rs @@ -109,6 +109,7 @@ impl PaneLaunchEnv { } fn apply_pane_launch_env(cmd: &mut CommandBuilder, launch_env: &PaneLaunchEnv) { + cmd.env_remove("CODEX_THREAD_ID"); for (key, value) in &launch_env.extra { cmd.env(key, value); } @@ -2894,6 +2895,16 @@ impl PaneRuntime { mod tests { use super::*; + #[test] + fn pane_launch_env_removes_outer_codex_thread_id() { + let mut cmd = CommandBuilder::new("shell"); + cmd.env("CODEX_THREAD_ID", "outer-session"); + + apply_pane_launch_env(&mut cmd, &PaneLaunchEnv::default()); + + assert!(cmd.get_env("CODEX_THREAD_ID").is_none()); + } + #[tokio::test] async fn cwd_returns_accepted_report_without_rechecking_filesystem() { let stamp = std::time::SystemTime::now() -- cgit v1.2.3