@ycodium-ai/agent-codex 0.2.3082 → 0.2.3088

package/dist/index.js

@@ -48,7 +48,7 @@ var CODEX_CARD = {
     // 三字段组合在 openThread 时定，切档要重开会话（与 runtimeModeSwitch 同为 next-turn）。
     nativeModeSwitch: true,
     contextCompaction: "native",
-    // 子代理经 collab 通知报成 task.*（events.ts 的 mapCollabAgentEvent）。
+    // 子代理经 collab 通知报成 task.*（events/collabAgents.ts 的 mapCollabAgentEvent）。
     reportsSpawnedAgents: true,
     // 出处不是 provider 文档：这是产品此前对所有 provider 统一施加的单图上限（10 MiB），
     // codex 在这个上限下一直把图片以 data URL 内联。没有查到 Codex / OpenAI 对单图的明文
@@ -1381,9 +1381,6 @@ function buildCodexDeveloperInstructions(interactionMode, runtime, browserToolsA
 <runtime_info>In case you're asked: you are running in Ycodium through the Codex harness, as ${toSingleLine(runtime.model)} with ${toSingleLine(runtime.reasoningEffort)} reasoning effort. No need to mention this otherwise.</runtime_info>`;
 }
 
-// src/events.ts
-import * as NodeCrypto from "node:crypto";
-
 // src/codexArtifacts.ts
 function imageGenerationArtifacts(input) {
   if (input.itemType !== "imageGeneration" || input.status !== "completed") return [];
@@ -1421,407 +1418,572 @@ function toCanonicalItemType(raw) {
   return "unknown";
 }
 
-// src/approvalMapping.ts
-function fileChangeEntries(params) {
-  if (!isRecord3(params)) return [];
-  const item = isRecord3(params["item"]) ? params["item"] : params;
-  const changes = item["changes"] ?? item["fileChanges"] ?? params["fileChanges"];
-  if (!isRecord3(changes) && !Array.isArray(changes)) return [];
-  const entries = Array.isArray(changes) ? changes : Object.entries(changes).map(([path, change]) => ({
-    path,
-    ...isRecord3(change) ? change : {}
-  }));
-  const out = [];
-  for (const entry of entries) {
-    if (!isRecord3(entry)) continue;
-    const path = asString(entry["path"]) ?? asString(entry["file"]);
-    if (!path) continue;
-    out.push({
-      path,
-      kind: (asString(entry["type"]) ?? asString(entry["kind"]) ?? "update").toLowerCase(),
-      movePath: asString(entry["move_path"]) ?? asString(entry["movePath"]),
-      diff: asString(entry["unified_diff"]) ?? asString(entry["unifiedDiff"]),
-      content: asString(entry["content"])
-    });
-  }
-  return out;
+// src/events/base.ts
+import * as NodeCrypto from "node:crypto";
+var CODEX_PROVIDER = "codex";
+var EVENT_ID_PREFIX = `codex-evt-${NodeCrypto.randomUUID()}`;
+var eventSeq = 0;
+function nextEventId() {
+  eventSeq += 1;
+  return `${EVENT_ID_PREFIX}-${eventSeq}`;
 }
-var MAX_DESCRIBED_FILE_CHANGES = 20;
-function describeFileChanges(params) {
-  const entries = fileChangeEntries(params).toSorted(
-    (left, right) => left.path.localeCompare(right.path)
-  );
-  if (entries.length === 0) return void 0;
-  const lines = entries.slice(0, MAX_DESCRIBED_FILE_CHANGES).map(
-    (entry) => entry.movePath ? `${entry.kind} ${entry.path} -> ${entry.movePath}` : `${entry.kind} ${entry.path}`
-  );
-  const remaining = entries.length - lines.length;
-  return remaining > 0 ? `${lines.join("\n")}
-+${remaining} more` : lines.join("\n");
+function nowIso2() {
+  return (/* @__PURE__ */ new Date()).toISOString();
 }
-function toApplyPatchFileChanges(params) {
-  const out = [];
-  for (const { path, kind, movePath, diff, content } of fileChangeEntries(params)) {
-    if (kind === "add") {
-      out.push({
-        path,
-        changeKind: "add",
-        ...content !== void 0 ? { content: { kind: "replace", newText: content } } : {}
-      });
-    } else if (kind === "delete") {
-      out.push({
-        path,
-        changeKind: "delete",
-        ...content !== void 0 ? { content: { kind: "replace", oldText: content, newText: "" } } : {}
-      });
-    } else if (movePath) {
-      out.push({
-        path,
-        changeKind: "rename",
-        ...diff ? { content: { kind: "unified", diff } } : {}
-      });
-    } else {
-      out.push({
-        path,
-        changeKind: "modify",
-        ...diff ? { content: { kind: "unified", diff } } : {}
-      });
-    }
-  }
-  return out;
+function eventRaw(source, method, payload) {
+  return { source, method, payload };
 }
-function describeCommandApproval(params) {
-  const record = isRecord3(params) ? params : {};
-  const commandValue = record["command"];
-  const command = Array.isArray(commandValue) ? commandValue.filter((entry) => typeof entry === "string").join(" ") : asString(commandValue) ?? "";
-  const cwd = asString(record["cwd"]);
-  const reason = trimText(record["reason"]);
-  const callId = asString(record["callId"]);
+function baseEvent(input) {
   return {
-    command,
-    ...cwd ? { cwd } : {},
-    ...reason ? { reason } : {},
-    ...callId ? { callId } : {}
+    eventId: nextEventId(),
+    provider: CODEX_PROVIDER,
+    threadId: input.threadId,
+    createdAt: nowIso2(),
+    type: input.type,
+    payload: input.payload,
+    ...input.providerInstanceId ? { providerInstanceId: input.providerInstanceId } : {},
+    ...input.turnId ? { turnId: input.turnId } : {},
+    ...input.itemId ? { itemId: input.itemId } : {},
+    ...input.requestId ? { requestId: input.requestId } : {},
+    ...input.method ? {
+      raw: eventRaw(
+        input.source ?? "codex.app-server.notification",
+        input.method,
+        input.payload
+      )
+    } : {}
   };
 }
-function describeFileChangeApproval(params) {
-  const record = isRecord3(params) ? params : {};
-  const reason = trimText(record["reason"]);
-  const grantRoot = asString(record["grantRoot"]);
-  const callId = asString(record["callId"]);
-  const detail = reason ?? describeFileChanges(record) ?? trimText(grantRoot);
-  return {
-    ...reason ? { reason } : {},
-    ...detail ? { detail } : {},
-    ...grantRoot ? { grantRoot } : {},
-    ...callId ? { callId } : {},
-    fileChanges: toApplyPatchFileChanges(record)
-  };
+
+// src/events/fields.ts
+function itemIdOf(params) {
+  if (!isRecord3(params)) return void 0;
+  const item = isRecord3(params["item"]) ? params["item"] : params;
+  return asString(item["id"]) ?? asString(params["itemId"]) ?? void 0;
 }
-function describePermissionsApproval(params) {
-  const record = isRecord3(params) ? params : {};
-  const permissions = isRecord3(record["permissions"]) ? record["permissions"] : {};
-  const fileSystem = isRecord3(permissions["fileSystem"]) ? permissions["fileSystem"] : {};
-  const network = isRecord3(permissions["network"]) ? permissions["network"] : {};
-  const pathsOf = (value) => Array.isArray(value) ? value.flatMap((entry) => typeof entry === "string" && entry.length > 0 ? [entry] : []) : [];
-  const read = pathsOf(fileSystem["read"]);
-  const write = pathsOf(fileSystem["write"]);
-  const entries = Array.isArray(fileSystem["entries"]) ? fileSystem["entries"] : [];
-  for (const entry of entries) {
-    if (!isRecord3(entry) || !isRecord3(entry["path"])) continue;
-    const target = entry["path"];
-    const path = target["type"] === "path" ? asString(target["path"]) : target["type"] === "glob_pattern" ? asString(target["pattern"]) : void 0;
-    if (!path) continue;
-    if (entry["access"] === "read") read.push(path);
-    if (entry["access"] === "write") write.push(path);
-  }
-  const reason = trimText(record["reason"]);
-  return {
-    ...reason ? { reason } : {},
-    read: [...new Set(read)],
-    write: [...new Set(write)],
-    network: network["enabled"] === true
-  };
+function itemStatusOf(params) {
+  if (!isRecord3(params)) return void 0;
+  const item = isRecord3(params["item"]) ? params["item"] : params;
+  return asString(item["status"]) ?? void 0;
 }
-function toPermissionsResponse(decision, params, persistent) {
-  if (decision !== "allow") return { permissions: {} };
-  const requested = isRecord3(params) && isRecord3(params["permissions"]) ? params["permissions"] : {};
-  return {
-    permissions: {
-      ...requested["fileSystem"] !== void 0 ? { fileSystem: requested["fileSystem"] } : {},
-      ...requested["network"] !== void 0 ? { network: requested["network"] } : {}
-    },
-    scope: persistent ? "session" : "turn"
-  };
+function turnIdOf(params) {
+  if (!isRecord3(params)) return void 0;
+  return asString(params["turnId"]) ?? (isRecord3(params["turn"]) ? asString(params["turn"]["id"]) : null) ?? void 0;
 }
-function describeMcpElicitation(params) {
-  const record = isRecord3(params) ? params : {};
-  const appName = asString(record["appName"]) ?? asString(record["serverName"]) ?? void 0;
-  const serverName = asString(record["serverName"]);
-  const message = trimText(record["message"]);
-  const url = asString(record["url"]) ?? asString(record["authorizationUrl"]);
-  const identity = appName ?? url ?? "unknown";
-  return {
-    ...appName ? { appName } : {},
-    ...serverName ? { serverName } : {},
-    ...message ? { message } : {},
-    ...url ? { url } : {},
-    identity,
-    mode: url ? "url" : "form",
-    ...record["requestedSchema"] !== void 0 ? { schema: record["requestedSchema"] } : {}
-  };
+function itemTitle(params) {
+  if (!isRecord3(params)) return void 0;
+  const item = isRecord3(params["item"]) ? params["item"] : params;
+  return trimText(item["title"]) ?? trimText(item["name"]) ?? trimText(item["command"]) ?? trimText(item["summary"]) ?? void 0;
 }
-function persistFromMeta(meta) {
-  if (!isRecord3(meta)) return void 0;
-  const persist = asString(meta["persist"]) ?? asString(meta["persistence"]);
-  if (persist === "session" || persist === "acceptForSession") return "session";
-  if (persist === "always" || persist === "permanent" || persist === "forever" || persist === "persistent" || persist === "acceptAlways") {
-    return "always";
+function itemDetail(params) {
+  if (!isRecord3(params)) return void 0;
+  const item = isRecord3(params["item"]) ? params["item"] : params;
+  const query = isRecord3(item["action"]) ? item["action"]["queries"] : item["query"];
+  if (Array.isArray(query)) {
+    const joined = query.filter((entry) => typeof entry === "string").join(", ");
+    if (joined.length > 0) return joined;
   }
-  return void 0;
+  return trimText(item["text"]) ?? trimText(item["summary"]) ?? trimText(item["path"]) ?? trimText(item["savedPath"]) ?? trimText(item["prompt"]) ?? (typeof query === "string" ? query : void 0);
 }
-function toMcpElicitationResponse(decision, params) {
-  const described = describeMcpElicitation(params);
-  if (decision !== "allow" || described.mode === "url") {
-    return {
-      action: decision === "allow" ? "decline" : decision === "cancel" ? "cancel" : "decline"
-    };
-  }
-  const schema = isRecord3(described.schema) ? described.schema : void 0;
-  const properties = schema && isRecord3(schema["properties"]) ? schema["properties"] : {};
-  const required = schema && Array.isArray(schema["required"]) ? schema["required"] : [];
-  const content = {};
-  for (const [key, spec] of Object.entries(properties)) {
-    if (!isRecord3(spec)) continue;
-    if (Array.isArray(spec["oneOf"]) || Array.isArray(spec["enum"])) {
-      const options = Array.isArray(spec["oneOf"]) ? spec["oneOf"] : Array.isArray(spec["enum"]) ? spec["enum"] : [];
-      const first = options[0];
-      content[key] = isRecord3(first) ? first["const"] ?? first["value"] ?? first : first;
-    } else if (spec["type"] === "boolean") {
-      content[key] = true;
-    } else if (typeof spec["default"] !== "undefined") {
-      content[key] = spec["default"];
-    }
-  }
-  for (const key of required) {
-    if (typeof key === "string" && !(key in content)) {
-      return { action: "decline" };
-    }
+function toTurnStatus(status) {
+  switch (status) {
+    case "failed":
+      return "failed";
+    case "cancelled":
+    case "canceled":
+      return "cancelled";
+    case "interrupted":
+      return "interrupted";
+    default:
+      return "completed";
   }
-  const persist = persistFromMeta(isRecord3(params) ? params["_meta"] : void 0);
-  return {
-    action: "accept",
-    content,
-    ...persist ? { _meta: { persist } } : {}
-  };
 }
-
-// src/usage/codexQuota.ts
-var asRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
-var asFiniteNumber = (value) => typeof value === "number" && Number.isFinite(value) ? value : null;
-var asNonEmptyString = (value) => typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
-var clampPercent = (value) => Math.min(100, Math.max(0, value));
-var epochSecondsToIso = (value) => {
-  const seconds = asFiniteNumber(value);
-  if (seconds === null) return null;
-  const date = new Date(seconds * 1e3);
-  return Number.isNaN(date.getTime()) ? null : date.toISOString();
-};
-var SESSION_WINDOW_MINUTES = 5 * 60;
-var WEEKLY_WINDOW_MINUTES = 7 * 24 * 60;
-var formatWindowDuration = (minutes) => {
-  if (minutes % (24 * 60) === 0) return `${String(minutes / (24 * 60))}d`;
-  if (minutes % 60 === 0) return `${String(minutes / 60)}h`;
-  return `${String(minutes)}m`;
-};
-var classifyWindow = (minutes, slot) => {
-  if (minutes === SESSION_WINDOW_MINUTES) {
-    return { id: "session", label: { key: "usage.window.session" } };
-  }
-  if (minutes === WEEKLY_WINDOW_MINUTES) {
-    return { id: "weekly", label: { key: "usage.window.weekly" } };
-  }
-  if (minutes === null) return { id: slot, label: { key: "usage.window.limit" } };
-  return {
-    id: `window-${String(minutes)}m`,
-    label: { key: "usage.window.duration", values: { duration: formatWindowDuration(minutes) } }
-  };
-};
-var mapWindow = (raw, slot, describe) => {
-  const window = asRecord(raw);
-  const usedPercent = asFiniteNumber(window?.["usedPercent"]);
-  if (window === null || usedPercent === null) return null;
-  const rawMinutes = asFiniteNumber(window["windowDurationMins"]);
-  const minutes = rawMinutes !== null && rawMinutes > 0 ? Math.trunc(rawMinutes) : null;
-  const { id, label } = describe(minutes, slot);
+function threadStateFromStatus(status) {
+  const type = isRecord3(status) ? asString(status["type"]) : asString(status);
+  if (type === "idle") return "idle";
+  if (type === "systemError" || type === "error") return "error";
+  return "active";
+}
+function codexCompactionId(threadId, turnId) {
+  return `codex:${threadId}:${turnId ?? "session"}`;
+}
+function normalizeCodexTokenUsage(tokenUsage) {
+  if (!isRecord3(tokenUsage)) return void 0;
+  const last = isRecord3(tokenUsage["last"]) ? tokenUsage["last"] : void 0;
+  const total = isRecord3(tokenUsage["total"]) ? tokenUsage["total"] : void 0;
+  const count = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : void 0;
+  const usedTokens = count(last?.["totalTokens"]);
+  if (usedTokens === void 0 || usedTokens <= 0) return void 0;
+  const totalProcessedTokens = count(total?.["totalTokens"]);
+  const maxTokens = count(tokenUsage["modelContextWindow"]);
+  const inputTokens = count(last?.["inputTokens"]);
+  const cachedInputTokens = count(last?.["cachedInputTokens"]);
+  const outputTokens = count(last?.["outputTokens"]);
+  const reasoningOutputTokens = count(last?.["reasoningOutputTokens"]);
   return {
-    id,
-    label,
-    usedPercent: clampPercent(usedPercent),
-    resetsAt: epochSecondsToIso(window["resetsAt"]),
-    ...minutes === null ? {} : { windowMs: minutes * 6e4 }
+    usedTokens,
+    lastUsedTokens: usedTokens,
+    ...totalProcessedTokens !== void 0 && totalProcessedTokens > usedTokens ? { totalProcessedTokens } : {},
+    ...maxTokens !== void 0 && maxTokens > 0 ? { maxTokens } : {},
+    ...inputTokens !== void 0 ? { inputTokens, lastInputTokens: inputTokens } : {},
+    ...cachedInputTokens !== void 0 ? { cachedInputTokens, lastCachedInputTokens: cachedInputTokens } : {},
+    ...outputTokens !== void 0 ? { outputTokens, lastOutputTokens: outputTokens } : {},
+    ...reasoningOutputTokens !== void 0 ? { reasoningOutputTokens, lastReasoningOutputTokens: reasoningOutputTokens } : {},
+    compactsAutomatically: true
   };
-};
-var PLAN_LABELS = {
-  free: "Free",
-  go: "Go",
-  plus: "Plus",
-  pro: "Pro",
-  prolite: "Pro Lite",
-  team: "Team",
-  business: "Business",
-  enterprise: "Enterprise",
-  edu: "Edu"
-};
-var planLabel = (planType) => {
-  const id = asNonEmptyString(planType);
-  if (id === null || id === "unknown") return void 0;
-  return PLAN_LABELS[id] ?? id.split("_").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
-};
-var creditBalance = (value) => {
-  if (typeof value === "number") return Number.isFinite(value) ? value : null;
-  if (typeof value !== "string" || value.trim().length === 0) return null;
-  const numeric = Number(value.trim());
-  return Number.isFinite(numeric) ? numeric : null;
-};
-var MAIN_LIMIT_ID = "codex";
-var CREDITS_BALANCE_ID = "credits";
-var isMainCodexLimit = (snapshot) => {
-  const limitId = asNonEmptyString(asRecord(snapshot)?.["limitId"]);
-  return limitId === null || limitId === MAIN_LIMIT_ID;
-};
-var mapCodexSnapshotWindows = (snapshot) => {
-  const bucket = asRecord(snapshot);
-  if (bucket === null || !isMainCodexLimit(bucket)) return [];
-  const windows = [];
-  const takenIds = /* @__PURE__ */ new Set();
-  for (const slot of ["primary", "secondary"]) {
-    const window = mapWindow(bucket[slot], slot, classifyWindow);
-    if (window === null) continue;
-    const id = takenIds.has(window.id) ? `${window.id}:${slot}` : window.id;
-    takenIds.add(id);
-    windows.push({ ...window, id, group: MAIN_LIMIT_ID });
-  }
-  return windows;
-};
-var mapCodexRateLimits = (response, accountKey) => {
-  const root = asRecord(response);
-  const legacy = asRecord(root?.["rateLimits"]);
-  const byLimitId = asRecord(root?.["rateLimitsByLimitId"]);
-  const codexBucket = asRecord(byLimitId?.[MAIN_LIMIT_ID]);
-  const main = codexBucket ?? (legacy !== null && isMainCodexLimit(legacy) ? legacy : null);
-  if (root === null || legacy === null && codexBucket === null) return null;
-  const windows = mapCodexSnapshotWindows(main);
-  const takenIds = new Set(windows.map((window) => window.id));
-  const push = (window, slot) => {
-    if (window === null) return;
-    const id = takenIds.has(window.id) ? `${window.id}:${slot}` : window.id;
-    takenIds.add(id);
-    windows.push({ ...window, id });
+}
+function turnCompletedControlFlow(params) {
+  const turn = isRecord3(params) ? isRecord3(params["turn"]) ? params["turn"] : params : {};
+  const state = toTurnStatus(asString(turn["status"]) ?? void 0);
+  const error = isRecord3(turn["error"]) ? trimText(turn["error"]["message"]) : void 0;
+  return error ? { state, errorMessage: error } : { state };
+}
+
+// src/events/collabAgents.ts
+var COLLAB_CHILD_STATUSES = /* @__PURE__ */ new Set([
+  "running",
+  "idle",
+  "failed",
+  "interrupted",
+  "cancelled"
+]);
+function asCollabChildStatus(value) {
+  return typeof value === "string" && COLLAB_CHILD_STATUSES.has(value) ? value : void 0;
+}
+function collabTurnEndStatus(turnStatus) {
+  const state = toTurnStatus(turnStatus);
+  return state === "completed" ? "idle" : state;
+}
+function pathLeaf(value) {
+  if (!value) return void 0;
+  const parts = value.split("/").filter((part) => part.length > 0);
+  return parts.at(-1);
+}
+function mapCollabAgentEvent(input) {
+  if (!isRecord3(input.params)) return [];
+  const agentThreadId = asString(input.params["agentThreadId"]) ?? asString(input.params["threadId"]);
+  if (!agentThreadId) return [];
+  const agentPath = asString(input.params["agentPath"]) ?? asString(input.params["path"]) ?? void 0;
+  const nickname = asString(input.params["agentNickname"]) ?? asString(input.params["nickname"]);
+  const role = asString(input.params["agentRole"]) ?? asString(input.params["role"]) ?? pathLeaf(agentPath) ?? "general-purpose";
+  const knownName = nickname ?? pathLeaf(agentPath);
+  const title = knownName ?? agentThreadId;
+  const model = trimText(input.params["model"]);
+  const effort = trimText(input.params["effort"]);
+  const linkage = {
+    role,
+    ...knownName ? { title: knownName } : {},
+    ...model ? { model } : {},
+    ...effort ? { effort } : {},
+    ...agentPath ? { agentPath } : {},
+    timelineBypass: true,
+    rosterKind: "subagent"
   };
-  const others = /* @__PURE__ */ new Map();
-  for (const [limitId, rawBucket] of Object.entries(byLimitId ?? {})) {
-    const bucket = asRecord(rawBucket);
-    if (limitId !== MAIN_LIMIT_ID && bucket !== null) others.set(limitId, bucket);
+  const threadId = input.rootThreadId;
+  const method = input.method;
+  if (method === "collabAgent/started" || method === "task.started") {
+    return [
+      baseEvent({
+        type: "task.started",
+        threadId,
+        payload: { taskId: agentThreadId, ...linkage },
+        method,
+        providerInstanceId: input.providerInstanceId
+      })
+    ];
   }
-  const legacyLimitId = asNonEmptyString(legacy?.["limitId"]);
-  if (legacy !== null && legacyLimitId !== null && !isMainCodexLimit(legacy)) {
-    if (!others.has(legacyLimitId)) others.set(legacyLimitId, legacy);
+  if (method === "collabAgent/progress" || method === "task.progress") {
+    const summary = trimText(input.params["detail"]) ?? trimText(input.params["text"]);
+    return [
+      baseEvent({
+        type: "task.progress",
+        threadId,
+        // 契约 TaskProgressPayload 的 description 是必填；子代理行靠它显示名字。
+        payload: {
+          taskId: agentThreadId,
+          description: title,
+          ...summary ? { summary } : {},
+          ...linkage
+        },
+        method,
+        providerInstanceId: input.providerInstanceId
+      })
+    ];
   }
-  for (const [limitId, bucket] of others) {
-    const name = asNonEmptyString(bucket["limitName"]) ?? limitId;
-    for (const slot of ["primary", "secondary"]) {
-      const window = mapWindow(bucket[slot], slot, (minutes) => ({
-        id: `${limitId}:${slot}`,
-        label: minutes === null ? { text: name } : {
-          key: "usage.window.named",
-          values: { name, duration: formatWindowDuration(minutes) }
-        }
-      }));
-      push(window === null ? null : { ...window, group: limitId }, slot);
-    }
+  if (method === "collabAgent/completed" || method === "task.completed") {
+    const status = collabTurnEndStatus(asString(input.params["turnStatus"]) ?? void 0);
+    return [
+      baseEvent({
+        type: "task.updated",
+        threadId,
+        payload: { taskId: agentThreadId, status, ...linkage },
+        method,
+        providerInstanceId: input.providerInstanceId
+      })
+    ];
   }
-  const balances = [];
-  const credits = asRecord(main?.["credits"]);
-  const balance = creditBalance(credits?.["balance"]);
-  if (credits !== null && credits["unlimited"] !== true && balance !== null) {
-    if (credits["hasCredits"] === true || balance > 0) {
-      balances.push({
-        id: CREDITS_BALANCE_ID,
-        label: { key: "usage.balance.credits" },
-        remaining: balance,
-        used: null,
-        limit: null,
-        unit: { kind: "credits" },
-        resetsAt: null
-      });
-    }
+  if (method === "collabAgent/statusChanged") {
+    const raw = asString(input.params["status"]);
+    const status = raw === "systemError" || raw === "error" ? "failed" : raw === "idle" ? "idle" : "running";
+    return [
+      baseEvent({
+        type: "task.updated",
+        threadId,
+        payload: { taskId: agentThreadId, status, ...linkage },
+        method,
+        providerInstanceId: input.providerInstanceId
+      })
+    ];
   }
-  const plan = planLabel((main ?? legacy)?.["planType"]);
-  const resetSummary = asRecord(root["rateLimitResetCredits"]);
-  const availableCount = asFiniteNumber(resetSummary?.["availableCount"]);
+  if (method === "collabAgent/metadataUpdated") {
+    return [
+      baseEvent({
+        type: "task.updated",
+        threadId,
+        payload: { taskId: agentThreadId, ...linkage },
+        method,
+        providerInstanceId: input.providerInstanceId
+      })
+    ];
+  }
+  if (method === "collabAgent/metadata") {
+    const status = asCollabChildStatus(input.params["status"]);
+    if (status === void 0) return [];
+    return [
+      baseEvent({
+        type: "task.updated",
+        threadId,
+        payload: { taskId: agentThreadId, status, ...linkage },
+        method,
+        providerInstanceId: input.providerInstanceId
+      })
+    ];
+  }
+  if (method === "collabAgent/tokenUsage") {
+    const tokenUsage = isRecord3(input.params["tokenUsage"]) ? input.params["tokenUsage"] : void 0;
+    const total = tokenUsage && isRecord3(tokenUsage["total"]) ? tokenUsage["total"] : void 0;
+    const count = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : void 0;
+    const totalTokens = total ? count(total["totalTokens"]) : void 0;
+    if (total === void 0 || totalTokens === void 0) return [];
+    const inputTokens = count(total["inputTokens"]);
+    const cachedInputTokens = count(total["cachedInputTokens"]);
+    const outputTokens = count(total["outputTokens"]);
+    const reasoningOutputTokens = count(total["reasoningOutputTokens"]);
+    const typedUsage = {
+      totalTokens,
+      ...inputTokens !== void 0 ? { inputTokens } : {},
+      ...cachedInputTokens !== void 0 ? { cachedInputTokens } : {},
+      ...outputTokens !== void 0 ? { outputTokens } : {},
+      ...reasoningOutputTokens !== void 0 ? { reasoningOutputTokens } : {}
+    };
+    return [
+      baseEvent({
+        type: "task.progress",
+        threadId,
+        payload: {
+          taskId: agentThreadId,
+          description: title,
+          typedUsage,
+          ...linkage
+        },
+        method,
+        providerInstanceId: input.providerInstanceId
+      })
+    ];
+  }
+  return [];
+}
+
+// src/events/userInput.ts
+function toUserInputQuestions(params) {
+  if (!isRecord3(params)) return void 0;
+  const questions = Array.isArray(params["questions"]) ? params["questions"] : [];
+  const mapped = [];
+  for (const question of questions) {
+    if (!isRecord3(question)) return void 0;
+    const id = asString(question["id"]);
+    const header = asString(question["header"]);
+    const text = asString(question["question"]);
+    const rawOptions = Array.isArray(question["options"]) ? question["options"] : [];
+    const options = [];
+    for (const option of rawOptions) {
+      if (!isRecord3(option)) continue;
+      const label = trimText(option["label"]);
+      if (!label) continue;
+      options.push({
+        ...asString(option["id"]) ? { id: asString(option["id"]) } : {},
+        label,
+        description: trimText(option["description"]) ?? ""
+      });
+    }
+    if (!id || !header || !text || options.length === 0) return void 0;
+    mapped.push({
+      id,
+      header,
+      question: text,
+      options,
+      multiSelect: false
+    });
+  }
+  return mapped.length > 0 ? mapped : void 0;
+}
+function toAsyncQuestions(params) {
+  if (!isRecord3(params)) return void 0;
+  const item = isRecord3(params["item"]) ? params["item"] : params;
+  if (item["delivery"] !== "async" || !Array.isArray(item["questions"])) return void 0;
+  const mapped = [];
+  item["questions"].forEach((question, index) => {
+    if (!isRecord3(question)) return;
+    const title = trimText(question["title"]);
+    if (!title) return;
+    const labels = Array.isArray(question["options"]) ? question["options"] : [];
+    const options = labels.map((label) => trimText(label)).filter((label) => label !== void 0).map((label) => ({ label, description: "" }));
+    mapped.push({
+      id: `q${index}`,
+      header: title,
+      question: title,
+      options,
+      allowFreeform: true,
+      multiSelect: false
+    });
+  });
+  return mapped.length > 0 ? mapped : void 0;
+}
+function toCodexUserInputAnswers(answers) {
+  if (!isRecord3(answers)) return void 0;
+  const out = {};
+  for (const [questionId, value] of Object.entries(answers)) {
+    if (typeof value === "string") {
+      out[questionId] = { answers: [value] };
+      continue;
+    }
+    if (Array.isArray(value) && value.every((entry) => typeof entry === "string")) {
+      out[questionId] = { answers: [...value] };
+      continue;
+    }
+    if (isRecord3(value) && Array.isArray(value["answers"]) && value["answers"].every((entry) => typeof entry === "string")) {
+      out[questionId] = { answers: [...value["answers"]] };
+      continue;
+    }
+    return void 0;
+  }
+  return out;
+}
+function toCanonicalUserInputAnswers(answers) {
+  return Object.fromEntries(
+    Object.entries(answers).map(([questionId, value]) => [
+      questionId,
+      value.answers.length === 1 ? value.answers[0] : [...value.answers]
+    ])
+  );
+}
+
+// src/usage/codexQuota.ts
+var asRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
+var asFiniteNumber = (value) => typeof value === "number" && Number.isFinite(value) ? value : null;
+var asNonEmptyString = (value) => typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
+var clampPercent = (value) => Math.min(100, Math.max(0, value));
+var epochSecondsToIso = (value) => {
+  const seconds = asFiniteNumber(value);
+  if (seconds === null) return null;
+  const date = new Date(seconds * 1e3);
+  return Number.isNaN(date.getTime()) ? null : date.toISOString();
+};
+var SESSION_WINDOW_MINUTES = 5 * 60;
+var WEEKLY_WINDOW_MINUTES = 7 * 24 * 60;
+var formatWindowDuration = (minutes) => {
+  if (minutes % (24 * 60) === 0) return `${String(minutes / (24 * 60))}d`;
+  if (minutes % 60 === 0) return `${String(minutes / 60)}h`;
+  return `${String(minutes)}m`;
+};
+var classifyWindow = (minutes, slot) => {
+  if (minutes === SESSION_WINDOW_MINUTES) {
+    return { id: "session", label: { key: "usage.window.session" } };
+  }
+  if (minutes === WEEKLY_WINDOW_MINUTES) {
+    return { id: "weekly", label: { key: "usage.window.weekly" } };
+  }
+  if (minutes === null) return { id: slot, label: { key: "usage.window.limit" } };
   return {
-    status: "available",
-    ...plan === void 0 ? {} : { plan },
-    windows,
-    balances,
-    accountKey,
-    // 回包没带摘要（老版本 CLI）就是不知道，不填；填 0 会让界面说「没有可用的重置额度」。
-    ...availableCount === null || availableCount < 0 ? {} : { resetCredits: { availableCount: Math.trunc(availableCount) } }
+    id: `window-${String(minutes)}m`,
+    label: { key: "usage.window.duration", values: { duration: formatWindowDuration(minutes) } }
   };
 };
-var codexQuotaFromRateLimits = (snapshot) => {
-  const bucket = asRecord(snapshot);
-  if (bucket === null) return null;
-  const reading = mapCodexRateLimits({ rateLimits: snapshot }, "");
-  if (reading === null || reading.status !== "available") return null;
-  const main = isMainCodexLimit(bucket);
-  const group = main ? MAIN_LIMIT_ID : asNonEmptyString(bucket["limitId"]);
-  const replaces = {
-    windowGroups: group === null ? [] : [group],
-    balanceIds: main ? [CREDITS_BALANCE_ID] : []
-  };
+var mapWindow = (raw, slot, describe) => {
+  const window = asRecord(raw);
+  const usedPercent = asFiniteNumber(window?.["usedPercent"]);
+  if (window === null || usedPercent === null) return null;
+  const rawMinutes = asFiniteNumber(window["windowDurationMins"]);
+  const minutes = rawMinutes !== null && rawMinutes > 0 ? Math.trunc(rawMinutes) : null;
+  const { id, label } = describe(minutes, slot);
   return {
-    windows: reading.windows,
-    balances: reading.balances,
-    ...reading.plan === void 0 ? {} : { plan: reading.plan },
-    replaces
+    id,
+    label,
+    usedPercent: clampPercent(usedPercent),
+    resetsAt: epochSecondsToIso(window["resetsAt"]),
+    ...minutes === null ? {} : { windowMs: minutes * 6e4 }
   };
 };
-var classifyRateLimitsError = (message) => {
-  const text = message.toLowerCase();
-  if (text.includes("chatgpt authentication required")) return "unsupportedLogin";
-  if (text.includes("authentication required")) return "missingCredentials";
-  if (/\b(401|403)\b|unauthorized|forbidden/.test(text)) return "authRejected";
-  if (/\b429\b|too many requests/.test(text)) return "rateLimited";
-  return "unreachable";
+var PLAN_LABELS = {
+  free: "Free",
+  go: "Go",
+  plus: "Plus",
+  pro: "Pro",
+  prolite: "Pro Lite",
+  team: "Team",
+  business: "Business",
+  enterprise: "Enterprise",
+  edu: "Edu"
 };
-var CODEX_OFFICIAL_HOSTS = /* @__PURE__ */ new Set(["chatgpt.com"]);
-var CODEX_DEFAULT_MODEL_PROVIDER = "openai";
-var isOfficialUrl = (value) => {
-  const parsed = URL.parse(value.trim());
-  return parsed === null ? false : CODEX_OFFICIAL_HOSTS.has(parsed.hostname.toLowerCase());
+var planLabel = (planType) => {
+  const id = asNonEmptyString(planType);
+  if (id === null || id === "unknown") return void 0;
+  return PLAN_LABELS[id] ?? id.split("_").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
 };
-var readTomlScalar = (raw) => {
-  const quoted = /^(["'])(.*?)\1/.exec(raw.trim());
-  if (quoted?.[2] !== void 0) return quoted[2];
-  const [beforeComment = ""] = raw.split("#");
-  return beforeComment.trim();
+var creditBalance = (value) => {
+  if (typeof value === "number") return Number.isFinite(value) ? value : null;
+  if (typeof value !== "string" || value.trim().length === 0) return null;
+  const numeric = Number(value.trim());
+  return Number.isFinite(numeric) ? numeric : null;
 };
-var TABLE_HEADER = /^\[\s*([^\][]+?)\s*\]\s*(?:#.*)?$/;
-var KEY_VALUE = /^([A-Za-z0-9_.\-"']+)\s*=\s*(.*)$/;
-var BASE_URL_KEYS = /* @__PURE__ */ new Set([
-  "chatgpt_base_url",
-  "openai_base_url",
-  "base_url"
-]);
-var codexConfigSignal = (contents, options) => {
-  let table = null;
-  let selectedProvider = CODEX_DEFAULT_MODEL_PROVIDER;
-  const providerBaseUrls = /* @__PURE__ */ new Map();
-  for (const rawLine of contents.split("\n")) {
-    const line = rawLine.trim();
-    if (line.length === 0 || line.startsWith("#")) continue;
+var MAIN_LIMIT_ID = "codex";
+var CREDITS_BALANCE_ID = "credits";
+var isMainCodexLimit = (snapshot) => {
+  const limitId = asNonEmptyString(asRecord(snapshot)?.["limitId"]);
+  return limitId === null || limitId === MAIN_LIMIT_ID;
+};
+var mapCodexSnapshotWindows = (snapshot) => {
+  const bucket = asRecord(snapshot);
+  if (bucket === null || !isMainCodexLimit(bucket)) return [];
+  const windows = [];
+  const takenIds = /* @__PURE__ */ new Set();
+  for (const slot of ["primary", "secondary"]) {
+    const window = mapWindow(bucket[slot], slot, classifyWindow);
+    if (window === null) continue;
+    const id = takenIds.has(window.id) ? `${window.id}:${slot}` : window.id;
+    takenIds.add(id);
+    windows.push({ ...window, id, group: MAIN_LIMIT_ID });
+  }
+  return windows;
+};
+var mapCodexRateLimits = (response, accountKey) => {
+  const root = asRecord(response);
+  const legacy = asRecord(root?.["rateLimits"]);
+  const byLimitId = asRecord(root?.["rateLimitsByLimitId"]);
+  const codexBucket = asRecord(byLimitId?.[MAIN_LIMIT_ID]);
+  const main = codexBucket ?? (legacy !== null && isMainCodexLimit(legacy) ? legacy : null);
+  if (root === null || legacy === null && codexBucket === null) return null;
+  const windows = mapCodexSnapshotWindows(main);
+  const takenIds = new Set(windows.map((window) => window.id));
+  const push = (window, slot) => {
+    if (window === null) return;
+    const id = takenIds.has(window.id) ? `${window.id}:${slot}` : window.id;
+    takenIds.add(id);
+    windows.push({ ...window, id });
+  };
+  const others = /* @__PURE__ */ new Map();
+  for (const [limitId, rawBucket] of Object.entries(byLimitId ?? {})) {
+    const bucket = asRecord(rawBucket);
+    if (limitId !== MAIN_LIMIT_ID && bucket !== null) others.set(limitId, bucket);
+  }
+  const legacyLimitId = asNonEmptyString(legacy?.["limitId"]);
+  if (legacy !== null && legacyLimitId !== null && !isMainCodexLimit(legacy)) {
+    if (!others.has(legacyLimitId)) others.set(legacyLimitId, legacy);
+  }
+  for (const [limitId, bucket] of others) {
+    const name = asNonEmptyString(bucket["limitName"]) ?? limitId;
+    for (const slot of ["primary", "secondary"]) {
+      const window = mapWindow(bucket[slot], slot, (minutes) => ({
+        id: `${limitId}:${slot}`,
+        label: minutes === null ? { text: name } : {
+          key: "usage.window.named",
+          values: { name, duration: formatWindowDuration(minutes) }
+        }
+      }));
+      push(window === null ? null : { ...window, group: limitId }, slot);
+    }
+  }
+  const balances = [];
+  const credits = asRecord(main?.["credits"]);
+  const balance = creditBalance(credits?.["balance"]);
+  if (credits !== null && credits["unlimited"] !== true && balance !== null) {
+    if (credits["hasCredits"] === true || balance > 0) {
+      balances.push({
+        id: CREDITS_BALANCE_ID,
+        label: { key: "usage.balance.credits" },
+        remaining: balance,
+        used: null,
+        limit: null,
+        unit: { kind: "credits" },
+        resetsAt: null
+      });
+    }
+  }
+  const plan = planLabel((main ?? legacy)?.["planType"]);
+  const resetSummary = asRecord(root["rateLimitResetCredits"]);
+  const availableCount = asFiniteNumber(resetSummary?.["availableCount"]);
+  return {
+    status: "available",
+    ...plan === void 0 ? {} : { plan },
+    windows,
+    balances,
+    accountKey,
+    // 回包没带摘要（老版本 CLI）就是不知道，不填；填 0 会让界面说「没有可用的重置额度」。
+    ...availableCount === null || availableCount < 0 ? {} : { resetCredits: { availableCount: Math.trunc(availableCount) } }
+  };
+};
+var codexQuotaFromRateLimits = (snapshot) => {
+  const bucket = asRecord(snapshot);
+  if (bucket === null) return null;
+  const reading = mapCodexRateLimits({ rateLimits: snapshot }, "");
+  if (reading === null || reading.status !== "available") return null;
+  const main = isMainCodexLimit(bucket);
+  const group = main ? MAIN_LIMIT_ID : asNonEmptyString(bucket["limitId"]);
+  const replaces = {
+    windowGroups: group === null ? [] : [group],
+    balanceIds: main ? [CREDITS_BALANCE_ID] : []
+  };
+  return {
+    windows: reading.windows,
+    balances: reading.balances,
+    ...reading.plan === void 0 ? {} : { plan: reading.plan },
+    replaces
+  };
+};
+var classifyRateLimitsError = (message) => {
+  const text = message.toLowerCase();
+  if (text.includes("chatgpt authentication required")) return "unsupportedLogin";
+  if (text.includes("authentication required")) return "missingCredentials";
+  if (/\b(401|403)\b|unauthorized|forbidden/.test(text)) return "authRejected";
+  if (/\b429\b|too many requests/.test(text)) return "rateLimited";
+  return "unreachable";
+};
+var CODEX_OFFICIAL_HOSTS = /* @__PURE__ */ new Set(["chatgpt.com"]);
+var CODEX_DEFAULT_MODEL_PROVIDER = "openai";
+var isOfficialUrl = (value) => {
+  const parsed = URL.parse(value.trim());
+  return parsed === null ? false : CODEX_OFFICIAL_HOSTS.has(parsed.hostname.toLowerCase());
+};
+var readTomlScalar = (raw) => {
+  const quoted = /^(["'])(.*?)\1/.exec(raw.trim());
+  if (quoted?.[2] !== void 0) return quoted[2];
+  const [beforeComment = ""] = raw.split("#");
+  return beforeComment.trim();
+};
+var TABLE_HEADER = /^\[\s*([^\][]+?)\s*\]\s*(?:#.*)?$/;
+var KEY_VALUE = /^([A-Za-z0-9_.\-"']+)\s*=\s*(.*)$/;
+var BASE_URL_KEYS = /* @__PURE__ */ new Set([
+  "chatgpt_base_url",
+  "openai_base_url",
+  "base_url"
+]);
+var codexConfigSignal = (contents, options) => {
+  let table = null;
+  let selectedProvider = CODEX_DEFAULT_MODEL_PROVIDER;
+  const providerBaseUrls = /* @__PURE__ */ new Map();
+  for (const rawLine of contents.split("\n")) {
+    const line = rawLine.trim();
+    if (line.length === 0 || line.startsWith("#")) continue;
     const header = TABLE_HEADER.exec(line);
     if (header !== null) {
       table = header[1] ?? "";
@@ -1931,402 +2093,51 @@ var codexUsageLimitMessage = (snapshot, atIso, providerMessage) => {
 var isUsageLimitExceeded = (error) => asRecord2(error)?.["codexErrorInfo"] === "usageLimitExceeded";
 
 // src/events.ts
-var CODEX_PROVIDER = "codex";
-var EVENT_ID_PREFIX = `codex-evt-${NodeCrypto.randomUUID()}`;
-var eventSeq = 0;
-function nextEventId() {
-  eventSeq += 1;
-  return `${EVENT_ID_PREFIX}-${eventSeq}`;
-}
-function nowIso2() {
-  return (/* @__PURE__ */ new Date()).toISOString();
-}
-function itemIdOf(params) {
-  if (!isRecord3(params)) return void 0;
-  const item = isRecord3(params["item"]) ? params["item"] : params;
-  return asString(item["id"]) ?? asString(params["itemId"]) ?? void 0;
-}
-function itemStatusOf(params) {
-  if (!isRecord3(params)) return void 0;
-  const item = isRecord3(params["item"]) ? params["item"] : params;
-  return asString(item["status"]) ?? void 0;
-}
-function turnIdOf(params) {
-  if (!isRecord3(params)) return void 0;
-  return asString(params["turnId"]) ?? (isRecord3(params["turn"]) ? asString(params["turn"]["id"]) : null) ?? void 0;
-}
-function itemTitle(params) {
-  if (!isRecord3(params)) return void 0;
-  const item = isRecord3(params["item"]) ? params["item"] : params;
-  return trimText(item["title"]) ?? trimText(item["name"]) ?? trimText(item["command"]) ?? trimText(item["summary"]) ?? void 0;
-}
-function itemDetail(params) {
-  if (!isRecord3(params)) return void 0;
-  const item = isRecord3(params["item"]) ? params["item"] : params;
-  const query = isRecord3(item["action"]) ? item["action"]["queries"] : item["query"];
-  if (Array.isArray(query)) {
-    const joined = query.filter((entry) => typeof entry === "string").join(", ");
-    if (joined.length > 0) return joined;
+function mapNotificationToEvents(input) {
+  const { method, params, threadId, providerInstanceId, rateLimits } = input;
+  if (method.startsWith("collabAgent/")) {
+    return mapCollabAgentEvent({ method, params, rootThreadId: threadId, providerInstanceId });
   }
-  return trimText(item["text"]) ?? trimText(item["summary"]) ?? trimText(item["path"]) ?? trimText(item["savedPath"]) ?? trimText(item["prompt"]) ?? (typeof query === "string" ? query : void 0);
-}
-function toTurnStatus(status) {
-  switch (status) {
-    case "failed":
-      return "failed";
-    case "cancelled":
-    case "canceled":
-      return "cancelled";
-    case "interrupted":
-      return "interrupted";
-    default:
-      return "completed";
+  if (method === "error") {
+    if (isUsageLimitExceeded(isRecord3(params) ? params["error"] : void 0)) return [];
+    const willRetry = isRecord3(params) && params["willRetry"] === true;
+    const nested = isRecord3(params) && isRecord3(params["error"]) ? params["error"] : void 0;
+    const message = (nested ? trimText(nested["message"]) : void 0) ?? (isRecord3(params) ? trimText(params["message"]) : void 0) ?? "Codex error";
+    const payload = { message };
+    if (!willRetry) payload["class"] = "provider_error";
+    if (params !== void 0) payload["detail"] = params;
+    return [
+      baseEvent({
+        type: willRetry ? "runtime.warning" : "runtime.error",
+        threadId,
+        payload,
+        turnId: turnIdOf(params),
+        method,
+        providerInstanceId
+      })
+    ];
   }
-}
-var COLLAB_CHILD_STATUSES = /* @__PURE__ */ new Set([
-  "running",
-  "idle",
-  "failed",
-  "interrupted",
-  "cancelled"
-]);
-function asCollabChildStatus(value) {
-  return typeof value === "string" && COLLAB_CHILD_STATUSES.has(value) ? value : void 0;
-}
-function collabTurnEndStatus(turnStatus) {
-  const state = toTurnStatus(turnStatus);
-  return state === "completed" ? "idle" : state;
-}
-function threadStateFromStatus(status) {
-  const type = isRecord3(status) ? asString(status["type"]) : asString(status);
-  if (type === "idle") return "idle";
-  if (type === "systemError" || type === "error") return "error";
-  return "active";
-}
-function codexCompactionId(threadId, turnId) {
-  return `codex:${threadId}:${turnId ?? "session"}`;
-}
-function normalizeCodexTokenUsage(tokenUsage) {
-  if (!isRecord3(tokenUsage)) return void 0;
-  const last = isRecord3(tokenUsage["last"]) ? tokenUsage["last"] : void 0;
-  const total = isRecord3(tokenUsage["total"]) ? tokenUsage["total"] : void 0;
-  const count = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : void 0;
-  const usedTokens = count(last?.["totalTokens"]);
-  if (usedTokens === void 0 || usedTokens <= 0) return void 0;
-  const totalProcessedTokens = count(total?.["totalTokens"]);
-  const maxTokens = count(tokenUsage["modelContextWindow"]);
-  const inputTokens = count(last?.["inputTokens"]);
-  const cachedInputTokens = count(last?.["cachedInputTokens"]);
-  const outputTokens = count(last?.["outputTokens"]);
-  const reasoningOutputTokens = count(last?.["reasoningOutputTokens"]);
-  return {
-    usedTokens,
-    lastUsedTokens: usedTokens,
-    ...totalProcessedTokens !== void 0 && totalProcessedTokens > usedTokens ? { totalProcessedTokens } : {},
-    ...maxTokens !== void 0 && maxTokens > 0 ? { maxTokens } : {},
-    ...inputTokens !== void 0 ? { inputTokens, lastInputTokens: inputTokens } : {},
-    ...cachedInputTokens !== void 0 ? { cachedInputTokens, lastCachedInputTokens: cachedInputTokens } : {},
-    ...outputTokens !== void 0 ? { outputTokens, lastOutputTokens: outputTokens } : {},
-    ...reasoningOutputTokens !== void 0 ? { reasoningOutputTokens, lastReasoningOutputTokens: reasoningOutputTokens } : {},
-    compactsAutomatically: true
-  };
-}
-function turnCompletedControlFlow(params) {
-  const turn = isRecord3(params) ? isRecord3(params["turn"]) ? params["turn"] : params : {};
-  const state = toTurnStatus(asString(turn["status"]) ?? void 0);
-  const error = isRecord3(turn["error"]) ? trimText(turn["error"]["message"]) : void 0;
-  return error ? { state, errorMessage: error } : { state };
-}
-function toUserInputQuestions(params) {
-  if (!isRecord3(params)) return void 0;
-  const questions = Array.isArray(params["questions"]) ? params["questions"] : [];
-  const mapped = [];
-  for (const question of questions) {
-    if (!isRecord3(question)) return void 0;
-    const id = asString(question["id"]);
-    const header = asString(question["header"]);
-    const text = asString(question["question"]);
-    const rawOptions = Array.isArray(question["options"]) ? question["options"] : [];
-    const options = [];
-    for (const option of rawOptions) {
-      if (!isRecord3(option)) continue;
-      const label = trimText(option["label"]);
-      if (!label) continue;
-      options.push({
-        ...asString(option["id"]) ? { id: asString(option["id"]) } : {},
-        label,
-        description: trimText(option["description"]) ?? ""
-      });
-    }
-    if (!id || !header || !text || options.length === 0) return void 0;
-    mapped.push({
-      id,
-      header,
-      question: text,
-      options,
-      multiSelect: false
-    });
-  }
-  return mapped.length > 0 ? mapped : void 0;
-}
-function toAsyncQuestions(params) {
-  if (!isRecord3(params)) return void 0;
-  const item = isRecord3(params["item"]) ? params["item"] : params;
-  if (item["delivery"] !== "async" || !Array.isArray(item["questions"])) return void 0;
-  const mapped = [];
-  item["questions"].forEach((question, index) => {
-    if (!isRecord3(question)) return;
-    const title = trimText(question["title"]);
-    if (!title) return;
-    const labels = Array.isArray(question["options"]) ? question["options"] : [];
-    const options = labels.map((label) => trimText(label)).filter((label) => label !== void 0).map((label) => ({ label, description: "" }));
-    mapped.push({
-      id: `q${index}`,
-      header: title,
-      question: title,
-      options,
-      allowFreeform: true,
-      multiSelect: false
-    });
-  });
-  return mapped.length > 0 ? mapped : void 0;
-}
-function toCodexUserInputAnswers(answers) {
-  if (!isRecord3(answers)) return void 0;
-  const out = {};
-  for (const [questionId, value] of Object.entries(answers)) {
-    if (typeof value === "string") {
-      out[questionId] = { answers: [value] };
-      continue;
-    }
-    if (Array.isArray(value) && value.every((entry) => typeof entry === "string")) {
-      out[questionId] = { answers: [...value] };
-      continue;
-    }
-    if (isRecord3(value) && Array.isArray(value["answers"]) && value["answers"].every((entry) => typeof entry === "string")) {
-      out[questionId] = { answers: [...value["answers"]] };
-      continue;
+  if (method === "process/stderr") {
+    const text = isRecord3(params) ? trimText(params["text"]) ?? "" : "";
+    if (!text) return [];
+    if (isFatalStderr(text)) {
+      return [
+        baseEvent({
+          type: "runtime.error",
+          threadId,
+          payload: { message: text },
+          method,
+          providerInstanceId
+        })
+      ];
     }
-    return void 0;
-  }
-  return out;
-}
-function toCanonicalUserInputAnswers(answers) {
-  return Object.fromEntries(
-    Object.entries(answers).map(([questionId, value]) => [
-      questionId,
-      value.answers.length === 1 ? value.answers[0] : [...value.answers]
-    ])
-  );
-}
-function pathLeaf(value) {
-  if (!value) return void 0;
-  const parts = value.split("/").filter((part) => part.length > 0);
-  return parts.at(-1);
-}
-function eventRaw(source, method, payload) {
-  return { source, method, payload };
-}
-function baseEvent(input) {
-  return {
-    eventId: nextEventId(),
-    provider: CODEX_PROVIDER,
-    threadId: input.threadId,
-    createdAt: nowIso2(),
-    type: input.type,
-    payload: input.payload,
-    ...input.providerInstanceId ? { providerInstanceId: input.providerInstanceId } : {},
-    ...input.turnId ? { turnId: input.turnId } : {},
-    ...input.itemId ? { itemId: input.itemId } : {},
-    ...input.requestId ? { requestId: input.requestId } : {},
-    ...input.method ? {
-      raw: eventRaw(
-        input.source ?? "codex.app-server.notification",
-        input.method,
-        input.payload
-      )
-    } : {}
-  };
-}
-function mapCollabAgentEvent(input) {
-  if (!isRecord3(input.params)) return [];
-  const agentThreadId = asString(input.params["agentThreadId"]) ?? asString(input.params["threadId"]);
-  if (!agentThreadId) return [];
-  const agentPath = asString(input.params["agentPath"]) ?? asString(input.params["path"]) ?? void 0;
-  const nickname = asString(input.params["agentNickname"]) ?? asString(input.params["nickname"]);
-  const role = asString(input.params["agentRole"]) ?? asString(input.params["role"]) ?? pathLeaf(agentPath) ?? "general-purpose";
-  const knownName = nickname ?? pathLeaf(agentPath);
-  const title = knownName ?? agentThreadId;
-  const model = trimText(input.params["model"]);
-  const effort = trimText(input.params["effort"]);
-  const linkage = {
-    role,
-    ...knownName ? { title: knownName } : {},
-    ...model ? { model } : {},
-    ...effort ? { effort } : {},
-    ...agentPath ? { agentPath } : {},
-    timelineBypass: true,
-    rosterKind: "subagent"
-  };
-  const threadId = input.rootThreadId;
-  const method = input.method;
-  if (method === "collabAgent/started" || method === "task.started") {
-    return [
-      baseEvent({
-        type: "task.started",
-        threadId,
-        payload: { taskId: agentThreadId, ...linkage },
-        method,
-        providerInstanceId: input.providerInstanceId
-      })
-    ];
-  }
-  if (method === "collabAgent/progress" || method === "task.progress") {
-    const summary = trimText(input.params["detail"]) ?? trimText(input.params["text"]);
-    return [
-      baseEvent({
-        type: "task.progress",
-        threadId,
-        // 契约 TaskProgressPayload 的 description 是必填；子代理行靠它显示名字。
-        payload: {
-          taskId: agentThreadId,
-          description: title,
-          ...summary ? { summary } : {},
-          ...linkage
-        },
-        method,
-        providerInstanceId: input.providerInstanceId
-      })
-    ];
-  }
-  if (method === "collabAgent/completed" || method === "task.completed") {
-    const status = collabTurnEndStatus(asString(input.params["turnStatus"]) ?? void 0);
-    return [
-      baseEvent({
-        type: "task.updated",
-        threadId,
-        payload: { taskId: agentThreadId, status, ...linkage },
-        method,
-        providerInstanceId: input.providerInstanceId
-      })
-    ];
-  }
-  if (method === "collabAgent/statusChanged") {
-    const raw = asString(input.params["status"]);
-    const status = raw === "systemError" || raw === "error" ? "failed" : raw === "idle" ? "idle" : "running";
-    return [
-      baseEvent({
-        type: "task.updated",
-        threadId,
-        payload: { taskId: agentThreadId, status, ...linkage },
-        method,
-        providerInstanceId: input.providerInstanceId
-      })
-    ];
-  }
-  if (method === "collabAgent/metadataUpdated") {
     return [
       baseEvent({
-        type: "task.updated",
-        threadId,
-        payload: { taskId: agentThreadId, ...linkage },
-        method,
-        providerInstanceId: input.providerInstanceId
-      })
-    ];
-  }
-  if (method === "collabAgent/metadata") {
-    const status = asCollabChildStatus(input.params["status"]);
-    if (status === void 0) return [];
-    return [
-      baseEvent({
-        type: "task.updated",
+        type: "runtime.warning",
         threadId,
-        payload: { taskId: agentThreadId, status, ...linkage },
+        payload: { message: text },
         method,
-        providerInstanceId: input.providerInstanceId
-      })
-    ];
-  }
-  if (method === "collabAgent/tokenUsage") {
-    const tokenUsage = isRecord3(input.params["tokenUsage"]) ? input.params["tokenUsage"] : void 0;
-    const total = tokenUsage && isRecord3(tokenUsage["total"]) ? tokenUsage["total"] : void 0;
-    const count = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : void 0;
-    const totalTokens = total ? count(total["totalTokens"]) : void 0;
-    if (total === void 0 || totalTokens === void 0) return [];
-    const inputTokens = count(total["inputTokens"]);
-    const cachedInputTokens = count(total["cachedInputTokens"]);
-    const outputTokens = count(total["outputTokens"]);
-    const reasoningOutputTokens = count(total["reasoningOutputTokens"]);
-    const typedUsage = {
-      totalTokens,
-      ...inputTokens !== void 0 ? { inputTokens } : {},
-      ...cachedInputTokens !== void 0 ? { cachedInputTokens } : {},
-      ...outputTokens !== void 0 ? { outputTokens } : {},
-      ...reasoningOutputTokens !== void 0 ? { reasoningOutputTokens } : {}
-    };
-    return [
-      baseEvent({
-        type: "task.progress",
-        threadId,
-        payload: {
-          taskId: agentThreadId,
-          description: title,
-          typedUsage,
-          ...linkage
-        },
-        method,
-        providerInstanceId: input.providerInstanceId
-      })
-    ];
-  }
-  return [];
-}
-function mapNotificationToEvents(input) {
-  const { method, params, threadId, providerInstanceId, rateLimits } = input;
-  if (method.startsWith("collabAgent/")) {
-    return mapCollabAgentEvent({ method, params, rootThreadId: threadId, providerInstanceId });
-  }
-  if (method === "error") {
-    if (isUsageLimitExceeded(isRecord3(params) ? params["error"] : void 0)) return [];
-    const willRetry = isRecord3(params) && params["willRetry"] === true;
-    const nested = isRecord3(params) && isRecord3(params["error"]) ? params["error"] : void 0;
-    const message = (nested ? trimText(nested["message"]) : void 0) ?? (isRecord3(params) ? trimText(params["message"]) : void 0) ?? "Codex error";
-    const payload = { message };
-    if (!willRetry) payload["class"] = "provider_error";
-    if (params !== void 0) payload["detail"] = params;
-    return [
-      baseEvent({
-        type: willRetry ? "runtime.warning" : "runtime.error",
-        threadId,
-        payload,
-        turnId: turnIdOf(params),
-        method,
-        providerInstanceId
-      })
-    ];
-  }
-  if (method === "process/stderr") {
-    const text = isRecord3(params) ? trimText(params["text"]) ?? "" : "";
-    if (!text) return [];
-    if (isFatalStderr(text)) {
-      return [
-        baseEvent({
-          type: "runtime.error",
-          threadId,
-          payload: { message: text },
-          method,
-          providerInstanceId
-        })
-      ];
-    }
-    return [
-      baseEvent({
-        type: "runtime.warning",
-        threadId,
-        payload: { message: text },
-        method,
-        providerInstanceId
+        providerInstanceId
       })
     ];
   }
@@ -2851,6 +2662,203 @@ function mapNotificationToEvents(input) {
       return [];
   }
 }
+
+// src/approvalMapping.ts
+function fileChangeEntries(params) {
+  if (!isRecord3(params)) return [];
+  const item = isRecord3(params["item"]) ? params["item"] : params;
+  const changes = item["changes"] ?? item["fileChanges"] ?? params["fileChanges"];
+  if (!isRecord3(changes) && !Array.isArray(changes)) return [];
+  const entries = Array.isArray(changes) ? changes : Object.entries(changes).map(([path, change]) => ({
+    path,
+    ...isRecord3(change) ? change : {}
+  }));
+  const out = [];
+  for (const entry of entries) {
+    if (!isRecord3(entry)) continue;
+    const path = asString(entry["path"]) ?? asString(entry["file"]);
+    if (!path) continue;
+    out.push({
+      path,
+      kind: (asString(entry["type"]) ?? asString(entry["kind"]) ?? "update").toLowerCase(),
+      movePath: asString(entry["move_path"]) ?? asString(entry["movePath"]),
+      diff: asString(entry["unified_diff"]) ?? asString(entry["unifiedDiff"]),
+      content: asString(entry["content"])
+    });
+  }
+  return out;
+}
+var MAX_DESCRIBED_FILE_CHANGES = 20;
+function describeFileChanges(params) {
+  const entries = fileChangeEntries(params).toSorted(
+    (left, right) => left.path.localeCompare(right.path)
+  );
+  if (entries.length === 0) return void 0;
+  const lines = entries.slice(0, MAX_DESCRIBED_FILE_CHANGES).map(
+    (entry) => entry.movePath ? `${entry.kind} ${entry.path} -> ${entry.movePath}` : `${entry.kind} ${entry.path}`
+  );
+  const remaining = entries.length - lines.length;
+  return remaining > 0 ? `${lines.join("\n")}
++${remaining} more` : lines.join("\n");
+}
+function toApplyPatchFileChanges(params) {
+  const out = [];
+  for (const { path, kind, movePath, diff, content } of fileChangeEntries(params)) {
+    if (kind === "add") {
+      out.push({
+        path,
+        changeKind: "add",
+        ...content !== void 0 ? { content: { kind: "replace", newText: content } } : {}
+      });
+    } else if (kind === "delete") {
+      out.push({
+        path,
+        changeKind: "delete",
+        ...content !== void 0 ? { content: { kind: "replace", oldText: content, newText: "" } } : {}
+      });
+    } else if (movePath) {
+      out.push({
+        path,
+        changeKind: "rename",
+        ...diff ? { content: { kind: "unified", diff } } : {}
+      });
+    } else {
+      out.push({
+        path,
+        changeKind: "modify",
+        ...diff ? { content: { kind: "unified", diff } } : {}
+      });
+    }
+  }
+  return out;
+}
+function describeCommandApproval(params) {
+  const record = isRecord3(params) ? params : {};
+  const commandValue = record["command"];
+  const command = Array.isArray(commandValue) ? commandValue.filter((entry) => typeof entry === "string").join(" ") : asString(commandValue) ?? "";
+  const cwd = asString(record["cwd"]);
+  const reason = trimText(record["reason"]);
+  const callId = asString(record["callId"]);
+  return {
+    command,
+    ...cwd ? { cwd } : {},
+    ...reason ? { reason } : {},
+    ...callId ? { callId } : {}
+  };
+}
+function describeFileChangeApproval(params) {
+  const record = isRecord3(params) ? params : {};
+  const reason = trimText(record["reason"]);
+  const grantRoot = asString(record["grantRoot"]);
+  const callId = asString(record["callId"]);
+  const detail = reason ?? describeFileChanges(record) ?? trimText(grantRoot);
+  return {
+    ...reason ? { reason } : {},
+    ...detail ? { detail } : {},
+    ...grantRoot ? { grantRoot } : {},
+    ...callId ? { callId } : {},
+    fileChanges: toApplyPatchFileChanges(record)
+  };
+}
+function describePermissionsApproval(params) {
+  const record = isRecord3(params) ? params : {};
+  const permissions = isRecord3(record["permissions"]) ? record["permissions"] : {};
+  const fileSystem = isRecord3(permissions["fileSystem"]) ? permissions["fileSystem"] : {};
+  const network = isRecord3(permissions["network"]) ? permissions["network"] : {};
+  const pathsOf = (value) => Array.isArray(value) ? value.flatMap((entry) => typeof entry === "string" && entry.length > 0 ? [entry] : []) : [];
+  const read = pathsOf(fileSystem["read"]);
+  const write = pathsOf(fileSystem["write"]);
+  const entries = Array.isArray(fileSystem["entries"]) ? fileSystem["entries"] : [];
+  for (const entry of entries) {
+    if (!isRecord3(entry) || !isRecord3(entry["path"])) continue;
+    const target = entry["path"];
+    const path = target["type"] === "path" ? asString(target["path"]) : target["type"] === "glob_pattern" ? asString(target["pattern"]) : void 0;
+    if (!path) continue;
+    if (entry["access"] === "read") read.push(path);
+    if (entry["access"] === "write") write.push(path);
+  }
+  const reason = trimText(record["reason"]);
+  return {
+    ...reason ? { reason } : {},
+    read: [...new Set(read)],
+    write: [...new Set(write)],
+    network: network["enabled"] === true
+  };
+}
+function toPermissionsResponse(decision, params, persistent) {
+  if (decision !== "allow") return { permissions: {} };
+  const requested = isRecord3(params) && isRecord3(params["permissions"]) ? params["permissions"] : {};
+  return {
+    permissions: {
+      ...requested["fileSystem"] !== void 0 ? { fileSystem: requested["fileSystem"] } : {},
+      ...requested["network"] !== void 0 ? { network: requested["network"] } : {}
+    },
+    scope: persistent ? "session" : "turn"
+  };
+}
+function describeMcpElicitation(params) {
+  const record = isRecord3(params) ? params : {};
+  const appName = asString(record["appName"]) ?? asString(record["serverName"]) ?? void 0;
+  const serverName = asString(record["serverName"]);
+  const message = trimText(record["message"]);
+  const url = asString(record["url"]) ?? asString(record["authorizationUrl"]);
+  const identity = appName ?? url ?? "unknown";
+  return {
+    ...appName ? { appName } : {},
+    ...serverName ? { serverName } : {},
+    ...message ? { message } : {},
+    ...url ? { url } : {},
+    identity,
+    mode: url ? "url" : "form",
+    ...record["requestedSchema"] !== void 0 ? { schema: record["requestedSchema"] } : {}
+  };
+}
+function persistFromMeta(meta) {
+  if (!isRecord3(meta)) return void 0;
+  const persist = asString(meta["persist"]) ?? asString(meta["persistence"]);
+  if (persist === "session" || persist === "acceptForSession") return "session";
+  if (persist === "always" || persist === "permanent" || persist === "forever" || persist === "persistent" || persist === "acceptAlways") {
+    return "always";
+  }
+  return void 0;
+}
+function toMcpElicitationResponse(decision, params) {
+  const described = describeMcpElicitation(params);
+  if (decision !== "allow" || described.mode === "url") {
+    return {
+      action: decision === "allow" ? "decline" : decision === "cancel" ? "cancel" : "decline"
+    };
+  }
+  const schema = isRecord3(described.schema) ? described.schema : void 0;
+  const properties = schema && isRecord3(schema["properties"]) ? schema["properties"] : {};
+  const required = schema && Array.isArray(schema["required"]) ? schema["required"] : [];
+  const content = {};
+  for (const [key, spec] of Object.entries(properties)) {
+    if (!isRecord3(spec)) continue;
+    if (Array.isArray(spec["oneOf"]) || Array.isArray(spec["enum"])) {
+      const options = Array.isArray(spec["oneOf"]) ? spec["oneOf"] : Array.isArray(spec["enum"]) ? spec["enum"] : [];
+      const first = options[0];
+      content[key] = isRecord3(first) ? first["const"] ?? first["value"] ?? first : first;
+    } else if (spec["type"] === "boolean") {
+      content[key] = true;
+    } else if (typeof spec["default"] !== "undefined") {
+      content[key] = spec["default"];
+    }
+  }
+  for (const key of required) {
+    if (typeof key === "string" && !(key in content)) {
+      return { action: "decline" };
+    }
+  }
+  const persist = persistFromMeta(isRecord3(params) ? params["_meta"] : void 0);
+  return {
+    action: "accept",
+    content,
+    ...persist ? { _meta: { persist } } : {}
+  };
+}
+
+// src/events/serverRequests.ts
 function toRequestTypeFromKind(kind) {
   switch (kind) {
     case "command":
@@ -2995,311 +3003,90 @@ var windowsPath = (path) => path.replaceAll("/", "\\").toLowerCase();
 function basename(path) {
   const parts = path.split(/[\\/]/);
   return (parts[parts.length - 1] ?? "").toLowerCase();
-}
-function codexCommandMatcher(display) {
-  const expected = splitPosixCommand(display);
-  if (expected === null || expected.length === 0) return void 0;
-  return (argv, platform2) => {
-    if (platform2 !== "win32") return posixCommandMatches(expected, argv);
-    if (argv.length !== expected.length) return false;
-    const [actualExe, ...actualRest] = argv;
-    const [expectedExe, ...expectedRest] = expected;
-    if (actualExe === void 0 || expectedExe === void 0) return false;
-    if (windowsPath(actualExe) !== windowsPath(expectedExe)) return false;
-    const lastIndex = expectedRest.length - 1;
-    return expectedRest.every((arg, index) => {
-      const actual = actualRest[index];
-      if (actual === arg) return true;
-      return index === lastIndex && index >= 1 && expectedRest[index - 1]?.toLowerCase() === "-command" && isPowerShellExecutableName(basename(expectedExe)) && actual === WINDOWS_POWERSHELL_PREFIX + arg;
-    });
-  };
-}
-function trackOpenCommand(open, method, params) {
-  if (!isRecord3(params)) return;
-  const turnId = turnIdOf(params);
-  if (method === "turn/completed") {
-    for (const [id2, entry] of open) {
-      if (turnId === void 0 || entry.turnId === turnId) open.delete(id2);
-    }
-    return;
-  }
-  const item = params["item"];
-  if (!isRecord3(item) || item["type"] !== "commandExecution") return;
-  const id = item["id"];
-  if (typeof id !== "string") return;
-  if (method === "item/completed") {
-    open.delete(id);
-    return;
-  }
-  if (method !== "item/started") return;
-  const startedAtMs = params["startedAtMs"];
-  const command = item["command"];
-  if (typeof startedAtMs !== "number" || typeof command !== "string") return;
-  open.set(id, { turnId, startedAtMs, command });
-}
-function codexSessionProcessMatcher(appServerArgs) {
-  return (argv) => argv.length === appServerArgs.length + 1 && sameArgv(argv.slice(1), appServerArgs);
-}
-function openCommandsOf(booked) {
-  if (booked === void 0) return void 0;
-  const activeTurn = booked.runtime.activeTurnId;
-  const commands = [...booked.runtime.openCommands].flatMap(([toolCallId, entry]) => {
-    if (activeTurn !== void 0 && entry.turnId !== activeTurn) return [];
-    const matches = codexCommandMatcher(entry.command);
-    return matches === void 0 ? [] : [{ toolCallId, startedAtMs: entry.startedAtMs, matches }];
-  });
-  if (commands.length === 0) return void 0;
-  return {
-    rootPid: booked.handle.pid,
-    sessionProcess: codexSessionProcessMatcher(booked.runtime.appServerArgs),
-    commands
-  };
-}
-
-// src/sessionRuntime.ts
-var COLLAB_META_LOOKUP_TIMEOUT_MS = 5e3;
-function metaValue(value) {
-  const text = asString(value)?.trim();
-  return text === void 0 || text.length === 0 ? void 0 : text;
-}
-function cancelWireFor(pending) {
-  if (pending.kind === "permission") return toPermissionsResponse("cancel", pending.params, false);
-  return pending.kind === "mcp-elicitation" ? toMcpElicitationResponse("cancel", pending.params) : { decision: "cancel" };
-}
-var sleep = (ms) => new Promise((resolve2) => {
-  setTimeout(resolve2, ms);
-});
-function isRootChild(agentPath, agentThreadId, rootThreadId) {
-  if (agentThreadId === rootThreadId) return true;
-  return agentPath === "/root" || agentPath === "/";
-}
-function readSubAgentActivity(method, params) {
-  if (method !== "item/started" && method !== "item/completed") return void 0;
-  if (itemTypeOf(params) !== "subAgentActivity") return void 0;
-  const item = isRecord3(params) ? isRecord3(params["item"]) ? params["item"] : params : {};
-  return {
-    agentThreadId: asString(item["agentThreadId"]) ?? void 0,
-    agentPath: asString(item["agentPath"]) ?? void 0
-  };
-}
-function pathLeaf2(value) {
-  if (!value) return void 0;
-  const parts = value.split("/").filter((part) => part.length > 0);
-  return parts.at(-1);
-}
-function unconfirmedAnswerError(requestId, delivery) {
-  return new Error(
-    delivery === "closed" ? `could not confirm that codex received the answer to request ${requestId}: the session closed before the write was confirmed` : `could not confirm that codex received the answer to request ${requestId}: writing it to the CLI failed`
-  );
-}
-var CodexSessionRuntime = class {
-  threadId;
-  cwd;
-  session;
-  nativeThreadId;
-  activeTurnId;
-  model;
-  runtimeMode;
-  /** 宿主解好的这一轮的档（座位画的就是它）。缺席 = 宿主没给，按 `runtimeMode` 查表。 */
-  nativeModeId;
-  interactionMode;
-  closed = false;
-  closeCompleted = false;
-  turns = [];
-  pendingApprovals = /* @__PURE__ */ new Map();
-  pendingUserInputs = /* @__PURE__ */ new Map();
-  requestKinds = /* @__PURE__ */ new Map();
-  writeAcks = /* @__PURE__ */ new Map();
-  grants;
-  declineRelay;
-  collabChildren = /* @__PURE__ */ new Map();
-  collabChildMeta = /* @__PURE__ */ new Map();
-  liveForeignTurns = /* @__PURE__ */ new Map();
-  openCommands = /* @__PURE__ */ new Map();
-  collabReceiverTurns = /* @__PURE__ */ new Map();
-  memoryThreadIds = /* @__PURE__ */ new Set();
-  /** 这个会话见过的主额度快照（按字段合并），额度用尽停轮时点名窗口用。 */
-  rateLimits;
-  appServerArgs;
-  hasConfiguredMcpServer;
-  host;
-  attachments;
-  rpc;
-  emit;
-  /**
-   * 对外 requestId 的前缀，每个会话（即每个 app-server 进程）一份。JSON-RPC id 每个进程
-   * 都从 0 数起，宿主按 requestId 记「已接受」，不加前缀的话重启后的新请求会撞上旧请求。
-   */
-  #requestIdPrefix = `codex-${NodeCrypto2.randomUUID()}:`;
-  /** JSON-RPC id → 对外 requestId。`serverRequest/resolved` 里的 id 可能是数字也可能是字符串。 */
-  requestIdFor(jsonRpcId) {
-    return `${this.#requestIdPrefix}${String(jsonRpcId)}`;
-  }
-  /** 这一轮该用哪套三字段组合：只由这一轮的档决定（见 `codexNativeModeFor`）。 */
-  #threadConfig() {
-    return codexThreadConfigForNativeMode(codexNativeModeFor(this.runtimeMode, this.nativeModeId));
-  }
-  /** 同上，沙箱策略那一位。 */
-  #turnSandboxPolicy() {
-    return codexTurnSandboxPolicyForNativeMode(
-      codexNativeModeFor(this.runtimeMode, this.nativeModeId)
-    );
-  }
-  /** 给 CLI 的应答写入失败：带上线程与方法名记一行 warn。 */
-  #warnAnswerWriteFailed(method, jsonRpcId, error) {
-    this.host.log.warn("writing an answer to codex failed", {
-      threadId: this.threadId,
-      method,
-      jsonRpcId,
-      error: error instanceof Error ? error.message : String(error)
-    });
-  }
-  constructor(host, rpc, emit, input, cwd, appServerArgs, grants, declineRelay, attachments) {
-    this.attachments = attachments;
-    this.host = host;
-    this.rpc = rpc;
-    this.emit = emit;
-    this.threadId = input.threadId;
-    this.cwd = cwd;
-    this.runtimeMode = input.runtimeMode;
-    this.nativeModeId = input.nativeModeId;
-    this.appServerArgs = appServerArgs;
-    this.hasConfiguredMcpServer = (input.mcpServers?.length ?? 0) > 0;
-    this.grants = grants ?? createApprovalGrantStore();
-    this.declineRelay = declineRelay ?? createDeclineReasonRelay();
-    const createdAt = nowIso();
-    this.session = {
-      provider: CODEX_DRIVER_KIND,
-      providerInstanceId: host.instanceId,
-      status: "idle",
-      runtimeMode: input.runtimeMode,
-      nativeModeId: codexNativeModeFor(input.runtimeMode, input.nativeModeId),
-      cwd,
-      threadId: input.threadId,
-      createdAt,
-      updatedAt: createdAt,
-      ...input.bindingGeneration === void 0 ? {} : { bindingGeneration: input.bindingGeneration }
-    };
-  }
-  registerWriteAck(jsonRpcId) {
-    return new Promise((resolve2) => {
-      this.writeAcks.set(jsonRpcId, { resolve: resolve2 });
-    });
-  }
-  settleNativeWrite(requestId, status) {
-    const ack = this.writeAcks.get(requestId);
-    if (!ack) return;
-    this.writeAcks.delete(requestId);
-    ack.resolve(status);
-  }
-  failPendingNativeWrites(reason) {
-    for (const [, ack] of this.writeAcks) ack.resolve("closed");
-    this.writeAcks.clear();
-    void reason;
-  }
-  async confirmAfterNativeWrite(jsonRpcId) {
-    const existing = this.writeAcks.get(jsonRpcId);
-    if (existing) {
-      return await new Promise((resolve2) => {
-        const previous = existing.resolve;
-        existing.resolve = (status) => {
-          previous(status);
-          resolve2(status);
-        };
-      });
-    }
-    return await this.registerWriteAck(jsonRpcId);
-  }
-  handleStderrLine(line) {
-    const kind = classifyStderrLine(line);
-    if (kind === "drop") return;
-    if (isFatalStderr(line)) {
-      this.emit({
-        eventId: nextEventId(),
-        provider: CODEX_DRIVER_KIND,
-        threadId: this.threadId,
-        createdAt: nowIso(),
-        type: "runtime.error",
-        payload: { message: line }
-      });
-      return;
-    }
-    if (kind === "error") {
-      this.host.log.error(line, { threadId: this.threadId });
-      return;
-    }
-    this.host.log.warn(line, { threadId: this.threadId });
-  }
-  handleNotification(method, params) {
-    if (this.closed) return;
-    const conversationId = conversationIdFromNotification(params);
-    if (conversationId && conversationId !== this.nativeThreadId && conversationId !== this.threadId) {
-      this.interceptCollab(method, params, conversationId);
-      return;
-    }
-    if (conversationId && this.memoryThreadIds.has(conversationId)) {
-      if (method === "serverRequest" || method === "serverRequest/resolved") {
-        this.dispatchMapped(method, params);
-      }
-      return;
-    }
-    if (method === "thread/started") {
-      const name = isRecord3(params) ? asString(params["name"]) ?? (isRecord3(params["thread"]) ? asString(params["thread"]["name"]) : null) : null;
-      if (isMemoryConsolidationThread(name ?? void 0) && conversationId) {
-        this.memoryThreadIds.add(conversationId);
-        return;
-      }
-    }
-    const activity = readSubAgentActivity(method, params);
-    if (activity?.agentThreadId !== void 0 && !isRootChild(activity.agentPath, activity.agentThreadId, this.nativeThreadId ?? this.threadId)) {
-      this.upsertCollabChild(activity.agentThreadId, { agentPath: activity.agentPath });
-    }
-    this.dispatchMapped(method, params);
-  }
-  dispatchMapped(method, params) {
-    if (method === "serverRequest/resolved") {
-      const rawId = isRecord3(params) ? params["requestId"] : void 0;
-      if (typeof rawId !== "number" && typeof rawId !== "string") return;
-      const resolvedId = this.requestIdFor(rawId);
-      const pending = this.pendingApprovals.get(resolvedId);
-      if (pending === void 0) return;
-      pending.release();
-      this.emit({
-        eventId: nextEventId(),
-        provider: CODEX_DRIVER_KIND,
-        threadId: this.threadId,
-        createdAt: nowIso(),
-        type: "request.resolved",
-        requestId: resolvedId,
-        payload: {
-          requestType: toRequestTypeFromKind(this.requestKinds.get(resolvedId)),
-          resolution: params
-        }
-      });
-      return;
-    }
-    trackOpenCommand(this.openCommands, method, params);
-    if (method === "account/rateLimits/updated" && isRecord3(params)) {
-      this.rateLimits = mergeCodexRateLimits(this.rateLimits, params["rateLimits"]);
-    }
-    for (const event of mapNotificationToEvents({
-      method,
-      params,
-      threadId: this.threadId,
-      providerInstanceId: this.host.instanceId,
-      rateLimits: this.rateLimits
-    })) {
-      this.emit(event);
-    }
-    if (method === "turn/started") {
-      const turnId = turnIdOf(params);
-      if (turnId) this.activeTurnId = turnId;
-    }
-    if (method === "turn/completed") {
-      this.activeTurnId = void 0;
-      const { activeTurnId: _completedTurn, ...idleSession } = this.session;
-      this.session = { ...idleSession, status: "idle", updatedAt: nowIso() };
+}
+function codexCommandMatcher(display) {
+  const expected = splitPosixCommand(display);
+  if (expected === null || expected.length === 0) return void 0;
+  return (argv, platform2) => {
+    if (platform2 !== "win32") return posixCommandMatches(expected, argv);
+    if (argv.length !== expected.length) return false;
+    const [actualExe, ...actualRest] = argv;
+    const [expectedExe, ...expectedRest] = expected;
+    if (actualExe === void 0 || expectedExe === void 0) return false;
+    if (windowsPath(actualExe) !== windowsPath(expectedExe)) return false;
+    const lastIndex = expectedRest.length - 1;
+    return expectedRest.every((arg, index) => {
+      const actual = actualRest[index];
+      if (actual === arg) return true;
+      return index === lastIndex && index >= 1 && expectedRest[index - 1]?.toLowerCase() === "-command" && isPowerShellExecutableName(basename(expectedExe)) && actual === WINDOWS_POWERSHELL_PREFIX + arg;
+    });
+  };
+}
+function trackOpenCommand(open, method, params) {
+  if (!isRecord3(params)) return;
+  const turnId = turnIdOf(params);
+  if (method === "turn/completed") {
+    for (const [id2, entry] of open) {
+      if (turnId === void 0 || entry.turnId === turnId) open.delete(id2);
     }
+    return;
+  }
+  const item = params["item"];
+  if (!isRecord3(item) || item["type"] !== "commandExecution") return;
+  const id = item["id"];
+  if (typeof id !== "string") return;
+  if (method === "item/completed") {
+    open.delete(id);
+    return;
+  }
+  if (method !== "item/started") return;
+  const startedAtMs = params["startedAtMs"];
+  const command = item["command"];
+  if (typeof startedAtMs !== "number" || typeof command !== "string") return;
+  open.set(id, { turnId, startedAtMs, command });
+}
+function codexSessionProcessMatcher(appServerArgs) {
+  return (argv) => argv.length === appServerArgs.length + 1 && sameArgv(argv.slice(1), appServerArgs);
+}
+function openCommandsOf(booked) {
+  if (booked === void 0) return void 0;
+  const activeTurn = booked.runtime.activeTurnId;
+  const commands = [...booked.runtime.openCommands].flatMap(([toolCallId, entry]) => {
+    if (activeTurn !== void 0 && entry.turnId !== activeTurn) return [];
+    const matches = codexCommandMatcher(entry.command);
+    return matches === void 0 ? [] : [{ toolCallId, startedAtMs: entry.startedAtMs, matches }];
+  });
+  if (commands.length === 0) return void 0;
+  return {
+    rootPid: booked.handle.pid,
+    sessionProcess: codexSessionProcessMatcher(booked.runtime.appServerArgs),
+    commands
+  };
+}
+
+// src/sessionCollab.ts
+var COLLAB_META_LOOKUP_TIMEOUT_MS = 5e3;
+function metaValue(value) {
+  const text = asString(value)?.trim();
+  return text === void 0 || text.length === 0 ? void 0 : text;
+}
+function isRootChild(agentPath, agentThreadId, rootThreadId) {
+  if (agentThreadId === rootThreadId) return true;
+  return agentPath === "/root" || agentPath === "/";
+}
+function readSubAgentActivity(method, params) {
+  if (method !== "item/started" && method !== "item/completed") return void 0;
+  if (itemTypeOf(params) !== "subAgentActivity") return void 0;
+  const item = isRecord3(params) ? isRecord3(params["item"]) ? params["item"] : params : {};
+  return {
+    agentThreadId: asString(item["agentThreadId"]) ?? void 0,
+    agentPath: asString(item["agentPath"]) ?? void 0
+  };
+}
+var CodexSessionCollab = class {
+  runtime;
+  constructor(runtime) {
+    this.runtime = runtime;
   }
   interceptCollab(method, params, conversationId) {
     const thread = isRecord3(params) && isRecord3(params["thread"]) ? params["thread"] : void 0;
@@ -3308,8 +3095,9 @@ var CodexSessionRuntime = class {
     const spawn = isRecord3(subAgent) ? subAgent["thread_spawn"] : void 0;
     if (method === "thread/started" && thread !== void 0 && isRecord3(spawn)) {
       const agentPath = asString(spawn["agent_path"]) ?? void 0;
-      const knownPath = agentPath ?? this.collabChildren.get(conversationId)?.agentPath;
-      if (isRootChild(knownPath, conversationId, this.nativeThreadId ?? this.threadId)) return;
+      const knownPath = agentPath ?? this.runtime.collabChildren.get(conversationId)?.agentPath;
+      if (isRootChild(knownPath, conversationId, this.runtime.nativeThreadId ?? this.runtime.threadId))
+        return;
       this.upsertCollabChild(conversationId, {
         agentPath,
         role: asString(spawn["agent_role"]) ?? asString(thread["agentRole"]) ?? void 0,
@@ -3321,13 +3109,18 @@ var CodexSessionRuntime = class {
     if ((method === "item/started" || method === "item/completed") && itemType === "collabAgentToolCall") {
       const item = isRecord3(params) ? isRecord3(params["item"]) ? params["item"] : params : {};
       const receiver = asString(item["receiverThreadId"]) ?? asString(item["agentThreadId"]);
-      if (receiver && this.activeTurnId) this.collabReceiverTurns.set(receiver, this.activeTurnId);
+      if (receiver && this.runtime.activeTurnId)
+        this.runtime.collabReceiverTurns.set(receiver, this.runtime.activeTurnId);
       return;
     }
     const activity = readSubAgentActivity(method, params);
     if (activity !== void 0) {
       const agentThreadId = activity.agentThreadId ?? conversationId;
-      if (isRootChild(activity.agentPath, agentThreadId, this.nativeThreadId ?? this.threadId)) {
+      if (isRootChild(
+        activity.agentPath,
+        agentThreadId,
+        this.runtime.nativeThreadId ?? this.runtime.threadId
+      )) {
         return;
       }
       this.upsertCollabChild(agentThreadId, { agentPath: activity.agentPath });
@@ -3342,16 +3135,16 @@ var CodexSessionRuntime = class {
       this.updateCollabChildMeta(conversationId, { model, effort }, true);
       return;
     }
-    const child = this.collabChildren.get(conversationId);
+    const child = this.runtime.collabChildren.get(conversationId);
     if (method === "turn/started") {
       this.reopenCollabChildMeta(conversationId);
       const turnId = turnIdOf(params);
-      if (turnId) this.liveForeignTurns.set(conversationId, turnId);
+      if (turnId) this.runtime.liveForeignTurns.set(conversationId, turnId);
     }
     if (method === "turn/completed" || method === "thread/closed") {
-      this.liveForeignTurns.delete(conversationId);
+      this.runtime.liveForeignTurns.delete(conversationId);
     }
-    if (method === "thread/closed" && this.collabChildren.has(conversationId)) {
+    if (method === "thread/closed" && this.runtime.collabChildren.has(conversationId)) {
       this.metaOf(conversationId).closed = true;
     }
     if (!child) {
@@ -3374,285 +3167,568 @@ var CodexSessionRuntime = class {
       );
       return;
     }
-    if (method === "error") {
-      const willRetry = isRecord3(params) ? params["willRetry"] === true : false;
-      if (willRetry) return;
-      child.status = "failed";
-      this.emitCollab("collabAgent/statusChanged", child, { status: "systemError" });
+    if (method === "error") {
+      const willRetry = isRecord3(params) ? params["willRetry"] === true : false;
+      if (willRetry) return;
+      child.status = "failed";
+      this.emitCollab("collabAgent/statusChanged", child, { status: "systemError" });
+      return;
+    }
+    if (method === "thread/tokenUsage/updated") {
+      this.emitCollab("collabAgent/tokenUsage", child, params);
+      return;
+    }
+    if (CHILD_CHATTER_METHODS.has(method)) return;
+    if (CHILD_AGENT_EVENT_METHODS.has(method)) {
+      this.emitCollab("collabAgent/progress", child, params);
+    }
+  }
+  /**
+   * 两条登记路（根线程的 subAgentActivity、子线程的 thread/started）都走这里。
+   * 第一次见到就登记并宣布；已登记的只合并身份：已有的字段保留，缺的补上，补到了就发
+   * 一条带当前状态的元数据更新。不能再宣布一次：一轮结束之后才到的宣布，会让宿主把
+   * idle 当成新一轮开始。
+   */
+  upsertCollabChild(agentThreadId, identity) {
+    const fill = (known, next) => known ?? (next !== void 0 && next.length > 0 ? next : void 0);
+    const existing = this.runtime.collabChildren.get(agentThreadId);
+    const agentPath = fill(existing?.agentPath, identity.agentPath);
+    const role = fill(existing?.role, identity.role);
+    const nickname = fill(existing?.nickname, identity.nickname);
+    if (existing === void 0) {
+      const spawnTurnId = this.runtime.activeTurnId;
+      const child = {
+        agentThreadId,
+        ...agentPath ? { agentPath } : {},
+        ...role ? { role } : {},
+        ...nickname ? { nickname } : {},
+        ...spawnTurnId ? { spawnTurnId } : {},
+        status: "running"
+      };
+      this.runtime.collabChildren.set(agentThreadId, child);
+      this.emitCollab("collabAgent/started", child);
+      this.startCollabChildMetaLookup(agentThreadId);
+      return;
+    }
+    if (agentPath === existing.agentPath && role === existing.role && nickname === existing.nickname) {
+      return;
+    }
+    const merged = {
+      ...existing,
+      ...agentPath ? { agentPath } : {},
+      ...role ? { role } : {},
+      ...nickname ? { nickname } : {}
+    };
+    this.runtime.collabChildren.set(agentThreadId, merged);
+    this.emitCollab("collabAgent/metadata", merged, { status: merged.status });
+  }
+  metaOf(agentThreadId) {
+    let meta = this.runtime.collabChildMeta.get(agentThreadId);
+    if (meta === void 0) {
+      meta = { lookupStarted: false, closed: false };
+      this.runtime.collabChildMeta.set(agentThreadId, meta);
+    }
+    return meta;
+  }
+  reopenCollabChildMeta(agentThreadId) {
+    const meta = this.runtime.collabChildMeta.get(agentThreadId);
+    if (meta !== void 0) meta.closed = false;
+  }
+  /**
+   * 合并子线程的型号与推理档；变了且子代理已登记就补发一条不带状态的更新。
+   * 通知报的是当前值（overwrite），回读只补缺：回读的回包可能比通知晚到，不能盖掉更新的值。
+   */
+  updateCollabChildMeta(agentThreadId, update, overwrite) {
+    const meta = this.metaOf(agentThreadId);
+    const model = update.model !== void 0 && (overwrite || !meta.model) ? update.model : meta.model;
+    const effort = update.effort !== void 0 && (overwrite || !meta.effort) ? update.effort : meta.effort;
+    if (model === meta.model && effort === meta.effort) return;
+    if (model !== void 0) meta.model = model;
+    if (effort !== void 0) meta.effort = effort;
+    const child = this.runtime.collabChildren.get(agentThreadId);
+    if (child !== void 0 && !meta.closed) this.emitCollab("collabAgent/metadataUpdated", child);
+  }
+  /**
+   * 子线程已经在 CLI 里加载着：thread/resume 只是重新接上它，不开新一轮；
+   * excludeTurns 避免把它的历史再读一遍。回包带当前的型号与推理档。
+   */
+  startCollabChildMetaLookup(agentThreadId) {
+    const meta = this.metaOf(agentThreadId);
+    if (meta.lookupStarted || meta.closed) return;
+    meta.lookupStarted = true;
+    void this.runtime.rpc.request(
+      "thread/resume",
+      { threadId: agentThreadId, excludeTurns: true },
+      COLLAB_META_LOOKUP_TIMEOUT_MS
+    ).then((response) => {
+      if (this.runtime.closed || meta.closed || !isRecord3(response)) return;
+      const thread = response["thread"];
+      if (!isRecord3(thread) || thread["id"] !== agentThreadId) return;
+      this.updateCollabChildMeta(
+        agentThreadId,
+        { model: metaValue(response["model"]), effort: metaValue(response["reasoningEffort"]) },
+        false
+      );
+    }).catch(() => void 0);
+  }
+  emitCollab(method, child, extra) {
+    const meta = this.runtime.collabChildMeta.get(child.agentThreadId);
+    const params = {
+      agentThreadId: child.agentThreadId,
+      agentPath: child.agentPath,
+      agentRole: child.role ?? pathLeaf(child.agentPath) ?? "general-purpose",
+      agentNickname: child.nickname,
+      ...meta?.model ? { model: meta.model } : {},
+      ...meta?.effort ? { effort: meta.effort } : {},
+      ...isRecord3(extra) ? extra : {}
+    };
+    for (const event of mapNotificationToEvents({
+      method,
+      params,
+      threadId: this.runtime.threadId,
+      providerInstanceId: this.runtime.host.instanceId
+    })) {
+      this.runtime.emit(event);
+    }
+  }
+};
+
+// src/sessionRequests.ts
+function cancelWireFor(pending) {
+  if (pending.kind === "permission") return toPermissionsResponse("cancel", pending.params, false);
+  return pending.kind === "mcp-elicitation" ? toMcpElicitationResponse("cancel", pending.params) : { decision: "cancel" };
+}
+function unconfirmedAnswerError(requestId, delivery) {
+  return new Error(
+    delivery === "closed" ? `could not confirm that codex received the answer to request ${requestId}: the session closed before the write was confirmed` : `could not confirm that codex received the answer to request ${requestId}: writing it to the CLI failed`
+  );
+}
+var CodexSessionRequests = class {
+  runtime;
+  constructor(runtime) {
+    this.runtime = runtime;
+  }
+  /** 给 CLI 的应答写入失败：带上线程与方法名记一行 warn。 */
+  #warnAnswerWriteFailed(method, jsonRpcId, error) {
+    this.runtime.host.log.warn("writing an answer to codex failed", {
+      threadId: this.runtime.threadId,
+      method,
+      jsonRpcId,
+      error: error instanceof Error ? error.message : String(error)
+    });
+  }
+  async handleServerRequest(id, method, params) {
+    if (method === "item/commandExecution/requestApproval") {
+      await this.handleApproval(
+        id,
+        method,
+        params,
+        "command",
+        describeCommandApproval(params).command
+      );
+      return;
+    }
+    if (method === "item/fileChange/requestApproval") {
+      const described = describeFileChangeApproval(params);
+      await this.handleApproval(
+        id,
+        method,
+        params,
+        "file-change",
+        described.callId ?? "file-change"
+      );
+      return;
+    }
+    if (method === "mcpServer/elicitation/request") {
+      const described = describeMcpElicitation(params);
+      await this.handleApproval(id, method, params, "mcp-elicitation", described.identity);
+      return;
+    }
+    if (method === "item/permissions/requestApproval") {
+      await this.handleApproval(
+        id,
+        method,
+        params,
+        "permission",
+        isRecord3(params) ? asString(params["itemId"]) ?? "permission" : "permission"
+      );
+      return;
+    }
+    if (method === "item/tool/requestUserInput") {
+      const requestId = this.runtime.requestIdFor(id);
+      const events = mapServerRequestToEvents({
+        requestId,
+        method,
+        params,
+        threadId: this.runtime.threadId,
+        providerInstanceId: this.runtime.host.instanceId
+      });
+      if (events.length === 0) {
+        await this.runtime.rpc.respond(id, {});
+        return;
+      }
+      await new Promise((resolve2) => {
+        this.runtime.pendingUserInputs.set(requestId, {
+          jsonRpcId: id,
+          settle: (result) => {
+            this.runtime.pendingUserInputs.delete(requestId);
+            void this.runtime.rpc.respond(id, result).catch((error) => this.#warnAnswerWriteFailed(method, id, error)).finally(resolve2);
+          }
+        });
+        for (const event of events) this.runtime.emit(event);
+      });
+      return;
+    }
+    await this.runtime.rpc.respondError(id, -32601, `Method not found: ${method}`);
+  }
+  async handleApproval(id, method, params, kind, identity) {
+    const grant = kind === "permission" ? void 0 : this.runtime.grants.lookup(codexApprovalGrantKey(kind, identity));
+    if (grant) {
+      const decision = wireDecisionFromPersist(kind, grant);
+      await this.runtime.rpc.respond(id, { decision });
       return;
     }
-    if (method === "thread/tokenUsage/updated") {
-      this.emitCollab("collabAgent/tokenUsage", child, params);
-      return;
+    const requestId = this.runtime.requestIdFor(id);
+    const events = mapServerRequestToEvents({
+      requestId,
+      method,
+      params,
+      threadId: this.runtime.threadId,
+      providerInstanceId: this.runtime.host.instanceId
+    });
+    this.runtime.requestKinds.set(requestId, kind);
+    await new Promise((resolve2) => {
+      this.runtime.pendingApprovals.set(requestId, {
+        jsonRpcId: id,
+        method,
+        params,
+        kind,
+        identity,
+        settle: (decision) => {
+          this.runtime.pendingApprovals.delete(requestId);
+          void this.runtime.rpc.respond(id, decision).catch((error) => this.#warnAnswerWriteFailed(method, id, error)).finally(resolve2);
+        },
+        release: () => {
+          this.runtime.pendingApprovals.delete(requestId);
+          resolve2();
+        }
+      });
+      for (const event of events) this.runtime.emit(event);
+    });
+  }
+  async respondToRequest(requestId, decision, reason, persist) {
+    const pending = this.runtime.pendingApprovals.get(requestId);
+    if (!pending) throw new Error(`Unknown pending Codex approval request: ${requestId}`);
+    if (decision === "deny" && reason)
+      this.runtime.declineRelay.queue(this.runtime.threadId, reason);
+    let wire = { decision: decision === "allow" ? "accept" : "decline" };
+    if (decision === "allow" && pending.kind === "mcp-elicitation") {
+      wire = toMcpElicitationResponse("allow", pending.params);
     }
-    if (CHILD_CHATTER_METHODS.has(method)) return;
-    if (CHILD_AGENT_EVENT_METHODS.has(method)) {
-      this.emitCollab("collabAgent/progress", child, params);
+    if (pending.kind === "permission") {
+      wire = toPermissionsResponse(decision, pending.params, persist !== void 0);
+    } else if (decision === "allow" && persist) {
+      this.runtime.grants.remember(codexApprovalGrantKey(pending.kind, pending.identity), persist);
+      if (pending.kind !== "mcp-elicitation") {
+        wire = { decision: wireDecisionFromPersist(pending.kind, persist) };
+      }
     }
+    const ack = this.runtime.registerWriteAck(pending.jsonRpcId);
+    pending.settle(wire);
+    const delivery = await ack.catch(() => "closed");
+    this.runtime.emit({
+      eventId: nextEventId(),
+      provider: CODEX_DRIVER_KIND,
+      threadId: this.runtime.threadId,
+      createdAt: nowIso(),
+      type: "request.resolved",
+      requestId,
+      // requestType 是契约必填；缺了它宿主整条解不动，卡片停在「等待决议」。
+      payload: {
+        requestType: toRequestTypeFromKind(pending.kind),
+        decision,
+        ...reason ? { reason } : {}
+      }
+    });
+    if (delivery !== "written") throw unconfirmedAnswerError(requestId, delivery);
   }
-  /**
-   * 两条登记路（根线程的 subAgentActivity、子线程的 thread/started）都走这里。
-   * 第一次见到就登记并宣布；已登记的只合并身份：已有的字段保留，缺的补上，补到了就发
-   * 一条带当前状态的元数据更新。不能再宣布一次：一轮结束之后才到的宣布，会让宿主把
-   * idle 当成新一轮开始。
-   */
-  upsertCollabChild(agentThreadId, identity) {
-    const fill = (known, next) => known ?? (next !== void 0 && next.length > 0 ? next : void 0);
-    const existing = this.collabChildren.get(agentThreadId);
-    const agentPath = fill(existing?.agentPath, identity.agentPath);
-    const role = fill(existing?.role, identity.role);
-    const nickname = fill(existing?.nickname, identity.nickname);
-    if (existing === void 0) {
-      const spawnTurnId = this.activeTurnId;
-      const child = {
-        agentThreadId,
-        ...agentPath ? { agentPath } : {},
-        ...role ? { role } : {},
-        ...nickname ? { nickname } : {},
-        ...spawnTurnId ? { spawnTurnId } : {},
-        status: "running"
-      };
-      this.collabChildren.set(agentThreadId, child);
-      this.emitCollab("collabAgent/started", child);
-      this.startCollabChildMetaLookup(agentThreadId);
-      return;
+  async respondToUserInput(requestId, answers) {
+    const pending = this.runtime.pendingUserInputs.get(requestId);
+    if (!pending) throw new Error(`Unknown pending Codex user input request: ${requestId}`);
+    const mapped = toCodexUserInputAnswers(answers);
+    if (mapped === void 0) {
+      throw new Error(`invalid user input answers for request ${requestId}`);
     }
-    if (agentPath === existing.agentPath && role === existing.role && nickname === existing.nickname) {
-      return;
+    const ack = this.runtime.registerWriteAck(pending.jsonRpcId);
+    pending.settle({ answers: mapped });
+    const delivery = await ack.catch(() => "closed");
+    this.runtime.emit({
+      eventId: nextEventId(),
+      provider: CODEX_DRIVER_KIND,
+      threadId: this.runtime.threadId,
+      createdAt: nowIso(),
+      type: "user-input.resolved",
+      requestId,
+      // 契约的 answers 是 questionId → 答案 的 record，不是数组。
+      payload: { answers: toCanonicalUserInputAnswers(mapped) }
+    });
+    if (delivery !== "written") throw unconfirmedAnswerError(requestId, delivery);
+  }
+  /** 把还挂着的审批答成「取消」，逐条发 request.resolved。 */
+  cancelPendingApprovals() {
+    for (const [requestId, pending] of this.runtime.pendingApprovals) {
+      pending.settle(cancelWireFor(pending));
+      this.runtime.emit({
+        eventId: nextEventId(),
+        provider: CODEX_DRIVER_KIND,
+        threadId: this.runtime.threadId,
+        createdAt: nowIso(),
+        type: "request.resolved",
+        requestId,
+        payload: { requestType: toRequestTypeFromKind(pending.kind), decision: "cancel" }
+      });
     }
-    const merged = {
-      ...existing,
-      ...agentPath ? { agentPath } : {},
-      ...role ? { role } : {},
-      ...nickname ? { nickname } : {}
-    };
-    this.collabChildren.set(agentThreadId, merged);
-    this.emitCollab("collabAgent/metadata", merged, { status: merged.status });
   }
-  metaOf(agentThreadId) {
-    let meta = this.collabChildMeta.get(agentThreadId);
-    if (meta === void 0) {
-      meta = { lookupStarted: false, closed: false };
-      this.collabChildMeta.set(agentThreadId, meta);
+  /** 会话收口时把还挂着的审批答成「取消」：应答形状按审批种类，权限审批不认 decision。 */
+  settlePendingApprovals() {
+    for (const [requestId, pending] of this.runtime.pendingApprovals) {
+      pending.settle(cancelWireFor(pending));
+      this.runtime.pendingApprovals.delete(requestId);
     }
-    return meta;
   }
-  reopenCollabChildMeta(agentThreadId) {
-    const meta = this.collabChildMeta.get(agentThreadId);
-    if (meta !== void 0) meta.closed = false;
+  settlePendingUserInputs(result) {
+    for (const [requestId, pending] of this.runtime.pendingUserInputs) {
+      pending.settle(result);
+      this.runtime.pendingUserInputs.delete(requestId);
+    }
   }
-  /**
-   * 合并子线程的型号与推理档；变了且子代理已登记就补发一条不带状态的更新。
-   * 通知报的是当前值（overwrite），回读只补缺：回读的回包可能比通知晚到，不能盖掉更新的值。
-   */
-  updateCollabChildMeta(agentThreadId, update, overwrite) {
-    const meta = this.metaOf(agentThreadId);
-    const model = update.model !== void 0 && (overwrite || !meta.model) ? update.model : meta.model;
-    const effort = update.effort !== void 0 && (overwrite || !meta.effort) ? update.effort : meta.effort;
-    if (model === meta.model && effort === meta.effort) return;
-    if (model !== void 0) meta.model = model;
-    if (effort !== void 0) meta.effort = effort;
-    const child = this.collabChildren.get(agentThreadId);
-    if (child !== void 0 && !meta.closed) this.emitCollab("collabAgent/metadataUpdated", child);
+};
+async function markProviderRejection(run) {
+  try {
+    return await run();
+  } catch (error) {
+    if (!(error instanceof CodexRpcResponseError)) throw error;
+    const rejected = Object.assign(new Error(error.message), {
+      code: "provider-rejected"
+    });
+    throw rejected;
   }
+}
+
+// src/sessionRuntime.ts
+var sleep = (ms) => new Promise((resolve2) => {
+  setTimeout(resolve2, ms);
+});
+var CodexSessionRuntime = class {
+  threadId;
+  cwd;
+  session;
+  nativeThreadId;
+  activeTurnId;
+  model;
+  runtimeMode;
+  /** 宿主解好的这一轮的档（座位画的就是它）。缺席 = 宿主没给，按 `runtimeMode` 查表。 */
+  nativeModeId;
+  interactionMode;
+  closed = false;
+  closeCompleted = false;
+  turns = [];
+  pendingApprovals = /* @__PURE__ */ new Map();
+  pendingUserInputs = /* @__PURE__ */ new Map();
+  requestKinds = /* @__PURE__ */ new Map();
+  writeAcks = /* @__PURE__ */ new Map();
+  grants;
+  declineRelay;
+  collabChildren = /* @__PURE__ */ new Map();
+  collabChildMeta = /* @__PURE__ */ new Map();
+  liveForeignTurns = /* @__PURE__ */ new Map();
+  openCommands = /* @__PURE__ */ new Map();
+  collabReceiverTurns = /* @__PURE__ */ new Map();
+  memoryThreadIds = /* @__PURE__ */ new Set();
+  /** 这个会话见过的主额度快照（按字段合并），额度用尽停轮时点名窗口用。 */
+  rateLimits;
+  appServerArgs;
+  hasConfiguredMcpServer;
+  host;
+  attachments;
+  rpc;
+  emit;
+  #collab = new CodexSessionCollab(this);
+  #requests = new CodexSessionRequests(this);
   /**
-   * 子线程已经在 CLI 里加载着：thread/resume 只是重新接上它，不开新一轮；
-   * excludeTurns 避免把它的历史再读一遍。回包带当前的型号与推理档。
+   * 对外 requestId 的前缀，每个会话（即每个 app-server 进程）一份。JSON-RPC id 每个进程
+   * 都从 0 数起，宿主按 requestId 记「已接受」，不加前缀的话重启后的新请求会撞上旧请求。
    */
-  startCollabChildMetaLookup(agentThreadId) {
-    const meta = this.metaOf(agentThreadId);
-    if (meta.lookupStarted || meta.closed) return;
-    meta.lookupStarted = true;
-    void this.rpc.request(
-      "thread/resume",
-      { threadId: agentThreadId, excludeTurns: true },
-      COLLAB_META_LOOKUP_TIMEOUT_MS
-    ).then((response) => {
-      if (this.closed || meta.closed || !isRecord3(response)) return;
-      const thread = response["thread"];
-      if (!isRecord3(thread) || thread["id"] !== agentThreadId) return;
-      this.updateCollabChildMeta(
-        agentThreadId,
-        { model: metaValue(response["model"]), effort: metaValue(response["reasoningEffort"]) },
-        false
-      );
-    }).catch(() => void 0);
+  #requestIdPrefix = `codex-${NodeCrypto2.randomUUID()}:`;
+  /** JSON-RPC id → 对外 requestId。`serverRequest/resolved` 里的 id 可能是数字也可能是字符串。 */
+  requestIdFor(jsonRpcId) {
+    return `${this.#requestIdPrefix}${String(jsonRpcId)}`;
   }
-  emitCollab(method, child, extra) {
-    const meta = this.collabChildMeta.get(child.agentThreadId);
-    const params = {
-      agentThreadId: child.agentThreadId,
-      agentPath: child.agentPath,
-      agentRole: child.role ?? pathLeaf2(child.agentPath) ?? "general-purpose",
-      agentNickname: child.nickname,
-      ...meta?.model ? { model: meta.model } : {},
-      ...meta?.effort ? { effort: meta.effort } : {},
-      ...isRecord3(extra) ? extra : {}
+  /** 这一轮该用哪套三字段组合：只由这一轮的档决定（见 `codexNativeModeFor`）。 */
+  #threadConfig() {
+    return codexThreadConfigForNativeMode(codexNativeModeFor(this.runtimeMode, this.nativeModeId));
+  }
+  /** 同上，沙箱策略那一位。 */
+  #turnSandboxPolicy() {
+    return codexTurnSandboxPolicyForNativeMode(
+      codexNativeModeFor(this.runtimeMode, this.nativeModeId)
+    );
+  }
+  constructor(host, rpc, emit, input, cwd, appServerArgs, grants, declineRelay, attachments) {
+    this.attachments = attachments;
+    this.host = host;
+    this.rpc = rpc;
+    this.emit = emit;
+    this.threadId = input.threadId;
+    this.cwd = cwd;
+    this.runtimeMode = input.runtimeMode;
+    this.nativeModeId = input.nativeModeId;
+    this.appServerArgs = appServerArgs;
+    this.hasConfiguredMcpServer = (input.mcpServers?.length ?? 0) > 0;
+    this.grants = grants ?? createApprovalGrantStore();
+    this.declineRelay = declineRelay ?? createDeclineReasonRelay();
+    const createdAt = nowIso();
+    this.session = {
+      provider: CODEX_DRIVER_KIND,
+      providerInstanceId: host.instanceId,
+      status: "idle",
+      runtimeMode: input.runtimeMode,
+      nativeModeId: codexNativeModeFor(input.runtimeMode, input.nativeModeId),
+      cwd,
+      threadId: input.threadId,
+      createdAt,
+      updatedAt: createdAt,
+      ...input.bindingGeneration === void 0 ? {} : { bindingGeneration: input.bindingGeneration }
     };
-    for (const event of mapNotificationToEvents({
-      method,
-      params,
-      threadId: this.threadId,
-      providerInstanceId: this.host.instanceId
-    })) {
-      this.emit(event);
+  }
+  registerWriteAck(jsonRpcId) {
+    return new Promise((resolve2) => {
+      this.writeAcks.set(jsonRpcId, { resolve: resolve2 });
+    });
+  }
+  settleNativeWrite(requestId, status) {
+    const ack = this.writeAcks.get(requestId);
+    if (!ack) return;
+    this.writeAcks.delete(requestId);
+    ack.resolve(status);
+  }
+  failPendingNativeWrites(reason) {
+    for (const [, ack] of this.writeAcks) ack.resolve("closed");
+    this.writeAcks.clear();
+    void reason;
+  }
+  async confirmAfterNativeWrite(jsonRpcId) {
+    const existing = this.writeAcks.get(jsonRpcId);
+    if (existing) {
+      return await new Promise((resolve2) => {
+        const previous = existing.resolve;
+        existing.resolve = (status) => {
+          previous(status);
+          resolve2(status);
+        };
+      });
     }
+    return await this.registerWriteAck(jsonRpcId);
   }
-  async handleServerRequest(id, method, params) {
-    if (method === "item/commandExecution/requestApproval") {
-      await this.handleApproval(
-        id,
-        method,
-        params,
-        "command",
-        describeCommandApproval(params).command
-      );
+  handleStderrLine(line) {
+    const kind = classifyStderrLine(line);
+    if (kind === "drop") return;
+    if (isFatalStderr(line)) {
+      this.emit({
+        eventId: nextEventId(),
+        provider: CODEX_DRIVER_KIND,
+        threadId: this.threadId,
+        createdAt: nowIso(),
+        type: "runtime.error",
+        payload: { message: line }
+      });
       return;
     }
-    if (method === "item/fileChange/requestApproval") {
-      const described = describeFileChangeApproval(params);
-      await this.handleApproval(
-        id,
-        method,
-        params,
-        "file-change",
-        described.callId ?? "file-change"
-      );
+    if (kind === "error") {
+      this.host.log.error(line, { threadId: this.threadId });
       return;
     }
-    if (method === "mcpServer/elicitation/request") {
-      const described = describeMcpElicitation(params);
-      await this.handleApproval(id, method, params, "mcp-elicitation", described.identity);
+    this.host.log.warn(line, { threadId: this.threadId });
+  }
+  handleNotification(method, params) {
+    if (this.closed) return;
+    const conversationId = conversationIdFromNotification(params);
+    if (conversationId && conversationId !== this.nativeThreadId && conversationId !== this.threadId) {
+      this.#collab.interceptCollab(method, params, conversationId);
       return;
     }
-    if (method === "item/permissions/requestApproval") {
-      await this.handleApproval(
-        id,
-        method,
-        params,
-        "permission",
-        isRecord3(params) ? asString(params["itemId"]) ?? "permission" : "permission"
-      );
+    if (conversationId && this.memoryThreadIds.has(conversationId)) {
+      if (method === "serverRequest" || method === "serverRequest/resolved") {
+        this.dispatchMapped(method, params);
+      }
       return;
     }
-    if (method === "item/tool/requestUserInput") {
-      const requestId = this.requestIdFor(id);
-      const events = mapServerRequestToEvents({
-        requestId,
-        method,
-        params,
-        threadId: this.threadId,
-        providerInstanceId: this.host.instanceId
-      });
-      if (events.length === 0) {
-        await this.rpc.respond(id, {});
+    if (method === "thread/started") {
+      const name = isRecord3(params) ? asString(params["name"]) ?? (isRecord3(params["thread"]) ? asString(params["thread"]["name"]) : null) : null;
+      if (isMemoryConsolidationThread(name ?? void 0) && conversationId) {
+        this.memoryThreadIds.add(conversationId);
         return;
       }
-      await new Promise((resolve2) => {
-        this.pendingUserInputs.set(requestId, {
-          jsonRpcId: id,
-          settle: (result) => {
-            this.pendingUserInputs.delete(requestId);
-            void this.rpc.respond(id, result).catch((error) => this.#warnAnswerWriteFailed(method, id, error)).finally(resolve2);
-          }
-        });
-        for (const event of events) this.emit(event);
-      });
-      return;
     }
-    await this.rpc.respondError(id, -32601, `Method not found: ${method}`);
+    const activity = readSubAgentActivity(method, params);
+    if (activity?.agentThreadId !== void 0 && !isRootChild(activity.agentPath, activity.agentThreadId, this.nativeThreadId ?? this.threadId)) {
+      this.#collab.upsertCollabChild(activity.agentThreadId, { agentPath: activity.agentPath });
+    }
+    this.dispatchMapped(method, params);
   }
-  async handleApproval(id, method, params, kind, identity) {
-    const grant = kind === "permission" ? void 0 : this.grants.lookup(codexApprovalGrantKey(kind, identity));
-    if (grant) {
-      const decision = wireDecisionFromPersist(kind, grant);
-      await this.rpc.respond(id, { decision });
+  dispatchMapped(method, params) {
+    if (method === "serverRequest/resolved") {
+      const rawId = isRecord3(params) ? params["requestId"] : void 0;
+      if (typeof rawId !== "number" && typeof rawId !== "string") return;
+      const resolvedId = this.requestIdFor(rawId);
+      const pending = this.pendingApprovals.get(resolvedId);
+      if (pending === void 0) return;
+      pending.release();
+      this.emit({
+        eventId: nextEventId(),
+        provider: CODEX_DRIVER_KIND,
+        threadId: this.threadId,
+        createdAt: nowIso(),
+        type: "request.resolved",
+        requestId: resolvedId,
+        payload: {
+          requestType: toRequestTypeFromKind(this.requestKinds.get(resolvedId)),
+          resolution: params
+        }
+      });
       return;
     }
-    const requestId = this.requestIdFor(id);
-    const events = mapServerRequestToEvents({
-      requestId,
+    trackOpenCommand(this.openCommands, method, params);
+    if (method === "account/rateLimits/updated" && isRecord3(params)) {
+      this.rateLimits = mergeCodexRateLimits(this.rateLimits, params["rateLimits"]);
+    }
+    for (const event of mapNotificationToEvents({
       method,
       params,
       threadId: this.threadId,
-      providerInstanceId: this.host.instanceId
-    });
-    this.requestKinds.set(requestId, kind);
-    await new Promise((resolve2) => {
-      this.pendingApprovals.set(requestId, {
-        jsonRpcId: id,
-        method,
-        params,
-        kind,
-        identity,
-        settle: (decision) => {
-          this.pendingApprovals.delete(requestId);
-          void this.rpc.respond(id, decision).catch((error) => this.#warnAnswerWriteFailed(method, id, error)).finally(resolve2);
-        },
-        release: () => {
-          this.pendingApprovals.delete(requestId);
-          resolve2();
-        }
-      });
-      for (const event of events) this.emit(event);
-    });
-  }
-  async respondToRequest(requestId, decision, reason, persist) {
-    const pending = this.pendingApprovals.get(requestId);
-    if (!pending) throw new Error(`Unknown pending Codex approval request: ${requestId}`);
-    if (decision === "deny" && reason) this.declineRelay.queue(this.threadId, reason);
-    let wire = { decision: decision === "allow" ? "accept" : "decline" };
-    if (decision === "allow" && pending.kind === "mcp-elicitation") {
-      wire = toMcpElicitationResponse("allow", pending.params);
+      providerInstanceId: this.host.instanceId,
+      rateLimits: this.rateLimits
+    })) {
+      this.emit(event);
     }
-    if (pending.kind === "permission") {
-      wire = toPermissionsResponse(decision, pending.params, persist !== void 0);
-    } else if (decision === "allow" && persist) {
-      this.grants.remember(codexApprovalGrantKey(pending.kind, pending.identity), persist);
-      if (pending.kind !== "mcp-elicitation") {
-        wire = { decision: wireDecisionFromPersist(pending.kind, persist) };
-      }
+    if (method === "turn/started") {
+      const turnId = turnIdOf(params);
+      if (turnId) this.activeTurnId = turnId;
     }
-    const ack = this.registerWriteAck(pending.jsonRpcId);
-    pending.settle(wire);
-    const delivery = await ack.catch(() => "closed");
-    this.emit({
-      eventId: nextEventId(),
-      provider: CODEX_DRIVER_KIND,
-      threadId: this.threadId,
-      createdAt: nowIso(),
-      type: "request.resolved",
-      requestId,
-      // requestType 是契约必填；缺了它宿主整条解不动，卡片停在「等待决议」。
-      payload: {
-        requestType: toRequestTypeFromKind(pending.kind),
-        decision,
-        ...reason ? { reason } : {}
-      }
-    });
-    if (delivery !== "written") throw unconfirmedAnswerError(requestId, delivery);
+    if (method === "turn/completed") {
+      this.activeTurnId = void 0;
+      const { activeTurnId: _completedTurn, ...idleSession } = this.session;
+      this.session = { ...idleSession, status: "idle", updatedAt: nowIso() };
+    }
+  }
+  async handleServerRequest(id, method, params) {
+    return this.#requests.handleServerRequest(id, method, params);
+  }
+  async respondToRequest(requestId, decision, reason, persist) {
+    return this.#requests.respondToRequest(requestId, decision, reason, persist);
   }
   async respondToUserInput(requestId, answers) {
-    const pending = this.pendingUserInputs.get(requestId);
-    if (!pending) throw new Error(`Unknown pending Codex user input request: ${requestId}`);
-    const mapped = toCodexUserInputAnswers(answers);
-    if (mapped === void 0) {
-      throw new Error(`invalid user input answers for request ${requestId}`);
-    }
-    const ack = this.registerWriteAck(pending.jsonRpcId);
-    pending.settle({ answers: mapped });
-    const delivery = await ack.catch(() => "closed");
-    this.emit({
-      eventId: nextEventId(),
-      provider: CODEX_DRIVER_KIND,
-      threadId: this.threadId,
-      createdAt: nowIso(),
-      type: "user-input.resolved",
-      requestId,
-      // 契约的 answers 是 questionId → 答案 的 record，不是数组。
-      payload: { answers: toCanonicalUserInputAnswers(mapped) }
-    });
-    if (delivery !== "written") throw unconfirmedAnswerError(requestId, delivery);
+    return this.#requests.respondToUserInput(requestId, answers);
   }
   async withActiveWriterRecovery(run, allowUnsubscribe) {
     let lastError;
@@ -3846,22 +3922,7 @@ var CodexSessionRuntime = class {
     if (target) {
       await this.rpc.request("turn/interrupt", { threadId: this.nativeThreadId, turnId: target }, 0).catch(() => void 0);
     }
-    this.cancelPendingApprovals();
-  }
-  /** 把还挂着的审批答成「取消」，逐条发 request.resolved。 */
-  cancelPendingApprovals() {
-    for (const [requestId, pending] of this.pendingApprovals) {
-      pending.settle(cancelWireFor(pending));
-      this.emit({
-        eventId: nextEventId(),
-        provider: CODEX_DRIVER_KIND,
-        threadId: this.threadId,
-        createdAt: nowIso(),
-        type: "request.resolved",
-        requestId,
-        payload: { requestType: toRequestTypeFromKind(pending.kind), decision: "cancel" }
-      });
-    }
+    this.#requests.cancelPendingApprovals();
   }
   async compactContext() {
     if (!this.nativeThreadId) return;
@@ -3895,16 +3956,10 @@ var CodexSessionRuntime = class {
   }
   /** 会话收口时把还挂着的审批答成「取消」：应答形状按审批种类，权限审批不认 decision。 */
   settlePendingApprovals() {
-    for (const [requestId, pending] of this.pendingApprovals) {
-      pending.settle(cancelWireFor(pending));
-      this.pendingApprovals.delete(requestId);
-    }
+    return this.#requests.settlePendingApprovals();
   }
   settlePendingUserInputs(result) {
-    for (const [requestId, pending] of this.pendingUserInputs) {
-      pending.settle(result);
-      this.pendingUserInputs.delete(requestId);
-    }
+    return this.#requests.settlePendingUserInputs(result);
   }
   async close() {
     if (this.closeCompleted) return;
@@ -3930,17 +3985,6 @@ var CodexSessionRuntime = class {
     });
   }
 };
-async function markProviderRejection(run) {
-  try {
-    return await run();
-  } catch (error) {
-    if (!(error instanceof CodexRpcResponseError)) throw error;
-    const rejected = Object.assign(new Error(error.message), {
-      code: "provider-rejected"
-    });
-    throw rejected;
-  }
-}
 
 // src/sessions.ts
 import * as NodeFS3 from "node:fs";