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

package/dist/index.js

@@ -34696,6 +34696,370 @@ 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/AgentFileChangeReport.ts
+import fs2 from "node:fs";
+import path5 from "node:path";
+var AGENT_FILE_CHANGE_REPORT_VERSION = 1;
+var AGENT_FILE_CHANGE_REPORT_MAX_PATHS = 1024;
+var AGENT_FILE_CHANGE_REPORT_MAX_PATH_LENGTH = 4096;
+var AGENT_FILE_CHANGE_REPORT_MAX_TOTAL_BYTES = 256 * 1024;
+var AGENT_FILE_CHANGE_REPORT_MAX_DIFF_BYTES = 8 * 1024 * 1024;
+var NEUTRAL_AGENT_FILE_CHANGE_REPORT_META_KEY = "agentFileChangeReport";
+var NEUTRAL_AGENT_FILE_CHANGE_REPORT_REQUEST_META_KEY = "agentFileChangeReportRequest";
+var TURN_DIFF_UNCERTAINTY = "Codex turn diffs may omit same-content renames and changes made outside apply_patch, including shell commands, version-control commands, generators, and child processes.";
+function captureAgentFileChangeWorkspace(cwd, additionalDirectories) {
+  const lexicalCwd = parseWorkspaceRoot(cwd);
+  return {
+    cwd,
+    additionalDirectories: [...additionalDirectories],
+    diffRoot: lexicalCwd === null ? cwd : findDiffDisplayRoot(lexicalCwd).value
+  };
+}
+function neutralAgentFileChangeReportCapability() {
+  return { version: AGENT_FILE_CHANGE_REPORT_VERSION };
+}
+function clientRequestsNeutralAgentFileChangeReport(capabilities) {
+  const declared = asRecord2(capabilities?._meta?.[NEUTRAL_AGENT_FILE_CHANGE_REPORT_META_KEY]);
+  const version2 = declared?.["version"];
+  return typeof version2 === "number" && Number.isInteger(version2) && version2 >= 1;
+}
+function parseAgentFileChangeReportRequest(meta3) {
+  const jetbrains = asRecord2(meta3?.[JETBRAINS_META_KEY]);
+  const air = asRecord2(jetbrains?.[AIR_META_KEY]);
+  return validateAgentFileChangeReportRequest(air?.[AIR_AGENT_FILE_CHANGE_REPORT_REQUEST_KEY]);
+}
+function parseNeutralAgentFileChangeReportRequest(meta3) {
+  return validateAgentFileChangeReportRequest(meta3?.[NEUTRAL_AGENT_FILE_CHANGE_REPORT_REQUEST_META_KEY]);
+}
+function agentFileChangeReportRequestFor(format, meta3) {
+  switch (format) {
+    case "none":
+      return null;
+    case "air":
+      return parseAgentFileChangeReportRequest(meta3);
+    case "neutral":
+      return parseNeutralAgentFileChangeReportRequest(meta3);
+  }
+}
+function agentFileChangeReportMeta(format, report) {
+  if (format === "neutral") {
+    return { [NEUTRAL_AGENT_FILE_CHANGE_REPORT_META_KEY]: report };
+  }
+  return {
+    [JETBRAINS_META_KEY]: {
+      [AIR_META_KEY]: {
+        [AIR_EXTENSION_VERSION_KEY]: AIR_EXTENSION_VERSION,
+        [AIR_AGENT_FILE_CHANGE_REPORT_KEY]: report
+      }
+    }
+  };
+}
+function validateAgentFileChangeReportRequest(value) {
+  const request = asRecord2(value);
+  if (request === null || !hasOnlyKeys(request, ["version", "requestId"]) || request["version"] !== AGENT_FILE_CHANGE_REPORT_VERSION) {
+    return null;
+  }
+  const requestId = request["requestId"];
+  if (typeof requestId !== "string" || !/^[A-Za-z0-9._:-]{1,128}$/.test(requestId)) {
+    return null;
+  }
+  return { version: AGENT_FILE_CHANGE_REPORT_VERSION, requestId };
+}
+function createReportedAgentFileChangeReport(requestId, diff, workspace) {
+  if (Buffer.byteLength(diff, "utf8") > AGENT_FILE_CHANGE_REPORT_MAX_DIFF_BYTES) {
+    throw new AgentFileChangeReportError("invalidOutput", "The turn diff exceeds the parser input limit");
+  }
+  const parsedReport = parseTurnDiff(diff);
+  const normalized = normalizeFileChangeReport(parsedReport, workspace);
+  return fitReportedAgentFileChangeReport({
+    version: AGENT_FILE_CHANGE_REPORT_VERSION,
+    requestId,
+    status: "reported",
+    ...normalized
+  });
+}
+function createUnavailableAgentFileChangeReport(requestId, reason) {
+  return {
+    version: AGENT_FILE_CHANGE_REPORT_VERSION,
+    requestId,
+    status: "unavailable",
+    reason
+  };
+}
+var AgentFileChangeReportError = class extends Error {
+  reason;
+  constructor(reason, message) {
+    super(message);
+    this.name = "AgentFileChangeReportError";
+    this.reason = reason;
+  }
+};
+function parseTurnDiff(diff) {
+  if (diff.trim() === "") {
+    return { paths: [], complete: false, uncertainty: TURN_DIFF_UNCERTAINTY };
+  }
+  let patches;
+  try {
+    patches = parsePatch(diff);
+  } catch (error62) {
+    throw new AgentFileChangeReportError(
+      "invalidOutput",
+      `The turn diff is not valid unified diff: ${error62 instanceof Error ? error62.message : String(error62)}`
+    );
+  }
+  if (patches.length === 0) {
+    throw new AgentFileChangeReportError("invalidOutput", "The turn diff contains no parseable file patches");
+  }
+  const rawFileHeaders = extractRawFileHeaders(diff);
+  const paths = [];
+  for (const [index, patch] of patches.entries()) {
+    const rawHeaders = rawFileHeaders[index];
+    const oldPath = normalizeDiffPath(selectLosslessFileName(rawHeaders?.oldFileName, patch.oldFileName));
+    const newPath = normalizeDiffPath(selectLosslessFileName(rawHeaders?.newFileName, patch.newFileName));
+    if (oldPath === null && newPath === null) {
+      throw new AgentFileChangeReportError("invalidOutput", "The turn diff contains a patch without a file path");
+    }
+    if (oldPath !== null) paths.push(oldPath);
+    if (newPath !== null) paths.push(newPath);
+  }
+  return { paths, complete: false, uncertainty: TURN_DIFF_UNCERTAINTY };
+}
+function extractRawFileHeaders(diff) {
+  return diff.split(/(?=^diff --git )/m).filter((section) => section.trim() !== "").map((section) => {
+    const lines = section.split(/\r?\n/);
+    for (let index = 0; index < lines.length; index += 1) {
+      const line = lines[index];
+      if (line?.startsWith("@@ ")) return null;
+      const nextLine = lines[index + 1];
+      if (line?.startsWith("--- ") && nextLine?.startsWith("+++ ")) {
+        return {
+          oldFileName: line.slice(4),
+          newFileName: nextLine.slice(4)
+        };
+      }
+    }
+    return null;
+  });
+}
+function selectLosslessFileName(rawFileName, parsedFileName) {
+  return rawFileName === void 0 || rawFileName.startsWith('"') ? parsedFileName : rawFileName;
+}
+function normalizeDiffPath(value) {
+  if (value === void 0 || value === "/dev/null") return null;
+  return value.startsWith("a/") || value.startsWith("b/") ? value.slice(2) : value;
+}
+function fitReportedAgentFileChangeReport(report) {
+  const paths = [...report.paths];
+  let truncated = report.truncated;
+  let fitted = report;
+  while (Buffer.byteLength(JSON.stringify(fitted), "utf8") > AGENT_FILE_CHANGE_REPORT_MAX_TOTAL_BYTES) {
+    if (paths.length === 0) {
+      throw new AgentFileChangeReportError("invalidOutput", "The audit report exceeds the wire limit");
+    }
+    paths.pop();
+    truncated = true;
+    fitted = {
+      ...report,
+      paths: [...paths],
+      declaredComplete: false,
+      truncated
+    };
+  }
+  return fitted;
+}
+function normalizeFileChangeReport(report, workspace) {
+  const lexicalCwd = parseWorkspaceRoot(workspace.cwd);
+  if (lexicalCwd === null) {
+    throw new AgentFileChangeReportError("providerError", "The session working directory is not absolute");
+  }
+  const cwd = canonicalizeWorkspaceRoot(lexicalCwd);
+  const diffRoot = parseWorkspaceRoot(workspace.diffRoot);
+  if (diffRoot === null || diffRoot.flavor !== cwd.flavor) {
+    throw new AgentFileChangeReportError("providerError", "The captured turn-diff root is invalid");
+  }
+  const roots = [cwd, ...workspace.additionalDirectories.flatMap((directory) => {
+    const root = normalizeWorkspaceRoot(directory);
+    return root === null || root.flavor !== cwd.flavor ? [] : [root];
+  })];
+  const paths = [];
+  const seen = /* @__PURE__ */ new Set();
+  let totalBytes = 0;
+  let truncated = false;
+  for (const reportedPath of report.paths) {
+    if (reportedPath.length > AGENT_FILE_CHANGE_REPORT_MAX_PATH_LENGTH) {
+      truncated = true;
+      continue;
+    }
+    const normalized = normalizeReportedPath(reportedPath, diffRoot, roots);
+    if (normalized === null || normalized.value.length > AGENT_FILE_CHANGE_REPORT_MAX_PATH_LENGTH) {
+      truncated = true;
+      continue;
+    }
+    const key = normalized.flavor === "windows" ? normalized.value.toLowerCase() : normalized.value;
+    if (seen.has(key)) {
+      continue;
+    }
+    const bytes = Buffer.byteLength(normalized.value, "utf8");
+    if (paths.length >= AGENT_FILE_CHANGE_REPORT_MAX_PATHS || totalBytes + bytes > AGENT_FILE_CHANGE_REPORT_MAX_TOTAL_BYTES) {
+      truncated = true;
+      continue;
+    }
+    seen.add(key);
+    paths.push(normalized.value);
+    totalBytes += bytes;
+  }
+  return {
+    paths,
+    declaredComplete: report.complete && !truncated,
+    truncated,
+    ...report.uncertainty ? { uncertainty: report.uncertainty } : {}
+  };
+}
+function normalizeWorkspaceRoot(value) {
+  const root = parseWorkspaceRoot(value);
+  return root === null ? null : canonicalizeWorkspaceRoot(root);
+}
+function parseWorkspaceRoot(value) {
+  const trimmed = value.trim();
+  if (!isValidPathText(trimmed)) {
+    return null;
+  }
+  if (isWindowsAbsolutePath(trimmed)) {
+    return {
+      value: path5.win32.normalize(trimmed.replace(/\//g, "\\")),
+      flavor: "windows"
+    };
+  }
+  if (path5.posix.isAbsolute(trimmed)) {
+    return {
+      value: path5.posix.normalize(trimmed.replace(/\\/g, "/")),
+      flavor: "posix"
+    };
+  }
+  return null;
+}
+function normalizeReportedPath(value, relativeRoot, roots) {
+  if (!isValidPathText(value) || /^[A-Za-z]:[^\\/]/.test(value) || /^\\\\[?.]\\/.test(value) || /^(?:\\\\|\/\/)/.test(value) && !isWindowsAbsolutePath(value) || relativeRoot.flavor === "windows" && /^\\(?!\\)/.test(value) || /^[A-Za-z][A-Za-z0-9+.-]*:\/\//.test(value)) {
+    return null;
+  }
+  let candidate;
+  if (isWindowsAbsolutePath(value)) {
+    candidate = { value: path5.win32.normalize(value.replace(/\//g, "\\")), flavor: "windows" };
+  } else if (path5.posix.isAbsolute(value)) {
+    candidate = { value: path5.posix.normalize(value.replace(/\\/g, "/")), flavor: "posix" };
+  } else if (relativeRoot.flavor === "windows") {
+    candidate = {
+      value: path5.win32.resolve(relativeRoot.value, value.replace(/\//g, "\\")),
+      flavor: "windows"
+    };
+  } else {
+    candidate = {
+      value: path5.posix.resolve(relativeRoot.value, value.replace(/\\/g, "/")),
+      flavor: "posix"
+    };
+  }
+  candidate = canonicalizeReportedPath(candidate);
+  return roots.some((root) => pathIsStrictlyInside(root, candidate)) ? candidate : null;
+}
+function findDiffDisplayRoot(cwd) {
+  if (!isNativePathFlavor(cwd.flavor)) return cwd;
+  const pathImplementation = cwd.flavor === "windows" ? path5.win32 : path5.posix;
+  let current = cwd.value;
+  while (true) {
+    if (fs2.existsSync(pathImplementation.join(current, ".git"))) {
+      return canonicalizeWorkspaceRoot({ value: current, flavor: cwd.flavor });
+    }
+    const parent = pathImplementation.dirname(current);
+    if (parent === current) return cwd;
+    current = parent;
+  }
+}
+function canonicalizeWorkspaceRoot(root) {
+  if (!isNativePathFlavor(root.flavor)) {
+    return root;
+  }
+  return { ...root, value: canonicalizeFromExistingAncestor(root.value) };
+}
+function canonicalizeReportedPath(candidate) {
+  if (!isNativePathFlavor(candidate.flavor)) {
+    return candidate;
+  }
+  const parent = canonicalizeFromExistingAncestor(path5.dirname(candidate.value));
+  return { ...candidate, value: path5.resolve(parent, path5.basename(candidate.value)) };
+}
+function canonicalizeFromExistingAncestor(value) {
+  const original = path5.resolve(value);
+  let current = original;
+  const missingSegments = [];
+  while (true) {
+    try {
+      const canonical = fs2.realpathSync.native(current);
+      return path5.resolve(canonical, ...missingSegments.reverse());
+    } catch (error62) {
+      if (!isMissingPathError(error62)) return original;
+    }
+    const parent = path5.dirname(current);
+    if (parent === current) return original;
+    missingSegments.push(path5.basename(current));
+    current = parent;
+  }
+}
+function isMissingPathError(error62) {
+  if (typeof error62 !== "object" || error62 === null || !("code" in error62)) return false;
+  return error62.code === "ENOENT" || error62.code === "ENOTDIR";
+}
+function isNativePathFlavor(flavor) {
+  return process.platform === "win32" ? flavor === "windows" : flavor === "posix";
+}
+function pathIsStrictlyInside(root, candidate) {
+  if (root.flavor !== candidate.flavor) {
+    return false;
+  }
+  const pathImplementation = root.flavor === "windows" ? path5.win32 : path5.posix;
+  const relative = pathImplementation.relative(root.value, candidate.value);
+  return relative.length > 0 && !pathImplementation.isAbsolute(relative) && relative !== ".." && !relative.startsWith(`..${pathImplementation.sep}`);
+}
+function isWindowsAbsolutePath(value) {
+  const portable = value.replace(/\\/g, "/");
+  return /^[A-Za-z]:\//.test(portable) || /^\/\/[^/]+\/[^/]+(?:\/|$)/.test(portable);
+}
+function isValidPathText(value) {
+  return value.length > 0 && !/[\u0000-\u001F\u007F-\u009F]/.test(value);
+}
+function asRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
+}
+function hasOnlyKeys(value, allowed) {
+  const allowedKeys = new Set(allowed);
+  return Object.keys(value).every((key) => allowedKeys.has(key));
+}
+
 // src/tool-calls/ClientCapabilities.ts
 var ClientCapabilities = class _ClientCapabilities {
   static DEFAULT = new _ClientCapabilities({
@@ -34708,6 +35072,8 @@ var ClientCapabilities = class _ClientCapabilities {
     planUpdates: false,
     air: { rawInputRendering: false, planContentDelta: false, diffPatch: false },
     diffPatchFormat: "none",
+    sessionFailureFormat: "none",
+    agentFileChangeReportFormat: "none",
     permissionPromptFields: false
   });
   /** The client declares `_meta.jetbrains.air`. */
@@ -34726,6 +35092,8 @@ var ClientCapabilities = class _ClientCapabilities {
   planUpdates;
   air;
   diffPatchFormat;
+  sessionFailureFormat;
+  agentFileChangeReportFormat;
   /** A permission request has its own `title` and `description` (ACP v2). */
   permissionPromptFields;
   constructor(values) {
@@ -34738,6 +35106,8 @@ var ClientCapabilities = class _ClientCapabilities {
     this.planUpdates = values.planUpdates;
     this.air = values.air;
     this.diffPatchFormat = values.diffPatchFormat;
+    this.sessionFailureFormat = values.sessionFailureFormat;
+    this.agentFileChangeReportFormat = values.agentFileChangeReportFormat;
     this.permissionPromptFields = values.permissionPromptFields;
   }
   static from(capabilities) {
@@ -34759,6 +35129,10 @@ 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",
+      // Likewise. The request and the report use the selected form.
+      agentFileChangeReportFormat: clientRequestsNeutralAgentFileChangeReport(capabilities) ? "neutral" : clientSupportsAirCapability(capabilities, AIR_AGENT_FILE_CHANGE_REPORT_KEY) ? "air" : "none",
       permissionPromptFields: false
     });
   }
@@ -34781,6 +35155,10 @@ 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",
+      // The client-neutral report is an ACP v1 extension, so v2 ignores its opt-in.
+      agentFileChangeReportFormat: clientSupportsAirCapability(capabilities, AIR_AGENT_FILE_CHANGE_REPORT_KEY) ? "air" : "none",
       permissionPromptFields: true
     });
   }
@@ -36451,413 +36829,114 @@ var StandardSubagentEventRouter = class {
     }
     await this.publishCancellation(child);
   }
-  /** Historical state bypasses the current foreground cache and grants no runtime ownership. */
-  async replayTurnOutcome(threadId, turn) {
-    const child = this.children.get(threadId);
-    const state = turnEndState(turn);
-    if (!child || state === void 0 || this.retired) return;
-    await this.ensureAnnounced(child);
-    if (this.retired) return;
-    await this.session.updateSubagentState(child.sessionId, child.parentSessionId, state);
-  }
-  childSessionIds() {
-    return [...this.children.values()].map((child) => child.sessionId);
-  }
-  isNativeSubagentThread(threadId) {
-    return this.children.has(threadId);
-  }
-  shouldIgnore() {
-    return false;
-  }
-  notificationSessionId(notification) {
-    const threadId = notification.params.threadId;
-    return typeof threadId === "string" ? this.children.get(threadId)?.sessionId ?? this.rootSessionId : this.rootSessionId;
-  }
-  takeBufferedNotifications() {
-    return this.replayQueue.splice(0);
-  }
-  async waitForMaterializedSession(threadId) {
-    if (this.retired) return null;
-    await this.materializePending();
-    const child = this.children.get(threadId);
-    if (child) await this.ensureAnnounced(child);
-    return child?.sessionId ?? null;
-  }
-  closingChildSessions(notification) {
-    if (notification.method !== "turn/completed") return [];
-    const child = this.children.get(notification.params.threadId);
-    const turn = notification.params.turn;
-    if (!child || turn.status === "inProgress" || child.endedTurns.has(turn.id) || child.turnId !== null && child.turnId !== turn.id) return [];
-    return [{
-      threadId: child.threadId,
-      sessionId: child.sessionId,
-      state: turn.status === "interrupted" ? "cancelled" : turn.status === "failed" ? "failed" : "completed"
-    }];
-  }
-  async wait(_signal) {
-    return "settled";
-  }
-  hasOutstanding() {
-    return [...this.children.values()].some((child) => child.turnId !== null);
-  }
-  legacyActivityStarted(item) {
-    this.legacyActivities.add(item.id);
-    return SubagentActivityReporter.activity(item, "in_progress", "start");
-  }
-  legacyActivityCompleted(item) {
-    return SubagentActivityReporter.activity(item, "completed", this.legacyActivities.delete(item.id) ? "update" : "start");
-  }
-  legacyCollaborationStarted(item) {
-    return CollabAgentReporter.started(item);
-  }
-  legacyCollaborationCompleted(item) {
-    return CollabAgentReporter.completed(item);
-  }
-};
-function turnEndState(turn) {
-  switch (turn.status) {
-    case "inProgress":
-      return void 0;
-    case "completed":
-      return toV2IdleState({ stopReason: "end_turn" });
-    case "interrupted":
-      return toV2IdleState({ stopReason: "cancelled" });
-    case "failed":
-      return toV2IdleState({ stopReason: "end_turn" }, {
-        code: -32603,
-        message: turn.error ? readableServiceErrorMessage(turn.error.message) : "Subagent work failed"
-      });
-  }
-}
-
-// src/RateLimitsMap.ts
-function rateLimitId(snapshot, fallback = "codex") {
-  return snapshot.limitId ?? fallback;
-}
-function createRateLimitsMap(response) {
-  const result = /* @__PURE__ */ new Map();
-  const snapshots = Object.entries(response.rateLimitsByLimitId ?? {}).filter((entry) => entry[1] !== void 0);
-  if (snapshots.length === 0) {
-    snapshots.push([rateLimitId(response.rateLimits), response.rateLimits]);
-  }
-  for (const [fallbackId, snapshot] of snapshots) {
-    const limitId = rateLimitId(snapshot, fallbackId);
-    result.set(limitId, {
-      limitId,
-      limitName: snapshot.limitName ?? limitId,
-      snapshot
-    });
-  }
-  return result;
-}
-function mergeRateLimitSnapshot(previous, update) {
-  return {
-    ...update,
-    limitId: update.limitId ?? "codex",
-    credits: update.credits ?? previous.credits,
-    individualLimit: update.individualLimit ?? previous.individualLimit,
-    spendControlReached: update.spendControlReached ?? previous.spendControlReached,
-    planType: update.planType ?? previous.planType
-  };
-}
-
-// src/AgentFileChangeReport.ts
-import fs2 from "node:fs";
-import path5 from "node:path";
-var AGENT_FILE_CHANGE_REPORT_VERSION = 1;
-var AGENT_FILE_CHANGE_REPORT_MAX_PATHS = 1024;
-var AGENT_FILE_CHANGE_REPORT_MAX_PATH_LENGTH = 4096;
-var AGENT_FILE_CHANGE_REPORT_MAX_TOTAL_BYTES = 256 * 1024;
-var AGENT_FILE_CHANGE_REPORT_MAX_DIFF_BYTES = 8 * 1024 * 1024;
-var TURN_DIFF_UNCERTAINTY = "Codex turn diffs may omit same-content renames and changes made outside apply_patch, including shell commands, version-control commands, generators, and child processes.";
-function captureAgentFileChangeWorkspace(cwd, additionalDirectories) {
-  const lexicalCwd = parseWorkspaceRoot(cwd);
-  return {
-    cwd,
-    additionalDirectories: [...additionalDirectories],
-    diffRoot: lexicalCwd === null ? cwd : findDiffDisplayRoot(lexicalCwd).value
-  };
-}
-function parseAgentFileChangeReportRequest(meta3) {
-  const jetbrains = asRecord2(meta3?.[JETBRAINS_META_KEY]);
-  const air = asRecord2(jetbrains?.[AIR_META_KEY]);
-  const request = asRecord2(air?.[AIR_AGENT_FILE_CHANGE_REPORT_REQUEST_KEY]);
-  if (request === null || !hasOnlyKeys(request, ["version", "requestId"]) || request["version"] !== AGENT_FILE_CHANGE_REPORT_VERSION) {
-    return null;
-  }
-  const requestId = request["requestId"];
-  if (typeof requestId !== "string" || !/^[A-Za-z0-9._:-]{1,128}$/.test(requestId)) {
-    return null;
-  }
-  return { version: AGENT_FILE_CHANGE_REPORT_VERSION, requestId };
-}
-function createReportedAgentFileChangeReport(requestId, diff, workspace) {
-  if (Buffer.byteLength(diff, "utf8") > AGENT_FILE_CHANGE_REPORT_MAX_DIFF_BYTES) {
-    throw new AgentFileChangeReportError("invalidOutput", "The turn diff exceeds the parser input limit");
-  }
-  const parsedReport = parseTurnDiff(diff);
-  const normalized = normalizeFileChangeReport(parsedReport, workspace);
-  return fitReportedAgentFileChangeReport({
-    version: AGENT_FILE_CHANGE_REPORT_VERSION,
-    requestId,
-    status: "reported",
-    ...normalized
-  });
-}
-function createUnavailableAgentFileChangeReport(requestId, reason) {
-  return {
-    version: AGENT_FILE_CHANGE_REPORT_VERSION,
-    requestId,
-    status: "unavailable",
-    reason
-  };
-}
-var AgentFileChangeReportError = class extends Error {
-  reason;
-  constructor(reason, message) {
-    super(message);
-    this.name = "AgentFileChangeReportError";
-    this.reason = reason;
-  }
-};
-function parseTurnDiff(diff) {
-  if (diff.trim() === "") {
-    return { paths: [], complete: false, uncertainty: TURN_DIFF_UNCERTAINTY };
-  }
-  let patches;
-  try {
-    patches = parsePatch(diff);
-  } catch (error62) {
-    throw new AgentFileChangeReportError(
-      "invalidOutput",
-      `The turn diff is not valid unified diff: ${error62 instanceof Error ? error62.message : String(error62)}`
-    );
-  }
-  if (patches.length === 0) {
-    throw new AgentFileChangeReportError("invalidOutput", "The turn diff contains no parseable file patches");
-  }
-  const rawFileHeaders = extractRawFileHeaders(diff);
-  const paths = [];
-  for (const [index, patch] of patches.entries()) {
-    const rawHeaders = rawFileHeaders[index];
-    const oldPath = normalizeDiffPath(selectLosslessFileName(rawHeaders?.oldFileName, patch.oldFileName));
-    const newPath = normalizeDiffPath(selectLosslessFileName(rawHeaders?.newFileName, patch.newFileName));
-    if (oldPath === null && newPath === null) {
-      throw new AgentFileChangeReportError("invalidOutput", "The turn diff contains a patch without a file path");
-    }
-    if (oldPath !== null) paths.push(oldPath);
-    if (newPath !== null) paths.push(newPath);
-  }
-  return { paths, complete: false, uncertainty: TURN_DIFF_UNCERTAINTY };
-}
-function extractRawFileHeaders(diff) {
-  return diff.split(/(?=^diff --git )/m).filter((section) => section.trim() !== "").map((section) => {
-    const lines = section.split(/\r?\n/);
-    for (let index = 0; index < lines.length; index += 1) {
-      const line = lines[index];
-      if (line?.startsWith("@@ ")) return null;
-      const nextLine = lines[index + 1];
-      if (line?.startsWith("--- ") && nextLine?.startsWith("+++ ")) {
-        return {
-          oldFileName: line.slice(4),
-          newFileName: nextLine.slice(4)
-        };
-      }
-    }
-    return null;
-  });
-}
-function selectLosslessFileName(rawFileName, parsedFileName) {
-  return rawFileName === void 0 || rawFileName.startsWith('"') ? parsedFileName : rawFileName;
-}
-function normalizeDiffPath(value) {
-  if (value === void 0 || value === "/dev/null") return null;
-  return value.startsWith("a/") || value.startsWith("b/") ? value.slice(2) : value;
-}
-function fitReportedAgentFileChangeReport(report) {
-  const paths = [...report.paths];
-  let truncated = report.truncated;
-  let fitted = report;
-  while (Buffer.byteLength(JSON.stringify(fitted), "utf8") > AGENT_FILE_CHANGE_REPORT_MAX_TOTAL_BYTES) {
-    if (paths.length === 0) {
-      throw new AgentFileChangeReportError("invalidOutput", "The audit report exceeds the wire limit");
-    }
-    paths.pop();
-    truncated = true;
-    fitted = {
-      ...report,
-      paths: [...paths],
-      declaredComplete: false,
-      truncated
-    };
+  /** Historical state bypasses the current foreground cache and grants no runtime ownership. */
+  async replayTurnOutcome(threadId, turn) {
+    const child = this.children.get(threadId);
+    const state = turnEndState(turn);
+    if (!child || state === void 0 || this.retired) return;
+    await this.ensureAnnounced(child);
+    if (this.retired) return;
+    await this.session.updateSubagentState(child.sessionId, child.parentSessionId, state);
   }
-  return fitted;
-}
-function normalizeFileChangeReport(report, workspace) {
-  const lexicalCwd = parseWorkspaceRoot(workspace.cwd);
-  if (lexicalCwd === null) {
-    throw new AgentFileChangeReportError("providerError", "The session working directory is not absolute");
+  childSessionIds() {
+    return [...this.children.values()].map((child) => child.sessionId);
   }
-  const cwd = canonicalizeWorkspaceRoot(lexicalCwd);
-  const diffRoot = parseWorkspaceRoot(workspace.diffRoot);
-  if (diffRoot === null || diffRoot.flavor !== cwd.flavor) {
-    throw new AgentFileChangeReportError("providerError", "The captured turn-diff root is invalid");
+  isNativeSubagentThread(threadId) {
+    return this.children.has(threadId);
   }
-  const roots = [cwd, ...workspace.additionalDirectories.flatMap((directory) => {
-    const root = normalizeWorkspaceRoot(directory);
-    return root === null || root.flavor !== cwd.flavor ? [] : [root];
-  })];
-  const paths = [];
-  const seen = /* @__PURE__ */ new Set();
-  let totalBytes = 0;
-  let truncated = false;
-  for (const reportedPath of report.paths) {
-    if (reportedPath.length > AGENT_FILE_CHANGE_REPORT_MAX_PATH_LENGTH) {
-      truncated = true;
-      continue;
-    }
-    const normalized = normalizeReportedPath(reportedPath, diffRoot, roots);
-    if (normalized === null || normalized.value.length > AGENT_FILE_CHANGE_REPORT_MAX_PATH_LENGTH) {
-      truncated = true;
-      continue;
-    }
-    const key = normalized.flavor === "windows" ? normalized.value.toLowerCase() : normalized.value;
-    if (seen.has(key)) {
-      continue;
-    }
-    const bytes = Buffer.byteLength(normalized.value, "utf8");
-    if (paths.length >= AGENT_FILE_CHANGE_REPORT_MAX_PATHS || totalBytes + bytes > AGENT_FILE_CHANGE_REPORT_MAX_TOTAL_BYTES) {
-      truncated = true;
-      continue;
-    }
-    seen.add(key);
-    paths.push(normalized.value);
-    totalBytes += bytes;
+  shouldIgnore() {
+    return false;
   }
-  return {
-    paths,
-    declaredComplete: report.complete && !truncated,
-    truncated,
-    ...report.uncertainty ? { uncertainty: report.uncertainty } : {}
-  };
-}
-function normalizeWorkspaceRoot(value) {
-  const root = parseWorkspaceRoot(value);
-  return root === null ? null : canonicalizeWorkspaceRoot(root);
-}
-function parseWorkspaceRoot(value) {
-  const trimmed = value.trim();
-  if (!isValidPathText(trimmed)) {
-    return null;
+  notificationSessionId(notification) {
+    const threadId = notification.params.threadId;
+    return typeof threadId === "string" ? this.children.get(threadId)?.sessionId ?? this.rootSessionId : this.rootSessionId;
   }
-  if (isWindowsAbsolutePath(trimmed)) {
-    return {
-      value: path5.win32.normalize(trimmed.replace(/\//g, "\\")),
-      flavor: "windows"
-    };
+  takeBufferedNotifications() {
+    return this.replayQueue.splice(0);
   }
-  if (path5.posix.isAbsolute(trimmed)) {
-    return {
-      value: path5.posix.normalize(trimmed.replace(/\\/g, "/")),
-      flavor: "posix"
-    };
+  async waitForMaterializedSession(threadId) {
+    if (this.retired) return null;
+    await this.materializePending();
+    const child = this.children.get(threadId);
+    if (child) await this.ensureAnnounced(child);
+    return child?.sessionId ?? null;
   }
-  return null;
-}
-function normalizeReportedPath(value, relativeRoot, roots) {
-  if (!isValidPathText(value) || /^[A-Za-z]:[^\\/]/.test(value) || /^\\\\[?.]\\/.test(value) || /^(?:\\\\|\/\/)/.test(value) && !isWindowsAbsolutePath(value) || relativeRoot.flavor === "windows" && /^\\(?!\\)/.test(value) || /^[A-Za-z][A-Za-z0-9+.-]*:\/\//.test(value)) {
-    return null;
+  closingChildSessions(notification) {
+    if (notification.method !== "turn/completed") return [];
+    const child = this.children.get(notification.params.threadId);
+    const turn = notification.params.turn;
+    if (!child || turn.status === "inProgress" || child.endedTurns.has(turn.id) || child.turnId !== null && child.turnId !== turn.id) return [];
+    return [{
+      threadId: child.threadId,
+      sessionId: child.sessionId,
+      state: turn.status === "interrupted" ? "cancelled" : turn.status === "failed" ? "failed" : "completed"
+    }];
   }
-  let candidate;
-  if (isWindowsAbsolutePath(value)) {
-    candidate = { value: path5.win32.normalize(value.replace(/\//g, "\\")), flavor: "windows" };
-  } else if (path5.posix.isAbsolute(value)) {
-    candidate = { value: path5.posix.normalize(value.replace(/\\/g, "/")), flavor: "posix" };
-  } else if (relativeRoot.flavor === "windows") {
-    candidate = {
-      value: path5.win32.resolve(relativeRoot.value, value.replace(/\//g, "\\")),
-      flavor: "windows"
-    };
-  } else {
-    candidate = {
-      value: path5.posix.resolve(relativeRoot.value, value.replace(/\\/g, "/")),
-      flavor: "posix"
-    };
+  async wait(_signal) {
+    return "settled";
   }
-  candidate = canonicalizeReportedPath(candidate);
-  return roots.some((root) => pathIsStrictlyInside(root, candidate)) ? candidate : null;
-}
-function findDiffDisplayRoot(cwd) {
-  if (!isNativePathFlavor(cwd.flavor)) return cwd;
-  const pathImplementation = cwd.flavor === "windows" ? path5.win32 : path5.posix;
-  let current = cwd.value;
-  while (true) {
-    if (fs2.existsSync(pathImplementation.join(current, ".git"))) {
-      return canonicalizeWorkspaceRoot({ value: current, flavor: cwd.flavor });
-    }
-    const parent = pathImplementation.dirname(current);
-    if (parent === current) return cwd;
-    current = parent;
+  hasOutstanding() {
+    return [...this.children.values()].some((child) => child.turnId !== null);
   }
-}
-function canonicalizeWorkspaceRoot(root) {
-  if (!isNativePathFlavor(root.flavor)) {
-    return root;
+  legacyActivityStarted(item) {
+    this.legacyActivities.add(item.id);
+    return SubagentActivityReporter.activity(item, "in_progress", "start");
   }
-  return { ...root, value: canonicalizeFromExistingAncestor(root.value) };
-}
-function canonicalizeReportedPath(candidate) {
-  if (!isNativePathFlavor(candidate.flavor)) {
-    return candidate;
+  legacyActivityCompleted(item) {
+    return SubagentActivityReporter.activity(item, "completed", this.legacyActivities.delete(item.id) ? "update" : "start");
   }
-  const parent = canonicalizeFromExistingAncestor(path5.dirname(candidate.value));
-  return { ...candidate, value: path5.resolve(parent, path5.basename(candidate.value)) };
-}
-function canonicalizeFromExistingAncestor(value) {
-  const original = path5.resolve(value);
-  let current = original;
-  const missingSegments = [];
-  while (true) {
-    try {
-      const canonical = fs2.realpathSync.native(current);
-      return path5.resolve(canonical, ...missingSegments.reverse());
-    } catch (error62) {
-      if (!isMissingPathError(error62)) return original;
-    }
-    const parent = path5.dirname(current);
-    if (parent === current) return original;
-    missingSegments.push(path5.basename(current));
-    current = parent;
+  legacyCollaborationStarted(item) {
+    return CollabAgentReporter.started(item);
   }
-}
-function isMissingPathError(error62) {
-  if (typeof error62 !== "object" || error62 === null || !("code" in error62)) return false;
-  return error62.code === "ENOENT" || error62.code === "ENOTDIR";
-}
-function isNativePathFlavor(flavor) {
-  return process.platform === "win32" ? flavor === "windows" : flavor === "posix";
-}
-function pathIsStrictlyInside(root, candidate) {
-  if (root.flavor !== candidate.flavor) {
-    return false;
+  legacyCollaborationCompleted(item) {
+    return CollabAgentReporter.completed(item);
+  }
+};
+function turnEndState(turn) {
+  switch (turn.status) {
+    case "inProgress":
+      return void 0;
+    case "completed":
+      return toV2IdleState({ stopReason: "end_turn" });
+    case "interrupted":
+      return toV2IdleState({ stopReason: "cancelled" });
+    case "failed":
+      return toV2IdleState({ stopReason: "end_turn" }, {
+        code: -32603,
+        message: turn.error ? readableServiceErrorMessage(turn.error.message) : "Subagent work failed"
+      });
   }
-  const pathImplementation = root.flavor === "windows" ? path5.win32 : path5.posix;
-  const relative = pathImplementation.relative(root.value, candidate.value);
-  return relative.length > 0 && !pathImplementation.isAbsolute(relative) && relative !== ".." && !relative.startsWith(`..${pathImplementation.sep}`);
-}
-function isWindowsAbsolutePath(value) {
-  const portable = value.replace(/\\/g, "/");
-  return /^[A-Za-z]:\//.test(portable) || /^\/\/[^/]+\/[^/]+(?:\/|$)/.test(portable);
 }
-function isValidPathText(value) {
-  return value.length > 0 && !/[\u0000-\u001F\u007F-\u009F]/.test(value);
+
+// src/RateLimitsMap.ts
+function rateLimitId(snapshot, fallback = "codex") {
+  return snapshot.limitId ?? fallback;
 }
-function asRecord2(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
+function createRateLimitsMap(response) {
+  const result = /* @__PURE__ */ new Map();
+  const snapshots = Object.entries(response.rateLimitsByLimitId ?? {}).filter((entry) => entry[1] !== void 0);
+  if (snapshots.length === 0) {
+    snapshots.push([rateLimitId(response.rateLimits), response.rateLimits]);
+  }
+  for (const [fallbackId, snapshot] of snapshots) {
+    const limitId = rateLimitId(snapshot, fallbackId);
+    result.set(limitId, {
+      limitId,
+      limitName: snapshot.limitName ?? limitId,
+      snapshot
+    });
+  }
+  return result;
 }
-function hasOnlyKeys(value, allowed) {
-  const allowedKeys = new Set(allowed);
-  return Object.keys(value).every((key) => allowedKeys.has(key));
+function mergeRateLimitSnapshot(previous, update) {
+  return {
+    ...update,
+    limitId: update.limitId ?? "codex",
+    credits: update.credits ?? previous.credits,
+    individualLimit: update.individualLimit ?? previous.individualLimit,
+    spendControlReached: update.spendControlReached ?? previous.spendControlReached,
+    planType: update.planType ?? previous.planType
+  };
 }
 
 // src/SessionNotice.ts
@@ -37059,6 +37138,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 +37221,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 +37239,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 +38076,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 +38096,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 +38136,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 +38156,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 +40721,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.5.0-alas.4",
+  version: "2.5.0-alas.6",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -40701,7 +40799,7 @@ var package_default = {
   alasDownstream: {
     upstreamVersion: "2.5.0",
     upstreamCommit: "34e08970aa324a2be985f5080674d5aa91d7666f",
-    sourceCommit: "8af13bd4134b9a24acfd06b85418642f3c2742b6"
+    sourceCommit: "7c99c083270255f2960fa4cd2da93f72bdf402ad"
   }
 };
 
@@ -52124,12 +52222,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);
-}
 function isAuthRequiredError(error62) {
   return error62 instanceof RequestError && error62.code === RequestError.authRequired().code;
 }
@@ -52146,6 +52238,7 @@ var CodexAcpServer = class {
   getExitCode;
   getRecentStderr;
   sessionFailureEpoch;
+  neutralSessionFailures = new NeutralSessionFailureLedger();
   availableCommands;
   clientInfo;
   clientCapabilities;
@@ -52570,6 +52663,16 @@ 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 client-neutral agent file-change report, see `docs/air-extensions.md`. It is an ACP v1 extension,
+      // so `ClientCapabilities.fromV2` never selects it.
+      ...protocolVersion === 1 && this.capabilities.agentFileChangeReportFormat === "neutral" ? {
+        [NEUTRAL_AGENT_FILE_CHANGE_REPORT_META_KEY]: neutralAgentFileChangeReportCapability()
+      } : {},
       // 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 +53295,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 +54579,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);
@@ -55258,7 +55363,7 @@ You have been logged out. Please try again.`);
       title
     });
   }
-  async publishAgentFileChangeReport(sessionState, turnId, request, unavailableReason, turnDiff, workspace) {
+  async publishAgentFileChangeReport(sessionState, format, turnId, request, unavailableReason, turnDiff, workspace) {
     let report;
     try {
       report = turnId === null ? createUnavailableAgentFileChangeReport(request.requestId, unavailableReason) : createReportedAgentFileChangeReport(request.requestId, turnDiff, workspace);
@@ -55276,14 +55381,7 @@ You have been logged out. Please try again.`);
       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
-            }
-          }
-        }
+        _meta: agentFileChangeReportMeta(format, report)
       });
     } catch (error62) {
       logger.error("Failed to publish agent file-change report", error62);
@@ -55956,7 +56054,8 @@ You have been logged out. Please try again.`);
     const sessionState = this.getSessionState(params.sessionId);
     const clearing = sessionState.promptSuggestions?.clear();
     if (clearing) await clearing;
-    const agentFileChangeReportRequest = clientSupportsAgentFileChangeReports(this.clientCapabilities) ? parseAgentFileChangeReportRequest(params._meta) : null;
+    const agentFileChangeReportFormat = this.capabilities.agentFileChangeReportFormat;
+    const agentFileChangeReportRequest = agentFileChangeReportRequestFor(agentFileChangeReportFormat, params._meta);
     const agentFileChangeWorkspace = agentFileChangeReportRequest === null ? null : captureAgentFileChangeWorkspace(sessionState.cwd, sessionState.additionalDirectories);
     let agentFileChangeReportTurnId = null;
     let agentFileChangeReportUnavailableReason = "providerError";
@@ -56038,13 +56137,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 +56563,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
@@ -56489,7 +56589,7 @@ You have been logged out. Please try again.`);
       } catch (error62) {
         logger.error("Failed to publish terminal compaction or subagent state during prompt cleanup", error62);
       }
-      if (agentFileChangeReportRequest !== null && agentFileChangeWorkspace !== null) {
+      if (agentFileChangeReportFormat !== "none" && agentFileChangeReportRequest !== null && agentFileChangeWorkspace !== null) {
         if (promptWasCancelled || activePrompt.signal.aborted || this.sessionIsClosing(params.sessionId)) {
           agentFileChangeReportTurnId = null;
           agentFileChangeReportUnavailableReason = "cancelled";
@@ -56499,6 +56599,7 @@ You have been logged out. Please try again.`);
         }
         await this.publishAgentFileChangeReport(
           sessionState,
+          agentFileChangeReportFormat,
           agentFileChangeReportTurnId,
           agentFileChangeReportRequest,
           agentFileChangeReportUnavailableReason,

package/package.json

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