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

package/dist/index.js

@@ -32121,6 +32121,17 @@ var CODEX_NETWORK_PERMISSION_TITLE = "Allow network access?";
 var CODEX_FILE_CHANGE_PERMISSION_TITLE = "Make edits?";
 var CODEX_ADDITIONAL_PERMISSIONS_TITLE = "Grant permissions?";
 var PERMISSION_PROMPT_META_KEY = "permission_prompt";
+var NEUTRAL_PERMISSION_PRESENTATION_META_KEY = "permissionPresentation";
+var NEUTRAL_QUESTION_CUSTOM_ANSWER_META_KEY = "questionCustomAnswer";
+function neutralPresentationCapability() {
+  return { version: 1 };
+}
+function clientRequestsNeutralPresentation(capabilities, key) {
+  const declared = capabilities?._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;
+}
 function requestPermissionMeta(capabilities, title, reason) {
   const description = nonBlank(reason);
   const permission = {
@@ -32130,6 +32141,7 @@ function requestPermissionMeta(capabilities, title, reason) {
   };
   const meta3 = {
     ...airOnlyMeta(capabilities.airClient, AIR_PERMISSION_KEY, permission),
+    ...capabilities.neutralPermissionPresentation ? { [NEUTRAL_PERMISSION_PRESENTATION_META_KEY]: permission } : {},
     ...capabilities.permissionPromptFields ? { [PERMISSION_PROMPT_META_KEY]: permission } : {}
   };
   return Object.keys(meta3).length > 0 ? { _meta: meta3 } : {};
@@ -32141,11 +32153,15 @@ function readPermissionMeta(meta3) {
   if (typeof title !== "string") return void 0;
   return { version: 1, title, ...typeof description === "string" ? { description } : {} };
 }
-function optionPermissionMeta(airClient, description) {
+function optionPermissionMeta(capabilities, description) {
   const normalized = nonBlank(description);
   if (!normalized) return void 0;
   const permission = { version: 1, description: normalized };
-  return airOnlyMeta(airClient, AIR_PERMISSION_KEY, permission);
+  const meta3 = {
+    ...airOnlyMeta(capabilities.airClient, AIR_PERMISSION_KEY, permission),
+    ...capabilities.neutralPermissionPresentation ? { [NEUTRAL_PERMISSION_PRESENTATION_META_KEY]: permission } : {}
+  };
+  return Object.keys(meta3).length > 0 ? meta3 : void 0;
 }
 function nonBlank(value) {
   const normalized = value?.trim();
@@ -34722,195 +34738,553 @@ var NeutralSessionFailureLedger = class {
   }
 };
 
-// src/tool-calls/ClientCapabilities.ts
-var ClientCapabilities = class _ClientCapabilities {
-  static DEFAULT = new _ClientCapabilities({
-    airClient: false,
-    airToolCallContract: false,
-    goal: false,
-    asyncTasks: false,
-    terminalOutput: false,
-    terminalOutputDelta: false,
-    planUpdates: false,
-    air: { rawInputRendering: false, planContentDelta: false, diffPatch: false },
-    diffPatchFormat: "none",
-    sessionFailureFormat: "none",
-    permissionPromptFields: false
-  });
-  /** The client declares `_meta.jetbrains.air`. */
-  airClient;
-  /** The client gets the tool call reports of the AIR tool call contract. Only AIR on ACP v1 does. */
-  airToolCallContract;
-  /** The client is AIR or declares `_meta.goal`. */
-  goal;
-  /** AIR declares its versioned asyncTasks capability; other clients opt in with literal true. */
-  asyncTasks;
-  /** The client declares `_meta.terminal_output`, the Zed convention for command output chunks. */
-  terminalOutput;
-  /** The client declares `_meta.terminal_output_delta` and appends the output chunks. */
-  terminalOutputDelta;
-  /** The client shows `plan_update`. Other clients get the plan as agent message text. */
-  planUpdates;
-  air;
-  diffPatchFormat;
-  sessionFailureFormat;
-  /** A permission request has its own `title` and `description` (ACP v2). */
-  permissionPromptFields;
-  constructor(values) {
-    this.airClient = values.airClient;
-    this.airToolCallContract = values.airToolCallContract;
-    this.goal = values.goal;
-    this.asyncTasks = values.asyncTasks;
-    this.terminalOutput = values.terminalOutput;
-    this.terminalOutputDelta = values.terminalOutputDelta;
-    this.planUpdates = values.planUpdates;
-    this.air = values.air;
-    this.diffPatchFormat = values.diffPatchFormat;
-    this.sessionFailureFormat = values.sessionFailureFormat;
-    this.permissionPromptFields = values.permissionPromptFields;
-  }
-  static from(capabilities) {
-    const airClient = isAirClient(capabilities);
-    const diffPatch = clientSupportsAirCapability(capabilities, AIR_DIFF_PATCH_KEY);
-    const goal = capabilities?._meta?.["goal"];
-    return new _ClientCapabilities({
-      airClient,
-      airToolCallContract: airClient,
-      goal: airClient || goal !== null && typeof goal === "object" && !Array.isArray(goal),
-      asyncTasks: airClient ? clientSupportsAirCapability(capabilities, AIR_ASYNC_TASKS_KEY) : capabilities?._meta?.["async-tasks"] === true,
-      terminalOutput: capabilities?._meta?.["terminal_output"] === true,
-      terminalOutputDelta: capabilities?._meta?.["terminal_output_delta"] === true,
-      planUpdates: capabilities?.plan != null,
-      air: {
-        rawInputRendering: clientSupportsAirCapability(capabilities, AIR_RAW_INPUT_RENDERING_KEY),
-        planContentDelta: clientSupportsAirCapability(capabilities, AIR_PLAN_CONTENT_DELTA_KEY),
-        diffPatch
-      },
-      // 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
-    });
-  }
-  /**
-   * The capabilities of an ACP v2 client, from the v1 view of its capabilities (`toV1ClientCapabilitiesView`).
-   *
-   * Every v2 client gets the standard tool call reports, also AIR: v2 has its own terminal and diff updates.
-   * A shell command streams its output into its terminal. A read, search or list command has no terminal,
-   * so its output goes to `content` at the end. A diff carries a Git patch. A permission request has its own title.
-   * Plan updates need no capability on v2.
-   */
-  static fromV2(capabilities) {
-    return new _ClientCapabilities({
-      airClient: isAirClient(capabilities),
-      airToolCallContract: false,
-      goal: isAirClient(capabilities),
-      asyncTasks: clientSupportsAirCapability(capabilities, AIR_ASYNC_TASKS_KEY),
-      terminalOutput: true,
-      terminalOutputDelta: false,
-      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
-    });
-  }
-  /**
-   * The key of the output chunks of a command, or `null` when the client has no chunk channel for it.
-   * A client that declares `terminal_output_delta` gets appends for every command.
-   * A client that declares `terminal_output` (Zed) gets `terminal_output` for a command that shows a terminal,
-   * and no chunks for a read, search or list command.
-   * Every other client that is not AIR gets `terminal_output_delta`, as before the tool call contract.
-   * AIR without either capability gets no chunks.
-   * A command sends its output once: as chunks when the key is not `null`, and in `rawOutput` otherwise.
-   */
-  terminalOutputKey(terminal) {
-    if (this.terminalOutputDelta) return "terminal_output_delta";
-    if (this.terminalOutput) return terminal ? "terminal_output" : null;
-    return this.airToolCallContract ? null : "terminal_output_delta";
-  }
-};
-
-// src/ServiceErrorMessage.ts
-var SERVICE_ERROR_TYPES = /* @__PURE__ */ new Set([
-  "invalid_request_error",
-  "server_error",
-  "rate_limit_error",
-  "insufficient_quota",
-  "authentication_error",
-  "permission_error",
-  "not_found_error",
-  "conflict_error",
-  "overloaded_error"
-]);
-var INVALID_ENCRYPTED_CONTENT_CODE = "invalid_encrypted_content";
-var INVALID_ENCRYPTED_CONTENT_MESSAGE = "The current provider can't read this thread's earlier reasoning, which another provider or account encrypted. This happens after the provider changes in a thread. Switch back to the previous provider or start a new thread.";
-function workspaceRoutingUnavailableMessage(text) {
-  return `Codex can't reach chatgpt.com to look up your ChatGPT workspace. Check your network connection and any proxy, VPN, or firewall that blocks chatgpt.com, then try again. (${text})`;
+// 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 readableServiceErrorMessage(text) {
-  if (isWorkspaceRoutingUnavailableMessage(text)) return workspaceRoutingUnavailableMessage(text);
-  const value = parseJson(text);
-  if (value === void 0) return text;
-  if (isInvalidEncryptedContentError(value)) return INVALID_ENCRYPTED_CONTENT_MESSAGE;
-  if (!isObject2(value) || Object.keys(value).some((key) => !["type", "status", "error"].includes(key)) || value["type"] !== "error" || typeof value["status"] !== "number" || !Number.isInteger(value["status"]) || value["status"] < 400 || value["status"] > 599 || !isObject2(value["error"])) return text;
-  const error62 = value["error"];
-  if (Object.keys(error62).some((key) => !["type", "message", "code", "param"].includes(key)) || typeof error62["type"] !== "string" || !SERVICE_ERROR_TYPES.has(error62["type"]) || typeof error62["message"] !== "string" || error62["message"].trim().length === 0 || ["code", "param"].some((key) => key in error62 && error62[key] !== null && typeof error62[key] !== "string")) return text;
-  return error62["message"];
+function neutralAgentFileChangeReportCapability() {
+  return { version: AGENT_FILE_CHANGE_REPORT_VERSION };
 }
-function isInvalidEncryptedContentError(value) {
-  if (!isObject2(value) || !isObject2(value["error"])) return false;
-  const error62 = value["error"];
-  if (error62["code"] === INVALID_ENCRYPTED_CONTENT_CODE) return true;
-  const metadata = error62["metadata"];
-  if (!isObject2(metadata)) return false;
-  return metadata["provider_error_code"] === INVALID_ENCRYPTED_CONTENT_CODE || typeof metadata["raw"] === "string" && isInvalidEncryptedContentError(parseJson(metadata["raw"]));
+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 parseJson(text) {
-  try {
-    return JSON.parse(text);
-  } catch {
-    return void 0;
+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 isObject2(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
+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
+      }
+    }
+  };
 }
-
-// src/app-server-recovery/AppServerExit.ts
-var CODEX_PROCESS_EXITED_ERROR_CODE = 1001;
-function likelyOutOfMemory(exit) {
-  return exit.signal === "SIGKILL" || exit.code === 137;
+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 describeExit(exit) {
-  if (exit.error !== void 0) {
-    return exit.pid === void 0 ? `could not be started (${exit.error})` : `stopped responding (${exit.error})`;
+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 oom = likelyOutOfMemory(exit) ? ", which usually means it ran out of memory" : "";
-  if (exit.signal !== null) return `was killed by ${exit.signal}${oom}`;
-  return `exited with code ${exit.code ?? "unknown"}${oom}`;
+  const parsedReport = parseTurnDiff(diff);
+  const normalized = normalizeFileChangeReport(parsedReport, workspace);
+  return fitReportedAgentFileChangeReport({
+    version: AGENT_FILE_CHANGE_REPORT_VERSION,
+    requestId,
+    status: "reported",
+    ...normalized
+  });
 }
-var AppServerUnavailableError = class extends RequestError {
-  constructor(message, data) {
-    super(CODEX_PROCESS_EXITED_ERROR_CODE, message, data);
-    this.name = "AppServerUnavailableError";
+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;
   }
 };
-var ThreadRefusedError = class extends AppServerUnavailableError {
-  constructor(message, data) {
-    super(message, data);
-    this.name = "ThreadRefusedError";
+function parseTurnDiff(diff) {
+  if (diff.trim() === "") {
+    return { paths: [], complete: false, uncertainty: TURN_DIFF_UNCERTAINTY };
   }
-};
-var SessionReplacedError = class extends AppServerUnavailableError {
-  constructor(sessionId) {
-    super(
-      `Session ${sessionId} was closed or opened again while the agent reopened it after an app-server restart.`,
-      { exitCode: null, signal: null, restartable: true }
+  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)}`
     );
-    this.name = "SessionReplacedError";
+  }
+  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({
+    airClient: false,
+    airToolCallContract: false,
+    goal: false,
+    asyncTasks: false,
+    terminalOutput: false,
+    terminalOutputDelta: false,
+    planUpdates: false,
+    air: { rawInputRendering: false, planContentDelta: false, diffPatch: false },
+    diffPatchFormat: "none",
+    sessionFailureFormat: "none",
+    agentFileChangeReportFormat: "none",
+    permissionPromptFields: false,
+    neutralPermissionPresentation: false,
+    neutralQuestionCustomAnswer: false
+  });
+  /** The client declares `_meta.jetbrains.air`. */
+  airClient;
+  /** The client gets the tool call reports of the AIR tool call contract. Only AIR on ACP v1 does. */
+  airToolCallContract;
+  /** The client is AIR or declares `_meta.goal`. */
+  goal;
+  /** AIR declares its versioned asyncTasks capability; other clients opt in with literal true. */
+  asyncTasks;
+  /** The client declares `_meta.terminal_output`, the Zed convention for command output chunks. */
+  terminalOutput;
+  /** The client declares `_meta.terminal_output_delta` and appends the output chunks. */
+  terminalOutputDelta;
+  /** The client shows `plan_update`. Other clients get the plan as agent message text. */
+  planUpdates;
+  air;
+  diffPatchFormat;
+  sessionFailureFormat;
+  agentFileChangeReportFormat;
+  /** A permission request has its own `title` and `description` (ACP v2). */
+  permissionPromptFields;
+  /** The client gets the permission presentation in `_meta.permissionPresentation`. Only ACP v1 reads the opt-in. */
+  neutralPermissionPresentation;
+  /** A question's note field carries `_meta.questionCustomAnswer`. Only ACP v1 reads the opt-in. */
+  neutralQuestionCustomAnswer;
+  constructor(values) {
+    this.airClient = values.airClient;
+    this.airToolCallContract = values.airToolCallContract;
+    this.goal = values.goal;
+    this.asyncTasks = values.asyncTasks;
+    this.terminalOutput = values.terminalOutput;
+    this.terminalOutputDelta = values.terminalOutputDelta;
+    this.planUpdates = values.planUpdates;
+    this.air = values.air;
+    this.diffPatchFormat = values.diffPatchFormat;
+    this.sessionFailureFormat = values.sessionFailureFormat;
+    this.agentFileChangeReportFormat = values.agentFileChangeReportFormat;
+    this.permissionPromptFields = values.permissionPromptFields;
+    this.neutralPermissionPresentation = values.neutralPermissionPresentation;
+    this.neutralQuestionCustomAnswer = values.neutralQuestionCustomAnswer;
+  }
+  static from(capabilities) {
+    const airClient = isAirClient(capabilities);
+    const diffPatch = clientSupportsAirCapability(capabilities, AIR_DIFF_PATCH_KEY);
+    const goal = capabilities?._meta?.["goal"];
+    return new _ClientCapabilities({
+      airClient,
+      airToolCallContract: airClient,
+      goal: airClient || goal !== null && typeof goal === "object" && !Array.isArray(goal),
+      asyncTasks: airClient ? clientSupportsAirCapability(capabilities, AIR_ASYNC_TASKS_KEY) : capabilities?._meta?.["async-tasks"] === true,
+      terminalOutput: capabilities?._meta?.["terminal_output"] === true,
+      terminalOutputDelta: capabilities?._meta?.["terminal_output_delta"] === true,
+      planUpdates: capabilities?.plan != null,
+      air: {
+        rawInputRendering: clientSupportsAirCapability(capabilities, AIR_RAW_INPUT_RENDERING_KEY),
+        planContentDelta: clientSupportsAirCapability(capabilities, AIR_PLAN_CONTENT_DELTA_KEY),
+        diffPatch
+      },
+      // 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,
+      neutralPermissionPresentation: clientRequestsNeutralPresentation(capabilities, NEUTRAL_PERMISSION_PRESENTATION_META_KEY),
+      neutralQuestionCustomAnswer: clientRequestsNeutralPresentation(capabilities, NEUTRAL_QUESTION_CUSTOM_ANSWER_META_KEY)
+    });
+  }
+  /**
+   * The capabilities of an ACP v2 client, from the v1 view of its capabilities (`toV1ClientCapabilitiesView`).
+   *
+   * Every v2 client gets the standard tool call reports, also AIR: v2 has its own terminal and diff updates.
+   * A shell command streams its output into its terminal. A read, search or list command has no terminal,
+   * so its output goes to `content` at the end. A diff carries a Git patch. A permission request has its own title.
+   * Plan updates need no capability on v2.
+   */
+  static fromV2(capabilities) {
+    return new _ClientCapabilities({
+      airClient: isAirClient(capabilities),
+      airToolCallContract: false,
+      goal: isAirClient(capabilities),
+      asyncTasks: clientSupportsAirCapability(capabilities, AIR_ASYNC_TASKS_KEY),
+      terminalOutput: true,
+      terminalOutputDelta: false,
+      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,
+      // A v2 request has its own title and description, so v2 ignores both client-neutral opt-ins.
+      neutralPermissionPresentation: false,
+      neutralQuestionCustomAnswer: false
+    });
+  }
+  /**
+   * The key of the output chunks of a command, or `null` when the client has no chunk channel for it.
+   * A client that declares `terminal_output_delta` gets appends for every command.
+   * A client that declares `terminal_output` (Zed) gets `terminal_output` for a command that shows a terminal,
+   * and no chunks for a read, search or list command.
+   * Every other client that is not AIR gets `terminal_output_delta`, as before the tool call contract.
+   * AIR without either capability gets no chunks.
+   * A command sends its output once: as chunks when the key is not `null`, and in `rawOutput` otherwise.
+   */
+  terminalOutputKey(terminal) {
+    if (this.terminalOutputDelta) return "terminal_output_delta";
+    if (this.terminalOutput) return terminal ? "terminal_output" : null;
+    return this.airToolCallContract ? null : "terminal_output_delta";
+  }
+};
+
+// src/ServiceErrorMessage.ts
+var SERVICE_ERROR_TYPES = /* @__PURE__ */ new Set([
+  "invalid_request_error",
+  "server_error",
+  "rate_limit_error",
+  "insufficient_quota",
+  "authentication_error",
+  "permission_error",
+  "not_found_error",
+  "conflict_error",
+  "overloaded_error"
+]);
+var INVALID_ENCRYPTED_CONTENT_CODE = "invalid_encrypted_content";
+var INVALID_ENCRYPTED_CONTENT_MESSAGE = "The current provider can't read this thread's earlier reasoning, which another provider or account encrypted. This happens after the provider changes in a thread. Switch back to the previous provider or start a new thread.";
+function workspaceRoutingUnavailableMessage(text) {
+  return `Codex can't reach chatgpt.com to look up your ChatGPT workspace. Check your network connection and any proxy, VPN, or firewall that blocks chatgpt.com, then try again. (${text})`;
+}
+function readableServiceErrorMessage(text) {
+  if (isWorkspaceRoutingUnavailableMessage(text)) return workspaceRoutingUnavailableMessage(text);
+  const value = parseJson(text);
+  if (value === void 0) return text;
+  if (isInvalidEncryptedContentError(value)) return INVALID_ENCRYPTED_CONTENT_MESSAGE;
+  if (!isObject2(value) || Object.keys(value).some((key) => !["type", "status", "error"].includes(key)) || value["type"] !== "error" || typeof value["status"] !== "number" || !Number.isInteger(value["status"]) || value["status"] < 400 || value["status"] > 599 || !isObject2(value["error"])) return text;
+  const error62 = value["error"];
+  if (Object.keys(error62).some((key) => !["type", "message", "code", "param"].includes(key)) || typeof error62["type"] !== "string" || !SERVICE_ERROR_TYPES.has(error62["type"]) || typeof error62["message"] !== "string" || error62["message"].trim().length === 0 || ["code", "param"].some((key) => key in error62 && error62[key] !== null && typeof error62[key] !== "string")) return text;
+  return error62["message"];
+}
+function isInvalidEncryptedContentError(value) {
+  if (!isObject2(value) || !isObject2(value["error"])) return false;
+  const error62 = value["error"];
+  if (error62["code"] === INVALID_ENCRYPTED_CONTENT_CODE) return true;
+  const metadata = error62["metadata"];
+  if (!isObject2(metadata)) return false;
+  return metadata["provider_error_code"] === INVALID_ENCRYPTED_CONTENT_CODE || typeof metadata["raw"] === "string" && isInvalidEncryptedContentError(parseJson(metadata["raw"]));
+}
+function parseJson(text) {
+  try {
+    return JSON.parse(text);
+  } catch {
+    return void 0;
+  }
+}
+function isObject2(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+
+// src/app-server-recovery/AppServerExit.ts
+var CODEX_PROCESS_EXITED_ERROR_CODE = 1001;
+function likelyOutOfMemory(exit) {
+  return exit.signal === "SIGKILL" || exit.code === 137;
+}
+function describeExit(exit) {
+  if (exit.error !== void 0) {
+    return exit.pid === void 0 ? `could not be started (${exit.error})` : `stopped responding (${exit.error})`;
+  }
+  const oom = likelyOutOfMemory(exit) ? ", which usually means it ran out of memory" : "";
+  if (exit.signal !== null) return `was killed by ${exit.signal}${oom}`;
+  return `exited with code ${exit.code ?? "unknown"}${oom}`;
+}
+var AppServerUnavailableError = class extends RequestError {
+  constructor(message, data) {
+    super(CODEX_PROCESS_EXITED_ERROR_CODE, message, data);
+    this.name = "AppServerUnavailableError";
+  }
+};
+var ThreadRefusedError = class extends AppServerUnavailableError {
+  constructor(message, data) {
+    super(message, data);
+    this.name = "ThreadRefusedError";
+  }
+};
+var SessionReplacedError = class extends AppServerUnavailableError {
+  constructor(sessionId) {
+    super(
+      `Session ${sessionId} was closed or opened again while the agent reopened it after an app-server restart.`,
+      { exitCode: null, signal: null, restartable: true }
+    );
+    this.name = "SessionReplacedError";
   }
 };
 var UnpersistedSessionLostError = class extends AppServerUnavailableError {
@@ -36484,413 +36858,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
@@ -38891,9 +38966,9 @@ function parsePersistOptions(meta3) {
 function isMcpToolCallApproval(meta3) {
   return isRecord2(meta3) && meta3["codex_approval_kind"] === "mcp_tool_call";
 }
-function buildMcpPermissionOptions(isToolApproval, persistOptions, airClient) {
+function buildMcpPermissionOptions(isToolApproval, persistOptions, capabilities) {
   const permissionOption2 = (optionId, name, kind, description) => {
-    const meta3 = optionPermissionMeta(airClient, description);
+    const meta3 = optionPermissionMeta(capabilities, description);
     return { optionId, name, kind, ...meta3 ? { _meta: meta3 } : {} };
   };
   const options = [permissionOption2(
@@ -38955,7 +39030,7 @@ function buildMcpPermissionRequest(sessionId, params, context, nextStandaloneToo
       options: buildMcpPermissionOptions(
         context.isToolApproval,
         context.persistOptions,
-        renderer.capabilities.airClient
+        renderer.capabilities
       )
     },
     correlatedCallId
@@ -39068,7 +39143,7 @@ function userInputResponseValue(content, fieldId) {
   }
   return value;
 }
-function buildUserInputSchema(questions, clientCapabilities, answersRequired) {
+function buildUserInputSchema(questions, clientCapabilities, answersRequired, neutralCustomAnswer = false) {
   const properties = {};
   const required2 = [];
   const questionIds = new Set(questions.map((question) => question.id));
@@ -39120,7 +39195,10 @@ function buildUserInputSchema(questions, clientCapabilities, answersRequired) {
       properties[userInputNoteFieldId(question.id, questionIds)] = {
         type: "string",
         title: "Additional answer or note",
-        _meta: airClient ? withAirMeta({ ...noteMeta, [LEGACY_AIR_CUSTOM_ANSWER_KEY]: true }, AIR_CUSTOM_ANSWER_KEY, true) : noteMeta
+        _meta: {
+          ...airClient ? withAirMeta({ ...noteMeta, [LEGACY_AIR_CUSTOM_ANSWER_KEY]: true }, AIR_CUSTOM_ANSWER_KEY, true) : noteMeta,
+          ...neutralCustomAnswer ? { [NEUTRAL_QUESTION_CUSTOM_ANSWER_META_KEY]: { version: 1, questionId: question.id } } : {}
+        }
       };
     }
   }
@@ -39130,13 +39208,13 @@ function buildUserInputSchema(questions, clientCapabilities, answersRequired) {
     ...answersRequired ? { required: required2 } : {}
   };
 }
-function buildUserInputRequest(params, clientCapabilities) {
+function buildUserInputRequest(params, clientCapabilities, neutralCustomAnswer) {
   return {
     sessionId: params.threadId,
     toolCallId: params.itemId,
     mode: "form",
     message: "Codex needs your input to continue.",
-    requestedSchema: buildUserInputSchema(params.questions, clientCapabilities, true),
+    requestedSchema: buildUserInputSchema(params.questions, clientCapabilities, true, neutralCustomAnswer),
     _meta: {
       codex: {
         autoResolutionMs: params.autoResolutionMs
@@ -39299,7 +39377,7 @@ var CodexElicitationHandler = class {
     return cancellationSignal ? { cancellationSignal } : void 0;
   }
   async requestUserInputElicitation(params) {
-    const request = buildUserInputRequest(params, this.clientCapabilities);
+    const request = buildUserInputRequest(params, this.clientCapabilities, this.renderer.capabilities.neutralQuestionCustomAnswer);
     const signal = subagentInteractionSignal(params.threadId, this.cancellationSignal);
     if (params.autoResolutionMs === null) {
       return await withSubagentUserAction(params.threadId, () => this.connection.request(
@@ -40675,7 +40753,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.5.0-alas.5",
+  version: "2.5.0-alas.7",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -40753,7 +40831,7 @@ var package_default = {
   alasDownstream: {
     upstreamVersion: "2.5.0",
     upstreamCommit: "34e08970aa324a2be985f5080674d5aa91d7666f",
-    sourceCommit: "d1c53266b4d5d1f308323259b81d01ea687104ef"
+    sourceCommit: "4b88aaf47a9765b7b64a51712cca179fc141fa46"
   }
 };
 
@@ -49211,14 +49289,16 @@ var AsyncQuestionClient = class {
   }
 };
 var AsyncQuestionElicitations = class {
-  constructor(sessionId, clientCapabilities, client) {
+  constructor(sessionId, clientCapabilities, client, neutralCustomAnswer = false) {
     this.sessionId = sessionId;
     this.clientCapabilities = clientCapabilities;
     this.client = client;
+    this.neutralCustomAnswer = neutralCustomAnswer;
   }
   sessionId;
   clientCapabilities;
   client;
+  neutralCustomAnswer;
   // The running turns that asked a question, each with the signal that cancels its questions.
   turns = /* @__PURE__ */ new Map();
   /** Asks the questions of a completed async message and cancels them when their turn ends; never waits. */
@@ -49263,7 +49343,7 @@ var AsyncQuestionElicitations = class {
       mode: "form",
       message: "Codex keeps working while you answer. An answer sent after it finishes is not delivered.",
       // Questions are answered independently, as in Codex.
-      requestedSchema: buildUserInputSchema(questions, this.clientCapabilities, false),
+      requestedSchema: buildUserInputSchema(questions, this.clientCapabilities, false, this.neutralCustomAnswer),
       _meta: { codex: { delivery: "async" } }
     };
     void this.client.createElicitation(request, turn.signal).then(
@@ -52176,9 +52256,6 @@ var DENY_ALL_ELICITATIONS = {
   handleElicitation: async () => ({ action: "cancel", content: null, _meta: null }),
   handleUserInput: async () => ({ answers: {} })
 };
-function clientSupportsAgentFileChangeReports(capabilities) {
-  return clientSupportsAirCapability(capabilities, AIR_AGENT_FILE_CHANGE_REPORT_KEY);
-}
 function isAuthRequiredError(error62) {
   return error62 instanceof RequestError && error62.code === RequestError.authRequired().code;
 }
@@ -52625,6 +52702,19 @@ var CodexAcpServer = class {
       ...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 client-neutral presentation contracts, see `docs/air-extensions.md`. `ClientCapabilities.fromV2`
+      // never selects them.
+      ...this.capabilities.neutralPermissionPresentation ? {
+        [NEUTRAL_PERMISSION_PRESENTATION_META_KEY]: neutralPresentationCapability()
+      } : {},
+      ...this.capabilities.neutralQuestionCustomAnswer ? {
+        [NEUTRAL_QUESTION_CUSTOM_ANSWER_META_KEY]: neutralPresentationCapability()
+      } : {},
       // The session index for a client that opted in without AIR, see `docs/air-extensions.md`.
       ...neutralSessionIndex ? {
         [NEUTRAL_SESSION_INDEX_META_KEY]: neutralSessionIndex
@@ -55315,7 +55405,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);
@@ -55333,14 +55423,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);
@@ -56013,7 +56096,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";
@@ -56547,7 +56631,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";
@@ -56557,6 +56641,7 @@ You have been logged out. Please try again.`);
         }
         await this.publishAgentFileChangeReport(
           sessionState,
+          agentFileChangeReportFormat,
           agentFileChangeReportTurnId,
           agentFileChangeReportRequest,
           agentFileChangeReportUnavailableReason,
@@ -56616,7 +56701,7 @@ You have been logged out. Please try again.`);
         this.connection,
         this.clientCapabilities,
         () => this.codexAcpClient
-      ));
+      ), this.capabilities.neutralQuestionCustomAnswer);
       this.asyncQuestions.set(sessionId, questions);
     }
     return questions;