From b93007878c5475eab5a135ea3e8bf039b3cc786f Mon Sep 17 00:00:00 2001
From: Channing Conger <cconger@openai.com>
Date: Thu, 19 Feb 2026 20:45:59 -0800
Subject: [PATCH] Address P1 leaked tokio task.

- Updated unregister to unwind the controller-applied pause before dropping tracking:
    - codex-rs/exec-server/src/posix/stopwatch_controller.rs:39
    - It now removes the stopwatch, checks paused, and calls stopwatch.resume().await when global pause is active.

- Added regression test:
      - codex-rs/exec-server/src/posix/stopwatch_controller.rs:121
      - unregistering_while_paused_resumes_controller_pause verifies a stopwatch still reaches cancellation after unregistering during pause (would hang before).
---
 .../src/posix/stopwatch_controller.rs         | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/codex-rs/exec-server/src/posix/stopwatch_controller.rs b/codex-rs/exec-server/src/posix/stopwatch_controller.rs
index 0a9deaab82..e3ad91c3f0 100644
--- a/codex-rs/exec-server/src/posix/stopwatch_controller.rs
+++ b/codex-rs/exec-server/src/posix/stopwatch_controller.rs
@@ -38,7 +38,14 @@ impl StopwatchController {
 
     pub(crate) async fn unregister(&self, stopwatch_id: u64) {
         let _operation_guard = self.operation_lock.lock().await;
-        self.state.lock().await.stopwatches.remove(&stopwatch_id);
+        let (stopwatch, paused) = {
+            let mut guard = self.state.lock().await;
+            (guard.stopwatches.remove(&stopwatch_id), guard.paused)
+        };
+
+        if paused && let Some(stopwatch) = stopwatch {
+            stopwatch.resume().await;
+        }
     }
 
     pub(crate) async fn set_paused(&self, paused: bool) {
@@ -109,4 +116,28 @@ mod tests {
         controller.unregister(stopwatch_id).await;
         token.cancelled().await;
     }
+
+    #[tokio::test]
+    async fn unregistering_while_paused_resumes_controller_pause() {
+        let controller = StopwatchController::default();
+        let stopwatch = Stopwatch::new(Duration::from_millis(50));
+        let token = stopwatch.cancellation_token();
+
+        let stopwatch_id = controller.register(stopwatch).await;
+        controller.set_paused(true).await;
+
+        assert!(
+            timeout(Duration::from_millis(30), token.cancelled())
+                .await
+                .is_err()
+        );
+
+        controller.unregister(stopwatch_id).await;
+
+        assert!(
+            timeout(Duration::from_millis(120), token.cancelled())
+                .await
+                .is_ok()
+        );
+    }
 }