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

package/dist/index.js

@@ -33488,6 +33488,18 @@ function parsePatch(uniDiff) {
 
 // src/GitPatch.ts
 var DIFF_PATCH_MAX_BYTES = 1024 * 1024;
+var NEUTRAL_DIFF_PATCH_META_KEY = "diffPatch";
+var DIFF_PATCH_VERSION = 1;
+var DIFF_PATCH_FORMAT = "git_patch";
+function neutralDiffPatchCapability() {
+  return { version: DIFF_PATCH_VERSION, format: DIFF_PATCH_FORMAT };
+}
+function clientRequestsNeutralDiffPatch(capabilities) {
+  const declared = capabilities?._meta?.[NEUTRAL_DIFF_PATCH_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 BINARY_PROBE_LENGTH = 8e3;
 var NO_NEWLINE_MARKER = "\";
 var HUNK_HEADER = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
@@ -33707,29 +33719,31 @@ var FileChangeReporter = class {
   }
 };
 function createPatchContent(change, diffPatch) {
-  const supportsDiffPatch = diffPatch === "air";
+  const wrapper = diffPatch === "air" || diffPatch === "neutral" ? diffPatch : null;
   try {
     if (diffPatch === "acpV2") return createAcpV2Content(change);
     switch (change.kind.type) {
       case "add":
-        return createWholeFileContent(change, "add", supportsDiffPatch);
+        return createWholeFileContent(change, "add", wrapper);
       case "delete":
-        return createWholeFileContent(change, "delete", supportsDiffPatch);
+        return createWholeFileContent(change, "delete", wrapper);
       case "update":
-        return createUpdateFileContent(change, change.kind.move_path, supportsDiffPatch);
+        return createUpdateFileContent(change, change.kind.move_path, wrapper);
     }
   } catch (error62) {
     logger.log(`Error processing file update change: ${error62}`);
     return [];
   }
 }
-function createWholeFileContent(change, kind, supportsDiffPatch) {
+function createWholeFileContent(change, kind, wrapper) {
   if (!fitsDiffLimit(change.diff)) {
     logger.log("Skipped the diff of a file that is too large", { path: change.path });
     return [];
   }
-  const patch = !supportsDiffPatch ? null : kind === "add" ? createAddedFileGitPatch(change.path, change.diff) : createDeletedFileGitPatch(change.path, change.diff);
-  if (patch !== null) return [createPatchOnlyContent(change.path, kind, patch)];
+  if (wrapper !== null) {
+    const patch = kind === "add" ? createAddedFileGitPatch(change.path, change.diff) : createDeletedFileGitPatch(change.path, change.diff);
+    if (patch !== null) return [createPatchOnlyContent(change.path, kind, patch, wrapper)];
+  }
   return [{
     type: "diff",
     oldText: kind === "add" ? null : change.diff,
@@ -33738,16 +33752,16 @@ function createWholeFileContent(change, kind, supportsDiffPatch) {
     _meta: { kind }
   }];
 }
-function createUpdateFileContent(change, movePath, supportsDiffPatch) {
+function createUpdateFileContent(change, movePath, wrapper) {
   const unifiedDiff = recoverCorruptedDiff(change.diff);
   const targetPath = movePath ?? change.path;
   if (!fitsDiffLimit(unifiedDiff)) {
     logger.log("Skipped the diff of a file change that is too large", { path: targetPath });
     return [];
   }
-  const gitPatch = supportsDiffPatch ? createUpdateGitPatch(change.path, targetPath, unifiedDiff) : null;
-  if (gitPatch !== null) {
-    return [createPatchOnlyContent(targetPath, "update", gitPatch)];
+  if (wrapper !== null) {
+    const gitPatch = createUpdateGitPatch(change.path, targetPath, unifiedDiff);
+    if (gitPatch !== null) return [createPatchOnlyContent(targetPath, "update", gitPatch, wrapper)];
   }
   if (movePath !== null && unifiedDiff.trim().length === 0) {
     return [{ type: "diff", oldText: "", newText: "", path: targetPath, _meta: { kind: "update" } }];
@@ -33829,17 +33843,14 @@ function parseSinglePatch(diff) {
     return null;
   }
 }
-function createPatchOnlyContent(path16, kind, patch) {
+function createPatchOnlyContent(path16, kind, patch, wrapper) {
+  const diffPatch = { version: DIFF_PATCH_VERSION, format: DIFF_PATCH_FORMAT, text: patch };
   return {
     type: "diff",
     oldText: null,
     newText: "",
     path: path16,
-    _meta: withAirMeta({ kind }, AIR_DIFF_PATCH_KEY, {
-      version: 1,
-      format: "git_patch",
-      text: patch
-    })
+    _meta: wrapper === "air" ? withAirMeta({ kind }, AIR_DIFF_PATCH_KEY, diffPatch) : { kind, [NEUTRAL_DIFF_PATCH_META_KEY]: diffPatch }
   };
 }
 function recoverCorruptedDiff(diff) {
@@ -34685,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({
@@ -34697,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`. */
@@ -34715,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) {
@@ -34727,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) {
@@ -34746,7 +34786,10 @@ var ClientCapabilities = class _ClientCapabilities {
         planContentDelta: clientSupportsAirCapability(capabilities, AIR_PLAN_CONTENT_DELTA_KEY),
         diffPatch
       },
-      diffPatchFormat: diffPatch ? "air" : "none",
+      // 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
     });
   }
@@ -34769,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
     });
   }
@@ -37047,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",
@@ -37129,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);
@@ -37145,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 = [];
@@ -37979,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);
@@ -37998,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
@@ -38031,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;
@@ -38050,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
         }
       }
     };
@@ -40611,7 +40675,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.5.0-alas.3",
+  version: "2.5.0-alas.5",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -40689,7 +40753,7 @@ var package_default = {
   alasDownstream: {
     upstreamVersion: "2.5.0",
     upstreamCommit: "34e08970aa324a2be985f5080674d5aa91d7666f",
-    sourceCommit: "de8d4c961871fc0584ca1bd89f31a8de95066c65"
+    sourceCommit: "d1c53266b4d5d1f308323259b81d01ea687104ef"
   }
 };
 
@@ -52112,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);
 }
@@ -52134,6 +52195,7 @@ var CodexAcpServer = class {
   getExitCode;
   getRecentStderr;
   sessionFailureEpoch;
+  neutralSessionFailures = new NeutralSessionFailureLedger();
   availableCommands;
   clientInfo;
   clientCapabilities;
@@ -52553,6 +52615,16 @@ var CodexAcpServer = class {
       ...this.neutralForkPointSupported ? {
         [NEUTRAL_FORK_POINT_META_KEY]: neutralForkPointCapability()
       } : {},
+      // The client-neutral diff patch, see `docs/air-extensions.md`. ACP v2 has its own diff patch,
+      // so `ClientCapabilities.fromV2` never selects it.
+      ...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
@@ -53175,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);
@@ -54458,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);
@@ -56021,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);
@@ -56446,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.3",
+  "version": "2.5.0-alas.5",
   "description": "",
   "main": "dist/index.js",
   "bin": {
@@ -81,6 +81,6 @@
   "alasDownstream": {
     "upstreamVersion": "2.5.0",
     "upstreamCommit": "34e08970aa324a2be985f5080674d5aa91d7666f",
-    "sourceCommit": "de8d4c961871fc0584ca1bd89f31a8de95066c65"
+    "sourceCommit": "d1c53266b4d5d1f308323259b81d01ea687104ef"
   }
 }