@agentclientprotocol/codex-acp 2.5.1-preview.12 → 2.5.1-preview.13

package/dist/index.js

@@ -41256,7 +41256,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.5.1-preview.12",
+  version: "2.5.1-preview.13",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -53373,12 +53373,14 @@ You have been logged out. Please try again.`);
     cancellers.clear();
   }
   async interruptPromptTurn(sessionState, turn, requestName) {
+    const activePrompt = this.activePrompts.get(sessionState.sessionId);
     this.codexAcpClient.markTurnStale({
       threadId: turn.threadId,
       turnId: turn.turnId
     });
     try {
       await this.interruptStandardChildren(sessionState);
+      if (this.activePrompts.get(sessionState.sessionId) !== activePrompt) return;
       await this.requestTurnInterrupt(sessionState, turn.threadId, turn.turnId, requestName);
     } finally {
       this.codexAcpClient.resolveTurnInterrupted({
@@ -53393,13 +53395,17 @@ You have been logged out. Please try again.`);
    * interrupt", and once it registers a later turn under a different id, "expected active turn
    * id <completionTurnId> but found <Y>". Both are retried, with the id recomputed on every
    * attempt so a `turn/started` that arrives between retries is picked up.
+   * Retries belong to that prompt, not to a newer prompt that starts while a reply is pending.
    */
   async requestTurnInterrupt(sessionState, threadId, completionTurnId, requestName) {
     if (this.recovery !== null && !this.turnAppServerIsLive(threadId)) {
       logger.log(`${requestName} - turnInterrupt skipped: the app-server of the turn is gone`, { sessionId: threadId });
       return;
     }
-    let turnId = codexRunningTurnId(sessionState, completionTurnId);
+    const activePrompt = this.activePrompts.get(sessionState.sessionId);
+    const ownsRegisteredTurn = activePrompt?.currentTurn?.threadId === threadId && activePrompt.currentTurn.turnId === completionTurnId;
+    const stillOwnsPrompt = () => ownsRegisteredTurn && activePrompt !== void 0 && this.activePrompts.get(sessionState.sessionId) === activePrompt;
+    let turnId = ownsRegisteredTurn ? codexRunningTurnId(sessionState, completionTurnId) : completionTurnId;
     for (let attempt = 0; ; attempt++) {
       try {
         await this.runWithProcessCheck(() => this.codexAcpClient.turnInterrupt({
@@ -53412,15 +53418,15 @@ You have been logged out. Please try again.`);
         });
         return;
       } catch (err) {
-        const promptStillActive = this.activePrompts.has(threadId);
         const mismatch = parseExpectedActiveTurnMismatch(err);
         const isMismatch = mismatch !== null && mismatch.expected === sessionState.currentTurnId && mismatch.found !== "";
-        const retryable = promptStillActive && (isNoActiveTurnError(err) || isMismatch) && attempt < NO_ACTIVE_TURN_RETRY_DELAYS_MS.length;
+        const retryable = stillOwnsPrompt() && (isNoActiveTurnError(err) || isMismatch) && attempt < NO_ACTIVE_TURN_RETRY_DELAYS_MS.length;
         if (!retryable) {
           logger.error(`${requestName} - turnInterrupt failed`, err);
           return;
         }
         await new Promise((resolve) => setTimeout(resolve, NO_ACTIVE_TURN_RETRY_DELAYS_MS[attempt]));
+        if (!stillOwnsPrompt()) return;
         turnId = sessionState.interruptTurnId ?? (isMismatch ? mismatch.found : completionTurnId);
         logger.log(`${requestName} - turn not interruptible yet, retrying`, {
           sessionId: threadId,
@@ -53442,9 +53448,11 @@ You have been logged out. Please try again.`);
     return activePrompt.signal.aborted || this.activePrompts.get(sessionId) !== activePrompt || this.sessionIsClosing(sessionId);
   }
   async interruptSessionTurn(sessionState, requestName, resolveInterruptedTurn) {
+    const activePrompt = this.activePrompts.get(sessionState.sessionId);
     await this.interruptStandardChildren(sessionState);
+    if (this.activePrompts.get(sessionState.sessionId) !== activePrompt) return;
     const turnId = await this.getInterruptibleTurnId(sessionState, requestName);
-    if (!turnId) {
+    if (!turnId || this.activePrompts.get(sessionState.sessionId) !== activePrompt) {
       return;
     }
     logger.log(`${requestName} session requested`, {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.5.1-preview.12",
+  "version": "2.5.1-preview.13",
   "description": "",
   "main": "dist/index.js",
   "bin": {