null stream after aborting

Author: jonchurch

codex-cli/src/utils/agent/agent-loop.ts

@@ -119,8 +119,6 @@ export class AgentLoop {
       return;
     }
 
-    // Reset the current stream to allow new requests
-    this.currentStream = null;
     log(
       `AgentLoop.cancel() invoked – currentStream=${Boolean(
         this.currentStream,
@@ -132,6 +130,9 @@ export class AgentLoop {
       this.currentStream as { controller?: { abort?: () => void } } | null
     )?.controller?.abort?.();
 
+    // Reset the current stream to allow new requests
+    this.currentStream = null;
+
     this.canceled = true;
 
     // Abort any in-progress tool calls