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

package/dist/index.js

@@ -31968,6 +31968,9 @@ var AIR_CUSTOM_ANSWER_KEY = "customAnswer";
 var LEGACY_AIR_CUSTOM_ANSWER_KEY = "_askUserQuestionCustomAnswer";
 var AIR_EXTENSION_VERSION = 1;
 function withAirMeta(meta3, key, value) {
+  return withAirMetadata(meta3, { [key]: value });
+}
+function withAirMetadata(meta3, fields) {
   const root = asRecord(meta3);
   const jetbrains = asRecord(root[JETBRAINS_META_KEY]);
   const air = asRecord(jetbrains[AIR_META_KEY]);
@@ -31978,11 +31981,19 @@ function withAirMeta(meta3, key, value) {
       [AIR_META_KEY]: {
         ...air,
         [AIR_EXTENSION_VERSION_KEY]: AIR_EXTENSION_VERSION,
-        [key]: value
+        ...fields
       }
     }
   };
 }
+function publishAirSessionMetadata(session, key, value) {
+  if (session.protocolVersion === 2) {
+    return session.patchSessionMetadata((current) => ({
+      [JETBRAINS_META_KEY]: withAirMeta(current, key, value)[JETBRAINS_META_KEY]
+    }));
+  }
+  return session.update({ sessionUpdate: "session_info_update", _meta: withAirMeta(void 0, key, value) });
+}
 function airOnlyMeta(airClient, key, value) {
   return airClient ? withAirMeta(void 0, key, value) : void 0;
 }
@@ -32238,12 +32249,13 @@ var AcpV2SessionInfo = class {
       await this.publish(copy.update, copy._meta);
     });
   }
-  patchMetadata(change) {
+  patchMetadata(change, fields = {}) {
+    const copy = JSON.parse(JSON.stringify(fields));
     return this.enqueue(async () => {
       const current = JSON.parse(JSON.stringify(Object.fromEntries(this.metadata)));
       const patch = change(current);
       if (patch === null) return;
-      const update = JSON.parse(JSON.stringify({ sessionUpdate: "session_info_update", _meta: patch }));
+      const update = JSON.parse(JSON.stringify({ ...copy, sessionUpdate: "session_info_update", _meta: patch }));
       this.applyMetadata(update._meta);
       await this.publish(update);
     });
@@ -32921,8 +32933,8 @@ var AcpV2Connection = class {
   snapshotSessionInfo(sessionId, title) {
     return this.sessionInfoFor(sessionId).snapshot(title);
   }
-  patchSessionMetadata(sessionId, change) {
-    return this.sessionInfoFor(sessionId).patchMetadata(change);
+  patchSessionMetadata(sessionId, change, fields = {}) {
+    return this.sessionInfoFor(sessionId).patchMetadata(change, fields);
   }
   startForegroundItem(sessionId, itemId) {
     return this.foregroundFor(sessionId).startItem(itemId);
@@ -32934,11 +32946,14 @@ var AcpV2Connection = class {
     this.foregroundFor(sessionId, running);
   }
   forgetSession(sessionId) {
-    this.foreground.get(sessionId)?.dispose();
-    this.foreground.delete(sessionId);
+    this.forgetForegroundState(sessionId);
     this.sessionInfo.get(sessionId)?.dispose();
     this.sessionInfo.delete(sessionId);
   }
+  forgetForegroundState(sessionId) {
+    this.foreground.get(sessionId)?.dispose();
+    this.foreground.delete(sessionId);
+  }
   sessionInfoFor(sessionId, metadata = null) {
     if (this.sessionDelivery && !this.sessionDelivery.canPublishSession(sessionId)) {
       const closed = new AcpV2SessionInfo(async () => {
@@ -33118,8 +33133,8 @@ var ACPSessionConnection = class _ACPSessionConnection {
     return new _ACPSessionConnection(this.connection, sessionId);
   }
   /** Domain writers can rebuild an owned metadata value without changing v2's shallow patch semantics. */
-  patchSessionMetadata(change) {
-    return this.v2Connection?.patchSessionMetadata(this.sessionId, change) ?? Promise.resolve();
+  patchSessionMetadata(change, fields = {}) {
+    return this.v2Connection?.patchSessionMetadata(this.sessionId, change, fields) ?? Promise.resolve();
   }
   /** Replay shares live report filtering, with v2 entity initialization after conversion. */
   replayUpdate(update, initialized) {
@@ -35303,6 +35318,9 @@ function goalSessionInfoUpdate(goal, airClient) {
     _meta: withAirMeta(void 0, AIR_GOAL_KEY, goal)
   };
 }
+function publishGoalSessionInfo(session, goal, airClient) {
+  return airClient ? publishAirSessionMetadata(session, AIR_GOAL_KEY, goal) : Promise.resolve();
+}
 
 // src/tool-calls/ClientCapabilities.ts
 var ClientCapabilities = class _ClientCapabilities {
@@ -37848,7 +37866,7 @@ ${diff}`, "");
     await this.finishCompactionsForNotification(notification);
     if (this.isAuthenticationRequiredError(notification.params.error.codexErrorInfo)) return;
     if (notification.params.willRetry) {
-      await this.session.update(this.createSessionFailureUpdate(this.recordRetryWarning(notification.params, false)));
+      await this.publishUpdate(this.createSessionFailureUpdate(this.recordRetryWarning(notification.params, false)));
       return;
     }
     const failure3 = this.recordSessionFailure(
@@ -37859,7 +37877,7 @@ ${diff}`, "");
       void 0,
       false
     );
-    await this.session.update(this.createSessionFailureUpdate(failure3));
+    await this.publishUpdate(this.createSessionFailureUpdate(failure3));
   }
   async flushPendingErrors() {
     if (this.sessionState.currentTurnId === null || this.pendingErrors.length === 0) {
@@ -37869,7 +37887,7 @@ ${diff}`, "");
     for (const error62 of errors) {
       const update = await this.createErrorEvent(error62);
       if (update) {
-        await this.session.update(update);
+        await this.publishUpdate(update);
       }
     }
   }
@@ -37980,7 +37998,7 @@ ${diff}`, "");
     if (ignoredBySubagents) return;
     if (updateEvent === void 0) updateEvent = await this.createUpdateEvent(notification);
     if (updateEvent) {
-      await this.session.update(updateEvent, this.subagents.notificationSessionId(notification));
+      await this.publishUpdate(updateEvent, this.subagents.notificationSessionId(notification));
     }
   }
   async waitForNativeSubagentSession(childThreadId) {
@@ -38259,6 +38277,21 @@ ${params.turnId}`;
         return null;
     }
   }
+  /** These fact builders produce partial owned namespaces, unlike raw metadata patches. */
+  publishUpdate(update, sessionId = this.sessionState.sessionId) {
+    if (this.session.protocolVersion !== 2 || update.sessionUpdate !== "session_info_update" || update._meta == null) {
+      return this.session.update(update, sessionId);
+    }
+    const { _meta, sessionUpdate: _tag, ...fields } = update;
+    return this.session.forSession(sessionId).patchSessionMetadata((current) => {
+      const metadata = { ..._meta };
+      const codex = recordOrNull(_meta["codex"]);
+      if (codex) metadata["codex"] = { ...recordOrNull(current["codex"]), ...codex };
+      const air = recordOrNull(recordOrNull(_meta[JETBRAINS_META_KEY])?.[AIR_META_KEY]);
+      if (air) metadata[JETBRAINS_META_KEY] = withAirMetadata(current, air)[JETBRAINS_META_KEY];
+      return metadata;
+    }, fields);
+  }
   createCodexSessionInfoUpdate(codexMetadata) {
     return {
       sessionUpdate: "session_info_update",
@@ -41223,7 +41256,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.5.1-preview.11",
+  version: "2.5.1-preview.13",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -49453,10 +49486,7 @@ var SessionIndexService = class {
         }
       });
       if (archived ? open3 : this.host.session(sessionId) !== void 0) {
-        await new ACPSessionConnection(this.host.connection(), sessionId).update({
-          sessionUpdate: "session_info_update",
-          _meta: withAirMeta(void 0, AIR_ARCHIVED_KEY, archived)
-        });
+        await publishAirSessionMetadata(new ACPSessionConnection(this.host.connection(), sessionId), AIR_ARCHIVED_KEY, archived);
       }
     } finally {
       if (archived) this.host.endSessionCloseFence(sessionId);
@@ -50683,7 +50713,7 @@ You have been logged out. Please try again.`);
   endSessionCloseFence(sessionId) {
     const fence = this.closingSessions.get(sessionId);
     if (!fence || --fence.count > 0) return;
-    for (const closed of fence.closedSessions) this.clientDelivery.closeSession(closed);
+    for (const closed of fence.closedSessions) this.sealSessionDelivery(closed);
     this.closingSessions.delete(sessionId);
   }
   /** Nested operations such as archive may still owe their final metadata update. */
@@ -50691,9 +50721,13 @@ You have been logged out. Please try again.`);
     const fence = this.closingSessions.get(sessionId);
     for (const closed of [sessionId, ...children]) {
       if (fence) fence.closedSessions.add(closed);
-      else this.clientDelivery.closeSession(closed);
+      else this.sealSessionDelivery(closed);
     }
   }
+  sealSessionDelivery(sessionId) {
+    this.clientDelivery.closeSession(sessionId);
+    AcpV2Connection.of(this.connection)?.forgetSession(sessionId);
+  }
   getSessionGeneration(sessionId) {
     return this.sessionGenerations.get(sessionId) ?? 0;
   }
@@ -51420,7 +51454,7 @@ You have been logged out. Please try again.`);
         this.sessions.delete(params.sessionId);
         this.asyncQuestions.get(params.sessionId)?.dispose();
         this.asyncQuestions.delete(params.sessionId);
-        AcpV2Connection.of(this.connection)?.forgetSession(params.sessionId);
+        AcpV2Connection.of(this.connection)?.forgetForegroundState(params.sessionId);
         this.mcpSessionStartup.close(params.sessionId);
         this.codexAcpClient.appServerClient.mcpStartup.forgetThread(params.sessionId);
         this.pendingTurnStarts.delete(params.sessionId);
@@ -52493,9 +52527,11 @@ You have been logged out. Please try again.`);
       return;
     }
     sessionState.currentGoal = snapshot;
-    const update = goalSessionInfoUpdate(snapshot, sessionState.clientCapabilities.airClient);
-    if (update === null) return;
-    await new ACPSessionConnection(this.connection, sessionState.sessionId).update(update);
+    await publishGoalSessionInfo(
+      new ACPSessionConnection(this.connection, sessionState.sessionId),
+      snapshot,
+      sessionState.clientCapabilities.airClient
+    );
   }
   /** The models of a root session, for the configuration of its native subagent sessions. */
   subagentModels(sessionState) {
@@ -53004,17 +53040,7 @@ You have been logged out. Please try again.`);
     }
     try {
       const session = new ACPSessionConnection(this.connection, sessionState.sessionId);
-      await session.update({
-        sessionUpdate: "session_info_update",
-        _meta: {
-          [JETBRAINS_META_KEY]: {
-            [AIR_META_KEY]: {
-              [AIR_EXTENSION_VERSION_KEY]: AIR_EXTENSION_VERSION,
-              [AIR_AGENT_FILE_CHANGE_REPORT_KEY]: report
-            }
-          }
-        }
-      });
+      await publishAirSessionMetadata(session, AIR_AGENT_FILE_CHANGE_REPORT_KEY, report);
     } catch (error62) {
       logger.error("Failed to publish agent file-change report", error62);
     }
@@ -53347,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({
@@ -53367,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({
@@ -53386,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,
@@ -53416,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`, {
@@ -53652,7 +53686,7 @@ You have been logged out. Please try again.`);
       ).finally(() => {
         signal?.removeEventListener("abort", dropPendingRequest);
         reservation.release();
-        if (!this.sessions.has(sessionId)) AcpV2Connection.of(this.connection)?.forgetSession(sessionId);
+        if (!this.sessions.has(sessionId)) AcpV2Connection.of(this.connection)?.forgetForegroundState(sessionId);
       });
     });
   }

package/package.json

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