@alas-ide/codex-acp 2.5.0-alas.4 → 2.5.0-alas.5

package/dist/index.js

@@ -34696,6 +34696,32 @@ function goalSessionInfoUpdate(goal, capabilities) {
   };
 }
 
+// src/SessionFailureExtension.ts
+var NEUTRAL_SESSION_FAILURE_META_KEY = "sessionFailure";
+var SESSION_FAILURE_VERSION = 1;
+function neutralSessionFailureCapability() {
+  return { version: SESSION_FAILURE_VERSION };
+}
+function clientRequestsNeutralSessionFailure(capabilities) {
+  const declared = capabilities?._meta?.[NEUTRAL_SESSION_FAILURE_META_KEY];
+  if (declared === null || typeof declared !== "object" || Array.isArray(declared)) return false;
+  const version2 = declared["version"];
+  return typeof version2 === "number" && Number.isInteger(version2) && version2 >= 1;
+}
+var NeutralSessionFailureLedger = class {
+  revisions = /* @__PURE__ */ new Map();
+  nextIncident = 1;
+  incidentNumber() {
+    return this.nextIncident++;
+  }
+  /** The lowest revision of `id` that is at least `proposed` and above every revision already sent. */
+  revision(id, proposed) {
+    const revision = Math.max(proposed, (this.revisions.get(id) ?? 0) + 1);
+    this.revisions.set(id, revision);
+    return revision;
+  }
+};
+
 // src/tool-calls/ClientCapabilities.ts
 var ClientCapabilities = class _ClientCapabilities {
   static DEFAULT = new _ClientCapabilities({
@@ -34708,6 +34734,7 @@ var ClientCapabilities = class _ClientCapabilities {
     planUpdates: false,
     air: { rawInputRendering: false, planContentDelta: false, diffPatch: false },
     diffPatchFormat: "none",
+    sessionFailureFormat: "none",
     permissionPromptFields: false
   });
   /** The client declares `_meta.jetbrains.air`. */
@@ -34726,6 +34753,7 @@ var ClientCapabilities = class _ClientCapabilities {
   planUpdates;
   air;
   diffPatchFormat;
+  sessionFailureFormat;
   /** A permission request has its own `title` and `description` (ACP v2). */
   permissionPromptFields;
   constructor(values) {
@@ -34738,6 +34766,7 @@ var ClientCapabilities = class _ClientCapabilities {
     this.planUpdates = values.planUpdates;
     this.air = values.air;
     this.diffPatchFormat = values.diffPatchFormat;
+    this.sessionFailureFormat = values.sessionFailureFormat;
     this.permissionPromptFields = values.permissionPromptFields;
   }
   static from(capabilities) {
@@ -34759,6 +34788,8 @@ var ClientCapabilities = class _ClientCapabilities {
       },
       // A client that declares both forms gets only the client-neutral one.
       diffPatchFormat: clientRequestsNeutralDiffPatch(capabilities) ? "neutral" : diffPatch ? "air" : "none",
+      // Likewise, and the client-neutral form selects the whole typed failure lane.
+      sessionFailureFormat: clientRequestsNeutralSessionFailure(capabilities) ? "neutral" : clientSupportsAirCapability(capabilities, AIR_SESSION_FAILURE_KEY) ? "air" : "none",
       permissionPromptFields: false
     });
   }
@@ -34781,6 +34812,8 @@ var ClientCapabilities = class _ClientCapabilities {
       planUpdates: true,
       air: { rawInputRendering: false, planContentDelta: false, diffPatch: false },
       diffPatchFormat: "acpV2",
+      // ACP v2 has its own terminal failure state, so it ignores the client-neutral opt-in.
+      sessionFailureFormat: clientSupportsAirCapability(capabilities, AIR_SESSION_FAILURE_KEY) ? "air" : "none",
       permissionPromptFields: true
     });
   }
@@ -37059,6 +37092,7 @@ var SessionIndexTitles = class {
 
 // src/CodexEventHandler.ts
 var MAX_SESSION_FAILURE_TITLE_LENGTH = 240;
+var SESSION_NOTICE_KIND = "notice";
 var SESSION_FAILURE_POLICY = {
   transport_lost: {
     category: "connection",
@@ -37141,12 +37175,14 @@ function failureWasShownAsMessage(error62) {
   return error62 instanceof RequestError && failuresShownAsMessages.has(error62);
 }
 var CodexEventHandler = class {
-  constructor(connection, sessionState, supportsTypedSessionFailures, sessionFailureEpoch, subagents, onAccountUpdated, collectTurnDiffs, supportsCompaction, supportsNotices) {
+  constructor(connection, sessionState, sessionFailureFormat, sessionFailureEpoch, subagents, onAccountUpdated, collectTurnDiffs, supportsCompaction, supportsNotices, neutralFailures) {
+    this.sessionFailureFormat = sessionFailureFormat;
     this.supportsCompaction = supportsCompaction;
     this.supportsNotices = supportsNotices;
+    this.neutralFailures = neutralFailures;
     this.onAccountUpdated = onAccountUpdated;
     this.sessionState = sessionState;
-    this.supportsTypedSessionFailures = supportsTypedSessionFailures;
+    this.supportsTypedSessionFailures = sessionFailureFormat !== "none";
     this.sessionFailureEpoch = sessionFailureEpoch;
     this.session = new ACPSessionConnection(connection, sessionState.sessionId);
     this.renderer = new AcpToolCallRenderer(sessionState.clientCapabilities);
@@ -37157,9 +37193,12 @@ var CodexEventHandler = class {
       this.failuresById.set(sessionState.sessionFailure.id, sessionState.sessionFailure);
     }
   }
+  sessionFailureFormat;
   supportsCompaction;
   supportsNotices;
+  neutralFailures;
   sessionState;
+  /** The typed failure lane, in either form. Only {@link createSessionFailureMeta} reads the form itself. */
   supportsTypedSessionFailures;
   sessionFailureEpoch;
   pendingErrors = [];
@@ -37991,11 +38030,12 @@ ${event.details}` : event.summary;
     const previous = this.failuresById.get(id);
     const failure3 = {
       id,
-      revision: nextSessionFailureRevision(previous, id),
+      revision: this.sessionFailureRevision(previous, id),
       category: policy.category,
       severity,
       title: readableServiceErrorMessage(title),
-      actions: actionsOverride ?? policy.actions
+      actions: actionsOverride ?? policy.actions,
+      kind
     };
     this.failuresById.set(id, failure3);
     this.failureTurnIdById.set(id, attributeToTurn ? turnId : void 0);
@@ -38010,7 +38050,14 @@ ${event.details}` : event.summary;
       return `${turnId}:error`;
     }
     this.allocatedFailureScopes.add(scope);
-    return `${scope}:error:${this.sessionFailureEpoch}:${this.nextNoticeId++}`;
+    return `${scope}:error:${this.sessionFailureEpoch}:${this.nextIncidentNumber()}`;
+  }
+  nextIncidentNumber() {
+    return this.sessionFailureFormat === "neutral" ? this.neutralFailures.incidentNumber() : this.nextNoticeId++;
+  }
+  sessionFailureRevision(previous, id) {
+    const revision = nextSessionFailureRevision(previous, id);
+    return this.sessionFailureFormat === "neutral" ? this.neutralFailures.revision(id, revision) : revision;
   }
   /**
    * A retry warning remains the active incident until Codex produces turn content again. That content is
@@ -38043,15 +38090,16 @@ ${event.details}` : event.summary;
   recordSessionNotice(title, details) {
     const key = `${title}\0${details ?? ""}`;
     const previous = this.lastSessionNotice?.key === key ? this.lastSessionNotice.failure : void 0;
-    const id = previous?.id ?? `${this.sessionState.sessionId}:notice:${this.sessionFailureEpoch}:${this.nextNoticeId++}`;
+    const id = previous?.id ?? `${this.sessionState.sessionId}:notice:${this.sessionFailureEpoch}:${this.nextIncidentNumber()}`;
     const notice = {
       id,
-      revision: nextSessionFailureRevision(previous, id),
+      revision: this.sessionFailureRevision(previous, id),
       category: "unknown",
       severity: "warning",
       title,
       ...details === void 0 ? {} : { details },
-      actions: []
+      actions: [],
+      kind: SESSION_NOTICE_KIND
     };
     this.lastSessionNotice = { key, failure: notice };
     return notice;
@@ -38062,11 +38110,15 @@ ${event.details}` : event.summary;
     return combinedTitle.length <= MAX_SESSION_FAILURE_TITLE_LENGTH ? [combinedTitle] : [summary, details];
   }
   createSessionFailureMeta(failure3) {
+    if (this.sessionFailureFormat === "neutral") {
+      return { [NEUTRAL_SESSION_FAILURE_META_KEY]: { version: SESSION_FAILURE_VERSION, ...failure3 } };
+    }
+    const { kind: _kind, ...airFailure } = failure3;
     return {
       [JETBRAINS_META_KEY]: {
         [AIR_META_KEY]: {
           [AIR_EXTENSION_VERSION_KEY]: AIR_EXTENSION_VERSION,
-          [AIR_SESSION_FAILURE_KEY]: failure3
+          [AIR_SESSION_FAILURE_KEY]: airFailure
         }
       }
     };
@@ -40623,7 +40675,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.5.0-alas.4",
+  version: "2.5.0-alas.5",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -40701,7 +40753,7 @@ var package_default = {
   alasDownstream: {
     upstreamVersion: "2.5.0",
     upstreamCommit: "34e08970aa324a2be985f5080674d5aa91d7666f",
-    sourceCommit: "8af13bd4134b9a24acfd06b85418642f3c2742b6"
+    sourceCommit: "d1c53266b4d5d1f308323259b81d01ea687104ef"
   }
 };
 
@@ -52124,9 +52176,6 @@ var DENY_ALL_ELICITATIONS = {
   handleElicitation: async () => ({ action: "cancel", content: null, _meta: null }),
   handleUserInput: async () => ({ answers: {} })
 };
-function clientSupportsTypedSessionFailures(capabilities) {
-  return clientSupportsAirCapability(capabilities, AIR_SESSION_FAILURE_KEY);
-}
 function clientSupportsAgentFileChangeReports(capabilities) {
   return clientSupportsAirCapability(capabilities, AIR_AGENT_FILE_CHANGE_REPORT_KEY);
 }
@@ -52146,6 +52195,7 @@ var CodexAcpServer = class {
   getExitCode;
   getRecentStderr;
   sessionFailureEpoch;
+  neutralSessionFailures = new NeutralSessionFailureLedger();
   availableCommands;
   clientInfo;
   clientCapabilities;
@@ -52570,6 +52620,11 @@ var CodexAcpServer = class {
       ...protocolVersion === 1 && this.capabilities.diffPatchFormat === "neutral" ? {
         [NEUTRAL_DIFF_PATCH_META_KEY]: neutralDiffPatchCapability()
       } : {},
+      // The client-neutral session failure, see `docs/air-extensions.md`. ACP v2 has its own terminal
+      // failure state, so `ClientCapabilities.fromV2` never selects it.
+      ...protocolVersion === 1 && this.capabilities.sessionFailureFormat === "neutral" ? {
+        [NEUTRAL_SESSION_FAILURE_META_KEY]: neutralSessionFailureCapability()
+      } : {},
       // The session index for a client that opted in without AIR, see `docs/air-extensions.md`.
       ...neutralSessionIndex ? {
         [NEUTRAL_SESSION_INDEX_META_KEY]: neutralSessionIndex
@@ -53192,13 +53247,14 @@ You have been logged out. Please try again.`);
           baselineEventHandler = new CodexEventHandler(
             this.connection,
             sessionState,
-            clientSupportsTypedSessionFailures(this.clientCapabilities),
+            this.capabilities.sessionFailureFormat,
             this.sessionFailureEpoch,
             sessionState.subagents,
             (accountUpdated) => this.handleAccountUpdated(accountUpdated),
             false,
             clientSupportsCompaction(this.clientCapabilities),
-            clientSupportsNotices(this.clientCapabilities)
+            clientSupportsNotices(this.clientCapabilities),
+            this.neutralSessionFailures
           );
         }
         await this.trackCodexForegroundWork(sessionState, event);
@@ -54475,13 +54531,14 @@ You have been logged out. Please try again.`);
     const eventHandler = new CodexEventHandler(
       this.connection,
       sessionState,
-      clientSupportsTypedSessionFailures(this.clientCapabilities),
+      this.capabilities.sessionFailureFormat,
       this.sessionFailureEpoch,
       sessionState.subagents,
       (accountUpdated) => this.handleAccountUpdated(accountUpdated),
       false,
       clientSupportsCompaction(this.clientCapabilities),
-      clientSupportsNotices(this.clientCapabilities)
+      clientSupportsNotices(this.clientCapabilities),
+      this.neutralSessionFailures
     );
     const permissionContext = this.permissionLifecycleContext(sessionState).beginPrompt();
     const toolCallRenderer = new AcpToolCallRenderer(this.capabilities);
@@ -56038,13 +56095,14 @@ You have been logged out. Please try again.`);
       const promptEventHandler = new CodexEventHandler(
         this.connection,
         sessionState,
-        clientSupportsTypedSessionFailures(this.clientCapabilities),
+        this.capabilities.sessionFailureFormat,
         this.sessionFailureEpoch,
         sessionState.subagents,
         (accountUpdated) => this.handleAccountUpdated(accountUpdated),
         agentFileChangeReportRequest !== null,
         clientSupportsCompaction(this.clientCapabilities),
-        clientSupportsNotices(this.clientCapabilities)
+        clientSupportsNotices(this.clientCapabilities),
+        this.neutralSessionFailures
       );
       eventHandler = promptEventHandler;
       const permissionLifecycle = this.permissionLifecycleContext(sessionState);
@@ -56463,7 +56521,7 @@ You have been logged out. Please try again.`);
       }
       insertion?.onFailure?.(toV2Failure(err));
       const isUnexpectedFailure = !(err instanceof RequestError);
-      if (eventHandler !== null && clientSupportsTypedSessionFailures(this.clientCapabilities) && (isProcessExit || isUnexpectedFailure)) {
+      if (eventHandler !== null && this.capabilities.sessionFailureFormat !== "none" && (isProcessExit || isUnexpectedFailure)) {
         eventHandler.recordSyntheticTerminalFailure(
           isProcessExit ? "transport_lost" : "internal_error",
           sessionState.currentTurnId

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.5.0-alas.4",
+  "version": "2.5.0-alas.5",
   "description": "",
   "main": "dist/index.js",
   "bin": {
@@ -81,6 +81,6 @@
   "alasDownstream": {
     "upstreamVersion": "2.5.0",
     "upstreamCommit": "34e08970aa324a2be985f5080674d5aa91d7666f",
-    "sourceCommit": "8af13bd4134b9a24acfd06b85418642f3c2742b6"
+    "sourceCommit": "d1c53266b4d5d1f308323259b81d01ea687104ef"
   }
 }