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

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;
 }
@@ -32216,6 +32227,77 @@ function normalizeJsonObject(value) {
   );
 }
 
+// src/AcpV2SessionInfo.ts
+var AcpV2SessionInfo = class {
+  constructor(send, initialMetadata = null) {
+    this.send = send;
+    this.applyMetadata(JSON.parse(JSON.stringify({ _meta: initialMetadata }))._meta);
+  }
+  send;
+  metadata = /* @__PURE__ */ new Map();
+  tail = Promise.resolve();
+  disposed = false;
+  update(update, notificationMetadata) {
+    let copy;
+    try {
+      copy = JSON.parse(JSON.stringify({ update, _meta: notificationMetadata }));
+    } catch (error62) {
+      return Promise.reject(error62);
+    }
+    return this.enqueue(async () => {
+      this.applyMetadata(copy.update._meta);
+      await this.publish(copy.update, copy._meta);
+    });
+  }
+  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({ ...copy, sessionUpdate: "session_info_update", _meta: patch }));
+      this.applyMetadata(update._meta);
+      await this.publish(update);
+    });
+  }
+  seedMetadata(metadata) {
+    const copy = JSON.parse(JSON.stringify({ _meta: metadata }))._meta;
+    return this.enqueue(async () => {
+      this.applyMetadata(copy);
+    });
+  }
+  snapshot(title) {
+    return this.enqueue(async () => {
+      await this.publish({ sessionUpdate: "session_info_update", title, _meta: null });
+      if (this.metadata.size > 0) {
+        await this.publish({ sessionUpdate: "session_info_update", _meta: Object.fromEntries(this.metadata) });
+      }
+    });
+  }
+  dispose() {
+    this.disposed = true;
+    this.metadata.clear();
+  }
+  applyMetadata(patch) {
+    if (patch === null) this.metadata.clear();
+    else if (isRecord2(patch)) for (const [key, value] of Object.entries(patch)) {
+      if (value === null) this.metadata.delete(key);
+      else this.metadata.set(key, value);
+    }
+  }
+  enqueue(operation) {
+    const next = this.tail.then(async () => {
+      if (!this.disposed) await operation();
+    });
+    this.tail = next.catch(() => {
+    });
+    return next;
+  }
+  publish(update, notificationMetadata) {
+    return this.disposed ? Promise.resolve() : this.send(update, notificationMetadata);
+  }
+};
+
 // src/JsonSnapshot.ts
 import { types } from "node:util";
 var JsonObject = class {
@@ -32773,6 +32855,10 @@ var AcpV2Connection = class {
         if (method === methods2.client.elicitation.complete) return this.sendElicitationCompletion(params);
         const sessionId = clientNotificationSessionId(method, params);
         if (sessionId !== null && this.sessionDelivery && !this.sessionDelivery.canPublishSession(sessionId)) return Promise.resolve();
+        if (sessionId !== null) {
+          const { update, _meta } = params;
+          if (SessionUpdate.isSessionInfoUpdate(update)) return this.sessionInfoFor(sessionId).update(update, _meta);
+        }
         return client.notify(method, params);
       },
       request: (method, params, options) => {
@@ -32793,6 +32879,7 @@ var AcpV2Connection = class {
   client;
   isTurnRunning = () => true;
   foreground = /* @__PURE__ */ new Map();
+  sessionInfo = /* @__PURE__ */ new Map();
   sessionDelivery = null;
   sendElicitationCompletion;
   setClientDelivery(delivery) {
@@ -32817,9 +32904,12 @@ var AcpV2Connection = class {
    * Sends a session update, rendered in the v2 wire shape, through the v2 `session/update`
    * binding. One update can render to several v2 updates (or none), sent in order.
    */
-  async updateSession(sessionId, update) {
+  async updateSession(sessionId, update, metadata) {
     for (const v2Update of toV2SessionUpdates(update)) {
-      await this.client.notify(methods2.client.session.update, { sessionId, update: v2Update });
+      await this.client.notify(
+        methods2.client.session.update,
+        { sessionId, update: v2Update, ...metadata !== void 0 ? { _meta: metadata } : {} }
+      );
     }
   }
   /** Sends a `state_update`, which only exists on v2 and so needs no rendering. */
@@ -32832,6 +32922,20 @@ var AcpV2Connection = class {
   snapshotForegroundState(sessionId) {
     return this.foregroundFor(sessionId).snapshot();
   }
+  resetSessionInfo(sessionId, metadata) {
+    this.sessionInfo.get(sessionId)?.dispose();
+    this.sessionInfo.delete(sessionId);
+    this.sessionInfoFor(sessionId, metadata);
+  }
+  refreshSessionInfo(sessionId, metadata) {
+    return metadata ? this.sessionInfoFor(sessionId).seedMetadata(metadata) : Promise.resolve();
+  }
+  snapshotSessionInfo(sessionId, title) {
+    return this.sessionInfoFor(sessionId).snapshot(title);
+  }
+  patchSessionMetadata(sessionId, change, fields = {}) {
+    return this.sessionInfoFor(sessionId).patchMetadata(change, fields);
+  }
   startForegroundItem(sessionId, itemId) {
     return this.foregroundFor(sessionId).startItem(itemId);
   }
@@ -32842,9 +32946,34 @@ var AcpV2Connection = class {
     this.foregroundFor(sessionId, running);
   }
   forgetSession(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 () => {
+      });
+      closed.dispose();
+      return closed;
+    }
+    let info = this.sessionInfo.get(sessionId);
+    if (!info) {
+      info = new AcpV2SessionInfo((update, notificationMetadata) => {
+        if (this.sessionDelivery && !this.sessionDelivery.canPublishSession(sessionId)) return Promise.resolve();
+        return this.transportClient.notify(
+          methods2.client.session.update,
+          { sessionId, update, ...notificationMetadata !== void 0 ? { _meta: notificationMetadata } : {} }
+        );
+      }, metadata);
+      this.sessionInfo.set(sessionId, info);
+    }
+    return info;
+  }
   foregroundFor(sessionId, running = false) {
     if (this.sessionDelivery && !this.sessionDelivery.canPublishSession(sessionId)) {
       const closed = new AcpV2ForegroundState(async () => {
@@ -32934,7 +33063,7 @@ var AcpV2Connection = class {
         }
         if (method === methods.client.session.update) {
           const notification = params;
-          return this.updateSession(notification.sessionId, notification.update);
+          return this.updateSession(notification.sessionId, notification.update, notification._meta);
         }
         if (method === methods.client.elicitation.complete) {
           return this.completeElicitation(params);
@@ -33003,6 +33132,10 @@ var ACPSessionConnection = class _ACPSessionConnection {
   forSession(sessionId) {
     return new _ACPSessionConnection(this.connection, sessionId);
   }
+  /** Domain writers can rebuild an owned metadata value without changing v2's shallow patch semantics. */
+  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) {
     return this.v2Connection ? this.v2Connection.replaySessionUpdate(this.sessionId, update, initialized) : this.update(update);
@@ -35185,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 {
@@ -37730,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(
@@ -37741,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) {
@@ -37751,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);
       }
     }
   }
@@ -37765,7 +37901,17 @@ ${diff}`, "");
     }
   }
   async clearSessionFailure() {
+    const failure3 = this.sessionState.sessionFailure;
     delete this.sessionState.sessionFailure;
+    if (!failure3 || this.session.protocolVersion !== 2) return;
+    await this.session.patchSessionMetadata((metadata) => {
+      const jetbrains = recordOrNull(metadata[JETBRAINS_META_KEY]);
+      const air = recordOrNull(jetbrains?.[AIR_META_KEY]);
+      const published = recordOrNull(air?.[AIR_SESSION_FAILURE_KEY]);
+      if (!air || published?.["id"] !== failure3.id || published?.["revision"] !== failure3.revision) return null;
+      const { [AIR_SESSION_FAILURE_KEY]: _failure, ...currentAir } = air;
+      return { [JETBRAINS_META_KEY]: { ...jetbrains, [AIR_META_KEY]: currentAir } };
+    });
   }
   async completeSuccessfulTurn(turnId) {
     this.lastSessionNotice = void 0;
@@ -37773,7 +37919,7 @@ ${diff}`, "");
     const active = this.sessionState.sessionFailure;
     if (active?.id !== this.activeFailureIdByScope.get(turnId) || active?.severity !== "warning") return;
     this.activeFailureIdByScope.delete(turnId);
-    delete this.sessionState.sessionFailure;
+    await this.clearSessionFailure();
   }
   async handleFailedTurn(turn) {
     if (turn.status === "failed" && this.isAuthenticationRequiredError(turn.error?.codexErrorInfo ?? null)) {
@@ -37852,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) {
@@ -38131,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",
@@ -38502,7 +38663,7 @@ ${event.details}` : event.summary;
     if (activeId === void 0 || this.failuresById.get(activeId)?.severity !== "warning") return;
     this.activeFailureIdByScope.delete(turnId);
     if (this.sessionState.sessionFailure?.id === activeId) {
-      delete this.sessionState.sessionFailure;
+      void this.clearSessionFailure().catch((error62) => logger.error("Failed to clear session failure metadata", error62));
     }
   }
   recordRetryWarning(params, attributeToTurn = true) {
@@ -41095,7 +41256,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.5.1-preview.10",
+  version: "2.5.1-preview.12",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -49325,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);
@@ -50555,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. */
@@ -50563,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;
   }
@@ -50702,7 +50864,7 @@ You have been logged out. Please try again.`);
       this.sessionIndex.titleWriter(sessionId)
     );
     sessionState.promptSuggestions = this.createPromptSuggestions(sessionState);
-    this.installSessionState(sessionState);
+    this.installSessionState(sessionState, sessionMetadata.threadStatus);
     AcpV2Connection.of(this.connection)?.restoreForegroundState(sessionId, sessionMetadata.threadStatus?.type === "active");
     this.recovery?.markLoaded(sessionState, openGeneration);
     if (settleTrackerReady) {
@@ -50865,12 +51027,22 @@ You have been logged out. Please try again.`);
       new ACPSessionConnection(this.connection, sessionId)
     );
   }
-  installSessionState(sessionState) {
+  installSessionState(sessionState, threadStatus) {
     const previous = this.sessions.get(sessionState.sessionId);
     previous?.asyncTasks.clear();
     void previous?.promptSuggestions?.clear();
     this.sessions.set(sessionState.sessionId, sessionState);
     this.clientDelivery.openSession(sessionState.sessionId);
+    const v2 = AcpV2Connection.of(this.connection);
+    if (v2) {
+      const metadata = threadStatus ? { codex: { threadStatus } } : null;
+      if (previous) {
+        if (previous.sessionFailure) sessionState.sessionFailure = previous.sessionFailure;
+        void v2.refreshSessionInfo(sessionState.sessionId, metadata);
+      } else {
+        v2.resetSessionInfo(sessionState.sessionId, metadata);
+      }
+    }
   }
   /**
    * Installs a baseline session-scoped subscription, so a Codex-initiated turn starting before
@@ -51173,10 +51345,7 @@ You have been logged out. Please try again.`);
   async snapshotSessionStateV2(sessionId) {
     await this.codexAcpClient.waitForSessionNotifications(sessionId);
     const state = this.getSessionState(sessionId);
-    await new ACPSessionConnection(this.connection, sessionId).update({
-      sessionUpdate: "session_info_update",
-      title: state.sessionTitle
-    });
+    await AcpV2Connection.of(this.connection).snapshotSessionInfo(sessionId, state.sessionTitle);
     await AcpV2Connection.of(this.connection).snapshotForegroundState(sessionId);
   }
   async forkSession(params) {
@@ -51285,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);
@@ -52358,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) {
@@ -52499,7 +52670,7 @@ You have been logged out. Please try again.`);
       this.sessionIndex.titleWriter(sessionId)
     );
     sessionState.promptSuggestions = this.createPromptSuggestions(sessionState);
-    this.installSessionState(sessionState);
+    this.installSessionState(sessionState, thread.status);
     AcpV2Connection.of(this.connection)?.restoreForegroundState(sessionId, thread.status.type === "active");
     this.recovery?.markLoaded(sessionState, openGeneration);
     if (knownAccount === "pending") {
@@ -52869,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);
     }
@@ -53517,7 +53678,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.10",
+  "version": "2.5.1-preview.12",
   "description": "",
   "main": "dist/index.js",
   "bin": {