@qwen-code/qwen-code 0.21.7 → 0.21.8

package/chunks/{session-3VTUHH4Q.js → session-HZ57QK7K.js}

@@ -1,39 +1,40 @@
 // Force strict mode and setup for ESM
 "use strict";
 import {
+  TurnInterruptedError,
   runNonInteractive
-} from "./chunk-ZJ3VGYHK.js";
-import "./chunk-SHZYHGQH.js";
+} from "./chunk-2ILAOM2I.js";
+import "./chunk-WG6542MA.js";
 import {
   buildPermissionSuggestions
 } from "./chunk-43T5WDQ7.js";
 import {
   settleChatRecording,
   subscribeToHeadlessChatRecordingFailures
-} from "./chunk-3NB7TSE2.js";
+} from "./chunk-U5SLIG7E.js";
 import {
   StreamJsonOutputAdapter
-} from "./chunk-72LNFGUY.js";
-import "./chunk-KR4ZSC7K.js";
+} from "./chunk-77QVBFCU.js";
+import "./chunk-FWBXMANW.js";
 import {
   getAvailableCommands
-} from "./chunk-RUL4S3K3.js";
-import "./chunk-KKJJB5X6.js";
-import "./chunk-RNVQB725.js";
+} from "./chunk-YHJFF7KH.js";
+import "./chunk-7VUERJHS.js";
+import "./chunk-XHD7CRP2.js";
 import "./chunk-NYX53SV4.js";
-import "./chunk-YHEEE624.js";
-import "./chunk-SCI7K3GM.js";
+import "./chunk-EN2TKTFH.js";
+import "./chunk-GOEVOFQI.js";
 import "./chunk-4WGODMVR.js";
-import "./chunk-GSS34377.js";
+import "./chunk-ZHA242R4.js";
 import "./chunk-YAF2MQZ6.js";
 import "./chunk-CTJLZLB5.js";
-import "./chunk-CB2464BK.js";
+import "./chunk-HWX5HPUG.js";
 import "./chunk-6H67XLET.js";
-import "./chunk-FPM27XN4.js";
-import "./chunk-TDXGKHDN.js";
-import "./chunk-6XJMFJ4D.js";
+import "./chunk-EIVICVHM.js";
+import "./chunk-IYES5WOT.js";
+import "./chunk-2M4K4KYS.js";
 import "./chunk-OWMAZHIX.js";
-import "./chunk-KXSDEOFU.js";
+import "./chunk-4ALIARFY.js";
 import "./chunk-4NFY2S7N.js";
 import "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
@@ -41,48 +42,48 @@ import "./chunk-EKTCKZV5.js";
 import "./chunk-3Z43GZUQ.js";
 import "./chunk-RXFQM6FQ.js";
 import "./chunk-HGCQ5SE7.js";
-import "./chunk-CSZEXZBE.js";
-import "./chunk-55LYDVPU.js";
+import "./chunk-GBDINRIL.js";
+import "./chunk-C5VWPTGT.js";
 import "./chunk-AOHJKPKL.js";
 import "./chunk-Z4X5MTRT.js";
-import "./chunk-EUQTXRKZ.js";
-import "./chunk-OHJLEW5J.js";
+import "./chunk-E4ZBKMSF.js";
+import "./chunk-QQWD7LZV.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-SPMY6CX6.js";
+import "./chunk-3SE7J4DR.js";
 import "./chunk-3SH53ANB.js";
 import "./chunk-MZSJ43WV.js";
 import "./chunk-XCGIMOLN.js";
-import "./chunk-ZXU5UHMI.js";
-import "./chunk-VWOVHOTT.js";
-import "./chunk-IUFV6FYU.js";
+import "./chunk-QXVSWG66.js";
+import "./chunk-KJZ26VBX.js";
+import "./chunk-NGYI5EF5.js";
 import "./chunk-V6WHFGST.js";
 import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-YP5KH5Y7.js";
-import "./chunk-24ER7UV4.js";
+import "./chunk-UFALT4LK.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-HIBNSEJE.js";
 import "./chunk-BKHCW2BI.js";
 import "./chunk-M5GB774H.js";
 import "./chunk-UVX4Y6IN.js";
-import "./chunk-WUC6ZFXO.js";
-import "./chunk-DIEFUBV6.js";
+import "./chunk-ZWBUH5UP.js";
+import "./chunk-DIWZNWZT.js";
 import "./chunk-UDXSXLER.js";
-import "./chunk-6HVUFDS2.js";
+import "./chunk-Y4TETC74.js";
 import {
   createMinimalSettings
-} from "./chunk-PQBHU2IA.js";
+} from "./chunk-OHKJVAKG.js";
 import "./chunk-RKUWKYED.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
-import "./chunk-DBOFL3LQ.js";
-import "./chunk-VOARQPTA.js";
-import "./chunk-6PEXNQTX.js";
-import "./chunk-HYRDKNUY.js";
-import "./chunk-FZBZSYKU.js";
+import "./chunk-PG62DFWD.js";
+import "./chunk-B52AWKBB.js";
+import "./chunk-UA5H3DS2.js";
+import "./chunk-IUQ52YJK.js";
+import "./chunk-FN6YXJOP.js";
 import "./chunk-VJNBRRZG.js";
-import "./chunk-6XU3PH66.js";
-import "./chunk-ALGGS7UH.js";
+import "./chunk-HA3SAB64.js";
+import "./chunk-NPQ5ZKRP.js";
 import "./chunk-MR3PXB6E.js";
 import "./chunk-XFSFZCM5.js";
 import {
@@ -90,21 +91,21 @@ import {
   TURN_INTERRUPTION_HISTORY_TAIL_COUNT,
   buildSessionRecoveryPlanFromApiHistory,
   loadUsageDashboard
-} from "./chunk-Y7E5LNLO.js";
+} from "./chunk-GXSNGY5M.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-H6XPXXMH.js";
-import "./chunk-CNIID3TV.js";
+import "./chunk-2UUMVNYT.js";
 import "./chunk-MVUQRLOH.js";
 import "./chunk-XCWO3SMQ.js";
 import "./chunk-7MH4J33A.js";
 import "./chunk-6PVPNMXU.js";
-import "./chunk-RMH5OWLD.js";
+import "./chunk-VXZ5HAOV.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
 import "./chunk-GNPNYXJB.js";
-import "./chunk-Y4NGLFGJ.js";
+import "./chunk-HUWENAHO.js";
 import "./chunk-O6GEWCJA.js";
 import "./chunk-T26EAKDL.js";
 import "./chunk-ZPJWUGCS.js";
@@ -113,41 +114,45 @@ import "./chunk-J6SZID63.js";
 import "./chunk-KRXPRVGL.js";
 import "./chunk-GM463R2B.js";
 import "./chunk-SEZ556DZ.js";
-import "./chunk-CJXIIILK.js";
-import "./chunk-3K7FH2KQ.js";
-import "./chunk-BVWVWGLE.js";
+import "./chunk-2FRY5CRX.js";
+import "./chunk-67N6HB5H.js";
+import "./chunk-WAUGQKUU.js";
+import "./chunk-PLFATELK.js";
+import "./chunk-L4N6TIP7.js";
+import "./chunk-SAH4BD2J.js";
+import "./chunk-CPG6P4GG.js";
 import "./chunk-S6LOFUVP.js";
-import "./chunk-LZC3B5N2.js";
+import "./chunk-2J3OJGTL.js";
+import "./chunk-IA7TGCN2.js";
 import "./chunk-K623ENWT.js";
 import "./chunk-AQ37AY7B.js";
 import "./chunk-EQL65XGA.js";
-import "./chunk-IIJEYBNH.js";
-import "./chunk-22NBYCPD.js";
+import "./chunk-3P2LV43B.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-3ULCB3NE.js";
-import "./chunk-BGG4MBYD.js";
+import "./chunk-HV76SFIA.js";
+import "./chunk-4PYCZH2V.js";
+import "./chunk-P3QQPMQA.js";
+import "./chunk-SR7RZ4MS.js";
+import "./chunk-M6HMMKVG.js";
 import {
   normalizeReasoningEffort
 } from "./chunk-DGEIYUC3.js";
 import "./chunk-MPHPFVKK.js";
 import "./chunk-AXMWHKXA.js";
-import "./chunk-DJ2GSRLV.js";
-import "./chunk-33ACCIIY.js";
-import "./chunk-L4N6TIP7.js";
-import "./chunk-2J3OJGTL.js";
-import "./chunk-P3QQPMQA.js";
-import "./chunk-M6HMMKVG.js";
 import "./chunk-GLCZKT5V.js";
+import "./chunk-DJ2GSRLV.js";
 import "./chunk-EI3HZX6C.js";
-import "./chunk-2U3WZGZG.js";
+import "./chunk-3PY4LPJF.js";
 import "./chunk-WOJZWRAZ.js";
 import "./chunk-VGC4I5JJ.js";
 import "./chunk-FVKHVJZQ.js";
-import "./chunk-NG2R4N5O.js";
+import "./chunk-COBO5EBO.js";
+import "./chunk-6ZRFAKXK.js";
 import {
   ToolNames
-} from "./chunk-IC4Z6LX6.js";
-import "./chunk-6EOI4HOK.js";
+} from "./chunk-PYQADEFD.js";
+import "./chunk-M3STHEMM.js";
+import "./chunk-F6WFNA7U.js";
 import "./chunk-46UV252V.js";
 import "./chunk-ZBVS26BY.js";
 import "./chunk-KKBPOU75.js";
@@ -160,13 +165,13 @@ import {
   createDebugLogger
 } from "./chunk-OIVKILPI.js";
 import "./chunk-VOQXFAY5.js";
-import "./chunk-PJOBIWUG.js";
+import "./chunk-BF52U4XJ.js";
 import {
   finalizeStartupProfile,
   profileCheckpoint
 } from "./chunk-QSWDGAIC.js";
 import "./chunk-Q7YDKOGY.js";
-import "./chunk-EORNAQDT.js";
+import "./chunk-6TR7CFXH.js";
 import "./chunk-KGJGEEVR.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
@@ -250,6 +255,7 @@ var ControlContext = class {
   streamJson;
   sessionId;
   abortSignal;
+  getActiveTurnAbortSignal;
   debugMode;
   settings;
   permissionMode;
@@ -264,6 +270,7 @@ var ControlContext = class {
     this.streamJson = options.streamJson;
     this.sessionId = options.sessionId;
     this.abortSignal = options.abortSignal;
+    this.getActiveTurnAbortSignal = options.getActiveTurnAbortSignal;
     this.debugMode = options.config.getDebugMode();
     this.settings = options.settings;
     this.permissionMode = options.permissionMode || "default";
@@ -299,6 +306,16 @@ var BaseController = class {
     this.controllerName = controllerName;
     this.debugLogger = createDebugLogger();
   }
+  /**
+   * Capture cancellation for a request owned by the current turn. Session
+   * cancellation always applies; when a turn is active, interrupting that
+   * turn also cancels the request. Call this when creating each request so a
+   * later active turn cannot take ownership of work already in flight.
+   */
+  getTurnRequestAbortSignal() {
+    const activeTurnSignal = this.context.getActiveTurnAbortSignal?.();
+    return activeTurnSignal ? AbortSignal.any([this.context.abortSignal, activeTurnSignal]) : this.context.abortSignal;
+  }
   /**
    * Handle an incoming control request
    *
@@ -465,7 +482,7 @@ var SystemController = class extends BaseController {
       throw new Error("Request aborted");
     }
     try {
-      const mod = await import("./contextCommand-ZJA6A5K5.js");
+      const mod = await import("./contextCommand-CX3YF4ZE.js");
       if (signal.aborted) {
         throw new Error("Request aborted");
       }
@@ -1102,13 +1119,14 @@ var PermissionController = class extends BaseController {
    * This is passed to executeToolCall to hook into CoreToolScheduler updates
    */
   getToolCallUpdateCallback() {
+    const turnSignal = this.getTurnRequestAbortSignal();
     return (toolCalls) => {
       for (const call of toolCalls) {
         if (call && typeof call === "object" && call.status === "awaiting_approval") {
           const awaiting = call;
           if (typeof awaiting.confirmationDetails?.onConfirm === "function" && !this.pendingOutgoingRequests.has(awaiting.request.callId)) {
             this.pendingOutgoingRequests.add(awaiting.request.callId);
-            void this.handleOutgoingPermissionRequest(awaiting);
+            void this.handleOutgoingPermissionRequest(awaiting, turnSignal);
           }
         }
       }
@@ -1151,7 +1169,7 @@ var PermissionController = class extends BaseController {
    */
   async handleTeammateApproval(event) {
     try {
-      if (this.context.abortSignal?.aborted) {
+      if (this.context.abortSignal.aborted) {
         await event.respond("cancel" /* Cancel */);
         return;
       }
@@ -1278,11 +1296,11 @@ var PermissionController = class extends BaseController {
    * - stream-json mode: Send can_use_tool to SDK and await response
    * - Other modes: Check local approval mode and decide immediately
    */
-  async handleOutgoingPermissionRequest(toolCall) {
+  async handleOutgoingPermissionRequest(toolCall, signal) {
     const requiresUserInteraction = toolCall.invocation?.requiresUserInteraction?.() === true;
     const interactionUnavailableMessage = toolCall.request.name === ToolNames.EXIT_PLAN_MODE ? "The host could not present plan-exit approval. Use the host mode selector or /plan exit to leave plan mode." : `The host could not present the required approval for "${toolCall.request.name}".`;
     try {
-      if (this.context.abortSignal?.aborted) {
+      if (signal.aborted) {
         await toolCall.confirmationDetails.onConfirm(
           "cancel" /* Cancel */
         );
@@ -1318,7 +1336,7 @@ var PermissionController = class extends BaseController {
           blocked_path: null
         },
         this.context.sdkCanUseToolTimeoutMs ?? DEFAULT_CAN_USE_TOOL_TIMEOUT_MS,
-        this.context.abortSignal
+        signal
       );
       if (response.subtype !== "success") {
         await toolCall.confirmationDetails.onConfirm(
@@ -1446,6 +1464,7 @@ var SdkMcpController = class extends BaseController {
       `[SdkMcpController] Sending MCP message to SDK server '${serverName}':`,
       JSON.stringify(message)
     );
+    const signal = this.getTurnRequestAbortSignal();
     const response = await this.sendControlRequest(
       {
         subtype: "mcp_message",
@@ -1453,7 +1472,7 @@ var SdkMcpController = class extends BaseController {
         message
       },
       MCP_REQUEST_TIMEOUT,
-      this.context.abortSignal
+      signal
     );
     const responsePayload = response.response;
     const mcpResponse = responsePayload?.["mcp_response"];
@@ -1496,6 +1515,7 @@ var ControlDispatcher = class {
   pendingIncomingRequests = /* @__PURE__ */ new Map();
   pendingOutgoingRequests = /* @__PURE__ */ new Map();
   abortHandler = null;
+  isShutdown = false;
   constructor(context) {
     this.context = context;
     this.systemController = new SystemController(
@@ -1616,6 +1636,10 @@ var ControlDispatcher = class {
    * Stops all pending requests and cleans up all controllers
    */
   shutdown() {
+    if (this.isShutdown) {
+      return;
+    }
+    this.isShutdown = true;
     debugLogger2.debug("[ControlDispatcher] Shutting down");
     if (this.abortHandler) {
       this.context.abortSignal.removeEventListener("abort", this.abortHandler);
@@ -1950,7 +1974,8 @@ var Session = class {
   monitorQueue = [];
   pendingContinueTurn = false;
   continueTurnInProgress = false;
-  abortController;
+  sessionAbortController;
+  activeTurnAbortController = null;
   config;
   sessionId;
   promptIdCounter = 0;
@@ -1978,7 +2003,7 @@ var Session = class {
     this.config = config;
     this.settings = settings;
     this.sessionId = config.getSessionId();
-    this.abortController = new AbortController();
+    this.sessionAbortController = new AbortController();
     this.initialPrompt = initialPrompt ?? null;
     this.inputReader = new StreamJsonInputReader();
     this.outputAdapter = new StreamJsonOutputAdapter(
@@ -2051,7 +2076,7 @@ var Session = class {
     }
     const registry = this.config.getMonitorRegistry();
     registry.setNotificationCallback((displayText, modelText, meta) => {
-      if (this.isShuttingDown || this.abortController.signal.aborted) {
+      if (this.isShuttingDown || this.sessionAbortController.signal.aborted) {
         return;
       }
       if (meta.status === "running" && typeof registry.get === "function") {
@@ -2076,7 +2101,7 @@ var Session = class {
     }
     const registry = this.config.getMonitorRegistry();
     registry.setRegisterCallback((entry) => {
-      if (this.isShuttingDown || this.abortController.signal.aborted) {
+      if (this.isShuttingDown || this.sessionAbortController.signal.aborted) {
         return;
       }
       this.enqueueMonitorStarted({
@@ -2126,7 +2151,8 @@ var Session = class {
       config: this.config,
       streamJson: this.outputAdapter,
       sessionId: this.sessionId,
-      abortSignal: this.abortController.signal,
+      abortSignal: this.sessionAbortController.signal,
+      getActiveTurnAbortSignal: /* @__PURE__ */ __name(() => this.activeTurnAbortController?.signal, "getActiveTurnAbortSignal"),
       settings: this.settings,
       permissionMode: this.config.getApprovalMode(),
       onInterrupt: /* @__PURE__ */ __name(() => this.handleInterrupt(), "onInterrupt"),
@@ -2251,16 +2277,20 @@ var Session = class {
     }
     await this.waitForInitialization();
     const promptId = this.getNextPromptId();
+    const turnAbortController = this.startTurn();
     try {
       await runNonInteractive(this.config, this.settings, input, promptId, {
-        abortController: this.abortController,
+        abortController: turnAbortController,
         adapter: this.outputAdapter,
         controlService: this.controlService ?? void 0,
         captureMonitorNotifications: false,
-        captureMonitorRegistrations: false
+        captureMonitorRegistrations: false,
+        recoverableCancellation: true
       });
     } catch (error) {
       debugLogger3.error("[Session] Query execution error:", error);
+    } finally {
+      this.finishTurn(turnAbortController);
     }
   }
   /**
@@ -2271,7 +2301,7 @@ var Session = class {
    */
   async requestContinueLastTurn() {
     await this.waitForInitialization();
-    if (this.isShuttingDown || this.abortController.signal.aborted) {
+    if (this.isShuttingDown || this.sessionAbortController.signal.aborted) {
       debugLogger3.debug(
         "[Session] continue_last_turn rejected: session is shutting down"
       );
@@ -2325,16 +2355,19 @@ var Session = class {
   async processContinueTurn() {
     this.continueTurnInProgress = true;
     let resultAlreadyEmitted = false;
+    let turnAbortController = null;
     try {
       await this.waitForInitialization();
       const promptId = this.getNextPromptId();
+      turnAbortController = this.startTurn();
       await runNonInteractive(this.config, this.settings, "", promptId, {
-        abortController: this.abortController,
+        abortController: turnAbortController,
         adapter: this.outputAdapter,
         controlService: this.controlService ?? void 0,
         continueInterrupted: true,
         captureMonitorNotifications: false,
         captureMonitorRegistrations: false,
+        recoverableCancellation: true,
         onResultEmitted: /* @__PURE__ */ __name(() => {
           resultAlreadyEmitted = true;
         }, "onResultEmitted")
@@ -2350,6 +2383,9 @@ var Session = class {
       }
       throw new Error(`Continue turn failed: ${message}`, { cause: error });
     } finally {
+      if (turnAbortController) {
+        this.finishTurn(turnAbortController);
+      }
       this.continueTurnInProgress = false;
     }
   }
@@ -2374,27 +2410,33 @@ var Session = class {
     const combinedModelText = batch.map((n) => n.modelText).join("\n\n");
     const combinedDisplayText = batch.map((n) => n.displayText).join("; ");
     const promptId = this.getNextPromptId();
-    await runNonInteractive(
-      this.config,
-      this.settings,
-      combinedModelText,
-      promptId,
-      {
-        abortController: this.abortController,
-        adapter: this.outputAdapter,
-        controlService: this.controlService ?? void 0,
-        sendMessageType: "notification" /* Notification */,
-        notificationDisplayText: combinedDisplayText,
-        captureMonitorNotifications: false,
-        captureMonitorRegistrations: false
-      }
-    );
+    const turnAbortController = this.startTurn();
+    try {
+      await runNonInteractive(
+        this.config,
+        this.settings,
+        combinedModelText,
+        promptId,
+        {
+          abortController: turnAbortController,
+          adapter: this.outputAdapter,
+          controlService: this.controlService ?? void 0,
+          sendMessageType: "notification" /* Notification */,
+          notificationDisplayText: combinedDisplayText,
+          captureMonitorNotifications: false,
+          captureMonitorRegistrations: false,
+          recoverableCancellation: true
+        }
+      );
+    } finally {
+      this.finishTurn(turnAbortController);
+    }
   }
   async processPendingWork() {
-    if (this.isShuttingDown || this.abortController.signal.aborted) {
+    if (this.isShuttingDown || this.sessionAbortController.signal.aborted) {
       return;
     }
-    while ((this.pendingContinueTurn || this.userMessageQueue.length > 0 || this.monitorStartedQueue.length > 0 || this.monitorQueue.length > 0) && !this.isShuttingDown && !this.abortController.signal.aborted) {
+    while ((this.pendingContinueTurn || this.userMessageQueue.length > 0 || this.monitorStartedQueue.length > 0 || this.monitorQueue.length > 0) && !this.isShuttingDown && !this.sessionAbortController.signal.aborted) {
       if (this.pendingContinueTurn) {
         this.pendingContinueTurn = false;
         try {
@@ -2453,7 +2495,7 @@ var Session = class {
     }
     this.processingPromise = this.processPendingWork().finally(() => {
       this.processingPromise = null;
-      if ((this.pendingContinueTurn || this.userMessageQueue.length > 0 || this.monitorStartedQueue.length > 0 || this.monitorQueue.length > 0) && !this.isShuttingDown && !this.abortController.signal.aborted) {
+      if ((this.pendingContinueTurn || this.userMessageQueue.length > 0 || this.monitorStartedQueue.length > 0 || this.monitorQueue.length > 0) && !this.isShuttingDown && !this.sessionAbortController.signal.aborted) {
         this.ensureProcessingStarted();
       }
     });
@@ -2472,13 +2514,30 @@ var Session = class {
   }
   handleInterrupt() {
     debugLogger3.info("[Session] Interrupt requested");
-    this.abortController.abort();
+    this.activeTurnAbortController?.abort(new TurnInterruptedError());
+  }
+  startTurn() {
+    const controller = new AbortController();
+    if (this.sessionAbortController.signal.aborted) {
+      controller.abort(this.sessionAbortController.signal.reason);
+    }
+    this.activeTurnAbortController = controller;
+    return controller;
+  }
+  finishTurn(controller) {
+    if (this.activeTurnAbortController === controller) {
+      this.activeTurnAbortController = null;
+    }
+  }
+  abortSession() {
+    this.activeTurnAbortController?.abort();
+    this.sessionAbortController.abort();
   }
   setupSignalHandlers() {
     this.shutdownHandler = () => {
       debugLogger3.info("[Session] Shutdown signal received");
       this.isShuttingDown = true;
-      this.abortController.abort();
+      this.abortSession();
     };
     process.on("SIGINT", this.shutdownHandler);
     process.on("SIGTERM", this.shutdownHandler);
@@ -2522,6 +2581,7 @@ var Session = class {
   async shutdown() {
     debugLogger3.debug("[Session] Shutting down");
     this.isShuttingDown = true;
+    this.abortSession();
     this.abortTaskRegistries();
     this.stopMonitorCallbacks();
     await this.waitForAllPendingWork();
@@ -2542,6 +2602,7 @@ var Session = class {
     this.config.getBackgroundTaskRegistry().abortAll();
   }
   finishShutdown() {
+    this.abortSession();
     this.dispatcher?.shutdown();
     this.cleanupSignalHandlers();
   }
@@ -2592,7 +2653,7 @@ var Session = class {
       }
       try {
         for await (const message of this.inputReader.read()) {
-          if (this.abortController.signal.aborted) {
+          if (this.sessionAbortController.signal.aborted) {
             break;
           }
           if (isControlResponse(message)) {