@nyssance/codex-acp-v2 0.7.1 → 0.7.3

package/dist/index.js

@@ -21844,7 +21844,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "0.7.1",
+  version: "0.7.3",
   description: "Native ACP v2 agent for the OpenAI Codex app-server",
   packageManager: "bun@1.4.0",
   engines: {
@@ -24204,138 +24204,10 @@ function withWritableRoots(policy, roots) {
   return { ...policy, writableRoots: [...new Set([...policy.writableRoots, ...roots])] };
 }
 
-// src/codex/models.ts
-var MODEL_CONFIG_ID = "model";
-var EFFORT_CONFIG_ID = "effort";
-var FAST_MODE_CONFIG_ID = "fast_mode";
-var COLLABORATION_MODE_CONFIG_ID = "collaboration_mode";
-var DEFAULT_EFFORT = "medium";
-var FAST_SERVICE_TIER = "fast";
-function resolveModelSelection(catalog, modelId, effort) {
-  const listed = modelId === null ? undefined : catalog.find((model) => model.id === modelId);
-  if (listed)
-    return { model: listed.id, effort: effort ?? listed.defaultReasoningEffort };
-  if (modelId)
-    return { model: modelId, effort: effort ?? DEFAULT_EFFORT };
-  const fallback = catalog.find((model) => model.isDefault) ?? catalog[0];
-  if (!fallback)
-    throw new Error("Codex did not return any models");
-  return { model: fallback.id, effort: effort ?? fallback.defaultReasoningEffort };
-}
-function findModel(catalog, modelId) {
-  return catalog.find((model) => model.id === modelId);
-}
-function supportedEfforts(model) {
-  return model?.supportedReasoningEfforts ?? [];
-}
-function coerceEffort(model, effort) {
-  const options = supportedEfforts(model);
-  if (options.length === 0)
-    return effort;
-  if (options.some((option) => option.reasoningEffort === effort))
-    return effort;
-  return model?.defaultReasoningEffort ?? options[0].reasoningEffort;
-}
-function modelSupportsFast(model) {
-  if (!model)
-    return false;
-  return model.serviceTiers.some((tier) => tier.id === FAST_SERVICE_TIER) || model.additionalSpeedTiers.includes(FAST_SERVICE_TIER);
-}
-function modelSupportsImages(model) {
-  return model?.inputModalities.includes("image") ?? true;
-}
-function modelLacksReasoning(model) {
-  const options = supportedEfforts(model);
-  return options.length > 0 && options.every((option) => option.reasoningEffort === "none");
-}
-function modelConfigOption(catalog, current, gatewayGroups = []) {
-  const visible = catalog.filter((model) => !model.hidden || model.id === current);
-  const options = visible.map((model) => ({
-    value: model.id,
-    name: model.displayName,
-    description: model.description || null
-  }));
-  if (!options.some((option) => option.value === current)) {
-    options.unshift({ value: current, name: current, description: null });
-  }
-  const base = {
-    configId: MODEL_CONFIG_ID,
-    name: "Model",
-    description: "Model Codex uses for this session",
-    category: "model",
-    type: "select",
-    currentValue: current
-  };
-  if (gatewayGroups.length === 0)
-    return { ...base, options };
-  const owner = new Map;
-  for (const group of gatewayGroups)
-    for (const id of group.modelIds)
-      owner.set(id, group.id);
-  const native = options.filter((option) => !owner.has(option.value));
-  return {
-    ...base,
-    options: [
-      { groupId: "codex", name: "Codex", options: native },
-      ...gatewayGroups.map((group) => ({ groupId: group.id, name: group.name, options: options.filter((option) => owner.get(option.value) === group.id) }))
-    ]
-  };
-}
-function effortConfigOption(efforts, current) {
-  const options = efforts.map((option) => ({
-    value: option.reasoningEffort,
-    name: capitalize(option.reasoningEffort),
-    description: option.description || null
-  }));
-  if (!options.some((option) => option.value === current)) {
-    options.unshift({ value: current, name: capitalize(current), description: null });
-  }
-  return {
-    configId: EFFORT_CONFIG_ID,
-    name: "Reasoning effort",
-    description: "How much reasoning effort the model should use",
-    category: "thought_level",
-    type: "select",
-    currentValue: current,
-    options
-  };
-}
-function fastModeConfigOption(enabled) {
-  return {
-    configId: FAST_MODE_CONFIG_ID,
-    name: "Fast mode",
-    description: "1.5x speed, increased usage",
-    category: "model_config",
-    type: "boolean",
-    currentValue: enabled
-  };
-}
-var DEFAULT_COLLABORATION_MODE = "default";
-var PLAN_COLLABORATION_MODE = "plan";
-function collaborationModeConfigOption(current) {
-  return {
-    configId: COLLABORATION_MODE_CONFIG_ID,
-    name: "Collaboration mode",
-    description: "How Codex collaborates on subsequent turns",
-    category: "model_config",
-    type: "select",
-    currentValue: current,
-    options: [
-      { value: DEFAULT_COLLABORATION_MODE, name: "Default", description: "Make changes directly" },
-      { value: PLAN_COLLABORATION_MODE, name: "Plan", description: "Plan before making changes" }
-    ]
-  };
-}
-function parseCollaborationMode(value) {
-  if (value === DEFAULT_COLLABORATION_MODE)
-    return DEFAULT_COLLABORATION_MODE;
-  if (value === PLAN_COLLABORATION_MODE)
-    return PLAN_COLLABORATION_MODE;
-  return;
-}
-function capitalize(value) {
-  return value.length === 0 ? value : value[0].toUpperCase() + value.slice(1);
-}
+// src/agent/providers.ts
+import { readFileSync } from "fs";
+import os from "os";
+import path4 from "path";
 
 // src/permissions/json.ts
 function isRecord2(value) {
@@ -24362,2278 +24234,2424 @@ function normalizeJsonObject(value) {
   return Object.fromEntries(Object.entries(value).filter(([, nested]) => nested !== undefined).map(([key, nested]) => [key, normalizeJsonValue(nested)]));
 }
 
-// src/permissions/commandDecisions.ts
-function availableCommandDecisions(params) {
-  if (params.availableDecisions === undefined || params.availableDecisions === null) {
-    return defaultDecisions(params);
-  }
-  if (!Array.isArray(params.availableDecisions) || params.availableDecisions.length === 0)
-    return;
-  const decisions = [];
-  for (const candidate of params.availableDecisions) {
-    const decision = parseDecision(candidate, params);
-    if (!decision)
-      return;
-    decisions.push(decision);
-  }
-  return decisions;
+// src/agent/providers.ts
+var OPENAI_PROVIDER_ID = "openai";
+var GATEWAY_MODEL_PROVIDER = "custom-gateway";
+var DEFAULT_OPENAI_BASE_URL = "https://api.openai.com/v1";
+var NATIVE_GROUP_ID = "chatgpt";
+var NATIVE_GROUP_NAME = "ChatGPT";
+var GATEWAY_ID_PATTERN = /^[a-z0-9-]+$/;
+function gatewayModelId(connectionId, modelId) {
+  return `gateway:${encodeURIComponent(connectionId)}:${encodeURIComponent(modelId)}`;
 }
-function defaultDecisions(params) {
-  if (params.networkApprovalContext) {
-    const decisions2 = ["accept", "acceptForSession"];
-    for (const amendment of params.proposedNetworkPolicyAmendments ?? []) {
-      decisions2.push({ applyNetworkPolicyAmendment: { network_policy_amendment: amendment } });
-    }
-    decisions2.push("decline", "cancel");
-    return decisions2;
-  }
-  if (params.additionalPermissions)
-    return ["accept", "cancel"];
-  const decisions = ["accept", "acceptForSession"];
-  if (params.proposedExecpolicyAmendment && params.proposedExecpolicyAmendment.length > 0) {
-    decisions.push({ acceptWithExecpolicyAmendment: { execpolicy_amendment: params.proposedExecpolicyAmendment } });
+
+class ProviderRouting {
+  baseConfig;
+  configuredProvider;
+  gateways = new Map;
+  constructor(baseConfig, configuredProvider) {
+    this.baseConfig = baseConfig;
+    this.configuredProvider = configuredProvider;
   }
-  decisions.push("decline", "cancel");
-  return decisions;
-}
-function parseDecision(candidate, params) {
-  if (candidate === "accept" || candidate === "acceptForSession" || candidate === "decline" || candidate === "cancel") {
-    return candidate;
+  copy() {
+    const copy = new ProviderRouting(this.baseConfig, this.configuredProvider);
+    copy.gateways = new Map(this.gateways);
+    return copy;
   }
-  if (!isRecord2(candidate))
-    return;
-  if ("acceptWithExecpolicyAmendment" in candidate) {
-    const value = candidate["acceptWithExecpolicyAmendment"];
-    if (!isRecord2(value))
-      return;
-    const amendment = value["execpolicy_amendment"];
-    if (!isStringArray(amendment) || amendment.length === 0)
-      return;
-    if (!sameStrings(amendment, params.proposedExecpolicyAmendment))
-      return;
-    return { acceptWithExecpolicyAmendment: { execpolicy_amendment: [...amendment] } };
+  get active() {
+    return this.gateways.values().next().value ?? null;
   }
-  if ("applyNetworkPolicyAmendment" in candidate) {
-    const value = candidate["applyNetworkPolicyAmendment"];
-    if (!isRecord2(value))
-      return;
-    const amendment = parseNetworkAmendment(value["network_policy_amendment"]);
-    if (!amendment || !params.networkApprovalContext)
-      return;
-    if (amendment.host !== params.networkApprovalContext.host)
-      return;
-    const proposed = params.proposedNetworkPolicyAmendments ?? [];
-    if (!proposed.some((entry) => entry.host === amendment.host && entry.action === amendment.action))
-      return;
-    return { applyNetworkPolicyAmendment: { network_policy_amendment: amendment } };
+  gateway(id) {
+    return id === null ? null : this.gateways.get(id) ?? null;
   }
-  return;
-}
-function parseNetworkAmendment(value) {
-  if (!isRecord2(value) || typeof value["host"] !== "string")
-    return;
-  const action = value["action"];
-  if (action !== "allow" && action !== "deny")
-    return;
-  return { host: value["host"], action };
-}
-function isStringArray(value) {
-  return Array.isArray(value) && value.every((entry) => typeof entry === "string");
-}
-function sameStrings(left, right) {
-  return !!right && left.length === right.length && left.every((value, index) => value === right[index]);
-}
-function renderExecPolicyPrefix(command) {
-  const script = extractWrappedScript(command);
-  if (script !== undefined)
-    return script;
-  if (command.some((value) => value.includes("\x00")))
-    return command.join(" ");
-  return command.map(shlexQuote).join(" ");
-}
-function extractWrappedScript(command) {
-  const executable = executableName(command[0]);
-  if ((executable === "bash" || executable === "zsh" || executable === "sh") && command.length === 3 && (command[1] === "-lc" || command[1] === "-c")) {
-    return command[2];
+  hasGateway(id) {
+    return id !== null && this.gateways.has(id);
   }
-  if (executable !== "pwsh" && executable !== "powershell")
-    return;
-  const allowedFlags = new Set(["-nologo", "-noprofile", "-command", "-c"]);
-  for (let index = 1;index + 1 < command.length; index++) {
-    const flag = command[index]?.toLowerCase();
-    if (flag === undefined || !allowedFlags.has(flag))
-      return;
-    if (flag === "-command" || flag === "-c")
-      return command[index + 1];
+  list() {
+    const first = this.active;
+    const routed = first !== null && first.mode === "route";
+    const summary = (gateway) => ({ id: gateway.id, name: gateway.name, baseUrl: gateway.baseUrl, models: gateway.models.map((model) => model.id) });
+    return {
+      providers: [{
+        providerId: OPENAI_PROVIDER_ID,
+        supported: ["openai"],
+        required: false,
+        current: routed && first ? { apiType: "openai", baseUrl: first.baseUrl } : { apiType: "openai", baseUrl: this.nativeBaseUrl() },
+        ...first && !routed ? { _meta: { codex: { mode: "catalog", gateway: summary(first), gateways: [...this.gateways.values()].map(summary) } } } : {}
+      }]
+    };
   }
-  return;
-}
-function executableName(command) {
-  let filename = command?.replaceAll("\\", "/").split("/").at(-1);
-  while (filename !== undefined) {
-    if (["bash", "zsh", "sh", "pwsh", "powershell"].includes(filename))
-      return filename;
-    const dot = filename.lastIndexOf(".");
-    if (dot <= 0)
-      return;
-    filename = filename.slice(0, dot);
+  set(request) {
+    if (request.providerId !== OPENAI_PROVIDER_ID) {
+      throw RequestError.invalidParams({ providerId: request.providerId }, `Unknown providerId "${request.providerId}"; only "${OPENAI_PROVIDER_ID}" is configurable`);
+    }
+    if (request.apiType !== "openai") {
+      throw RequestError.invalidParams({ apiType: request.apiType }, `Codex only speaks the OpenAI protocol; got apiType "${request.apiType}"`);
+    }
+    const baseUrl = typeof request.baseUrl === "string" ? request.baseUrl.trim() : "";
+    if (!/^https?:\/\//.test(baseUrl)) {
+      throw RequestError.invalidParams({ baseUrl: request.baseUrl }, "baseUrl must be an http(s) URL");
+    }
+    const hints = readHints(request._meta);
+    if (hints.id === OPENAI_PROVIDER_ID || hints.id === this.configuredProvider) {
+      throw RequestError.invalidParams({ id: hints.id }, `_meta.codex.id "${hints.id}" is Codex's own provider; pick another gateway id`);
+    }
+    if (hints.mode === "route" || this.mode !== hints.mode)
+      this.gateways.clear();
+    this.gateways.set(hints.id, {
+      id: hints.id,
+      baseUrl,
+      headers: { ...request.headers ?? {} },
+      name: hints.name ?? "Client-configured gateway",
+      models: hints.models,
+      model: hints.model,
+      bearerToken: hints.bearerToken,
+      config: hints.config,
+      mode: hints.mode,
+      catalogEntries: hints.catalogEntries
+    });
   }
-  return;
-}
-function shlexQuote(value) {
-  if (value.length === 0)
-    return "''";
-  if (/^[0-9A-Za-z+\-./:@_]+$/.test(value))
-    return value;
-  if (!value.includes("'"))
-    return `'${value}'`;
-  return `"${value.replace(/["\\$`!]/g, "\\$&")}"`;
-}
-
-// src/permissions/options.ts
-var OptionId = {
-  AllowOnce: "allow_once",
-  AllowForSession: "allow_for_session",
-  Decline: "decline",
-  Cancel: "cancel",
-  AcceptWithExecpolicyAmendment: "accept_execpolicy_amendment",
-  ApplyNetworkPolicyAmendment: "apply_network_policy_amendment",
-  AllowPermissionsForTurn: "allow_permissions_turn",
-  AllowPermissionsForTurnStrict: "allow_permissions_turn_strict_auto_review",
-  AllowPermissionsForSession: "allow_permissions_session",
-  RejectPermissions: "reject_permissions"
-};
-function commandDecisionOptions(params) {
-  const decisions = availableCommandDecisions(params);
-  if (!decisions)
-    return;
-  const options = [];
-  let networkIndex = 0;
-  for (const decision of decisions) {
-    if (decision === "accept") {
-      options.push(decisionOption(OptionId.AllowOnce, params.networkApprovalContext ? "Yes, just this once" : "Yes, proceed", "allow_once", decision));
-    } else if (decision === "acceptForSession") {
-      const name = params.networkApprovalContext ? "Yes, and allow this host for this conversation" : params.additionalPermissions ? "Yes, and allow these permissions for this session" : "Yes, and don't ask again for this command in this session";
-      options.push(decisionOption(OptionId.AllowForSession, name, "allow_always", decision));
-    } else if (decision === "decline") {
-      options.push(decisionOption(OptionId.Decline, "No, continue without running it", "reject_once", decision));
-    } else if (decision === "cancel") {
-      options.push(decisionOption(OptionId.Cancel, "No, and tell Codex what to do differently", "reject_once", decision));
-    } else if ("acceptWithExecpolicyAmendment" in decision) {
-      const prefix = renderExecPolicyPrefix(decision.acceptWithExecpolicyAmendment.execpolicy_amendment);
-      if (prefix.includes(`
-`) || prefix.includes("\r"))
-        continue;
-      options.push(decisionOption(OptionId.AcceptWithExecpolicyAmendment, `Yes, and don't ask again for commands that start with \`${prefix}\``, "allow_always", decision));
-    } else {
-      const amendment = decision.applyNetworkPolicyAmendment.network_policy_amendment;
-      options.push(decisionOption(`${OptionId.ApplyNetworkPolicyAmendment}:${networkIndex++}`, amendment.action === "allow" ? "Yes, and allow this host in the future" : "No, and block this host in the future", amendment.action === "allow" ? "allow_always" : "reject_always", decision));
+  get mode() {
+    return this.active?.mode ?? "route";
+  }
+  gatewayFor(modelId) {
+    for (const gateway of this.gateways.values()) {
+      if (gateway.models.some((model) => (this.mode === "catalog" ? gatewayModelId(gateway.id, model.id) : model.id) === modelId))
+        return gateway;
     }
+    return null;
   }
-  const ordered = [...options].sort((left, right) => order(left.option) - order(right.option));
-  const hasAllow = ordered.some(({ option }) => option.kind === "allow_once" || option.kind === "allow_always");
-  const hasReject = ordered.some(({ option }) => option.kind === "reject_once" || option.kind === "reject_always");
-  const ids = ordered.map(({ option }) => option.optionId);
-  return hasAllow && hasReject && new Set(ids).size === ids.length ? ordered : undefined;
-}
-function order(option) {
-  if (option.kind === "allow_once")
-    return 0;
-  if (option.kind === "allow_always")
-    return 1;
-  return 2;
-}
-function fileChangeDecisionOptions() {
-  return [
-    decisionOption(OptionId.AllowOnce, "Yes, proceed", "allow_once", "accept"),
-    decisionOption(OptionId.AllowForSession, "Yes, and don't ask again for these files", "allow_always", "acceptForSession"),
-    decisionOption(OptionId.Cancel, "No, and tell Codex what to do differently", "reject_once", "cancel")
-  ];
-}
-function permissionProfileOptions() {
-  return [
-    permissionOption(OptionId.AllowPermissionsForTurn, "Yes, grant these permissions for this turn", "allow_once"),
-    permissionOption(OptionId.AllowPermissionsForTurnStrict, "Yes, grant for this turn with strict auto review", "allow_once"),
-    permissionOption(OptionId.AllowPermissionsForSession, "Yes, grant these permissions for this session", "allow_always"),
-    permissionOption(OptionId.RejectPermissions, "No, continue without permissions", "reject_once")
-  ];
-}
-function decisionOption(optionId, name, kind, decision) {
-  return { option: permissionOption(optionId, name, kind), decision };
-}
-function permissionOption(optionId, name, kind, description) {
-  return { optionId, name, kind, ...description ? { _meta: { codex: { description } } } : {} };
-}
-function selectedDecision(response, decisions) {
-  if (response.outcome.outcome !== "selected")
-    return;
-  const optionId = response.outcome.optionId;
-  return decisions.find(({ option }) => option.optionId === optionId)?.decision;
-}
-
-// src/permissions/presentation.ts
-var COMMAND_TITLE = "Run command?";
-var NETWORK_TITLE = "Allow network access?";
-var FILE_CHANGE_TITLE = "Make edits?";
-var PERMISSIONS_TITLE = "Grant permissions?";
-function commandSubject(params) {
-  const network = params.networkApprovalContext;
-  const rawInput = {
-    ...params.command ? { command: stripShellPrefix(params.command) } : {},
-    ...params.cwd ? { cwd: params.cwd } : {},
-    ...network?.protocol === "http" || network?.protocol === "https" ? { url: `${network.protocol}://${network.host}` } : {},
-    ...params.additionalPermissions ? { additionalPermissions: params.additionalPermissions } : {}
-  };
-  const content = [];
-  if (network)
-    content.push(text(`${network.protocol} access to ${network.host}`));
-  if (params.additionalPermissions)
-    content.push(...profileContent(params.additionalPermissions));
-  const locations = unique([...commandActionPaths(params.commandActions), ...profilePaths(params.additionalPermissions)]);
-  return {
-    toolCallId: params.itemId,
-    name: ToolName.Shell,
-    kind: "execute",
-    status: "pending",
-    title: network ? `${network.protocol} network access to ${network.host}` : commandTitle(params.command, params.commandActions),
-    ...Object.keys(rawInput).length > 0 ? { rawInput } : {},
-    ...locations.length > 0 ? { locations: locations.map((path4) => ({ path: path4 })) } : {},
-    ...content.length > 0 ? { content } : {}
-  };
-}
-function fileChangeSubject(params, item) {
-  const paths = item ? changePaths(item.changes) : [];
-  return {
-    toolCallId: params.itemId,
-    name: ToolName.ApplyPatch,
-    kind: "edit",
-    status: "pending",
-    title: paths.length === 1 ? `Edit ${paths[0]}` : paths.length > 1 ? `Edit ${paths.length} files` : "Edit files",
-    ...paths.length > 0 ? { locations: paths.map((path4) => ({ path: path4 })) } : {},
-    ...item ? { content: item.changes.map(diffContent) } : {},
-    ...params.grantRoot ? { rawInput: { grantRoot: params.grantRoot } } : {}
-  };
-}
-function permissionsSubject(itemId, cwd, environmentId, permissions) {
-  const content = profileContent(permissions);
-  const paths = profilePaths(permissions);
-  return {
-    toolCallId: itemId,
-    name: ToolName.Shell,
-    kind: "other",
-    status: "pending",
-    title: "Additional sandbox permissions",
-    rawInput: { permissions, cwd, environmentId },
-    ...paths.length > 0 ? { locations: paths.map((path4) => ({ path: path4 })) } : {},
-    ...content.length > 0 ? { content } : {}
-  };
-}
-function commandTitle(command, actions) {
-  const first = actions?.[0];
-  if (first?.type === "read")
-    return actions?.length === 1 ? `Read ${first.path}` : "Run command with file reads";
-  if (first?.type === "listFiles")
-    return "List files";
-  if (first?.type === "search")
-    return "Search files";
-  return command ? stripShellPrefix(command) : "Run command";
-}
-function profilePaths(permissions) {
-  const fileSystem = permissions?.fileSystem;
-  return unique([
-    ...fileSystem?.read ?? [],
-    ...fileSystem?.write ?? [],
-    ...(fileSystem?.entries ?? []).flatMap((entry) => entry.path.type === "path" ? [entry.path.path] : [])
-  ]);
-}
-function profileContent(permissions) {
-  const lines = [];
-  const networkEnabled = permissions.network?.enabled;
-  if (networkEnabled !== null && networkEnabled !== undefined) {
-    lines.push(networkEnabled ? "Enable network access" : "Disable network access");
+  gatewayIdFor(modelId) {
+    return this.gatewayFor(modelId)?.id ?? null;
+  }
+  isGatewayModel(modelId) {
+    return this.gatewayFor(modelId) !== null;
+  }
+  gatewayGroups() {
+    if (this.mode !== "catalog")
+      return [];
+    return [...this.gateways.values()].filter((gateway) => gateway.models.length > 0).map((gateway) => ({ id: gateway.id, name: gateway.name, modelIds: gateway.models.map((model) => gatewayModelId(gateway.id, model.id)) }));
+  }
+  selectionId(modelId, provider) {
+    return modelId !== null && this.mode === "catalog" && this.hasGateway(provider) ? gatewayModelId(provider, modelId) : modelId;
+  }
+  upstreamModel(selectionId) {
+    if (selectionId === null || !selectionId.startsWith("gateway:"))
+      return selectionId;
+    const gateway = this.gatewayFor(selectionId);
+    const model = gateway?.models.find((model2) => gatewayModelId(gateway.id, model2.id) === selectionId);
+    if (!model)
+      throw RequestError.invalidParams({ model: selectionId }, "The selected provider connection or model is unavailable");
+    return model.id;
+  }
+  disable(request) {
+    if (request.providerId !== OPENAI_PROVIDER_ID)
+      return;
+    const id = readGatewayId(request._meta);
+    if (id === null)
+      this.gateways.clear();
+    else
+      this.gateways.delete(id);
+  }
+  modelProvider() {
+    return this.defaultGatewayId() ?? this.configuredProvider;
+  }
+  routesByDefault() {
+    return this.defaultGatewayId() !== null;
+  }
+  defaultGatewayId() {
+    const first = this.active;
+    return first !== null && first.mode === "route" ? first.id : null;
+  }
+  threadConfig(gatewayId = this.defaultGatewayId()) {
+    const gateway = this.gateway(gatewayId);
+    if (!gateway)
+      return this.baseConfig;
+    return this.applyGateway(this.baseConfig, gateway);
+  }
+  routeConfig(config2, gatewayId) {
+    return this.rebind(config2, this, gatewayId);
+  }
+  overrideKeys() {
+    const keys = new Set;
+    for (const gateway of this.gateways.values())
+      for (const key of Object.keys(gateway.config))
+        keys.add(key);
+    return [...keys];
   }
-  for (const entry of permissions.fileSystem?.entries ?? []) {
-    if (entry.path.type === "glob_pattern")
-      lines.push(`${entry.access} filesystem pattern ${entry.path.pattern}`);
-    else if (entry.path.type === "special")
-      lines.push(`${entry.access} Codex filesystem scope ${JSON.stringify(entry.path.value)}`);
+  rebind(config2, previous, gatewayId = this.defaultGatewayId()) {
+    const next = { ...config2 };
+    for (const key of previous.overrideKeys()) {
+      if (key in this.baseConfig)
+        next[key] = this.baseConfig[key];
+      else
+        delete next[key];
+    }
+    delete next["model_providers"];
+    if (isRecord2(this.baseConfig["model_providers"]))
+      next["model_providers"] = this.baseConfig["model_providers"];
+    const gateway = this.gateway(gatewayId);
+    return gateway ? this.applyGateway(next, gateway) : next;
   }
-  return lines.length > 0 ? [text(lines.join(`
-`))] : [];
-}
-function text(value) {
-  return { type: "content", content: { type: "text", text: value } };
-}
-function unique(values) {
-  return [...new Set(values)];
-}
-
-// src/permissions/ApprovalHandler.ts
-class CodexApprovalHandler {
-  client;
-  turn;
-  signal;
-  constructor(client, turn, signal = () => {
-    return;
-  }) {
-    this.client = client;
-    this.turn = turn;
-    this.signal = signal;
+  applyGateway(config2, gateway) {
+    const existing = isRecord2(config2["model_providers"]) ? config2["model_providers"] : {};
+    const entry = {
+      name: gateway.name,
+      base_url: gateway.baseUrl,
+      wire_api: "responses",
+      http_headers: { "X-Client-Feature-ID": "codex", ...gateway.headers }
+    };
+    if (gateway.bearerToken !== null)
+      entry["experimental_bearer_token"] = gateway.bearerToken;
+    return {
+      ...config2,
+      ...gateway.config,
+      model_providers: { ...existing, [gateway.id]: entry }
+    };
   }
-  async handleCommandExecution(params) {
-    const approvalParams = params;
-    const decisions = commandDecisionOptions(approvalParams);
-    if (!decisions) {
-      logger.log("cancelling command approval: no complete decision set", { itemId: params.itemId });
-      return { decision: "cancel" };
+  catalog(codexCatalog) {
+    const first = this.active;
+    if (first === null)
+      return codexCatalog;
+    if (first.mode === "route") {
+      if (first.models.length === 0)
+        return codexCatalog;
+      return first.models.map((model, index) => gatewayModel(model, index === 0, codexCatalog[0], first.catalogEntries.get(model.id)));
     }
-    try {
-      const response = await this.client.requestPermission({
-        title: params.networkApprovalContext ? NETWORK_TITLE : COMMAND_TITLE,
-        description: nonBlank(params.reason),
-        subject: { type: "tool_call", toolCall: commandSubject(approvalParams) },
-        options: decisions.map(({ option }) => option)
-      }, this.signal());
-      return { decision: selectedDecision(response, decisions) ?? "cancel" };
-    } catch (error40) {
-      logger.error("command approval failed", error40, { itemId: params.itemId });
-      return { decision: "cancel" };
+    const own = [];
+    for (const gateway of this.gateways.values()) {
+      for (const model of gateway.models)
+        own.push({ ...gatewayModel(model, false, codexCatalog[0], gateway.catalogEntries.get(model.id)), id: gatewayModelId(gateway.id, model.id) });
     }
+    return [...codexCatalog, ...own];
   }
-  async handleFileChange(params) {
-    const decisions = fileChangeDecisionOptions();
-    try {
-      const response = await this.client.requestPermission({
-        title: FILE_CHANGE_TITLE,
-        description: nonBlank(params.reason),
-        subject: { type: "tool_call", toolCall: fileChangeSubject(params, this.turn.fileChange(params.itemId)) },
-        options: decisions.map(({ option }) => option)
-      }, this.signal());
-      return { decision: selectedDecision(response, decisions) ?? "cancel" };
-    } catch (error40) {
-      logger.error("file change approval failed", error40, { itemId: params.itemId });
-      return { decision: "cancel" };
+  nativeBaseUrl() {
+    const providers = this.baseConfig["model_providers"];
+    if (this.configuredProvider && isRecord2(providers)) {
+      const entry = providers[this.configuredProvider];
+      const baseUrl = isRecord2(entry) ? entry["base_url"] : undefined;
+      if (typeof baseUrl === "string" && baseUrl.length > 0)
+        return baseUrl;
     }
+    return DEFAULT_OPENAI_BASE_URL;
   }
-  async handlePermissionsRequest(params) {
-    try {
-      const response = await this.client.requestPermission({
-        title: PERMISSIONS_TITLE,
-        description: nonBlank(params.reason),
-        subject: { type: "tool_call", toolCall: permissionsSubject(params.itemId, params.cwd, params.environmentId, params.permissions) },
-        options: permissionProfileOptions()
-      }, this.signal());
-      return permissionsResponse(params.permissions, response);
-    } catch (error40) {
-      logger.error("permissions approval failed", error40, { itemId: params.itemId });
-      return rejected();
+}
+function readHints(meta) {
+  const root = isRecord2(meta) ? meta : {};
+  const alwith = isRecord2(root["alwith"]) ? root["alwith"] : {};
+  const codex = isRecord2(root["codex"]) ? root["codex"] : {};
+  const id = readGatewayId(meta) ?? GATEWAY_MODEL_PROVIDER;
+  const models = [];
+  if (Array.isArray(alwith["models"])) {
+    for (const entry of alwith["models"]) {
+      if (!isRecord2(entry) || typeof entry["id"] !== "string" || entry["id"].length === 0)
+        continue;
+      models.push({
+        id: entry["id"],
+        name: typeof entry["label"] === "string" && entry["label"].length > 0 ? entry["label"] : entry["id"],
+        description: typeof entry["description"] === "string" ? entry["description"] : null
+      });
+    }
+  }
+  const model = typeof alwith["model"] === "string" && alwith["model"].length > 0 ? alwith["model"] : null;
+  const name = typeof codex["name"] === "string" && codex["name"].length > 0 ? codex["name"] : null;
+  const bearerToken = typeof codex["bearerToken"] === "string" && codex["bearerToken"].length > 0 ? codex["bearerToken"] : null;
+  const rawConfig = codex["config"];
+  if (rawConfig !== undefined && !isRecord2(rawConfig)) {
+    throw RequestError.invalidParams({ config: rawConfig }, "_meta.codex.config must be an object of top-level Codex config keys");
+  }
+  const config2 = {};
+  if (isRecord2(rawConfig)) {
+    for (const [key, value] of Object.entries(rawConfig)) {
+      if (key === "model_providers")
+        throw RequestError.invalidParams({ config: rawConfig }, "_meta.codex.config cannot set model_providers; that entry is derived from baseUrl and headers");
+      config2[key] = value;
     }
   }
+  const rawMode = codex["mode"];
+  if (rawMode !== undefined && rawMode !== "route" && rawMode !== "catalog") {
+    throw RequestError.invalidParams({ mode: rawMode }, '_meta.codex.mode must be "route" or "catalog"');
+  }
+  const mode = rawMode === "catalog" ? "catalog" : "route";
+  if (mode === "catalog" && models.length === 0) {
+    throw RequestError.invalidParams(undefined, `_meta.codex.mode "catalog" needs _meta.alwith.models: the models offered next to Codex's`);
+  }
+  const catalogPath = config2["model_catalog_json"];
+  const catalogEntries = typeof catalogPath === "string" ? readCatalogFile(catalogPath) : new Map;
+  return { id, models, model, name, bearerToken, config: config2, mode, catalogEntries };
 }
-function permissionsResponse(permissions, response) {
-  if (response.outcome.outcome !== "selected")
-    return rejected();
-  switch (response.outcome.optionId) {
-    case OptionId.AllowPermissionsForTurn:
-      return { permissions: granted(permissions), scope: "turn", strictAutoReview: false };
-    case OptionId.AllowPermissionsForTurnStrict:
-      return { permissions: granted(permissions), scope: "turn", strictAutoReview: true };
-    case OptionId.AllowPermissionsForSession:
-      return { permissions: granted(permissions), scope: "session", strictAutoReview: false };
-    default:
-      return rejected();
+function readGatewayId(meta) {
+  const root = isRecord2(meta) ? meta : {};
+  const codex = isRecord2(root["codex"]) ? root["codex"] : {};
+  const raw = codex["id"];
+  if (raw === undefined)
+    return null;
+  if (typeof raw !== "string" || !GATEWAY_ID_PATTERN.test(raw)) {
+    throw RequestError.invalidParams({ id: raw }, "_meta.codex.id must match [a-z0-9-]+");
+  }
+  if (raw === NATIVE_GROUP_ID) {
+    throw RequestError.invalidParams({ id: raw }, `_meta.codex.id "${NATIVE_GROUP_ID}" is the native model group`);
+  }
+  return raw;
+}
+function readCatalogFile(catalogPath) {
+  const resolved = catalogPath.startsWith("~/") ? path4.join(os.homedir(), catalogPath.slice(2)) : catalogPath;
+  let parsed;
+  try {
+    parsed = JSON.parse(readFileSync(resolved, "utf8"));
+  } catch (error40) {
+    throw RequestError.invalidParams({ model_catalog_json: catalogPath }, `model_catalog_json could not be read as JSON: ${error40 instanceof Error ? error40.message : String(error40)}`);
+  }
+  const models = isRecord2(parsed) && Array.isArray(parsed["models"]) ? parsed["models"] : null;
+  if (models === null)
+    throw RequestError.invalidParams({ model_catalog_json: catalogPath }, "model_catalog_json must be {models: [...]} as Codex expects");
+  const entries = new Map;
+  for (const entry of models) {
+    if (!isRecord2(entry) || typeof entry["slug"] !== "string")
+      continue;
+    const levels = Array.isArray(entry["supported_reasoning_levels"]) ? entry["supported_reasoning_levels"] : [];
+    const efforts = [];
+    for (const level of levels) {
+      if (!isRecord2(level) || typeof level["effort"] !== "string")
+        continue;
+      efforts.push({ reasoningEffort: level["effort"], description: typeof level["description"] === "string" ? level["description"] : "" });
+    }
+    const modalities = Array.isArray(entry["input_modalities"]) ? entry["input_modalities"].filter((value) => value === "text" || value === "image") : null;
+    entries.set(entry["slug"], {
+      displayName: typeof entry["display_name"] === "string" ? entry["display_name"] : null,
+      description: typeof entry["description"] === "string" ? entry["description"] : null,
+      efforts,
+      defaultEffort: typeof entry["default_reasoning_level"] === "string" ? entry["default_reasoning_level"] : null,
+      inputModalities: modalities
+    });
   }
+  return entries;
+}
+function gatewayModel(model, isDefault, template, entry) {
+  const efforts = entry && entry.efforts.length > 0 ? entry.efforts : template?.supportedReasoningEfforts ?? [];
+  const defaultEffort = entry?.defaultEffort ?? template?.defaultReasoningEffort ?? "medium";
+  return {
+    id: model.id,
+    model: model.id,
+    upgrade: null,
+    upgradeInfo: null,
+    availabilityNux: null,
+    displayName: model.name !== model.id ? model.name : entry?.displayName ?? model.name,
+    description: model.description ?? entry?.description ?? "",
+    modelSpecialty: null,
+    hidden: false,
+    supportedReasoningEfforts: efforts,
+    defaultReasoningEffort: defaultEffort,
+    inputModalities: entry?.inputModalities ?? ["text", "image"],
+    supportsPersonality: false,
+    multiAgentVersion: null,
+    additionalSpeedTiers: [],
+    serviceTiers: [],
+    defaultServiceTier: null,
+    availableAccessPrograms: null,
+    isDefault
+  };
+}
+
+// src/codex/models.ts
+var MODEL_CONFIG_ID = "model";
+var EFFORT_CONFIG_ID = "effort";
+var FAST_MODE_CONFIG_ID = "fast_mode";
+var COLLABORATION_MODE_CONFIG_ID = "collaboration_mode";
+var DEFAULT_EFFORT = "medium";
+var FAST_SERVICE_TIER = "fast";
+function resolveModelSelection(catalog, modelId, effort) {
+  const listed = modelId === null ? undefined : catalog.find((model) => model.id === modelId);
+  if (listed)
+    return { model: listed.id, effort: effort ?? listed.defaultReasoningEffort };
+  if (modelId)
+    return { model: modelId, effort: effort ?? DEFAULT_EFFORT };
+  const fallback = catalog.find((model) => model.isDefault) ?? catalog[0];
+  if (!fallback)
+    throw new Error("Codex did not return any models");
+  return { model: fallback.id, effort: effort ?? fallback.defaultReasoningEffort };
 }
-function granted(permissions) {
-  return {
-    ...permissions.network ? { network: permissions.network } : {},
-    ...permissions.fileSystem ? { fileSystem: permissions.fileSystem } : {}
-  };
+function findModel(catalog, modelId) {
+  return catalog.find((model) => model.id === modelId);
 }
-function rejected() {
-  return { permissions: {}, scope: "turn", strictAutoReview: false };
+function supportedEfforts(model) {
+  return model?.supportedReasoningEfforts ?? [];
 }
-function nonBlank(value) {
-  const trimmed = value?.trim();
-  return trimmed ? trimmed : null;
+function coerceEffort(model, effort) {
+  const options = supportedEfforts(model);
+  if (options.length === 0)
+    return effort;
+  if (options.some((option) => option.reasoningEffort === effort))
+    return effort;
+  return model?.defaultReasoningEffort ?? options[0].reasoningEffort;
 }
-
-// src/permissions/mcp.ts
-var McpOptionId = {
-  AllowOnce: "allow_once",
-  Accept: "accept",
-  AllowSession: "allow_session",
-  AllowAlways: "allow_always",
-  Decline: "decline",
-  Cancel: "cancel"
-};
-function parsePersistOptions(meta) {
-  const result = new Set;
-  if (!isRecord2(meta))
-    return result;
-  const persist = meta["persist"];
-  const values = Array.isArray(persist) ? persist : [persist];
-  if (values.includes("session"))
-    result.add("session");
-  if (values.includes("always"))
-    result.add("always");
-  return result;
+function modelSupportsFast(model) {
+  if (!model)
+    return false;
+  return model.serviceTiers.some((tier) => tier.id === FAST_SERVICE_TIER) || model.additionalSpeedTiers.includes(FAST_SERVICE_TIER);
 }
-function isMcpToolCallApproval(meta) {
-  return isRecord2(meta) && meta["codex_approval_kind"] === "mcp_tool_call";
+function modelSupportsImages(model) {
+  return model?.inputModalities.includes("image") ?? true;
 }
-function mcpPermissionOptions(isToolApproval, persist) {
-  const options = [permissionOption(isToolApproval ? McpOptionId.AllowOnce : McpOptionId.Accept, "Allow", "allow_once", isToolApproval ? "Run the tool and continue." : "Allow this request and continue.")];
-  if (persist.has("session")) {
-    options.push(permissionOption(McpOptionId.AllowSession, "Allow for this session", "allow_always", isToolApproval ? "Run the tool and remember this choice for this session." : "Allow this request and remember this choice for this session."));
-  }
-  if (persist.has("always")) {
-    options.push(permissionOption(McpOptionId.AllowAlways, "Always allow", "allow_always", isToolApproval ? "Run the tool and remember this choice for future tool calls." : "Allow this request and remember this choice for future requests."));
-  }
-  if (!isToolApproval) {
-    options.push(permissionOption(McpOptionId.Decline, "Deny", "reject_once", "Decline this request and continue."));
-  }
-  options.push(permissionOption(McpOptionId.Cancel, "Cancel", "reject_once", isToolApproval ? "Cancel this tool call." : "Cancel this request."));
-  return options;
+function modelLacksReasoning(model) {
+  const options = supportedEfforts(model);
+  return options.length > 0 && options.every((option) => option.reasoningEffort === "none");
 }
-function mcpPermissionRequest(params, context, nextStandaloneToolCallId) {
-  const message = { type: "content", content: { type: "text", text: params.message } };
-  const options = mcpPermissionOptions(context.isToolApproval, context.persistOptions);
-  const title = context.isToolApproval ? `Allow MCP tool call on ${params.serverName}?` : `${params.serverName} requests approval`;
-  if (params.mode === "url") {
-    return {
-      title,
-      description: params.message,
-      subject: {
-        type: "tool_call",
-        toolCall: {
-          toolCallId: `elicitation:${params.elicitationId}`,
-          name: ToolName.Mcp,
-          kind: "fetch",
-          status: "pending",
-          title: `Open ${params.url}`,
-          content: [message],
-          rawInput: { serverName: params.serverName, url: params.url }
-        }
-      },
-      options
-    };
-  }
-  if (context.correlatedCallId !== undefined) {
-    return {
-      title,
-      description: params.message,
-      subject: { type: "tool_call", toolCall: { toolCallId: context.correlatedCallId, status: "pending" } },
-      options
-    };
+function modelConfigOption(catalog, current, gatewayGroups = []) {
+  const visible = catalog.filter((model) => !model.hidden || model.id === current);
+  const options = visible.map((model) => ({
+    value: model.id,
+    name: model.displayName,
+    description: model.description || null
+  }));
+  if (!options.some((option) => option.value === current)) {
+    options.unshift({ value: current, name: current, description: null });
   }
+  const base = {
+    configId: MODEL_CONFIG_ID,
+    name: "Model",
+    description: "Model Codex uses for this session",
+    category: "model",
+    type: "select",
+    currentValue: current
+  };
+  if (gatewayGroups.length === 0)
+    return { ...base, options };
+  const owner = new Map;
+  for (const group of gatewayGroups)
+    for (const id of group.modelIds)
+      owner.set(id, group.id);
+  const native = options.filter((option) => !owner.has(option.value));
   return {
-    title,
-    description: params.message,
-    subject: {
-      type: "tool_call",
-      toolCall: {
-        toolCallId: nextStandaloneToolCallId(),
-        name: ToolName.Mcp,
-        kind: context.isToolApproval ? "execute" : "other",
-        status: "pending",
-        title,
-        content: [message],
-        rawInput: { serverName: params.serverName, schema: params.requestedSchema }
-      }
-    },
-    options
+    ...base,
+    options: [
+      { groupId: NATIVE_GROUP_ID, name: NATIVE_GROUP_NAME, options: native },
+      ...gatewayGroups.map((group) => ({ groupId: group.id, name: group.name, options: options.filter((option) => owner.get(option.value) === group.id) }))
+    ]
   };
 }
-function mcpPermissionResponse(response, isToolApproval, persist) {
-  if (response.outcome.outcome !== "selected")
-    return cancelled();
-  switch (response.outcome.optionId) {
-    case McpOptionId.AllowSession:
-      return persist.has("session") ? accepted({ persist: "session" }) : cancelled();
-    case McpOptionId.AllowAlways:
-      return persist.has("always") ? accepted({ persist: "always" }) : cancelled();
-    case McpOptionId.AllowOnce:
-      return isToolApproval ? accepted(null) : cancelled();
-    case McpOptionId.Accept:
-      return isToolApproval ? cancelled() : accepted(null);
-    case McpOptionId.Decline:
-      return isToolApproval ? cancelled() : { action: "decline", content: null, _meta: null };
-    default:
-      return cancelled();
+function effortConfigOption(efforts, current) {
+  const options = efforts.map((option) => ({
+    value: option.reasoningEffort,
+    name: capitalize(option.reasoningEffort),
+    description: option.description || null
+  }));
+  if (!options.some((option) => option.value === current)) {
+    options.unshift({ value: current, name: capitalize(current), description: null });
   }
+  return {
+    configId: EFFORT_CONFIG_ID,
+    name: "Reasoning effort",
+    description: "How much reasoning effort the model should use",
+    category: "thought_level",
+    type: "select",
+    currentValue: current,
+    options
+  };
 }
-function accepted(meta) {
-  return { action: "accept", content: null, _meta: meta };
-}
-function cancelled() {
-  return { action: "cancel", content: null, _meta: null };
+function fastModeConfigOption(enabled) {
+  return {
+    configId: FAST_MODE_CONFIG_ID,
+    name: "Fast mode",
+    description: "1.5x speed, increased usage",
+    category: "model_config",
+    type: "boolean",
+    currentValue: enabled
+  };
 }
-
-// src/permissions/ElicitationHandler.ts
-var OTHER_SUFFIX = "__other";
-
-class CodexElicitationHandler {
-  client;
-  turn;
-  signal;
-  pendingUrlElicitations = new Set;
-  constructor(client, turn, signal = () => {
-    return;
-  }) {
-    this.client = client;
-    this.turn = turn;
-    this.signal = signal;
-  }
-  async observe(notification) {
-    if (notification.method !== "serverRequest/resolved")
-      return;
-    const ids = [...this.pendingUrlElicitations];
-    this.pendingUrlElicitations.clear();
-    for (const elicitationId of ids) {
-      await this.client.completeElicitation(elicitationId);
-    }
-  }
-  async handleElicitation(params) {
-    try {
-      if (params.mode === "openai/userVerification") {
-        logger.log("MCP user verification is not supported over ACP", { server: params.serverName });
-        return cancelled();
-      }
-      const context = this.mcpContext(params);
-      const messageOnly = isMessageOnlyForm(params);
-      if (!messageOnly && this.useAcpElicitation(params)) {
-        const response2 = await this.client.createElicitation(this.elicitationRequest(params, context), this.signal());
-        const result2 = convertMcpElicitationResponse(response2, context);
-        if (params.mode === "url" && result2.action === "accept")
-          this.pendingUrlElicitations.add(params.elicitationId);
-        if (result2.action === "accept")
-          await this.markCorrelatedCallRunning(context);
-        return result2;
-      }
-      if (params.mode !== "url" && !messageOnly) {
-        return cancelled();
-      }
-      const request = mcpPermissionRequest(params, context, () => this.turn.nextStandaloneToolCallId(params.serverName));
-      const response = await this.client.requestPermission(request, this.signal());
-      const result = mcpPermissionResponse(response, context.isToolApproval, context.persistOptions);
-      if (result.action === "accept")
-        await this.markCorrelatedCallRunning(context);
-      return result;
-    } catch (error40) {
-      logger.error("MCP elicitation failed", error40, { server: params.serverName });
-      return cancelled();
-    }
+var DEFAULT_COLLABORATION_MODE = "default";
+var PLAN_COLLABORATION_MODE = "plan";
+function collaborationModeConfigOption(current) {
+  return {
+    configId: COLLABORATION_MODE_CONFIG_ID,
+    name: "Collaboration mode",
+    description: "How Codex collaborates on subsequent turns",
+    category: "model_config",
+    type: "select",
+    currentValue: current,
+    options: [
+      { value: DEFAULT_COLLABORATION_MODE, name: "Default", description: "Make changes directly" },
+      { value: PLAN_COLLABORATION_MODE, name: "Plan", description: "Plan before making changes" }
+    ]
+  };
+}
+function parseCollaborationMode(value) {
+  if (value === DEFAULT_COLLABORATION_MODE)
+    return DEFAULT_COLLABORATION_MODE;
+  if (value === PLAN_COLLABORATION_MODE)
+    return PLAN_COLLABORATION_MODE;
+  return;
+}
+function capitalize(value) {
+  return value.length === 0 ? value : value[0].toUpperCase() + value.slice(1);
+}
+
+// src/permissions/commandDecisions.ts
+function availableCommandDecisions(params) {
+  if (params.availableDecisions === undefined || params.availableDecisions === null) {
+    return defaultDecisions(params);
   }
-  async handleUserInput(params) {
-    if (!this.client.capabilities.formElicitation)
-      return { answers: {} };
-    try {
-      const response = await this.client.createElicitation(userInputRequest(this.client.sessionId, params), this.signal());
-      return convertUserInputResponse(response, params);
-    } catch (error40) {
-      logger.error("user input request failed", error40, { itemId: params.itemId });
-      return { answers: {} };
+  if (!Array.isArray(params.availableDecisions) || params.availableDecisions.length === 0)
+    return;
+  const decisions = [];
+  for (const candidate of params.availableDecisions) {
+    const decision = parseDecision(candidate, params);
+    if (!decision)
+      return;
+    decisions.push(decision);
+  }
+  return decisions;
+}
+function defaultDecisions(params) {
+  if (params.networkApprovalContext) {
+    const decisions2 = ["accept", "acceptForSession"];
+    for (const amendment of params.proposedNetworkPolicyAmendments ?? []) {
+      decisions2.push({ applyNetworkPolicyAmendment: { network_policy_amendment: amendment } });
     }
+    decisions2.push("decline", "cancel");
+    return decisions2;
   }
-  mcpContext(params) {
-    const isToolApproval = isMcpToolCallApproval(params._meta) && isMessageOnlyForm(params);
-    return {
-      isToolApproval,
-      persistOptions: parsePersistOptions(params._meta),
-      correlatedCallId: isToolApproval ? this.turn.popPendingMcpCall(params.serverName) : undefined
-    };
+  if (params.additionalPermissions)
+    return ["accept", "cancel"];
+  const decisions = ["accept", "acceptForSession"];
+  if (params.proposedExecpolicyAmendment && params.proposedExecpolicyAmendment.length > 0) {
+    decisions.push({ acceptWithExecpolicyAmendment: { execpolicy_amendment: params.proposedExecpolicyAmendment } });
   }
-  useAcpElicitation(params) {
-    if (params.mode === "form")
-      return this.client.capabilities.formElicitation;
-    if (params.mode === "url")
-      return this.client.capabilities.urlElicitation;
-    return false;
+  decisions.push("decline", "cancel");
+  return decisions;
+}
+function parseDecision(candidate, params) {
+  if (candidate === "accept" || candidate === "acceptForSession" || candidate === "decline" || candidate === "cancel") {
+    return candidate;
   }
-  elicitationRequest(params, context) {
-    const base = {
-      sessionId: this.client.sessionId,
-      ...context.correlatedCallId ? { toolCallId: context.correlatedCallId } : {},
-      message: params.message,
-      _meta: recordOrNull(params._meta)
-    };
-    if (params.mode === "form") {
-      return { ...base, mode: "form", requestedSchema: normalizeSchema(params.requestedSchema) };
-    }
-    return { ...base, mode: "url", url: params.url, elicitationId: params.elicitationId };
+  if (!isRecord2(candidate))
+    return;
+  if ("acceptWithExecpolicyAmendment" in candidate) {
+    const value = candidate["acceptWithExecpolicyAmendment"];
+    if (!isRecord2(value))
+      return;
+    const amendment = value["execpolicy_amendment"];
+    if (!isStringArray(amendment) || amendment.length === 0)
+      return;
+    if (!sameStrings(amendment, params.proposedExecpolicyAmendment))
+      return;
+    return { acceptWithExecpolicyAmendment: { execpolicy_amendment: [...amendment] } };
   }
-  async markCorrelatedCallRunning(context) {
-    if (context.correlatedCallId === undefined)
+  if ("applyNetworkPolicyAmendment" in candidate) {
+    const value = candidate["applyNetworkPolicyAmendment"];
+    if (!isRecord2(value))
       return;
-    await this.client.update({ sessionUpdate: "tool_call_update", toolCallId: context.correlatedCallId, status: "in_progress" });
+    const amendment = parseNetworkAmendment(value["network_policy_amendment"]);
+    if (!amendment || !params.networkApprovalContext)
+      return;
+    if (amendment.host !== params.networkApprovalContext.host)
+      return;
+    const proposed = params.proposedNetworkPolicyAmendments ?? [];
+    if (!proposed.some((entry) => entry.host === amendment.host && entry.action === amendment.action))
+      return;
+    return { applyNetworkPolicyAmendment: { network_policy_amendment: amendment } };
   }
+  return;
 }
-function isMessageOnlyForm(params) {
-  if (params.mode !== "form" && params.mode !== "openai/form" && params.mode !== "openaiForm")
-    return false;
-  const schema = params.requestedSchema;
-  if (schema === null)
-    return true;
-  if (!isRecord2(schema))
-    return false;
-  return schema["type"] === "object" && isRecord2(schema["properties"]) && Object.keys(schema["properties"]).length === 0;
+function parseNetworkAmendment(value) {
+  if (!isRecord2(value) || typeof value["host"] !== "string")
+    return;
+  const action = value["action"];
+  if (action !== "allow" && action !== "deny")
+    return;
+  return { host: value["host"], action };
 }
-function normalizeSchema(value) {
-  const normalized = normalizeSchemaValue(value);
-  if (!isRecord2(normalized))
-    return { type: "object", properties: {} };
-  return { ...normalized, type: "object" };
+function isStringArray(value) {
+  return Array.isArray(value) && value.every((entry) => typeof entry === "string");
 }
-function normalizeSchemaValue(value) {
-  if (typeof value === "bigint")
-    return Number(value);
-  if (Array.isArray(value))
-    return value.map(normalizeSchemaValue);
-  if (!isRecord2(value))
+function sameStrings(left, right) {
+  return !!right && left.length === right.length && left.every((value, index) => value === right[index]);
+}
+function renderExecPolicyPrefix(command) {
+  const script = extractWrappedScript(command);
+  if (script !== undefined)
+    return script;
+  if (command.some((value) => value.includes("\x00")))
+    return command.join(" ");
+  return command.map(shlexQuote).join(" ");
+}
+function extractWrappedScript(command) {
+  const executable = executableName(command[0]);
+  if ((executable === "bash" || executable === "zsh" || executable === "sh") && command.length === 3 && (command[1] === "-lc" || command[1] === "-c")) {
+    return command[2];
+  }
+  if (executable !== "pwsh" && executable !== "powershell")
+    return;
+  const allowedFlags = new Set(["-nologo", "-noprofile", "-command", "-c"]);
+  for (let index = 1;index + 1 < command.length; index++) {
+    const flag = command[index]?.toLowerCase();
+    if (flag === undefined || !allowedFlags.has(flag))
+      return;
+    if (flag === "-command" || flag === "-c")
+      return command[index + 1];
+  }
+  return;
+}
+function executableName(command) {
+  let filename = command?.replaceAll("\\", "/").split("/").at(-1);
+  while (filename !== undefined) {
+    if (["bash", "zsh", "sh", "pwsh", "powershell"].includes(filename))
+      return filename;
+    const dot = filename.lastIndexOf(".");
+    if (dot <= 0)
+      return;
+    filename = filename.slice(0, dot);
+  }
+  return;
+}
+function shlexQuote(value) {
+  if (value.length === 0)
+    return "''";
+  if (/^[0-9A-Za-z+\-./:@_]+$/.test(value))
     return value;
-  const result = Object.fromEntries(Object.entries(value).filter(([, nested]) => nested !== undefined).map(([key, nested]) => [key, normalizeSchemaValue(nested)]));
-  if (result["type"] === "string" && Array.isArray(result["enum"]) && Array.isArray(result["enumNames"]) && !Array.isArray(result["oneOf"])) {
-    const values = result["enum"];
-    const names = result["enumNames"];
-    result["oneOf"] = values.map((entry, index) => ({ const: String(entry), title: String(names[index] ?? entry) }));
-    delete result["enum"];
-    delete result["enumNames"];
+  if (!value.includes("'"))
+    return `'${value}'`;
+  return `"${value.replace(/["\\$`!]/g, "\\$&")}"`;
+}
+
+// src/permissions/options.ts
+var OptionId = {
+  AllowOnce: "allow_once",
+  AllowForSession: "allow_for_session",
+  Decline: "decline",
+  Cancel: "cancel",
+  AcceptWithExecpolicyAmendment: "accept_execpolicy_amendment",
+  ApplyNetworkPolicyAmendment: "apply_network_policy_amendment",
+  AllowPermissionsForTurn: "allow_permissions_turn",
+  AllowPermissionsForTurnStrict: "allow_permissions_turn_strict_auto_review",
+  AllowPermissionsForSession: "allow_permissions_session",
+  RejectPermissions: "reject_permissions"
+};
+function commandDecisionOptions(params) {
+  const decisions = availableCommandDecisions(params);
+  if (!decisions)
+    return;
+  const options = [];
+  let networkIndex = 0;
+  for (const decision of decisions) {
+    if (decision === "accept") {
+      options.push(decisionOption(OptionId.AllowOnce, params.networkApprovalContext ? "Yes, just this once" : "Yes, proceed", "allow_once", decision));
+    } else if (decision === "acceptForSession") {
+      const name = params.networkApprovalContext ? "Yes, and allow this host for this conversation" : params.additionalPermissions ? "Yes, and allow these permissions for this session" : "Yes, and don't ask again for this command in this session";
+      options.push(decisionOption(OptionId.AllowForSession, name, "allow_always", decision));
+    } else if (decision === "decline") {
+      options.push(decisionOption(OptionId.Decline, "No, continue without running it", "reject_once", decision));
+    } else if (decision === "cancel") {
+      options.push(decisionOption(OptionId.Cancel, "No, and tell Codex what to do differently", "reject_once", decision));
+    } else if ("acceptWithExecpolicyAmendment" in decision) {
+      const prefix = renderExecPolicyPrefix(decision.acceptWithExecpolicyAmendment.execpolicy_amendment);
+      if (prefix.includes(`
+`) || prefix.includes("\r"))
+        continue;
+      options.push(decisionOption(OptionId.AcceptWithExecpolicyAmendment, `Yes, and don't ask again for commands that start with \`${prefix}\``, "allow_always", decision));
+    } else {
+      const amendment = decision.applyNetworkPolicyAmendment.network_policy_amendment;
+      options.push(decisionOption(`${OptionId.ApplyNetworkPolicyAmendment}:${networkIndex++}`, amendment.action === "allow" ? "Yes, and allow this host in the future" : "No, and block this host in the future", amendment.action === "allow" ? "allow_always" : "reject_always", decision));
+    }
   }
-  return result;
+  const ordered = [...options].sort((left, right) => order(left.option) - order(right.option));
+  const hasAllow = ordered.some(({ option }) => option.kind === "allow_once" || option.kind === "allow_always");
+  const hasReject = ordered.some(({ option }) => option.kind === "reject_once" || option.kind === "reject_always");
+  const ids = ordered.map(({ option }) => option.optionId);
+  return hasAllow && hasReject && new Set(ids).size === ids.length ? ordered : undefined;
+}
+function order(option) {
+  if (option.kind === "allow_once")
+    return 0;
+  if (option.kind === "allow_always")
+    return 1;
+  return 2;
+}
+function fileChangeDecisionOptions() {
+  return [
+    decisionOption(OptionId.AllowOnce, "Yes, proceed", "allow_once", "accept"),
+    decisionOption(OptionId.AllowForSession, "Yes, and don't ask again for these files", "allow_always", "acceptForSession"),
+    decisionOption(OptionId.Cancel, "No, and tell Codex what to do differently", "reject_once", "cancel")
+  ];
 }
-function convertMcpElicitationResponse(response, context) {
-  if (CreateElicitationResponse.isAccept(response)) {
-    const content = isRecord2(response.content) ? { ...response.content } : {};
-    const persist = context.isToolApproval ? content["persist"] : undefined;
-    if (context.isToolApproval && !persistAllowed(persist, context.persistOptions))
-      return cancelled();
-    if (persist === "session" || persist === "always" || persist === "once")
-      delete content["persist"];
-    return { action: "accept", content: contentOrNull(content), _meta: responseMeta(response, context, persist) };
-  }
-  if (CreateElicitationResponse.isDecline(response)) {
-    return context.isToolApproval ? { action: "cancel", content: null, _meta: responseMeta(response, context) } : { action: "decline", content: null, _meta: responseMeta(response, context) };
-  }
-  if (CreateElicitationResponse.isCancel(response)) {
-    return { action: "cancel", content: null, _meta: responseMeta(response, context) };
-  }
-  return cancelled();
+function permissionProfileOptions() {
+  return [
+    permissionOption(OptionId.AllowPermissionsForTurn, "Yes, grant these permissions for this turn", "allow_once"),
+    permissionOption(OptionId.AllowPermissionsForTurnStrict, "Yes, grant for this turn with strict auto review", "allow_once"),
+    permissionOption(OptionId.AllowPermissionsForSession, "Yes, grant these permissions for this session", "allow_always"),
+    permissionOption(OptionId.RejectPermissions, "No, continue without permissions", "reject_once")
+  ];
 }
-function persistAllowed(persist, options) {
-  return persist === undefined || persist === "once" || persist === "session" && options.has("session") || persist === "always" && options.has("always");
+function decisionOption(optionId, name, kind, decision) {
+  return { option: permissionOption(optionId, name, kind), decision };
 }
-function contentOrNull(content) {
-  const entries = Object.entries(content);
-  if (entries.length === 0)
-    return null;
-  return Object.fromEntries(entries.map(([key, value]) => [key, normalizeJsonValue(value)]));
+function permissionOption(optionId, name, kind, description) {
+  return { optionId, name, kind, ...description ? { _meta: { codex: { description } } } : {} };
 }
-function responseMeta(response, context, persist) {
-  const source = recordOrNull(response._meta);
-  const meta = source ? normalizeJsonObject(source) : {};
-  if (context.isToolApproval)
-    delete meta["persist"];
-  if (persist === "session" || persist === "always")
-    meta["persist"] = persist;
-  return Object.keys(meta).length === 0 ? null : meta;
+function selectedDecision(response, decisions) {
+  if (response.outcome.outcome !== "selected")
+    return;
+  const optionId = response.outcome.optionId;
+  return decisions.find(({ option }) => option.optionId === optionId)?.decision;
 }
-function userInputRequest(sessionId, params) {
-  const properties = {};
-  const required2 = [];
-  const ids = new Set(params.questions.map((question) => question.id));
-  for (const question of params.questions) {
-    const options = question.options ?? [];
-    const hasOther = question.isOther && options.length > 0;
-    const base = {
-      title: question.header || question.id,
-      description: question.question,
-      _meta: { codex: { isOther: question.isOther, isSecret: question.isSecret } }
-    };
-    if (!hasOther)
-      required2.push(question.id);
-    properties[question.id] = options.length > 0 ? { ...base, type: "string", oneOf: options.map((option) => ({ const: option.label, title: option.label, description: option.description })) } : { ...base, type: "string" };
-    if (hasOther) {
-      properties[otherFieldId(question.id, ids)] = {
-        type: "string",
-        title: "Other",
-        description: "Type your own answer instead of choosing an option above.",
-        _meta: { codex: { questionId: question.id, isOtherAnswer: true, isSecret: question.isSecret } }
-      };
-    }
-  }
-  const first = params.questions[0];
+
+// src/permissions/presentation.ts
+var COMMAND_TITLE = "Run command?";
+var NETWORK_TITLE = "Allow network access?";
+var FILE_CHANGE_TITLE = "Make edits?";
+var PERMISSIONS_TITLE = "Grant permissions?";
+function commandSubject(params) {
+  const network = params.networkApprovalContext;
+  const rawInput = {
+    ...params.command ? { command: stripShellPrefix(params.command) } : {},
+    ...params.cwd ? { cwd: params.cwd } : {},
+    ...network?.protocol === "http" || network?.protocol === "https" ? { url: `${network.protocol}://${network.host}` } : {},
+    ...params.additionalPermissions ? { additionalPermissions: params.additionalPermissions } : {}
+  };
+  const content = [];
+  if (network)
+    content.push(text(`${network.protocol} access to ${network.host}`));
+  if (params.additionalPermissions)
+    content.push(...profileContent(params.additionalPermissions));
+  const locations = unique([...commandActionPaths(params.commandActions), ...profilePaths(params.additionalPermissions)]);
   return {
-    sessionId,
     toolCallId: params.itemId,
-    mode: "form",
-    message: params.questions.length === 1 && first ? first.question : "Input requested",
-    requestedSchema: { type: "object", properties, required: required2 },
-    _meta: { codex: { isBlocking: params.isBlocking } }
+    name: ToolName.Shell,
+    kind: "execute",
+    status: "pending",
+    title: network ? `${network.protocol} network access to ${network.host}` : commandTitle(params.command, params.commandActions),
+    ...Object.keys(rawInput).length > 0 ? { rawInput } : {},
+    ...locations.length > 0 ? { locations: locations.map((path5) => ({ path: path5 })) } : {},
+    ...content.length > 0 ? { content } : {}
   };
 }
-function convertUserInputResponse(response, params) {
-  if (!CreateElicitationResponse.isAccept(response))
-    return { answers: {} };
-  const content = isRecord2(response.content) ? response.content : {};
-  const ids = new Set(params.questions.map((question) => question.id));
-  const answers = {};
-  for (const question of params.questions) {
-    const hasOther = question.isOther && (question.options?.length ?? 0) > 0;
-    const value = (hasOther ? answerValue(content, otherFieldId(question.id, ids)) : undefined) ?? answerValue(content, question.id);
-    if (value === undefined)
-      continue;
-    answers[question.id] = { answers: Array.isArray(value) ? value.map(String) : [String(value)] };
+function fileChangeSubject(params, item) {
+  const paths = item ? changePaths(item.changes) : [];
+  return {
+    toolCallId: params.itemId,
+    name: ToolName.ApplyPatch,
+    kind: "edit",
+    status: "pending",
+    title: paths.length === 1 ? `Edit ${paths[0]}` : paths.length > 1 ? `Edit ${paths.length} files` : "Edit files",
+    ...paths.length > 0 ? { locations: paths.map((path5) => ({ path: path5 })) } : {},
+    ...item ? { content: item.changes.map(diffContent) } : {},
+    ...params.grantRoot ? { rawInput: { grantRoot: params.grantRoot } } : {}
+  };
+}
+function permissionsSubject(itemId, cwd, environmentId, permissions) {
+  const content = profileContent(permissions);
+  const paths = profilePaths(permissions);
+  return {
+    toolCallId: itemId,
+    name: ToolName.Shell,
+    kind: "other",
+    status: "pending",
+    title: "Additional sandbox permissions",
+    rawInput: { permissions, cwd, environmentId },
+    ...paths.length > 0 ? { locations: paths.map((path5) => ({ path: path5 })) } : {},
+    ...content.length > 0 ? { content } : {}
+  };
+}
+function commandTitle(command, actions) {
+  const first = actions?.[0];
+  if (first?.type === "read")
+    return actions?.length === 1 ? `Read ${first.path}` : "Run command with file reads";
+  if (first?.type === "listFiles")
+    return "List files";
+  if (first?.type === "search")
+    return "Search files";
+  return command ? stripShellPrefix(command) : "Run command";
+}
+function profilePaths(permissions) {
+  const fileSystem = permissions?.fileSystem;
+  return unique([
+    ...fileSystem?.read ?? [],
+    ...fileSystem?.write ?? [],
+    ...(fileSystem?.entries ?? []).flatMap((entry) => entry.path.type === "path" ? [entry.path.path] : [])
+  ]);
+}
+function profileContent(permissions) {
+  const lines = [];
+  const networkEnabled = permissions.network?.enabled;
+  if (networkEnabled !== null && networkEnabled !== undefined) {
+    lines.push(networkEnabled ? "Enable network access" : "Disable network access");
   }
-  return { answers };
+  for (const entry of permissions.fileSystem?.entries ?? []) {
+    if (entry.path.type === "glob_pattern")
+      lines.push(`${entry.access} filesystem pattern ${entry.path.pattern}`);
+    else if (entry.path.type === "special")
+      lines.push(`${entry.access} Codex filesystem scope ${JSON.stringify(entry.path.value)}`);
+  }
+  return lines.length > 0 ? [text(lines.join(`
+`))] : [];
 }
-function answerValue(content, fieldId) {
-  const value = content[fieldId];
-  if (typeof value === "string" && value.trim() === "")
-    return;
-  if (Array.isArray(value) && value.length === 0)
-    return;
-  return value;
+function text(value) {
+  return { type: "content", content: { type: "text", text: value } };
 }
-function otherFieldId(questionId, ids) {
-  const base = `${questionId}${OTHER_SUFFIX}`;
-  if (!ids.has(base))
-    return base;
-  let index = 1;
-  while (ids.has(`${base}${index}`))
-    index += 1;
-  return `${base}${index}`;
+function unique(values) {
+  return [...new Set(values)];
 }
 
-// src/permissions/turnContext.ts
-class TurnContext {
-  sessionId;
-  fileChanges = new Map;
-  pendingMcpCalls = new Map;
-  sequence = 0;
-  constructor(sessionId) {
-    this.sessionId = sessionId;
+// src/permissions/ApprovalHandler.ts
+class CodexApprovalHandler {
+  client;
+  turn;
+  signal;
+  constructor(client, turn, signal = () => {
+    return;
+  }) {
+    this.client = client;
+    this.turn = turn;
+    this.signal = signal;
   }
-  observe(notification) {
-    switch (notification.method) {
-      case "item/started":
-        this.itemStarted(notification.params.item);
-        return;
-      case "item/completed":
-        this.itemCompleted(notification.params.item);
-        return;
-      case "turn/completed":
-        this.fileChanges.clear();
-        this.pendingMcpCalls.clear();
-        return;
-      case "serverRequest/resolved":
-        this.pendingMcpCalls.clear();
-        return;
-      default:
-        return;
+  async handleCommandExecution(params) {
+    const approvalParams = params;
+    const decisions = commandDecisionOptions(approvalParams);
+    if (!decisions) {
+      logger.log("cancelling command approval: no complete decision set", { itemId: params.itemId });
+      return { decision: "cancel" };
+    }
+    try {
+      const response = await this.client.requestPermission({
+        title: params.networkApprovalContext ? NETWORK_TITLE : COMMAND_TITLE,
+        description: nonBlank(params.reason),
+        subject: { type: "tool_call", toolCall: commandSubject(approvalParams) },
+        options: decisions.map(({ option }) => option)
+      }, this.signal());
+      return { decision: selectedDecision(response, decisions) ?? "cancel" };
+    } catch (error40) {
+      logger.error("command approval failed", error40, { itemId: params.itemId });
+      return { decision: "cancel" };
     }
   }
-  fileChange(itemId) {
-    return this.fileChanges.get(itemId);
-  }
-  popPendingMcpCall(serverName) {
-    const pending = this.pendingMcpCalls.get(serverName);
-    if (pending?.length !== 1)
-      return;
-    this.pendingMcpCalls.delete(serverName);
-    return pending[0];
-  }
-  nextStandaloneToolCallId(serverName) {
-    this.sequence += 1;
-    return `elicitation:${this.sessionId}:${serverName}:${this.sequence}`;
-  }
-  itemStarted(item) {
-    if (item.type === "fileChange") {
-      this.fileChanges.set(item.id, item);
-    } else if (item.type === "mcpToolCall") {
-      const pending = this.pendingMcpCalls.get(item.server) ?? [];
-      pending.push(item.id);
-      this.pendingMcpCalls.set(item.server, pending);
+  async handleFileChange(params) {
+    const decisions = fileChangeDecisionOptions();
+    try {
+      const response = await this.client.requestPermission({
+        title: FILE_CHANGE_TITLE,
+        description: nonBlank(params.reason),
+        subject: { type: "tool_call", toolCall: fileChangeSubject(params, this.turn.fileChange(params.itemId)) },
+        options: decisions.map(({ option }) => option)
+      }, this.signal());
+      return { decision: selectedDecision(response, decisions) ?? "cancel" };
+    } catch (error40) {
+      logger.error("file change approval failed", error40, { itemId: params.itemId });
+      return { decision: "cancel" };
     }
   }
-  itemCompleted(item) {
-    if (item.type === "fileChange") {
-      this.fileChanges.delete(item.id);
-    } else if (item.type === "mcpToolCall") {
-      const pending = this.pendingMcpCalls.get(item.server);
-      if (!pending)
-        return;
-      const index = pending.indexOf(item.id);
-      if (index >= 0)
-        pending.splice(index, 1);
-      if (pending.length === 0)
-        this.pendingMcpCalls.delete(item.server);
+  async handlePermissionsRequest(params) {
+    try {
+      const response = await this.client.requestPermission({
+        title: PERMISSIONS_TITLE,
+        description: nonBlank(params.reason),
+        subject: { type: "tool_call", toolCall: permissionsSubject(params.itemId, params.cwd, params.environmentId, params.permissions) },
+        options: permissionProfileOptions()
+      }, this.signal());
+      return permissionsResponse(params.permissions, response);
+    } catch (error40) {
+      logger.error("permissions approval failed", error40, { itemId: params.itemId });
+      return rejected();
     }
   }
 }
-
-// node_modules/open/index.js
-import process10 from "process";
-import path5 from "path";
-import { fileURLToPath } from "url";
-import childProcess4 from "child_process";
-import fs6, { constants as fsConstants2 } from "fs/promises";
-
-// node_modules/wsl-utils/index.js
-import path4 from "path";
-import { promisify as promisify2 } from "util";
-import childProcess2 from "child_process";
-import fs5, { constants as fsConstants } from "fs/promises";
-
-// node_modules/is-wsl/index.js
-import process2 from "process";
-import os from "os";
-import fs4 from "fs";
-
-// node_modules/is-inside-container/index.js
-import fs3 from "fs";
-
-// node_modules/is-docker/index.js
-import fs2 from "fs";
-var isDockerCached;
-function hasDockerEnv() {
-  try {
-    fs2.statSync("/.dockerenv");
-    return true;
-  } catch {
-    return false;
+function permissionsResponse(permissions, response) {
+  if (response.outcome.outcome !== "selected")
+    return rejected();
+  switch (response.outcome.optionId) {
+    case OptionId.AllowPermissionsForTurn:
+      return { permissions: granted(permissions), scope: "turn", strictAutoReview: false };
+    case OptionId.AllowPermissionsForTurnStrict:
+      return { permissions: granted(permissions), scope: "turn", strictAutoReview: true };
+    case OptionId.AllowPermissionsForSession:
+      return { permissions: granted(permissions), scope: "session", strictAutoReview: false };
+    default:
+      return rejected();
   }
 }
-function hasDockerCGroup() {
-  try {
-    return fs2.readFileSync("/proc/self/cgroup", "utf8").includes("docker");
-  } catch {
-    return false;
-  }
+function granted(permissions) {
+  return {
+    ...permissions.network ? { network: permissions.network } : {},
+    ...permissions.fileSystem ? { fileSystem: permissions.fileSystem } : {}
+  };
 }
-function isDocker() {
-  if (isDockerCached === undefined) {
-    isDockerCached = hasDockerEnv() || hasDockerCGroup();
-  }
-  return isDockerCached;
+function rejected() {
+  return { permissions: {}, scope: "turn", strictAutoReview: false };
+}
+function nonBlank(value) {
+  const trimmed = value?.trim();
+  return trimmed ? trimmed : null;
 }
 
-// node_modules/is-inside-container/index.js
-var cachedResult;
-var hasContainerEnv = () => {
-  try {
-    fs3.statSync("/run/.containerenv");
-    return true;
-  } catch {
-    return false;
-  }
+// src/permissions/mcp.ts
+var McpOptionId = {
+  AllowOnce: "allow_once",
+  Accept: "accept",
+  AllowSession: "allow_session",
+  AllowAlways: "allow_always",
+  Decline: "decline",
+  Cancel: "cancel"
 };
-function isInsideContainer() {
-  if (cachedResult === undefined) {
-    cachedResult = hasContainerEnv() || isDocker();
-  }
-  return cachedResult;
+function parsePersistOptions(meta) {
+  const result = new Set;
+  if (!isRecord2(meta))
+    return result;
+  const persist = meta["persist"];
+  const values = Array.isArray(persist) ? persist : [persist];
+  if (values.includes("session"))
+    result.add("session");
+  if (values.includes("always"))
+    result.add("always");
+  return result;
 }
-
-// node_modules/is-wsl/index.js
-var isWsl = () => {
-  if (process2.platform !== "linux") {
-    return false;
+function isMcpToolCallApproval(meta) {
+  return isRecord2(meta) && meta["codex_approval_kind"] === "mcp_tool_call";
+}
+function mcpPermissionOptions(isToolApproval, persist) {
+  const options = [permissionOption(isToolApproval ? McpOptionId.AllowOnce : McpOptionId.Accept, "Allow", "allow_once", isToolApproval ? "Run the tool and continue." : "Allow this request and continue.")];
+  if (persist.has("session")) {
+    options.push(permissionOption(McpOptionId.AllowSession, "Allow for this session", "allow_always", isToolApproval ? "Run the tool and remember this choice for this session." : "Allow this request and remember this choice for this session."));
   }
-  if (os.release().toLowerCase().includes("microsoft")) {
-    if (isInsideContainer()) {
-      return false;
-    }
-    return true;
+  if (persist.has("always")) {
+    options.push(permissionOption(McpOptionId.AllowAlways, "Always allow", "allow_always", isToolApproval ? "Run the tool and remember this choice for future tool calls." : "Allow this request and remember this choice for future requests."));
   }
-  try {
-    if (fs4.readFileSync("/proc/version", "utf8").toLowerCase().includes("microsoft")) {
-      return !isInsideContainer();
-    }
-  } catch {}
-  if (fs4.existsSync("/proc/sys/fs/binfmt_misc/WSLInterop") || fs4.existsSync("/run/WSL")) {
-    return !isInsideContainer();
+  if (!isToolApproval) {
+    options.push(permissionOption(McpOptionId.Decline, "Deny", "reject_once", "Decline this request and continue."));
   }
-  return false;
-};
-var is_wsl_default = process2.env.__IS_WSL_TEST__ ? isWsl : isWsl();
-
-// node_modules/wsl-utils/node_modules/powershell-utils/index.js
-import process3 from "process";
-import { Buffer as Buffer2 } from "buffer";
-import { promisify } from "util";
-import childProcess from "child_process";
-var execFile = promisify(childProcess.execFile);
-var powerShellPath = () => `${process3.env.SYSTEMROOT || process3.env.windir || String.raw`C:\Windows`}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;
-var executePowerShell = async (command, options = {}) => {
-  const {
-    powerShellPath: psPath,
-    ...execFileOptions
-  } = options;
-  const encodedCommand = executePowerShell.encodeCommand(command);
-  return execFile(psPath ?? powerShellPath(), [
-    ...executePowerShell.argumentsPrefix,
-    encodedCommand
-  ], {
-    encoding: "utf8",
-    ...execFileOptions
-  });
-};
-executePowerShell.argumentsPrefix = [
-  "-NoProfile",
-  "-NonInteractive",
-  "-ExecutionPolicy",
-  "Bypass",
-  "-EncodedCommand"
-];
-executePowerShell.encodeCommand = (command) => Buffer2.from(command, "utf16le").toString("base64");
-executePowerShell.escapeArgument = (value) => `'${String(value).replaceAll("'", "''")}'`;
-
-// node_modules/wsl-utils/utilities.js
-function parseMountPointFromConfig(content) {
-  for (const line of content.split(`
-`)) {
-    if (/^\s*#/.test(line)) {
-      continue;
-    }
-    const match = /^\s*root\s*=\s*(?<mountPoint>"[^"]*"|'[^']*'|[^#]*)/.exec(line);
-    if (!match) {
-      continue;
-    }
-    return match.groups.mountPoint.trim().replaceAll(/^["']|["']$/g, "");
+  options.push(permissionOption(McpOptionId.Cancel, "Cancel", "reject_once", isToolApproval ? "Cancel this tool call." : "Cancel this request."));
+  return options;
+}
+function mcpPermissionRequest(params, context, nextStandaloneToolCallId) {
+  const message = { type: "content", content: { type: "text", text: params.message } };
+  const options = mcpPermissionOptions(context.isToolApproval, context.persistOptions);
+  const title = context.isToolApproval ? `Allow MCP tool call on ${params.serverName}?` : `${params.serverName} requests approval`;
+  if (params.mode === "url") {
+    return {
+      title,
+      description: params.message,
+      subject: {
+        type: "tool_call",
+        toolCall: {
+          toolCallId: `elicitation:${params.elicitationId}`,
+          name: ToolName.Mcp,
+          kind: "fetch",
+          status: "pending",
+          title: `Open ${params.url}`,
+          content: [message],
+          rawInput: { serverName: params.serverName, url: params.url }
+        }
+      },
+      options
+    };
+  }
+  if (context.correlatedCallId !== undefined) {
+    return {
+      title,
+      description: params.message,
+      subject: { type: "tool_call", toolCall: { toolCallId: context.correlatedCallId, status: "pending" } },
+      options
+    };
+  }
+  return {
+    title,
+    description: params.message,
+    subject: {
+      type: "tool_call",
+      toolCall: {
+        toolCallId: nextStandaloneToolCallId(),
+        name: ToolName.Mcp,
+        kind: context.isToolApproval ? "execute" : "other",
+        status: "pending",
+        title,
+        content: [message],
+        rawInput: { serverName: params.serverName, schema: params.requestedSchema }
+      }
+    },
+    options
+  };
+}
+function mcpPermissionResponse(response, isToolApproval, persist) {
+  if (response.outcome.outcome !== "selected")
+    return cancelled();
+  switch (response.outcome.optionId) {
+    case McpOptionId.AllowSession:
+      return persist.has("session") ? accepted({ persist: "session" }) : cancelled();
+    case McpOptionId.AllowAlways:
+      return persist.has("always") ? accepted({ persist: "always" }) : cancelled();
+    case McpOptionId.AllowOnce:
+      return isToolApproval ? accepted(null) : cancelled();
+    case McpOptionId.Accept:
+      return isToolApproval ? cancelled() : accepted(null);
+    case McpOptionId.Decline:
+      return isToolApproval ? cancelled() : { action: "decline", content: null, _meta: null };
+    default:
+      return cancelled();
   }
 }
+function accepted(meta) {
+  return { action: "accept", content: null, _meta: meta };
+}
+function cancelled() {
+  return { action: "cancel", content: null, _meta: null };
+}
 
-// node_modules/wsl-utils/index.js
-var execFile2 = promisify2(childProcess2.execFile);
-var wslDrivesMountPoint = (() => {
-  const defaultMountPoint = "/mnt/";
-  let mountPoint;
-  return async function() {
-    if (mountPoint) {
-      return mountPoint;
+// src/permissions/ElicitationHandler.ts
+var OTHER_SUFFIX = "__other";
+
+class CodexElicitationHandler {
+  client;
+  turn;
+  signal;
+  pendingUrlElicitations = new Set;
+  constructor(client, turn, signal = () => {
+    return;
+  }) {
+    this.client = client;
+    this.turn = turn;
+    this.signal = signal;
+  }
+  async observe(notification) {
+    if (notification.method !== "serverRequest/resolved")
+      return;
+    const ids = [...this.pendingUrlElicitations];
+    this.pendingUrlElicitations.clear();
+    for (const elicitationId of ids) {
+      await this.client.completeElicitation(elicitationId);
     }
-    const configFilePath = "/etc/wsl.conf";
-    let isConfigFileExists = false;
+  }
+  async handleElicitation(params) {
     try {
-      await fs5.access(configFilePath, fsConstants.F_OK);
-      isConfigFileExists = true;
-    } catch {}
-    if (!isConfigFileExists) {
-      return defaultMountPoint;
-    }
-    const configContent = await fs5.readFile(configFilePath, { encoding: "utf8" });
-    const parsedMountPoint = parseMountPointFromConfig(configContent);
-    if (parsedMountPoint === undefined) {
-      return defaultMountPoint;
+      if (params.mode === "openai/userVerification") {
+        logger.log("MCP user verification is not supported over ACP", { server: params.serverName });
+        return cancelled();
+      }
+      const context = this.mcpContext(params);
+      const messageOnly = isMessageOnlyForm(params);
+      if (!messageOnly && this.useAcpElicitation(params)) {
+        const response2 = await this.client.createElicitation(this.elicitationRequest(params, context), this.signal());
+        const result2 = convertMcpElicitationResponse(response2, context);
+        if (params.mode === "url" && result2.action === "accept")
+          this.pendingUrlElicitations.add(params.elicitationId);
+        if (result2.action === "accept")
+          await this.markCorrelatedCallRunning(context);
+        return result2;
+      }
+      if (params.mode !== "url" && !messageOnly) {
+        return cancelled();
+      }
+      const request = mcpPermissionRequest(params, context, () => this.turn.nextStandaloneToolCallId(params.serverName));
+      const response = await this.client.requestPermission(request, this.signal());
+      const result = mcpPermissionResponse(response, context.isToolApproval, context.persistOptions);
+      if (result.action === "accept")
+        await this.markCorrelatedCallRunning(context);
+      return result;
+    } catch (error40) {
+      logger.error("MCP elicitation failed", error40, { server: params.serverName });
+      return cancelled();
     }
-    mountPoint = parsedMountPoint;
-    mountPoint = mountPoint.endsWith("/") ? mountPoint : `${mountPoint}/`;
-    return mountPoint;
-  };
-})();
-var powerShellPathFromWsl = async () => {
-  const mountPoint = await wslDrivesMountPoint();
-  return `${mountPoint}c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe`;
-};
-var powerShellPath2 = is_wsl_default ? powerShellPathFromWsl : powerShellPath;
-var canAccessPowerShellPromise;
-var canAccessPowerShell = async () => {
-  canAccessPowerShellPromise ??= (async () => {
+  }
+  async handleUserInput(params) {
+    if (!this.client.capabilities.formElicitation)
+      return { answers: {} };
     try {
-      const psPath = await powerShellPath2();
-      await fs5.access(psPath, fsConstants.X_OK);
-      return true;
-    } catch {
-      return false;
-    }
-  })();
-  return canAccessPowerShellPromise;
-};
-var wslDefaultBrowser = async () => {
-  const psPath = await powerShellPath2();
-  const command = String.raw`(Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice").ProgId`;
-  const { stdout } = await executePowerShell(command, {
-    powerShellPath: psPath,
-    cwd: path4.dirname(psPath)
-  });
-  return stdout.trim();
-};
-var isUrl = (path5) => /^[a-z]+:\/\//i.test(path5);
-var convertWslPathToWindows = async (paths) => {
-  const isBatch = Array.isArray(paths);
-  const pathArray = isBatch ? paths : [paths];
-  const indicesToConvert = [];
-  const pathsToConvert = [];
-  for (const [index, path5] of pathArray.entries()) {
-    if (!isUrl(path5)) {
-      indicesToConvert.push(index);
-      pathsToConvert.push(path5);
+      const response = await this.client.createElicitation(userInputRequest(this.client.sessionId, params), this.signal());
+      return convertUserInputResponse(response, params);
+    } catch (error40) {
+      logger.error("user input request failed", error40, { itemId: params.itemId });
+      return { answers: {} };
     }
   }
-  const results = [...pathArray];
-  if (pathsToConvert.length > 0) {
-    try {
-      const { stdout } = await execFile2("wslpath", ["-aw", ...pathsToConvert], { encoding: "utf8" });
-      const convertedPaths = stdout.split(/\r?\n/).filter(Boolean);
-      for (const [index, originalIndex] of indicesToConvert.entries()) {
-        results[originalIndex] = convertedPaths[index] ?? pathArray[originalIndex];
-      }
-    } catch {}
+  mcpContext(params) {
+    const isToolApproval = isMcpToolCallApproval(params._meta) && isMessageOnlyForm(params);
+    return {
+      isToolApproval,
+      persistOptions: parsePersistOptions(params._meta),
+      correlatedCallId: isToolApproval ? this.turn.popPendingMcpCall(params.serverName) : undefined
+    };
   }
-  return isBatch ? results : results[0];
-};
-
-// node_modules/powershell-utils/index.js
-import process4 from "process";
-import { Buffer as Buffer3 } from "buffer";
-import { promisify as promisify3 } from "util";
-import childProcess3 from "child_process";
-var execFile3 = promisify3(childProcess3.execFile);
-var powerShellPath3 = () => `${process4.env.SYSTEMROOT || process4.env.windir || String.raw`C:\Windows`}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;
-var argumentsPrefix = [
-  "-NoProfile",
-  "-NonInteractive",
-  "-ExecutionPolicy",
-  "Bypass",
-  "-EncodedCommand"
-];
-var encodeCommand = (command) => Buffer3.from(command, "utf16le").toString("base64");
-var escapeArgument = (value) => `'${String(value).replaceAll(/['\u2018\u2019\u201A\u201B]/g, (match) => match + match)}'`;
-var createArguments = (command) => [...argumentsPrefix, encodeCommand(command)];
-var createExecFileOptions = (options) => ({
-  encoding: "utf8",
-  ...options,
-  shell: false
-});
-var executePowerShell2 = async (command, options = {}) => {
-  const {
-    powerShellPath: psPath,
-    ...execFileOptions
-  } = options;
-  return execFile3(psPath ?? powerShellPath3(), createArguments(command), createExecFileOptions(execFileOptions));
-};
-executePowerShell2.argumentsPrefix = argumentsPrefix;
-executePowerShell2.encodeCommand = encodeCommand;
-executePowerShell2.escapeArgument = escapeArgument;
-executePowerShell2.createArguments = createArguments;
-
-// node_modules/define-lazy-prop/index.js
-function defineLazyProperty(object2, propertyName, valueGetter) {
-  const define = (value) => Object.defineProperty(object2, propertyName, { value, enumerable: true, writable: true });
-  Object.defineProperty(object2, propertyName, {
-    configurable: true,
-    enumerable: true,
-    get() {
-      const result = valueGetter();
-      define(result);
-      return result;
-    },
-    set(value) {
-      define(value);
+  useAcpElicitation(params) {
+    if (params.mode === "form")
+      return this.client.capabilities.formElicitation;
+    if (params.mode === "url")
+      return this.client.capabilities.urlElicitation;
+    return false;
+  }
+  elicitationRequest(params, context) {
+    const base = {
+      sessionId: this.client.sessionId,
+      ...context.correlatedCallId ? { toolCallId: context.correlatedCallId } : {},
+      message: params.message,
+      _meta: recordOrNull(params._meta)
+    };
+    if (params.mode === "form") {
+      return { ...base, mode: "form", requestedSchema: normalizeSchema(params.requestedSchema) };
     }
-  });
-  return object2;
+    return { ...base, mode: "url", url: params.url, elicitationId: params.elicitationId };
+  }
+  async markCorrelatedCallRunning(context) {
+    if (context.correlatedCallId === undefined)
+      return;
+    await this.client.update({ sessionUpdate: "tool_call_update", toolCallId: context.correlatedCallId, status: "in_progress" });
+  }
+}
+function isMessageOnlyForm(params) {
+  if (params.mode !== "form" && params.mode !== "openai/form" && params.mode !== "openaiForm")
+    return false;
+  const schema = params.requestedSchema;
+  if (schema === null)
+    return true;
+  if (!isRecord2(schema))
+    return false;
+  return schema["type"] === "object" && isRecord2(schema["properties"]) && Object.keys(schema["properties"]).length === 0;
+}
+function normalizeSchema(value) {
+  const normalized = normalizeSchemaValue(value);
+  if (!isRecord2(normalized))
+    return { type: "object", properties: {} };
+  return { ...normalized, type: "object" };
 }
-
-// node_modules/default-browser/index.js
-import { promisify as promisify7 } from "util";
-import process8 from "process";
-import { execFile as execFile7 } from "child_process";
-
-// node_modules/default-browser-id/index.js
-import { promisify as promisify4 } from "util";
-import process5 from "process";
-import { execFile as execFile4 } from "child_process";
-var execFileAsync = promisify4(execFile4);
-async function defaultBrowserId() {
-  if (process5.platform !== "darwin") {
-    throw new Error("macOS only");
+function normalizeSchemaValue(value) {
+  if (typeof value === "bigint")
+    return Number(value);
+  if (Array.isArray(value))
+    return value.map(normalizeSchemaValue);
+  if (!isRecord2(value))
+    return value;
+  const result = Object.fromEntries(Object.entries(value).filter(([, nested]) => nested !== undefined).map(([key, nested]) => [key, normalizeSchemaValue(nested)]));
+  if (result["type"] === "string" && Array.isArray(result["enum"]) && Array.isArray(result["enumNames"]) && !Array.isArray(result["oneOf"])) {
+    const values = result["enum"];
+    const names = result["enumNames"];
+    result["oneOf"] = values.map((entry, index) => ({ const: String(entry), title: String(names[index] ?? entry) }));
+    delete result["enum"];
+    delete result["enumNames"];
   }
-  const { stdout } = await execFileAsync("defaults", ["read", "com.apple.LaunchServices/com.apple.launchservices.secure", "LSHandlers"]);
-  const match = /LSHandlerRoleAll = "(?!-)(?<id>[^"]+?)";\s+?LSHandlerURLScheme = (?:http|https);/.exec(stdout);
-  const browserId = match?.groups.id ?? "com.apple.Safari";
-  if (browserId === "com.apple.safari") {
-    return "com.apple.Safari";
+  return result;
+}
+function convertMcpElicitationResponse(response, context) {
+  if (CreateElicitationResponse.isAccept(response)) {
+    const content = isRecord2(response.content) ? { ...response.content } : {};
+    const persist = context.isToolApproval ? content["persist"] : undefined;
+    if (context.isToolApproval && !persistAllowed(persist, context.persistOptions))
+      return cancelled();
+    if (persist === "session" || persist === "always" || persist === "once")
+      delete content["persist"];
+    return { action: "accept", content: contentOrNull(content), _meta: responseMeta(response, context, persist) };
   }
-  return browserId;
+  if (CreateElicitationResponse.isDecline(response)) {
+    return context.isToolApproval ? { action: "cancel", content: null, _meta: responseMeta(response, context) } : { action: "decline", content: null, _meta: responseMeta(response, context) };
+  }
+  if (CreateElicitationResponse.isCancel(response)) {
+    return { action: "cancel", content: null, _meta: responseMeta(response, context) };
+  }
+  return cancelled();
 }
-
-// node_modules/run-applescript/index.js
-import process6 from "process";
-import { promisify as promisify5 } from "util";
-import { execFile as execFile5, execFileSync } from "child_process";
-var execFileAsync2 = promisify5(execFile5);
-async function runAppleScript(script, { humanReadableOutput = true, signal } = {}) {
-  if (process6.platform !== "darwin") {
-    throw new Error("macOS only");
+function persistAllowed(persist, options) {
+  return persist === undefined || persist === "once" || persist === "session" && options.has("session") || persist === "always" && options.has("always");
+}
+function contentOrNull(content) {
+  const entries = Object.entries(content);
+  if (entries.length === 0)
+    return null;
+  return Object.fromEntries(entries.map(([key, value]) => [key, normalizeJsonValue(value)]));
+}
+function responseMeta(response, context, persist) {
+  const source = recordOrNull(response._meta);
+  const meta = source ? normalizeJsonObject(source) : {};
+  if (context.isToolApproval)
+    delete meta["persist"];
+  if (persist === "session" || persist === "always")
+    meta["persist"] = persist;
+  return Object.keys(meta).length === 0 ? null : meta;
+}
+function userInputRequest(sessionId, params) {
+  const properties = {};
+  const required2 = [];
+  const ids = new Set(params.questions.map((question) => question.id));
+  for (const question of params.questions) {
+    const options = question.options ?? [];
+    const hasOther = question.isOther && options.length > 0;
+    const base = {
+      title: question.header || question.id,
+      description: question.question,
+      _meta: { codex: { isOther: question.isOther, isSecret: question.isSecret } }
+    };
+    if (!hasOther)
+      required2.push(question.id);
+    properties[question.id] = options.length > 0 ? { ...base, type: "string", oneOf: options.map((option) => ({ const: option.label, title: option.label, description: option.description })) } : { ...base, type: "string" };
+    if (hasOther) {
+      properties[otherFieldId(question.id, ids)] = {
+        type: "string",
+        title: "Other",
+        description: "Type your own answer instead of choosing an option above.",
+        _meta: { codex: { questionId: question.id, isOtherAnswer: true, isSecret: question.isSecret } }
+      };
+    }
   }
-  const outputArguments = humanReadableOutput ? [] : ["-ss"];
-  const execOptions = {};
-  if (signal) {
-    execOptions.signal = signal;
+  const first = params.questions[0];
+  return {
+    sessionId,
+    toolCallId: params.itemId,
+    mode: "form",
+    message: params.questions.length === 1 && first ? first.question : "Input requested",
+    requestedSchema: { type: "object", properties, required: required2 },
+    _meta: { codex: { isBlocking: params.isBlocking } }
+  };
+}
+function convertUserInputResponse(response, params) {
+  if (!CreateElicitationResponse.isAccept(response))
+    return { answers: {} };
+  const content = isRecord2(response.content) ? response.content : {};
+  const ids = new Set(params.questions.map((question) => question.id));
+  const answers = {};
+  for (const question of params.questions) {
+    const hasOther = question.isOther && (question.options?.length ?? 0) > 0;
+    const value = (hasOther ? answerValue(content, otherFieldId(question.id, ids)) : undefined) ?? answerValue(content, question.id);
+    if (value === undefined)
+      continue;
+    answers[question.id] = { answers: Array.isArray(value) ? value.map(String) : [String(value)] };
   }
-  const { stdout } = await execFileAsync2("osascript", ["-e", script, outputArguments], execOptions);
-  return stdout.trim();
+  return { answers };
 }
-
-// node_modules/bundle-name/index.js
-async function bundleName(bundleId) {
-  return runAppleScript(`tell application "Finder" to set app_path to application file id "${bundleId}" as string
-tell application "System Events" to get value of property list item "CFBundleName" of property list file (app_path & ":Contents:Info.plist")`);
+function answerValue(content, fieldId) {
+  const value = content[fieldId];
+  if (typeof value === "string" && value.trim() === "")
+    return;
+  if (Array.isArray(value) && value.length === 0)
+    return;
+  return value;
 }
-
-// node_modules/default-browser/windows.js
-import process7 from "process";
-import { promisify as promisify6 } from "util";
-import { execFile as execFile6 } from "child_process";
-var execFileAsync3 = promisify6(execFile6);
-var windowsBrowserProgIds = {
-  MSEdgeHTM: { name: "Edge", id: "com.microsoft.edge" },
-  MSEdgeBHTML: { name: "Edge Beta", id: "com.microsoft.edge.beta" },
-  MSEdgeDHTML: { name: "Edge Dev", id: "com.microsoft.edge.dev" },
-  AppXq0fevzme2pys62n3e0fbqa7peapykr8v: { name: "Edge", id: "com.microsoft.edge.old" },
-  ChromeHTML: { name: "Chrome", id: "com.google.chrome" },
-  ChromeBHTML: { name: "Chrome Beta", id: "com.google.chrome.beta" },
-  ChromeDHTML: { name: "Chrome Dev", id: "com.google.chrome.dev" },
-  ChromiumHTM: { name: "Chromium", id: "org.chromium.Chromium" },
-  BraveHTML: { name: "Brave", id: "com.brave.Browser" },
-  BraveBHTML: { name: "Brave Beta", id: "com.brave.Browser.beta" },
-  BraveDHTML: { name: "Brave Dev", id: "com.brave.Browser.dev" },
-  BraveSSHTM: { name: "Brave Nightly", id: "com.brave.Browser.nightly" },
-  FirefoxURL: { name: "Firefox", id: "org.mozilla.firefox" },
-  OperaStable: { name: "Opera", id: "com.operasoftware.Opera" },
-  VivaldiHTM: { name: "Vivaldi", id: "com.vivaldi.Vivaldi" },
-  "IE.HTTP": { name: "Internet Explorer", id: "com.microsoft.ie" }
-};
-var _windowsBrowserProgIdMap = new Map(Object.entries(windowsBrowserProgIds));
-
-class UnknownBrowserError extends Error {
+function otherFieldId(questionId, ids) {
+  const base = `${questionId}${OTHER_SUFFIX}`;
+  if (!ids.has(base))
+    return base;
+  let index = 1;
+  while (ids.has(`${base}${index}`))
+    index += 1;
+  return `${base}${index}`;
 }
-async function defaultBrowser(_execFileAsync = execFileAsync3) {
-  const regPath = `${process7.env.SYSTEMROOT ?? process7.env.windir ?? "C:\\Windows"}\\System32\\reg.exe`;
-  const { stdout } = await _execFileAsync(regPath, [
-    "QUERY",
-    " HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\http\\UserChoice",
-    "/v",
-    "ProgId"
-  ]);
-  const match = /ProgId\s*REG_SZ\s*(?<id>\S+)/.exec(stdout);
-  if (!match) {
-    throw new UnknownBrowserError(`Cannot find Windows browser in stdout: ${JSON.stringify(stdout)}`);
+
+// src/permissions/turnContext.ts
+class TurnContext {
+  sessionId;
+  fileChanges = new Map;
+  pendingMcpCalls = new Map;
+  sequence = 0;
+  constructor(sessionId) {
+    this.sessionId = sessionId;
+  }
+  observe(notification) {
+    switch (notification.method) {
+      case "item/started":
+        this.itemStarted(notification.params.item);
+        return;
+      case "item/completed":
+        this.itemCompleted(notification.params.item);
+        return;
+      case "turn/completed":
+        this.fileChanges.clear();
+        this.pendingMcpCalls.clear();
+        return;
+      case "serverRequest/resolved":
+        this.pendingMcpCalls.clear();
+        return;
+      default:
+        return;
+    }
+  }
+  fileChange(itemId) {
+    return this.fileChanges.get(itemId);
+  }
+  popPendingMcpCall(serverName) {
+    const pending = this.pendingMcpCalls.get(serverName);
+    if (pending?.length !== 1)
+      return;
+    this.pendingMcpCalls.delete(serverName);
+    return pending[0];
+  }
+  nextStandaloneToolCallId(serverName) {
+    this.sequence += 1;
+    return `elicitation:${this.sessionId}:${serverName}:${this.sequence}`;
+  }
+  itemStarted(item) {
+    if (item.type === "fileChange") {
+      this.fileChanges.set(item.id, item);
+    } else if (item.type === "mcpToolCall") {
+      const pending = this.pendingMcpCalls.get(item.server) ?? [];
+      pending.push(item.id);
+      this.pendingMcpCalls.set(item.server, pending);
+    }
+  }
+  itemCompleted(item) {
+    if (item.type === "fileChange") {
+      this.fileChanges.delete(item.id);
+    } else if (item.type === "mcpToolCall") {
+      const pending = this.pendingMcpCalls.get(item.server);
+      if (!pending)
+        return;
+      const index = pending.indexOf(item.id);
+      if (index >= 0)
+        pending.splice(index, 1);
+      if (pending.length === 0)
+        this.pendingMcpCalls.delete(item.server);
+    }
   }
-  const { id } = match.groups;
-  const dotIndex = id.lastIndexOf(".");
-  const hyphenIndex = id.lastIndexOf("-");
-  const baseIdByDot = dotIndex === -1 ? undefined : id.slice(0, dotIndex);
-  const baseIdByHyphen = hyphenIndex === -1 ? undefined : id.slice(0, hyphenIndex);
-  return windowsBrowserProgIds[id] ?? windowsBrowserProgIds[baseIdByDot] ?? windowsBrowserProgIds[baseIdByHyphen] ?? { name: id, id };
 }
 
-// node_modules/default-browser/index.js
-var execFileAsync4 = promisify7(execFile7);
-var titleize = (string4) => string4.toLowerCase().replaceAll(/(?:^|\s|-)\S/g, (x) => x.toUpperCase());
-async function defaultBrowser2() {
-  if (process8.platform === "darwin") {
-    const id = await defaultBrowserId();
-    const name = await bundleName(id);
-    return { name, id };
+// node_modules/open/index.js
+import process10 from "process";
+import path6 from "path";
+import { fileURLToPath } from "url";
+import childProcess4 from "child_process";
+import fs6, { constants as fsConstants2 } from "fs/promises";
+
+// node_modules/wsl-utils/index.js
+import path5 from "path";
+import { promisify as promisify2 } from "util";
+import childProcess2 from "child_process";
+import fs5, { constants as fsConstants } from "fs/promises";
+
+// node_modules/is-wsl/index.js
+import process2 from "process";
+import os2 from "os";
+import fs4 from "fs";
+
+// node_modules/is-inside-container/index.js
+import fs3 from "fs";
+
+// node_modules/is-docker/index.js
+import fs2 from "fs";
+var isDockerCached;
+function hasDockerEnv() {
+  try {
+    fs2.statSync("/.dockerenv");
+    return true;
+  } catch {
+    return false;
   }
-  if (process8.platform === "linux") {
-    const { stdout } = await execFileAsync4("xdg-mime", ["query", "default", "x-scheme-handler/http"]);
-    const id = stdout.trim();
-    const name = titleize(id.replace(/.desktop$/, "").replace("-", " "));
-    return { name, id };
+}
+function hasDockerCGroup() {
+  try {
+    return fs2.readFileSync("/proc/self/cgroup", "utf8").includes("docker");
+  } catch {
+    return false;
   }
-  if (process8.platform === "win32") {
-    return defaultBrowser();
+}
+function isDocker() {
+  if (isDockerCached === undefined) {
+    isDockerCached = hasDockerEnv() || hasDockerCGroup();
   }
-  throw new Error("Only macOS, Linux, and Windows are supported");
+  return isDockerCached;
 }
 
-// node_modules/is-in-ssh/index.js
-import process9 from "process";
-var isInSsh = Boolean(process9.env.SSH_CONNECTION || process9.env.SSH_CLIENT || process9.env.SSH_TTY);
-var is_in_ssh_default = isInSsh;
-
-// node_modules/open/index.js
-var fallbackAttemptSymbol = Symbol("fallbackAttempt");
-var __dirname2 = import.meta.url ? path5.dirname(fileURLToPath(import.meta.url)) : "";
-var localXdgOpenPath = path5.join(__dirname2, "xdg-open");
-var { platform, arch } = process10;
-var tryEachApp = async (apps, opener) => {
-  if (apps.length === 0) {
-    return;
-  }
-  const errors3 = [];
-  for (const app of apps) {
-    try {
-      return await opener(app);
-    } catch (error40) {
-      errors3.push(error40);
-    }
+// node_modules/is-inside-container/index.js
+var cachedResult;
+var hasContainerEnv = () => {
+  try {
+    fs3.statSync("/run/.containerenv");
+    return true;
+  } catch {
+    return false;
   }
-  throw new AggregateError(errors3, "Failed to open in all supported apps");
 };
-var baseOpen = async (options) => {
-  options = {
-    wait: false,
-    background: false,
-    newInstance: false,
-    allowNonzeroExitCode: false,
-    ...options
-  };
-  const isFallbackAttempt = options[fallbackAttemptSymbol] === true;
-  delete options[fallbackAttemptSymbol];
-  if (Array.isArray(options.app)) {
-    return tryEachApp(options.app, (singleApp) => baseOpen({
-      ...options,
-      app: singleApp,
-      [fallbackAttemptSymbol]: true
-    }));
+function isInsideContainer() {
+  if (cachedResult === undefined) {
+    cachedResult = hasContainerEnv() || isDocker();
   }
-  let { name: app, arguments: appArguments = [] } = options.app ?? {};
-  appArguments = [...appArguments];
-  if (Array.isArray(app)) {
-    return tryEachApp(app, (appName) => baseOpen({
-      ...options,
-      app: {
-        name: appName,
-        arguments: appArguments
-      },
-      [fallbackAttemptSymbol]: true
-    }));
+  return cachedResult;
+}
+
+// node_modules/is-wsl/index.js
+var isWsl = () => {
+  if (process2.platform !== "linux") {
+    return false;
   }
-  if (app === "browser" || app === "browserPrivate") {
-    const ids = {
-      "com.google.chrome": "chrome",
-      "google-chrome.desktop": "chrome",
-      "com.brave.browser": "brave",
-      "org.mozilla.firefox": "firefox",
-      "firefox.desktop": "firefox",
-      "com.microsoft.msedge": "edge",
-      "com.microsoft.edge": "edge",
-      "com.microsoft.edgemac": "edge",
-      "microsoft-edge.desktop": "edge",
-      "com.apple.safari": "safari"
-    };
-    const flags = {
-      chrome: "--incognito",
-      brave: "--incognito",
-      firefox: "--private-window",
-      edge: "--inPrivate"
-    };
-    let browser;
-    if (is_wsl_default) {
-      const progId = await wslDefaultBrowser();
-      const browserInfo = _windowsBrowserProgIdMap.get(progId);
-      browser = browserInfo ?? {};
-    } else {
-      browser = await defaultBrowser2();
-    }
-    if (Object.hasOwn(ids, browser.id)) {
-      const browserName = ids[browser.id.toLowerCase()];
-      if (browserName === undefined) {
-        throw new Error(`${browser.name} is not supported as a default browser`);
-      }
-      if (app === "browserPrivate") {
-        if (browserName === "safari") {
-          throw new Error("Safari doesn't support opening in private mode via command line");
-        }
-        appArguments.push(flags[browserName]);
-      }
-      return baseOpen({
-        ...options,
-        app: {
-          name: apps[browserName],
-          arguments: appArguments
-        }
-      });
+  if (os2.release().toLowerCase().includes("microsoft")) {
+    if (isInsideContainer()) {
+      return false;
     }
-    throw new Error(`${browser.name} is not supported as a default browser`);
-  }
-  let command;
-  const cliArguments = [];
-  const childProcessOptions = {};
-  let shouldUseWindowsInWsl = false;
-  if (is_wsl_default && !isInsideContainer() && !is_in_ssh_default && !app) {
-    shouldUseWindowsInWsl = await canAccessPowerShell();
+    return true;
   }
-  if (platform === "darwin") {
-    command = "open";
-    if (options.wait) {
-      cliArguments.push("--wait-apps");
-    }
-    if (options.background) {
-      cliArguments.push("--background");
-    }
-    if (options.newInstance) {
-      cliArguments.push("--new");
-    }
-    if (app) {
-      cliArguments.push("-a", app);
-    }
-  } else if (platform === "win32" || shouldUseWindowsInWsl) {
-    command = await powerShellPath2();
-    cliArguments.push(...executePowerShell2.argumentsPrefix);
-    if (!is_wsl_default) {
-      childProcessOptions.windowsVerbatimArguments = true;
-    }
-    if (is_wsl_default && options.target) {
-      options.target = await convertWslPathToWindows(options.target);
-    }
-    const encodedArguments = ["$ProgressPreference = 'SilentlyContinue';", "Start"];
-    if (options.wait) {
-      encodedArguments.push("-Wait");
-    }
-    if (app) {
-      encodedArguments.push(executePowerShell2.escapeArgument(app));
-      if (options.target) {
-        appArguments.push(options.target);
-      }
-    } else if (options.target) {
-      encodedArguments.push(executePowerShell2.escapeArgument(options.target));
+  try {
+    if (fs4.readFileSync("/proc/version", "utf8").toLowerCase().includes("microsoft")) {
+      return !isInsideContainer();
     }
-    if (appArguments.length > 0) {
-      appArguments = appArguments.map((argument) => executePowerShell2.escapeArgument(argument));
-      encodedArguments.push("-ArgumentList", appArguments.join(","));
+  } catch {}
+  if (fs4.existsSync("/proc/sys/fs/binfmt_misc/WSLInterop") || fs4.existsSync("/run/WSL")) {
+    return !isInsideContainer();
+  }
+  return false;
+};
+var is_wsl_default = process2.env.__IS_WSL_TEST__ ? isWsl : isWsl();
+
+// node_modules/wsl-utils/node_modules/powershell-utils/index.js
+import process3 from "process";
+import { Buffer as Buffer2 } from "buffer";
+import { promisify } from "util";
+import childProcess from "child_process";
+var execFile = promisify(childProcess.execFile);
+var powerShellPath = () => `${process3.env.SYSTEMROOT || process3.env.windir || String.raw`C:\Windows`}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;
+var executePowerShell = async (command, options = {}) => {
+  const {
+    powerShellPath: psPath,
+    ...execFileOptions
+  } = options;
+  const encodedCommand = executePowerShell.encodeCommand(command);
+  return execFile(psPath ?? powerShellPath(), [
+    ...executePowerShell.argumentsPrefix,
+    encodedCommand
+  ], {
+    encoding: "utf8",
+    ...execFileOptions
+  });
+};
+executePowerShell.argumentsPrefix = [
+  "-NoProfile",
+  "-NonInteractive",
+  "-ExecutionPolicy",
+  "Bypass",
+  "-EncodedCommand"
+];
+executePowerShell.encodeCommand = (command) => Buffer2.from(command, "utf16le").toString("base64");
+executePowerShell.escapeArgument = (value) => `'${String(value).replaceAll("'", "''")}'`;
+
+// node_modules/wsl-utils/utilities.js
+function parseMountPointFromConfig(content) {
+  for (const line of content.split(`
+`)) {
+    if (/^\s*#/.test(line)) {
+      continue;
     }
-    options.target = executePowerShell2.encodeCommand(encodedArguments.join(" "));
-    if (!options.wait) {
-      childProcessOptions.stdio = "ignore";
+    const match = /^\s*root\s*=\s*(?<mountPoint>"[^"]*"|'[^']*'|[^#]*)/.exec(line);
+    if (!match) {
+      continue;
     }
-    if (is_wsl_default) {
-      childProcessOptions.cwd = path5.dirname(command);
+    return match.groups.mountPoint.trim().replaceAll(/^["']|["']$/g, "");
+  }
+}
+
+// node_modules/wsl-utils/index.js
+var execFile2 = promisify2(childProcess2.execFile);
+var wslDrivesMountPoint = (() => {
+  const defaultMountPoint = "/mnt/";
+  let mountPoint;
+  return async function() {
+    if (mountPoint) {
+      return mountPoint;
     }
-  } else {
-    if (app) {
-      command = app;
-    } else {
-      const isBundled = !__dirname2 || __dirname2 === "/";
-      let exeLocalXdgOpen = false;
-      try {
-        await fs6.access(localXdgOpenPath, fsConstants2.X_OK);
-        exeLocalXdgOpen = true;
-      } catch {}
-      const useSystemXdgOpen = process10.versions.electron ?? (platform === "android" || isBundled || !exeLocalXdgOpen);
-      command = useSystemXdgOpen ? "xdg-open" : localXdgOpenPath;
+    const configFilePath = "/etc/wsl.conf";
+    let isConfigFileExists = false;
+    try {
+      await fs5.access(configFilePath, fsConstants.F_OK);
+      isConfigFileExists = true;
+    } catch {}
+    if (!isConfigFileExists) {
+      return defaultMountPoint;
     }
-    if (appArguments.length > 0) {
-      cliArguments.push(...appArguments);
+    const configContent = await fs5.readFile(configFilePath, { encoding: "utf8" });
+    const parsedMountPoint = parseMountPointFromConfig(configContent);
+    if (parsedMountPoint === undefined) {
+      return defaultMountPoint;
     }
-    if (!options.wait) {
-      childProcessOptions.stdio = "ignore";
-      childProcessOptions.detached = true;
+    mountPoint = parsedMountPoint;
+    mountPoint = mountPoint.endsWith("/") ? mountPoint : `${mountPoint}/`;
+    return mountPoint;
+  };
+})();
+var powerShellPathFromWsl = async () => {
+  const mountPoint = await wslDrivesMountPoint();
+  return `${mountPoint}c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe`;
+};
+var powerShellPath2 = is_wsl_default ? powerShellPathFromWsl : powerShellPath;
+var canAccessPowerShellPromise;
+var canAccessPowerShell = async () => {
+  canAccessPowerShellPromise ??= (async () => {
+    try {
+      const psPath = await powerShellPath2();
+      await fs5.access(psPath, fsConstants.X_OK);
+      return true;
+    } catch {
+      return false;
     }
-  }
-  if (platform === "darwin" && appArguments.length > 0) {
-    cliArguments.push("--args", ...appArguments);
-  }
-  if (options.target) {
-    cliArguments.push(options.target);
-  }
-  const subprocess = childProcess4.spawn(command, cliArguments, childProcessOptions);
-  if (options.wait) {
-    return new Promise((resolve, reject) => {
-      subprocess.once("error", reject);
-      subprocess.once("close", (exitCode) => {
-        if (!options.allowNonzeroExitCode && exitCode !== 0) {
-          reject(new Error(`Exited with code ${exitCode}`));
-          return;
-        }
-        resolve(subprocess);
-      });
-    });
-  }
-  if (isFallbackAttempt) {
-    return new Promise((resolve, reject) => {
-      subprocess.once("error", reject);
-      subprocess.once("spawn", () => {
-        subprocess.once("close", (exitCode) => {
-          subprocess.off("error", reject);
-          if (exitCode !== 0) {
-            reject(new Error(`Exited with code ${exitCode}`));
-            return;
-          }
-          subprocess.unref();
-          resolve(subprocess);
-        });
-      });
-    });
-  }
-  subprocess.unref();
-  return new Promise((resolve, reject) => {
-    subprocess.once("error", reject);
-    subprocess.once("spawn", () => {
-      subprocess.off("error", reject);
-      resolve(subprocess);
-    });
-  });
+  })();
+  return canAccessPowerShellPromise;
 };
-var open = (target, options) => {
-  if (typeof target !== "string") {
-    throw new TypeError("Expected a `target`");
-  }
-  return baseOpen({
-    ...options,
-    target
+var wslDefaultBrowser = async () => {
+  const psPath = await powerShellPath2();
+  const command = String.raw`(Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice").ProgId`;
+  const { stdout } = await executePowerShell(command, {
+    powerShellPath: psPath,
+    cwd: path5.dirname(psPath)
   });
+  return stdout.trim();
 };
-function detectArchBinary(binary) {
-  if (typeof binary === "string" || Array.isArray(binary)) {
-    return binary;
-  }
-  const { [arch]: archBinary } = binary;
-  if (!archBinary) {
-    throw new Error(`${arch} is not supported`);
-  }
-  return archBinary;
-}
-function detectPlatformBinary({ [platform]: platformBinary }, { wsl } = {}) {
-  if (wsl && is_wsl_default) {
-    return detectArchBinary(wsl);
+var isUrl = (path6) => /^[a-z]+:\/\//i.test(path6);
+var convertWslPathToWindows = async (paths) => {
+  const isBatch = Array.isArray(paths);
+  const pathArray = isBatch ? paths : [paths];
+  const indicesToConvert = [];
+  const pathsToConvert = [];
+  for (const [index, path6] of pathArray.entries()) {
+    if (!isUrl(path6)) {
+      indicesToConvert.push(index);
+      pathsToConvert.push(path6);
+    }
   }
-  if (!platformBinary) {
-    throw new Error(`${platform} is not supported`);
+  const results = [...pathArray];
+  if (pathsToConvert.length > 0) {
+    try {
+      const { stdout } = await execFile2("wslpath", ["-aw", ...pathsToConvert], { encoding: "utf8" });
+      const convertedPaths = stdout.split(/\r?\n/).filter(Boolean);
+      for (const [index, originalIndex] of indicesToConvert.entries()) {
+        results[originalIndex] = convertedPaths[index] ?? pathArray[originalIndex];
+      }
+    } catch {}
   }
-  return detectArchBinary(platformBinary);
-}
-var apps = {
-  browser: "browser",
-  browserPrivate: "browserPrivate"
+  return isBatch ? results : results[0];
 };
-defineLazyProperty(apps, "chrome", () => detectPlatformBinary({
-  darwin: "google chrome",
-  win32: "chrome",
-  linux: ["google-chrome", "google-chrome-stable", "chromium", "chromium-browser"]
-}, {
-  wsl: {
-    ia32: "/mnt/c/Program Files (x86)/Google/Chrome/Application/chrome.exe",
-    x64: ["/mnt/c/Program Files/Google/Chrome/Application/chrome.exe", "/mnt/c/Program Files (x86)/Google/Chrome/Application/chrome.exe"]
-  }
-}));
-defineLazyProperty(apps, "brave", () => detectPlatformBinary({
-  darwin: "brave browser",
-  win32: "brave",
-  linux: ["brave-browser", "brave"]
-}, {
-  wsl: {
-    ia32: "/mnt/c/Program Files (x86)/BraveSoftware/Brave-Browser/Application/brave.exe",
-    x64: ["/mnt/c/Program Files/BraveSoftware/Brave-Browser/Application/brave.exe", "/mnt/c/Program Files (x86)/BraveSoftware/Brave-Browser/Application/brave.exe"]
-  }
-}));
-defineLazyProperty(apps, "firefox", () => detectPlatformBinary({
-  darwin: "firefox",
-  win32: String.raw`C:\Program Files\Mozilla Firefox\firefox.exe`,
-  linux: "firefox"
-}, {
-  wsl: "/mnt/c/Program Files/Mozilla Firefox/firefox.exe"
-}));
-defineLazyProperty(apps, "edge", () => detectPlatformBinary({
-  darwin: "microsoft edge",
-  win32: "msedge",
-  linux: ["microsoft-edge", "microsoft-edge-dev"]
-}, {
-  wsl: "/mnt/c/Program Files (x86)/Microsoft/Edge/Application/msedge.exe"
-}));
-defineLazyProperty(apps, "safari", () => detectPlatformBinary({
-  darwin: "Safari"
-}));
-var open_default = open;
 
-// src/agent/auth.ts
-var AuthMethodId = {
-  ApiKey: "api-key",
-  ChatGpt: "chat-gpt",
-  ChatGptDeviceCode: "chat-gpt-device-code"
-};
-var CODEX_API_KEY_ENV = "CODEX_API_KEY";
-var OPENAI_API_KEY_ENV = "OPENAI_API_KEY";
-function authMethods(capabilities, env = process.env) {
-  const methods2 = [{
-    type: "agent",
-    methodId: AuthMethodId.ApiKey,
-    name: "API key",
-    description: `Use the API key from ${CODEX_API_KEY_ENV} or ${OPENAI_API_KEY_ENV}, or pass it in _meta["api-key"].apiKey`
-  }];
-  if (!env["NO_BROWSER"]) {
-    methods2.push({
-      type: "agent",
-      methodId: AuthMethodId.ChatGpt,
-      name: "ChatGPT",
-      description: "Sign in to ChatGPT in your browser"
-    });
+// node_modules/powershell-utils/index.js
+import process4 from "process";
+import { Buffer as Buffer3 } from "buffer";
+import { promisify as promisify3 } from "util";
+import childProcess3 from "child_process";
+var execFile3 = promisify3(childProcess3.execFile);
+var powerShellPath3 = () => `${process4.env.SYSTEMROOT || process4.env.windir || String.raw`C:\Windows`}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;
+var argumentsPrefix = [
+  "-NoProfile",
+  "-NonInteractive",
+  "-ExecutionPolicy",
+  "Bypass",
+  "-EncodedCommand"
+];
+var encodeCommand = (command) => Buffer3.from(command, "utf16le").toString("base64");
+var escapeArgument = (value) => `'${String(value).replaceAll(/['\u2018\u2019\u201A\u201B]/g, (match) => match + match)}'`;
+var createArguments = (command) => [...argumentsPrefix, encodeCommand(command)];
+var createExecFileOptions = (options) => ({
+  encoding: "utf8",
+  ...options,
+  shell: false
+});
+var executePowerShell2 = async (command, options = {}) => {
+  const {
+    powerShellPath: psPath,
+    ...execFileOptions
+  } = options;
+  return execFile3(psPath ?? powerShellPath3(), createArguments(command), createExecFileOptions(execFileOptions));
+};
+executePowerShell2.argumentsPrefix = argumentsPrefix;
+executePowerShell2.encodeCommand = encodeCommand;
+executePowerShell2.escapeArgument = escapeArgument;
+executePowerShell2.createArguments = createArguments;
+
+// node_modules/define-lazy-prop/index.js
+function defineLazyProperty(object2, propertyName, valueGetter) {
+  const define = (value) => Object.defineProperty(object2, propertyName, { value, enumerable: true, writable: true });
+  Object.defineProperty(object2, propertyName, {
+    configurable: true,
+    enumerable: true,
+    get() {
+      const result = valueGetter();
+      define(result);
+      return result;
+    },
+    set(value) {
+      define(value);
+    }
+  });
+  return object2;
+}
+
+// node_modules/default-browser/index.js
+import { promisify as promisify7 } from "util";
+import process8 from "process";
+import { execFile as execFile7 } from "child_process";
+
+// node_modules/default-browser-id/index.js
+import { promisify as promisify4 } from "util";
+import process5 from "process";
+import { execFile as execFile4 } from "child_process";
+var execFileAsync = promisify4(execFile4);
+async function defaultBrowserId() {
+  if (process5.platform !== "darwin") {
+    throw new Error("macOS only");
   }
-  if (capabilities.urlElicitation) {
-    methods2.push({
-      type: "agent",
-      methodId: AuthMethodId.ChatGptDeviceCode,
-      name: "ChatGPT (device code)",
-      description: "Sign in to ChatGPT by opening a verification page and entering a one-time code"
-    });
+  const { stdout } = await execFileAsync("defaults", ["read", "com.apple.LaunchServices/com.apple.launchservices.secure", "LSHandlers"]);
+  const match = /LSHandlerRoleAll = "(?!-)(?<id>[^"]+?)";\s+?LSHandlerURLScheme = (?:http|https);/.exec(stdout);
+  const browserId = match?.groups.id ?? "com.apple.Safari";
+  if (browserId === "com.apple.safari") {
+    return "com.apple.Safari";
   }
-  return methods2;
+  return browserId;
 }
-async function login(codex, link, request, requestId, env = process.env) {
-  switch (request.methodId) {
-    case AuthMethodId.ApiKey:
-      return await loginWithApiKey(codex, request, env);
-    case AuthMethodId.ChatGpt:
-      return await loginWithChatGpt(codex);
-    case AuthMethodId.ChatGptDeviceCode:
-      return await loginWithDeviceCode(codex, link, requestId);
-    default:
-      throw RequestError.invalidParams({ methodId: request.methodId }, `Unknown auth method "${request.methodId}"; expected one of ${Object.values(AuthMethodId).join(", ")}`);
+
+// node_modules/run-applescript/index.js
+import process6 from "process";
+import { promisify as promisify5 } from "util";
+import { execFile as execFile5, execFileSync } from "child_process";
+var execFileAsync2 = promisify5(execFile5);
+async function runAppleScript(script, { humanReadableOutput = true, signal } = {}) {
+  if (process6.platform !== "darwin") {
+    throw new Error("macOS only");
   }
-}
-async function loginWithApiKey(codex, request, env) {
-  const meta = request._meta?.["api-key"];
-  const fromMeta = typeof meta === "object" && meta !== null ? meta.apiKey : undefined;
-  const apiKey = typeof fromMeta === "string" && fromMeta.trim().length > 0 ? fromMeta.trim() : env[CODEX_API_KEY_ENV]?.trim() || env[OPENAI_API_KEY_ENV]?.trim();
-  if (!apiKey) {
-    throw RequestError.invalidParams({ envVars: [CODEX_API_KEY_ENV, OPENAI_API_KEY_ENV] }, `No API key: set ${CODEX_API_KEY_ENV} or ${OPENAI_API_KEY_ENV}, or pass _meta["api-key"].apiKey`);
+  const outputArguments = humanReadableOutput ? [] : ["-ss"];
+  const execOptions = {};
+  if (signal) {
+    execOptions.signal = signal;
   }
-  await codex.withNotification("account/login/completed", async (completed) => {
-    await codex.accountLogin({ type: "apiKey", apiKey });
-    const result = await completed;
-    if (!result.success)
-      throw RequestError.authRequired({ error: result.error }, result.error ?? "API key login failed");
-  });
+  const { stdout } = await execFileAsync2("osascript", ["-e", script, outputArguments], execOptions);
+  return stdout.trim();
 }
-async function loginWithChatGpt(codex) {
-  const account = await codex.accountRead({ refreshToken: true });
-  if (account.account?.type === "chatgpt")
-    return;
-  await codex.withNotification("account/login/completed", async (completed) => {
-    const started = await codex.accountLogin({ type: "chatgpt" });
-    if (started.type !== "chatgpt")
-      throw RequestError.internalError({ type: started.type }, "Unexpected login response");
-    logger.log("opening browser for ChatGPT login", { loginId: started.loginId });
-    await open_default(started.authUrl);
-    const result = await completed;
-    if (!result.success)
-      throw RequestError.authRequired({ error: result.error }, result.error ?? "ChatGPT login failed");
-  });
+
+// node_modules/bundle-name/index.js
+async function bundleName(bundleId) {
+  return runAppleScript(`tell application "Finder" to set app_path to application file id "${bundleId}" as string
+tell application "System Events" to get value of property list item "CFBundleName" of property list file (app_path & ":Contents:Info.plist")`);
 }
-async function loginWithDeviceCode(codex, link, requestId) {
-  const account = await codex.accountRead({ refreshToken: true });
-  if (account.account?.type === "chatgpt")
-    return;
-  await codex.withNotification("account/login/completed", async (completed) => {
-    const started = await codex.accountLogin({ type: "chatgptDeviceCode" });
-    if (started.type !== "chatgptDeviceCode")
-      throw RequestError.internalError({ type: started.type }, "Unexpected login response");
-    const elicitation = link.request(methods.client.elicitation.create, {
-      mode: "url",
-      requestId,
-      elicitationId: started.loginId,
-      url: started.verificationUrl,
-      message: `Sign in to ChatGPT and enter this code: ${started.userCode}`
-    });
-    elicitation.catch(() => {});
-    const first = await Promise.race([
-      completed.then((result2) => ({ kind: "completed", result: result2 })),
-      elicitation.then((response) => ({ kind: "elicitation", response }))
-    ]);
-    if (first.kind === "elicitation" && !CreateElicitationResponse.isAccept(first.response)) {
-      await codex.accountLoginCancel({ loginId: started.loginId });
-      throw RequestError.authRequired(undefined, "ChatGPT device code login was cancelled");
-    }
-    const result = first.kind === "completed" ? first.result : await completed;
-    await link.notify(methods.client.elicitation.complete, { elicitationId: started.loginId });
-    if (!result.success)
-      throw RequestError.authRequired({ error: result.error }, result.error ?? "ChatGPT login failed");
-  });
+
+// node_modules/default-browser/windows.js
+import process7 from "process";
+import { promisify as promisify6 } from "util";
+import { execFile as execFile6 } from "child_process";
+var execFileAsync3 = promisify6(execFile6);
+var windowsBrowserProgIds = {
+  MSEdgeHTM: { name: "Edge", id: "com.microsoft.edge" },
+  MSEdgeBHTML: { name: "Edge Beta", id: "com.microsoft.edge.beta" },
+  MSEdgeDHTML: { name: "Edge Dev", id: "com.microsoft.edge.dev" },
+  AppXq0fevzme2pys62n3e0fbqa7peapykr8v: { name: "Edge", id: "com.microsoft.edge.old" },
+  ChromeHTML: { name: "Chrome", id: "com.google.chrome" },
+  ChromeBHTML: { name: "Chrome Beta", id: "com.google.chrome.beta" },
+  ChromeDHTML: { name: "Chrome Dev", id: "com.google.chrome.dev" },
+  ChromiumHTM: { name: "Chromium", id: "org.chromium.Chromium" },
+  BraveHTML: { name: "Brave", id: "com.brave.Browser" },
+  BraveBHTML: { name: "Brave Beta", id: "com.brave.Browser.beta" },
+  BraveDHTML: { name: "Brave Dev", id: "com.brave.Browser.dev" },
+  BraveSSHTM: { name: "Brave Nightly", id: "com.brave.Browser.nightly" },
+  FirefoxURL: { name: "Firefox", id: "org.mozilla.firefox" },
+  OperaStable: { name: "Opera", id: "com.operasoftware.Opera" },
+  VivaldiHTM: { name: "Vivaldi", id: "com.vivaldi.Vivaldi" },
+  "IE.HTTP": { name: "Internet Explorer", id: "com.microsoft.ie" }
+};
+var _windowsBrowserProgIdMap = new Map(Object.entries(windowsBrowserProgIds));
+
+class UnknownBrowserError extends Error {
 }
-async function logout(codex) {
-  await codex.withNotification("account/updated", async (updated) => {
-    await codex.accountLogout();
-    await updated;
-  });
+async function defaultBrowser(_execFileAsync = execFileAsync3) {
+  const regPath = `${process7.env.SYSTEMROOT ?? process7.env.windir ?? "C:\\Windows"}\\System32\\reg.exe`;
+  const { stdout } = await _execFileAsync(regPath, [
+    "QUERY",
+    " HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\http\\UserChoice",
+    "/v",
+    "ProgId"
+  ]);
+  const match = /ProgId\s*REG_SZ\s*(?<id>\S+)/.exec(stdout);
+  if (!match) {
+    throw new UnknownBrowserError(`Cannot find Windows browser in stdout: ${JSON.stringify(stdout)}`);
+  }
+  const { id } = match.groups;
+  const dotIndex = id.lastIndexOf(".");
+  const hyphenIndex = id.lastIndexOf("-");
+  const baseIdByDot = dotIndex === -1 ? undefined : id.slice(0, dotIndex);
+  const baseIdByHyphen = hyphenIndex === -1 ? undefined : id.slice(0, hyphenIndex);
+  return windowsBrowserProgIds[id] ?? windowsBrowserProgIds[baseIdByDot] ?? windowsBrowserProgIds[baseIdByHyphen] ?? { name: id, id };
 }
 
-// src/agent/clientSession.ts
-class ClientSession {
-  sessionId;
-  link;
-  capabilities;
-  waiting = 0;
-  turnActive = false;
-  turnGeneration = 0;
-  disposed = false;
-  output = new AbortController;
-  terminalAttempted = false;
-  get signal() {
-    return this.output.signal;
-  }
-  constructor(sessionId, link, capabilities) {
-    this.sessionId = sessionId;
-    this.link = link;
-    this.capabilities = capabilities;
-  }
-  async update(update) {
-    if (this.disposed)
-      return;
-    await abortable(this.link.notify(methods.client.session.update, { sessionId: this.sessionId, update }), this.output.signal);
-  }
-  async updateAll(updates) {
-    for (const update of updates)
-      await this.update(update);
-  }
-  async requestPermission(request, signal) {
-    signal = signal ? AbortSignal.any([signal, this.output.signal]) : this.output.signal;
-    signal.throwIfAborted();
-    return await this.waitingOnClient(() => {
-      signal?.throwIfAborted();
-      const pending = this.link.request(methods.client.session.requestPermission, { sessionId: this.sessionId, ...request }, signal ? { cancellationSignal: signal } : undefined);
-      return signal ? abortable(pending, signal) : pending;
-    }, signal);
-  }
-  async requestTool(params, signal) {
-    return await this.link.request("_alwith/tool/call", params, { cancellationSignal: signal });
-  }
-  async createElicitation(request, signal) {
-    signal = signal ? AbortSignal.any([signal, this.output.signal]) : this.output.signal;
-    signal.throwIfAborted();
-    return await this.waitingOnClient(() => {
-      signal?.throwIfAborted();
-      const pending = this.link.request(methods.client.elicitation.create, request, signal ? { cancellationSignal: signal } : undefined);
-      return signal ? abortable(pending, signal) : pending;
-    }, signal);
-  }
-  async completeElicitation(elicitationId) {
-    if (this.disposed)
-      return;
-    await abortable(this.link.notify(methods.client.elicitation.complete, { elicitationId }), this.output.signal);
+// node_modules/default-browser/index.js
+var execFileAsync4 = promisify7(execFile7);
+var titleize = (string4) => string4.toLowerCase().replaceAll(/(?:^|\s|-)\S/g, (x) => x.toUpperCase());
+async function defaultBrowser2() {
+  if (process8.platform === "darwin") {
+    const id = await defaultBrowserId();
+    const name = await bundleName(id);
+    return { name, id };
   }
-  reportRunning() {
-    this.terminalAttempted = false;
-    this.turnGeneration += 1;
-    this.turnActive = true;
-    this.waiting = 0;
-    this.state({ sessionUpdate: "state_update", state: "running" });
+  if (process8.platform === "linux") {
+    const { stdout } = await execFileAsync4("xdg-mime", ["query", "default", "x-scheme-handler/http"]);
+    const id = stdout.trim();
+    const name = titleize(id.replace(/.desktop$/, "").replace("-", " "));
+    return { name, id };
   }
-  async reportIdle(stopReason, extra) {
-    if (this.terminalAttempted)
-      return;
-    this.terminalAttempted = true;
-    this.turnActive = false;
-    this.waiting = 0;
-    await this.update({
-      sessionUpdate: "state_update",
-      state: "idle",
-      stopReason,
-      ...extra?.usage === undefined ? {} : { usage: extra.usage },
-      ...extra?._meta === undefined ? {} : { _meta: extra._meta }
-    });
+  if (process8.platform === "win32") {
+    return defaultBrowser();
   }
-  async waitingOnClient(operation, signal) {
-    if (this.disposed)
-      throw new Error("Session is closed");
-    const generation = this.turnActive ? this.turnGeneration : null;
-    try {
-      if (generation !== null && this.waiting++ === 0) {
-        const pending = this.state({ sessionUpdate: "state_update", state: "requires_action" });
-        await (signal ? abortable(pending, signal) : pending);
-      }
-      return await operation();
-    } finally {
-      if (this.turnActive && generation === this.turnGeneration && --this.waiting === 0) {
-        const pending = this.state({ sessionUpdate: "state_update", state: "running" });
-        await (signal ? abortable(pending, signal).catch(() => {}) : pending);
-      }
-    }
+  throw new Error("Only macOS, Linux, and Windows are supported");
+}
+
+// node_modules/is-in-ssh/index.js
+import process9 from "process";
+var isInSsh = Boolean(process9.env.SSH_CONNECTION || process9.env.SSH_CLIENT || process9.env.SSH_TTY);
+var is_in_ssh_default = isInSsh;
+
+// node_modules/open/index.js
+var fallbackAttemptSymbol = Symbol("fallbackAttempt");
+var __dirname2 = import.meta.url ? path6.dirname(fileURLToPath(import.meta.url)) : "";
+var localXdgOpenPath = path6.join(__dirname2, "xdg-open");
+var { platform, arch } = process10;
+var tryEachApp = async (apps, opener) => {
+  if (apps.length === 0) {
+    return;
   }
-  async state(update) {
+  const errors3 = [];
+  for (const app of apps) {
     try {
-      await this.update(update);
+      return await opener(app);
     } catch (error40) {
-      logger.error("Failed to publish session state", error40, { sessionId: this.sessionId });
+      errors3.push(error40);
     }
   }
-  dispose() {
-    this.disposed = true;
-    this.output.abort();
-    this.turnActive = false;
-    this.waiting = 0;
+  throw new AggregateError(errors3, "Failed to open in all supported apps");
+};
+var baseOpen = async (options) => {
+  options = {
+    wait: false,
+    background: false,
+    newInstance: false,
+    allowNonzeroExitCode: false,
+    ...options
+  };
+  const isFallbackAttempt = options[fallbackAttemptSymbol] === true;
+  delete options[fallbackAttemptSymbol];
+  if (Array.isArray(options.app)) {
+    return tryEachApp(options.app, (singleApp) => baseOpen({
+      ...options,
+      app: singleApp,
+      [fallbackAttemptSymbol]: true
+    }));
   }
-}
-
-// src/agent/commands.ts
-var BUILTIN_COMMANDS = [
-  { name: "plan", description: "Toggle plan mode: Codex proposes a plan before making changes" },
-  { name: "review", description: "Review uncommitted changes, or review with custom instructions", input: { type: "text", hint: "optional review instructions" } },
-  { name: "review-branch", description: "Review changes relative to a base branch", input: { type: "text", hint: "branch name" } },
-  { name: "review-commit", description: "Review a specific commit", input: { type: "text", hint: "commit sha" } },
-  { name: "compact", description: "Summarize the conversation to free up context" },
-  { name: "status", description: "Show session configuration, token usage, and rate limits" },
-  { name: "mcp", description: "List configured Model Context Protocol (MCP) servers" },
-  { name: "skills", description: "List available skills" },
-  { name: "logout", description: "Sign out of the Codex account" }
-];
-function parseCommand(prompt) {
-  const first = prompt[0];
-  if (!first || first.type !== "text")
-    return null;
-  const text2 = first.text.trim();
-  if (!text2.startsWith("/"))
-    return null;
-  const body = text2.slice(1).trim();
-  const [name] = body.split(/\s+/);
-  if (!name || name.startsWith("$"))
-    return null;
-  return { name: name.toLowerCase(), rest: body.slice(name.length).trim() };
-}
-function resolveCommand(command, session) {
-  switch (command.name) {
-    case "plan":
-      return {
-        kind: "config",
-        configId: COLLABORATION_MODE_CONFIG_ID,
-        value: session.collaborationMode === PLAN_COLLABORATION_MODE ? DEFAULT_COLLABORATION_MODE : PLAN_COLLABORATION_MODE
-      };
-    case "compact":
-      return { kind: "compact" };
-    case "review":
-      return { kind: "review", target: command.rest.length > 0 ? { type: "custom", instructions: command.rest } : { type: "uncommittedChanges" } };
-    case "review-branch":
-      return command.rest.length > 0 ? { kind: "review", target: { type: "baseBranch", branch: command.rest } } : { kind: "message", text: usage("review-branch", "<branch name>") };
-    case "review-commit":
-      return command.rest.length > 0 ? { kind: "review", target: { type: "commit", sha: command.rest, title: null } } : { kind: "message", text: usage("review-commit", "<commit sha>") };
-    case "logout":
-      return { kind: "logout" };
-    case "status":
-    case "mcp":
-    case "skills":
-      return { kind: "message", text: "" };
-    default:
-      return { kind: "prompt" };
+  let { name: app, arguments: appArguments = [] } = options.app ?? {};
+  appArguments = [...appArguments];
+  if (Array.isArray(app)) {
+    return tryEachApp(app, (appName) => baseOpen({
+      ...options,
+      app: {
+        name: appName,
+        arguments: appArguments
+      },
+      [fallbackAttemptSymbol]: true
+    }));
   }
-}
-function usage(name, hint) {
-  return `Usage: /${name} ${hint}`;
-}
-function availableCommands(skills) {
-  const commands = new Map;
-  for (const builtin of BUILTIN_COMMANDS)
-    commands.set(builtin.name, builtin);
-  for (const entry of skills) {
-    for (const skill of entry.skills) {
-      const name = `$${skill.name}`;
-      if (commands.has(name))
-        continue;
-      commands.set(name, { name, description: skill.shortDescription || skill.description || skill.name });
+  if (app === "browser" || app === "browserPrivate") {
+    const ids = {
+      "com.google.chrome": "chrome",
+      "google-chrome.desktop": "chrome",
+      "com.brave.browser": "brave",
+      "org.mozilla.firefox": "firefox",
+      "firefox.desktop": "firefox",
+      "com.microsoft.msedge": "edge",
+      "com.microsoft.edge": "edge",
+      "com.microsoft.edgemac": "edge",
+      "microsoft-edge.desktop": "edge",
+      "com.apple.safari": "safari"
+    };
+    const flags = {
+      chrome: "--incognito",
+      brave: "--incognito",
+      firefox: "--private-window",
+      edge: "--inPrivate"
+    };
+    let browser;
+    if (is_wsl_default) {
+      const progId = await wslDefaultBrowser();
+      const browserInfo = _windowsBrowserProgIdMap.get(progId);
+      browser = browserInfo ?? {};
+    } else {
+      browser = await defaultBrowser2();
+    }
+    if (Object.hasOwn(ids, browser.id)) {
+      const browserName = ids[browser.id.toLowerCase()];
+      if (browserName === undefined) {
+        throw new Error(`${browser.name} is not supported as a default browser`);
+      }
+      if (app === "browserPrivate") {
+        if (browserName === "safari") {
+          throw new Error("Safari doesn't support opening in private mode via command line");
+        }
+        appArguments.push(flags[browserName]);
+      }
+      return baseOpen({
+        ...options,
+        app: {
+          name: apps[browserName],
+          arguments: appArguments
+        }
+      });
+    }
+    throw new Error(`${browser.name} is not supported as a default browser`);
+  }
+  let command;
+  const cliArguments = [];
+  const childProcessOptions = {};
+  let shouldUseWindowsInWsl = false;
+  if (is_wsl_default && !isInsideContainer() && !is_in_ssh_default && !app) {
+    shouldUseWindowsInWsl = await canAccessPowerShell();
+  }
+  if (platform === "darwin") {
+    command = "open";
+    if (options.wait) {
+      cliArguments.push("--wait-apps");
+    }
+    if (options.background) {
+      cliArguments.push("--background");
+    }
+    if (options.newInstance) {
+      cliArguments.push("--new");
+    }
+    if (app) {
+      cliArguments.push("-a", app);
+    }
+  } else if (platform === "win32" || shouldUseWindowsInWsl) {
+    command = await powerShellPath2();
+    cliArguments.push(...executePowerShell2.argumentsPrefix);
+    if (!is_wsl_default) {
+      childProcessOptions.windowsVerbatimArguments = true;
+    }
+    if (is_wsl_default && options.target) {
+      options.target = await convertWslPathToWindows(options.target);
+    }
+    const encodedArguments = ["$ProgressPreference = 'SilentlyContinue';", "Start"];
+    if (options.wait) {
+      encodedArguments.push("-Wait");
+    }
+    if (app) {
+      encodedArguments.push(executePowerShell2.escapeArgument(app));
+      if (options.target) {
+        appArguments.push(options.target);
+      }
+    } else if (options.target) {
+      encodedArguments.push(executePowerShell2.escapeArgument(options.target));
+    }
+    if (appArguments.length > 0) {
+      appArguments = appArguments.map((argument) => executePowerShell2.escapeArgument(argument));
+      encodedArguments.push("-ArgumentList", appArguments.join(","));
+    }
+    options.target = executePowerShell2.encodeCommand(encodedArguments.join(" "));
+    if (!options.wait) {
+      childProcessOptions.stdio = "ignore";
+    }
+    if (is_wsl_default) {
+      childProcessOptions.cwd = path6.dirname(command);
+    }
+  } else {
+    if (app) {
+      command = app;
+    } else {
+      const isBundled = !__dirname2 || __dirname2 === "/";
+      let exeLocalXdgOpen = false;
+      try {
+        await fs6.access(localXdgOpenPath, fsConstants2.X_OK);
+        exeLocalXdgOpen = true;
+      } catch {}
+      const useSystemXdgOpen = process10.versions.electron ?? (platform === "android" || isBundled || !exeLocalXdgOpen);
+      command = useSystemXdgOpen ? "xdg-open" : localXdgOpenPath;
+    }
+    if (appArguments.length > 0) {
+      cliArguments.push(...appArguments);
+    }
+    if (!options.wait) {
+      childProcessOptions.stdio = "ignore";
+      childProcessOptions.detached = true;
     }
   }
-  return [...commands.values()];
-}
-function skillsMessage(skills) {
-  const lines = skills.flatMap((entry) => entry.skills).map((skill) => {
-    const description = skill.shortDescription || skill.description;
-    return description ? `- ${skill.name}: ${description}` : `- ${skill.name}`;
+  if (platform === "darwin" && appArguments.length > 0) {
+    cliArguments.push("--args", ...appArguments);
+  }
+  if (options.target) {
+    cliArguments.push(options.target);
+  }
+  const subprocess = childProcess4.spawn(command, cliArguments, childProcessOptions);
+  if (options.wait) {
+    return new Promise((resolve, reject) => {
+      subprocess.once("error", reject);
+      subprocess.once("close", (exitCode) => {
+        if (!options.allowNonzeroExitCode && exitCode !== 0) {
+          reject(new Error(`Exited with code ${exitCode}`));
+          return;
+        }
+        resolve(subprocess);
+      });
+    });
+  }
+  if (isFallbackAttempt) {
+    return new Promise((resolve, reject) => {
+      subprocess.once("error", reject);
+      subprocess.once("spawn", () => {
+        subprocess.once("close", (exitCode) => {
+          subprocess.off("error", reject);
+          if (exitCode !== 0) {
+            reject(new Error(`Exited with code ${exitCode}`));
+            return;
+          }
+          subprocess.unref();
+          resolve(subprocess);
+        });
+      });
+    });
+  }
+  subprocess.unref();
+  return new Promise((resolve, reject) => {
+    subprocess.once("error", reject);
+    subprocess.once("spawn", () => {
+      subprocess.off("error", reject);
+      resolve(subprocess);
+    });
   });
-  return lines.length > 0 ? ["Available skills:", ...lines].join(`
-`) : "No skills configured.";
-}
-async function mcpMessage(codex, session) {
-  const servers = await codex.mcpServerStatusList({});
-  const lines = servers.data.map((server) => {
-    const tools = Object.keys(server.tools ?? {}).length;
-    const resources = (server.resources ?? []).length;
-    return `- ${server.name}: ${tools} tools, ${resources} resources, auth=${server.authStatus}`;
+};
+var open = (target, options) => {
+  if (typeof target !== "string") {
+    throw new TypeError("Expected a `target`");
+  }
+  return baseOpen({
+    ...options,
+    target
   });
-  const sessionLines = session.mcpServerNames.map((name) => `- ${name}`);
-  return [
-    lines.length > 0 ? "Configured MCP servers:" : "No MCP servers configured.",
-    ...lines,
-    ...sessionLines.length > 0 ? ["", "Session MCP servers:", ...sessionLines] : []
-  ].join(`
-`);
-}
-function statusMessage(session, rateLimits) {
-  const usage2 = session.lastUsage;
-  const lines = [
-    "**Session**",
-    `**Session ID:** ${session.id}`,
-    `**Working directory:** ${session.cwd}`,
-    `**Model:** ${session.model.model} (${session.model.effort})`,
-    `**Mode:** ${session.mode.name}`,
-    `**Collaboration:** ${session.collaborationMode}`,
-    `**Fast mode:** ${session.fastMode ? "on" : "off"}`,
-    `**Account:** ${accountInfo(session)}`,
-    "",
-    "**Usage**",
-    `**Last turn:** ${usage2 ? `${formatTokenCount(usage2.totalTokens)} total (${formatTokenCount(usage2.inputTokens)} input + ${formatTokenCount(usage2.cachedInputTokens)} cached, ${formatTokenCount(usage2.outputTokens)} output)` : "not available yet"}`,
-    `**Context window:** ${usage2 && session.contextWindow ? `${Math.round((session.contextWindow - usage2.totalTokens) / session.contextWindow * 100)}% left (${formatTokenCount(usage2.totalTokens)} / ${formatTokenCount(session.contextWindow)})` : "not available yet"}`,
-    ...rateLimitLines(rateLimits)
-  ];
-  return lines.join(`  
-`);
-}
-function accountInfo(session) {
-  const account = session.account;
-  if (!account)
-    return "not logged in";
-  switch (account.type) {
-    case "apiKey":
-      return "API key";
-    case "chatgpt":
-      return `ChatGPT ${account.planType}${account.email ? ` (${account.email})` : ""}`;
-    case "amazonBedrock":
-      return "Amazon Bedrock";
+};
+function detectArchBinary(binary) {
+  if (typeof binary === "string" || Array.isArray(binary)) {
+    return binary;
   }
-}
-function rateLimitLines(rateLimits) {
-  const lines = [];
-  for (const snapshot of rateLimits.values()) {
-    const prefix = snapshot.limitName ? `${snapshot.limitName} ` : "";
-    for (const window of [snapshot.primary, snapshot.secondary]) {
-      if (!window)
-        continue;
-      const label = windowLabel(window.windowDurationMins);
-      const reset = window.resetsAt === null ? "" : ` (resets ${new Date(window.resetsAt * 1000).toLocaleString()})`;
-      lines.push(`**${prefix}${label}:** ${Math.round(100 - window.usedPercent)}% left${reset}`);
-    }
-    if (snapshot.credits?.unlimited)
-      lines.push(`**${prefix}Credits:** unlimited`);
-    else if (snapshot.credits?.balance)
-      lines.push(`**${prefix}Credits:** ${snapshot.credits.balance}`);
+  const { [arch]: archBinary } = binary;
+  if (!archBinary) {
+    throw new Error(`${arch} is not supported`);
   }
-  return lines.length > 0 ? lines : ["**Limits:** not available yet"];
+  return archBinary;
 }
-function windowLabel(minutes) {
-  if (minutes === null)
-    return "Limit";
-  if (minutes < 60)
-    return `${minutes}m limit`;
-  if (minutes < 1440)
-    return `${Math.round(minutes / 60)}h limit`;
-  if (minutes < 10080)
-    return `${Math.round(minutes / 1440)}d limit`;
-  return "Weekly limit";
+function detectPlatformBinary({ [platform]: platformBinary }, { wsl } = {}) {
+  if (wsl && is_wsl_default) {
+    return detectArchBinary(wsl);
+  }
+  if (!platformBinary) {
+    throw new Error(`${platform} is not supported`);
+  }
+  return detectArchBinary(platformBinary);
 }
+var apps = {
+  browser: "browser",
+  browserPrivate: "browserPrivate"
+};
+defineLazyProperty(apps, "chrome", () => detectPlatformBinary({
+  darwin: "google chrome",
+  win32: "chrome",
+  linux: ["google-chrome", "google-chrome-stable", "chromium", "chromium-browser"]
+}, {
+  wsl: {
+    ia32: "/mnt/c/Program Files (x86)/Google/Chrome/Application/chrome.exe",
+    x64: ["/mnt/c/Program Files/Google/Chrome/Application/chrome.exe", "/mnt/c/Program Files (x86)/Google/Chrome/Application/chrome.exe"]
+  }
+}));
+defineLazyProperty(apps, "brave", () => detectPlatformBinary({
+  darwin: "brave browser",
+  win32: "brave",
+  linux: ["brave-browser", "brave"]
+}, {
+  wsl: {
+    ia32: "/mnt/c/Program Files (x86)/BraveSoftware/Brave-Browser/Application/brave.exe",
+    x64: ["/mnt/c/Program Files/BraveSoftware/Brave-Browser/Application/brave.exe", "/mnt/c/Program Files (x86)/BraveSoftware/Brave-Browser/Application/brave.exe"]
+  }
+}));
+defineLazyProperty(apps, "firefox", () => detectPlatformBinary({
+  darwin: "firefox",
+  win32: String.raw`C:\Program Files\Mozilla Firefox\firefox.exe`,
+  linux: "firefox"
+}, {
+  wsl: "/mnt/c/Program Files/Mozilla Firefox/firefox.exe"
+}));
+defineLazyProperty(apps, "edge", () => detectPlatformBinary({
+  darwin: "microsoft edge",
+  win32: "msedge",
+  linux: ["microsoft-edge", "microsoft-edge-dev"]
+}, {
+  wsl: "/mnt/c/Program Files (x86)/Microsoft/Edge/Application/msedge.exe"
+}));
+defineLazyProperty(apps, "safari", () => detectPlatformBinary({
+  darwin: "Safari"
+}));
+var open_default = open;
 
-// src/agent/configOptions.ts
-function sessionConfigOptions(session) {
-  const model = findModel(session.catalog, session.model.model);
-  const options = [
-    modeConfigOption(session.mode),
-    modelConfigOption(session.catalog, session.model.model, session.gatewayGroups),
-    effortConfigOption(supportedEfforts(model), session.model.effort),
-    collaborationModeConfigOption(session.collaborationMode)
-  ];
-  if (modelSupportsFast(model))
-    options.push(fastModeConfigOption(session.fastMode));
-  return options;
+// src/agent/auth.ts
+var AuthMethodId = {
+  ApiKey: "api-key",
+  ChatGpt: "chat-gpt",
+  ChatGptDeviceCode: "chat-gpt-device-code"
+};
+var CODEX_API_KEY_ENV = "CODEX_API_KEY";
+var OPENAI_API_KEY_ENV = "OPENAI_API_KEY";
+function authMethods(capabilities, env = process.env) {
+  const methods2 = [{
+    type: "agent",
+    methodId: AuthMethodId.ApiKey,
+    name: "API key",
+    description: `Use the API key from ${CODEX_API_KEY_ENV} or ${OPENAI_API_KEY_ENV}, or pass it in _meta["api-key"].apiKey`
+  }];
+  if (!env["NO_BROWSER"]) {
+    methods2.push({
+      type: "agent",
+      methodId: AuthMethodId.ChatGpt,
+      name: "ChatGPT",
+      description: "Sign in to ChatGPT in your browser"
+    });
+  }
+  if (capabilities.urlElicitation) {
+    methods2.push({
+      type: "agent",
+      methodId: AuthMethodId.ChatGptDeviceCode,
+      name: "ChatGPT (device code)",
+      description: "Sign in to ChatGPT by opening a verification page and entering a one-time code"
+    });
+  }
+  return methods2;
 }
-async function applyConfigOption(session, codex, request) {
-  switch (request.configId) {
-    case MODE_CONFIG_ID: {
-      const mode = findAgentMode(stringValue(request));
-      if (!mode)
-        throw RequestError.invalidParams({ configId: request.configId }, `Unknown mode "${String(request.value)}"`);
-      session.mode = mode;
-      return;
-    }
-    case MODEL_CONFIG_ID: {
-      const modelId = stringValue(request);
-      const model = findModel(session.catalog, modelId);
-      session.model = { model: modelId, effort: coerceEffort(model, session.model.effort) };
-      if (!modelSupportsFast(model))
-        session.fastMode = false;
-      return;
-    }
-    case EFFORT_CONFIG_ID: {
-      const effort = stringValue(request);
-      const model = findModel(session.catalog, session.model.model);
-      const efforts = supportedEfforts(model);
-      if (efforts.length > 0 && !efforts.some((option) => option.reasoningEffort === effort)) {
-        throw RequestError.invalidParams({ configId: request.configId }, `Model ${session.model.model} does not support effort "${effort}"`);
-      }
-      session.model = { ...session.model, effort };
-      return;
-    }
-    case FAST_MODE_CONFIG_ID: {
-      if (request.type !== "boolean" || typeof request.value !== "boolean") {
-        throw RequestError.invalidParams({ configId: request.configId }, "fast_mode expects a boolean value");
-      }
-      if (request.value && !modelSupportsFast(findModel(session.catalog, session.model.model))) {
-        throw RequestError.invalidParams({ configId: request.configId }, `Model ${session.model.model} does not support fast mode`);
-      }
-      session.fastMode = request.value;
-      return;
-    }
-    case COLLABORATION_MODE_CONFIG_ID: {
-      const mode = parseCollaborationMode(stringValue(request));
-      if (!mode)
-        throw RequestError.invalidParams({ configId: request.configId }, `Unknown collaboration mode "${String(request.value)}"`);
-      await codex.threadSettingsUpdate({
-        threadId: session.id,
-        collaborationMode: {
-          mode,
-          settings: { model: findModel(session.catalog, session.model.model)?.model ?? session.model.model, reasoning_effort: session.model.effort, developer_instructions: null }
-        }
-      });
-      session.collaborationMode = mode;
-      return;
-    }
+async function login(codex, link, request, requestId, env = process.env) {
+  switch (request.methodId) {
+    case AuthMethodId.ApiKey:
+      return await loginWithApiKey(codex, request, env);
+    case AuthMethodId.ChatGpt:
+      return await loginWithChatGpt(codex);
+    case AuthMethodId.ChatGptDeviceCode:
+      return await loginWithDeviceCode(codex, link, requestId);
     default:
-      throw RequestError.invalidParams({ configId: request.configId }, `Unknown config option "${request.configId}"`);
+      throw RequestError.invalidParams({ methodId: request.methodId }, `Unknown auth method "${request.methodId}"; expected one of ${Object.values(AuthMethodId).join(", ")}`);
   }
 }
-function stringValue(request) {
-  if (typeof request.value !== "string" || request.value.length === 0) {
-    throw RequestError.invalidParams({ configId: request.configId }, `Config option "${request.configId}" expects a string value`);
+async function loginWithApiKey(codex, request, env) {
+  const meta = request._meta?.["api-key"];
+  const fromMeta = typeof meta === "object" && meta !== null ? meta.apiKey : undefined;
+  const apiKey = typeof fromMeta === "string" && fromMeta.trim().length > 0 ? fromMeta.trim() : env[CODEX_API_KEY_ENV]?.trim() || env[OPENAI_API_KEY_ENV]?.trim();
+  if (!apiKey) {
+    throw RequestError.invalidParams({ envVars: [CODEX_API_KEY_ENV, OPENAI_API_KEY_ENV] }, `No API key: set ${CODEX_API_KEY_ENV} or ${OPENAI_API_KEY_ENV}, or pass _meta["api-key"].apiKey`);
   }
-  return request.value;
+  await codex.withNotification("account/login/completed", async (completed) => {
+    await codex.accountLogin({ type: "apiKey", apiKey });
+    const result = await completed;
+    if (!result.success)
+      throw RequestError.authRequired({ error: result.error }, result.error ?? "API key login failed");
+  });
 }
-
-// src/agent/history.ts
-function historyUpdates(turns) {
-  const updates = [];
-  for (const turn of turns) {
-    for (const item of turn.items) {
-      updates.push(...itemSnapshot(item));
-    }
-  }
-  return updates;
+async function loginWithChatGpt(codex) {
+  const account = await codex.accountRead({ refreshToken: true });
+  if (account.account?.type === "chatgpt")
+    return;
+  await codex.withNotification("account/login/completed", async (completed) => {
+    const started = await codex.accountLogin({ type: "chatgpt" });
+    if (started.type !== "chatgpt")
+      throw RequestError.internalError({ type: started.type }, "Unexpected login response");
+    logger.log("opening browser for ChatGPT login", { loginId: started.loginId });
+    await open_default(started.authUrl);
+    const result = await completed;
+    if (!result.success)
+      throw RequestError.authRequired({ error: result.error }, result.error ?? "ChatGPT login failed");
+  });
 }
-function historyTitle(thread, turns) {
-  const explicit = thread.name?.trim();
-  if (explicit)
-    return explicit;
-  for (const turn of turns) {
-    for (const item of turn.items) {
-      if (item.type !== "userMessage")
-        continue;
-      const text2 = item.content.filter((input) => input.type === "text").map((input) => input.text.trim()).find((part) => part.length > 0);
-      if (text2)
-        return firstLine(text2);
+async function loginWithDeviceCode(codex, link, requestId) {
+  const account = await codex.accountRead({ refreshToken: true });
+  if (account.account?.type === "chatgpt")
+    return;
+  await codex.withNotification("account/login/completed", async (completed) => {
+    const started = await codex.accountLogin({ type: "chatgptDeviceCode" });
+    if (started.type !== "chatgptDeviceCode")
+      throw RequestError.internalError({ type: started.type }, "Unexpected login response");
+    const elicitation = link.request(methods.client.elicitation.create, {
+      mode: "url",
+      requestId,
+      elicitationId: started.loginId,
+      url: started.verificationUrl,
+      message: `Sign in to ChatGPT and enter this code: ${started.userCode}`
+    });
+    elicitation.catch(() => {});
+    const first = await Promise.race([
+      completed.then((result2) => ({ kind: "completed", result: result2 })),
+      elicitation.then((response) => ({ kind: "elicitation", response }))
+    ]);
+    if (first.kind === "elicitation" && !CreateElicitationResponse.isAccept(first.response)) {
+      await codex.accountLoginCancel({ loginId: started.loginId });
+      throw RequestError.authRequired(undefined, "ChatGPT device code login was cancelled");
     }
-  }
-  const preview = thread.preview.trim();
-  return preview.length > 0 ? firstLine(preview) : null;
-}
-function firstLine(text2) {
-  const line = text2.split(/\r?\n/).map((part) => part.trim()).find((part) => part.length > 0) ?? text2;
-  return line.length > 120 ? `${line.slice(0, 117)}...` : line;
+    const result = first.kind === "completed" ? first.result : await completed;
+    await link.notify(methods.client.elicitation.complete, { elicitationId: started.loginId });
+    if (!result.success)
+      throw RequestError.authRequired({ error: result.error }, result.error ?? "ChatGPT login failed");
+  });
 }
-
-// src/agent/providers.ts
-import { readFileSync } from "fs";
-import os2 from "os";
-import path6 from "path";
-var OPENAI_PROVIDER_ID = "openai";
-var GATEWAY_MODEL_PROVIDER = "custom-gateway";
-var DEFAULT_OPENAI_BASE_URL = "https://api.openai.com/v1";
-var GATEWAY_ID_PATTERN = /^[a-z0-9-]+$/;
-function gatewayModelId(connectionId, modelId) {
-  return `gateway:${encodeURIComponent(connectionId)}:${encodeURIComponent(modelId)}`;
+async function logout(codex) {
+  await codex.withNotification("account/updated", async (updated) => {
+    await codex.accountLogout();
+    await updated;
+  });
 }
 
-class ProviderRouting {
-  baseConfig;
-  configuredProvider;
-  gateways = new Map;
-  constructor(baseConfig, configuredProvider) {
-    this.baseConfig = baseConfig;
-    this.configuredProvider = configuredProvider;
-  }
-  copy() {
-    const copy = new ProviderRouting(this.baseConfig, this.configuredProvider);
-    copy.gateways = new Map(this.gateways);
-    return copy;
-  }
-  get active() {
-    return this.gateways.values().next().value ?? null;
-  }
-  gateway(id) {
-    return id === null ? null : this.gateways.get(id) ?? null;
-  }
-  hasGateway(id) {
-    return id !== null && this.gateways.has(id);
-  }
-  list() {
-    const first = this.active;
-    const routed = first !== null && first.mode === "route";
-    const summary = (gateway) => ({ id: gateway.id, name: gateway.name, baseUrl: gateway.baseUrl, models: gateway.models.map((model) => model.id) });
-    return {
-      providers: [{
-        providerId: OPENAI_PROVIDER_ID,
-        supported: ["openai"],
-        required: false,
-        current: routed && first ? { apiType: "openai", baseUrl: first.baseUrl } : { apiType: "openai", baseUrl: this.nativeBaseUrl() },
-        ...first && !routed ? { _meta: { codex: { mode: "catalog", gateway: summary(first), gateways: [...this.gateways.values()].map(summary) } } } : {}
-      }]
-    };
-  }
-  set(request) {
-    if (request.providerId !== OPENAI_PROVIDER_ID) {
-      throw RequestError.invalidParams({ providerId: request.providerId }, `Unknown providerId "${request.providerId}"; only "${OPENAI_PROVIDER_ID}" is configurable`);
-    }
-    if (request.apiType !== "openai") {
-      throw RequestError.invalidParams({ apiType: request.apiType }, `Codex only speaks the OpenAI protocol; got apiType "${request.apiType}"`);
-    }
-    const baseUrl = typeof request.baseUrl === "string" ? request.baseUrl.trim() : "";
-    if (!/^https?:\/\//.test(baseUrl)) {
-      throw RequestError.invalidParams({ baseUrl: request.baseUrl }, "baseUrl must be an http(s) URL");
-    }
-    const hints = readHints(request._meta);
-    if (hints.id === OPENAI_PROVIDER_ID || hints.id === this.configuredProvider) {
-      throw RequestError.invalidParams({ id: hints.id }, `_meta.codex.id "${hints.id}" is Codex's own provider; pick another gateway id`);
-    }
-    if (hints.mode === "route" || this.mode !== hints.mode)
-      this.gateways.clear();
-    this.gateways.set(hints.id, {
-      id: hints.id,
-      baseUrl,
-      headers: { ...request.headers ?? {} },
-      name: hints.name ?? "Client-configured gateway",
-      models: hints.models,
-      model: hints.model,
-      bearerToken: hints.bearerToken,
-      config: hints.config,
-      mode: hints.mode,
-      catalogEntries: hints.catalogEntries
-    });
-  }
-  get mode() {
-    return this.active?.mode ?? "route";
+// src/agent/clientSession.ts
+class ClientSession {
+  sessionId;
+  link;
+  capabilities;
+  waiting = 0;
+  turnActive = false;
+  turnGeneration = 0;
+  disposed = false;
+  output = new AbortController;
+  terminalAttempted = false;
+  messageId;
+  get signal() {
+    return this.output.signal;
   }
-  gatewayFor(modelId) {
-    for (const gateway of this.gateways.values()) {
-      if (gateway.models.some((model) => (this.mode === "catalog" ? gatewayModelId(gateway.id, model.id) : model.id) === modelId))
-        return gateway;
-    }
-    return null;
+  constructor(sessionId, link, capabilities) {
+    this.sessionId = sessionId;
+    this.link = link;
+    this.capabilities = capabilities;
   }
-  gatewayIdFor(modelId) {
-    return this.gatewayFor(modelId)?.id ?? null;
+  async update(update) {
+    if (this.disposed)
+      return;
+    await abortable(this.link.notify(methods.client.session.update, { sessionId: this.sessionId, update }), this.output.signal);
   }
-  isGatewayModel(modelId) {
-    return this.gatewayFor(modelId) !== null;
+  async updateAll(updates) {
+    for (const update of updates)
+      await this.update(update);
   }
-  gatewayGroups() {
-    if (this.mode !== "catalog")
-      return [];
-    return [...this.gateways.values()].filter((gateway) => gateway.models.length > 0).map((gateway) => ({ id: gateway.id, name: gateway.name, modelIds: gateway.models.map((model) => gatewayModelId(gateway.id, model.id)) }));
+  async requestPermission(request, signal) {
+    signal = signal ? AbortSignal.any([signal, this.output.signal]) : this.output.signal;
+    signal.throwIfAborted();
+    return await this.waitingOnClient(() => {
+      signal?.throwIfAborted();
+      const pending = this.link.request(methods.client.session.requestPermission, { sessionId: this.sessionId, ...request }, signal ? { cancellationSignal: signal } : undefined);
+      return signal ? abortable(pending, signal) : pending;
+    }, signal);
   }
-  selectionId(modelId, provider) {
-    return modelId !== null && this.mode === "catalog" && this.hasGateway(provider) ? gatewayModelId(provider, modelId) : modelId;
+  async requestTool(params, signal) {
+    return await this.link.request("_alwith/tool/call", params, { cancellationSignal: signal });
   }
-  upstreamModel(selectionId) {
-    if (selectionId === null || !selectionId.startsWith("gateway:"))
-      return selectionId;
-    const gateway = this.gatewayFor(selectionId);
-    const model = gateway?.models.find((model2) => gatewayModelId(gateway.id, model2.id) === selectionId);
-    if (!model)
-      throw RequestError.invalidParams({ model: selectionId }, "The selected provider connection or model is unavailable");
-    return model.id;
+  async createElicitation(request, signal) {
+    signal = signal ? AbortSignal.any([signal, this.output.signal]) : this.output.signal;
+    signal.throwIfAborted();
+    return await this.waitingOnClient(() => {
+      signal?.throwIfAborted();
+      const pending = this.link.request(methods.client.elicitation.create, request, signal ? { cancellationSignal: signal } : undefined);
+      return signal ? abortable(pending, signal) : pending;
+    }, signal);
   }
-  disable(request) {
-    if (request.providerId !== OPENAI_PROVIDER_ID)
+  async completeElicitation(elicitationId) {
+    if (this.disposed)
       return;
-    const id = readGatewayId(request._meta);
-    if (id === null)
-      this.gateways.clear();
-    else
-      this.gateways.delete(id);
-  }
-  modelProvider() {
-    return this.defaultGatewayId() ?? this.configuredProvider;
-  }
-  routesByDefault() {
-    return this.defaultGatewayId() !== null;
+    await abortable(this.link.notify(methods.client.elicitation.complete, { elicitationId }), this.output.signal);
   }
-  defaultGatewayId() {
-    const first = this.active;
-    return first !== null && first.mode === "route" ? first.id : null;
+  reportRunning(messageId) {
+    this.messageId = messageId;
+    this.terminalAttempted = false;
+    this.turnGeneration += 1;
+    this.turnActive = true;
+    this.waiting = 0;
+    this.state({ sessionUpdate: "state_update", state: "running" });
   }
-  threadConfig(gatewayId = this.defaultGatewayId()) {
-    const gateway = this.gateway(gatewayId);
-    if (!gateway)
-      return this.baseConfig;
-    return this.applyGateway(this.baseConfig, gateway);
+  async reportIdle(stopReason, extra, messageId = this.messageId) {
+    if (messageId !== this.messageId)
+      return;
+    if (this.terminalAttempted)
+      return;
+    this.terminalAttempted = true;
+    this.turnActive = false;
+    this.waiting = 0;
+    await this.update(this.correlated({
+      sessionUpdate: "state_update",
+      state: "idle",
+      stopReason,
+      ...extra?.usage === undefined ? {} : { usage: extra.usage },
+      ...extra?._meta === undefined ? {} : { _meta: extra._meta }
+    }));
   }
-  routeConfig(config2, gatewayId) {
-    return this.rebind(config2, this, gatewayId);
+  correlated(update) {
+    if (this.messageId === undefined)
+      return update;
+    const meta = update._meta;
+    const alwith = meta?.["alwith"];
+    return { ...update, _meta: { ...meta, alwith: { ...alwith, messageId: this.messageId } } };
   }
-  overrideKeys() {
-    const keys = new Set;
-    for (const gateway of this.gateways.values())
-      for (const key of Object.keys(gateway.config))
-        keys.add(key);
-    return [...keys];
+  async waitingOnClient(operation, signal) {
+    if (this.disposed)
+      throw new Error("Session is closed");
+    const generation = this.turnActive ? this.turnGeneration : null;
+    try {
+      if (generation !== null && this.waiting++ === 0) {
+        const pending = this.state({ sessionUpdate: "state_update", state: "requires_action" });
+        await (signal ? abortable(pending, signal) : pending);
+      }
+      return await operation();
+    } finally {
+      if (this.turnActive && generation === this.turnGeneration && --this.waiting === 0) {
+        const pending = this.state({ sessionUpdate: "state_update", state: "running" });
+        await (signal ? abortable(pending, signal).catch(() => {}) : pending);
+      }
+    }
   }
-  rebind(config2, previous, gatewayId = this.defaultGatewayId()) {
-    const next = { ...config2 };
-    for (const key of previous.overrideKeys()) {
-      if (key in this.baseConfig)
-        next[key] = this.baseConfig[key];
-      else
-        delete next[key];
+  async state(update) {
+    try {
+      await this.update(this.correlated(update));
+    } catch (error40) {
+      logger.error("Failed to publish session state", error40, { sessionId: this.sessionId });
     }
-    delete next["model_providers"];
-    if (isRecord2(this.baseConfig["model_providers"]))
-      next["model_providers"] = this.baseConfig["model_providers"];
-    const gateway = this.gateway(gatewayId);
-    return gateway ? this.applyGateway(next, gateway) : next;
   }
-  applyGateway(config2, gateway) {
-    const existing = isRecord2(config2["model_providers"]) ? config2["model_providers"] : {};
-    const entry = {
-      name: gateway.name,
-      base_url: gateway.baseUrl,
-      wire_api: "responses",
-      http_headers: { "X-Client-Feature-ID": "codex", ...gateway.headers }
-    };
-    if (gateway.bearerToken !== null)
-      entry["experimental_bearer_token"] = gateway.bearerToken;
-    return {
-      ...config2,
-      ...gateway.config,
-      model_providers: { ...existing, [gateway.id]: entry }
-    };
+  dispose() {
+    this.disposed = true;
+    this.output.abort();
+    this.turnActive = false;
+    this.waiting = 0;
   }
-  catalog(codexCatalog) {
-    const first = this.active;
-    if (first === null)
-      return codexCatalog;
-    if (first.mode === "route") {
-      if (first.models.length === 0)
-        return codexCatalog;
-      return first.models.map((model, index) => gatewayModel(model, index === 0, codexCatalog[0], first.catalogEntries.get(model.id)));
-    }
-    const own = [];
-    for (const gateway of this.gateways.values()) {
-      for (const model of gateway.models)
-        own.push({ ...gatewayModel(model, false, codexCatalog[0], gateway.catalogEntries.get(model.id)), id: gatewayModelId(gateway.id, model.id) });
-    }
-    return [...codexCatalog, ...own];
+}
+
+// src/agent/commands.ts
+var BUILTIN_COMMANDS = [
+  { name: "plan", description: "Toggle plan mode: Codex proposes a plan before making changes" },
+  { name: "review", description: "Review uncommitted changes, or review with custom instructions", input: { type: "text", hint: "optional review instructions" } },
+  { name: "review-branch", description: "Review changes relative to a base branch", input: { type: "text", hint: "branch name" } },
+  { name: "review-commit", description: "Review a specific commit", input: { type: "text", hint: "commit sha" } },
+  { name: "compact", description: "Summarize the conversation to free up context" },
+  { name: "status", description: "Show session configuration, token usage, and rate limits" },
+  { name: "mcp", description: "List configured Model Context Protocol (MCP) servers" },
+  { name: "skills", description: "List available skills" },
+  { name: "logout", description: "Sign out of the Codex account" }
+];
+function parseCommand(prompt) {
+  const first = prompt[0];
+  if (!first || first.type !== "text")
+    return null;
+  const text2 = first.text.trim();
+  if (!text2.startsWith("/"))
+    return null;
+  const body = text2.slice(1).trim();
+  const [name] = body.split(/\s+/);
+  if (!name || name.startsWith("$"))
+    return null;
+  return { name: name.toLowerCase(), rest: body.slice(name.length).trim() };
+}
+function resolveCommand(command, session) {
+  switch (command.name) {
+    case "plan":
+      return {
+        kind: "config",
+        configId: COLLABORATION_MODE_CONFIG_ID,
+        value: session.collaborationMode === PLAN_COLLABORATION_MODE ? DEFAULT_COLLABORATION_MODE : PLAN_COLLABORATION_MODE
+      };
+    case "compact":
+      return { kind: "compact" };
+    case "review":
+      return { kind: "review", target: command.rest.length > 0 ? { type: "custom", instructions: command.rest } : { type: "uncommittedChanges" } };
+    case "review-branch":
+      return command.rest.length > 0 ? { kind: "review", target: { type: "baseBranch", branch: command.rest } } : { kind: "message", text: usage("review-branch", "<branch name>") };
+    case "review-commit":
+      return command.rest.length > 0 ? { kind: "review", target: { type: "commit", sha: command.rest, title: null } } : { kind: "message", text: usage("review-commit", "<commit sha>") };
+    case "logout":
+      return { kind: "logout" };
+    case "status":
+    case "mcp":
+    case "skills":
+      return { kind: "message", text: "" };
+    default:
+      return { kind: "prompt" };
   }
-  nativeBaseUrl() {
-    const providers = this.baseConfig["model_providers"];
-    if (this.configuredProvider && isRecord2(providers)) {
-      const entry = providers[this.configuredProvider];
-      const baseUrl = isRecord2(entry) ? entry["base_url"] : undefined;
-      if (typeof baseUrl === "string" && baseUrl.length > 0)
-        return baseUrl;
+}
+function usage(name, hint) {
+  return `Usage: /${name} ${hint}`;
+}
+function availableCommands(skills) {
+  const commands = new Map;
+  for (const builtin of BUILTIN_COMMANDS)
+    commands.set(builtin.name, builtin);
+  for (const entry of skills) {
+    for (const skill of entry.skills) {
+      const name = `$${skill.name}`;
+      if (commands.has(name))
+        continue;
+      commands.set(name, { name, description: skill.shortDescription || skill.description || skill.name });
     }
-    return DEFAULT_OPENAI_BASE_URL;
+  }
+  return [...commands.values()];
+}
+function skillsMessage(skills) {
+  const lines = skills.flatMap((entry) => entry.skills).map((skill) => {
+    const description = skill.shortDescription || skill.description;
+    return description ? `- ${skill.name}: ${description}` : `- ${skill.name}`;
+  });
+  return lines.length > 0 ? ["Available skills:", ...lines].join(`
+`) : "No skills configured.";
+}
+async function mcpMessage(codex, session) {
+  const servers = await codex.mcpServerStatusList({});
+  const lines = servers.data.map((server) => {
+    const tools = Object.keys(server.tools ?? {}).length;
+    const resources = (server.resources ?? []).length;
+    return `- ${server.name}: ${tools} tools, ${resources} resources, auth=${server.authStatus}`;
+  });
+  const sessionLines = session.mcpServerNames.map((name) => `- ${name}`);
+  return [
+    lines.length > 0 ? "Configured MCP servers:" : "No MCP servers configured.",
+    ...lines,
+    ...sessionLines.length > 0 ? ["", "Session MCP servers:", ...sessionLines] : []
+  ].join(`
+`);
+}
+function statusMessage(session, rateLimits) {
+  const usage2 = session.lastUsage;
+  const lines = [
+    "**Session**",
+    `**Session ID:** ${session.id}`,
+    `**Working directory:** ${session.cwd}`,
+    `**Model:** ${session.model.model} (${session.model.effort})`,
+    `**Mode:** ${session.mode.name}`,
+    `**Collaboration:** ${session.collaborationMode}`,
+    `**Fast mode:** ${session.fastMode ? "on" : "off"}`,
+    `**Account:** ${accountInfo(session)}`,
+    "",
+    "**Usage**",
+    `**Last turn:** ${usage2 ? `${formatTokenCount(usage2.totalTokens)} total (${formatTokenCount(usage2.inputTokens)} input + ${formatTokenCount(usage2.cachedInputTokens)} cached, ${formatTokenCount(usage2.outputTokens)} output)` : "not available yet"}`,
+    `**Context window:** ${usage2 && session.contextWindow ? `${Math.round((session.contextWindow - usage2.totalTokens) / session.contextWindow * 100)}% left (${formatTokenCount(usage2.totalTokens)} / ${formatTokenCount(session.contextWindow)})` : "not available yet"}`,
+    ...rateLimitLines(rateLimits)
+  ];
+  return lines.join(`  
+`);
+}
+function accountInfo(session) {
+  const account = session.account;
+  if (!account)
+    return "not logged in";
+  switch (account.type) {
+    case "apiKey":
+      return "API key";
+    case "chatgpt":
+      return `ChatGPT ${account.planType}${account.email ? ` (${account.email})` : ""}`;
+    case "amazonBedrock":
+      return "Amazon Bedrock";
   }
 }
-function readHints(meta) {
-  const root = isRecord2(meta) ? meta : {};
-  const alwith = isRecord2(root["alwith"]) ? root["alwith"] : {};
-  const codex = isRecord2(root["codex"]) ? root["codex"] : {};
-  const id = readGatewayId(meta) ?? GATEWAY_MODEL_PROVIDER;
-  const models = [];
-  if (Array.isArray(alwith["models"])) {
-    for (const entry of alwith["models"]) {
-      if (!isRecord2(entry) || typeof entry["id"] !== "string" || entry["id"].length === 0)
+function rateLimitLines(rateLimits) {
+  const lines = [];
+  for (const snapshot of rateLimits.values()) {
+    const prefix = snapshot.limitName ? `${snapshot.limitName} ` : "";
+    for (const window of [snapshot.primary, snapshot.secondary]) {
+      if (!window)
         continue;
-      models.push({
-        id: entry["id"],
-        name: typeof entry["label"] === "string" && entry["label"].length > 0 ? entry["label"] : entry["id"],
-        description: typeof entry["description"] === "string" ? entry["description"] : null
-      });
+      const label = windowLabel(window.windowDurationMins);
+      const reset = window.resetsAt === null ? "" : ` (resets ${new Date(window.resetsAt * 1000).toLocaleString()})`;
+      lines.push(`**${prefix}${label}:** ${Math.round(100 - window.usedPercent)}% left${reset}`);
     }
+    if (snapshot.credits?.unlimited)
+      lines.push(`**${prefix}Credits:** unlimited`);
+    else if (snapshot.credits?.balance)
+      lines.push(`**${prefix}Credits:** ${snapshot.credits.balance}`);
   }
-  const model = typeof alwith["model"] === "string" && alwith["model"].length > 0 ? alwith["model"] : null;
-  const name = typeof codex["name"] === "string" && codex["name"].length > 0 ? codex["name"] : null;
-  const bearerToken = typeof codex["bearerToken"] === "string" && codex["bearerToken"].length > 0 ? codex["bearerToken"] : null;
-  const rawConfig = codex["config"];
-  if (rawConfig !== undefined && !isRecord2(rawConfig)) {
-    throw RequestError.invalidParams({ config: rawConfig }, "_meta.codex.config must be an object of top-level Codex config keys");
-  }
-  const config2 = {};
-  if (isRecord2(rawConfig)) {
-    for (const [key, value] of Object.entries(rawConfig)) {
-      if (key === "model_providers")
-        throw RequestError.invalidParams({ config: rawConfig }, "_meta.codex.config cannot set model_providers; that entry is derived from baseUrl and headers");
-      config2[key] = value;
+  return lines.length > 0 ? lines : ["**Limits:** not available yet"];
+}
+function windowLabel(minutes) {
+  if (minutes === null)
+    return "Limit";
+  if (minutes < 60)
+    return `${minutes}m limit`;
+  if (minutes < 1440)
+    return `${Math.round(minutes / 60)}h limit`;
+  if (minutes < 10080)
+    return `${Math.round(minutes / 1440)}d limit`;
+  return "Weekly limit";
+}
+
+// src/agent/configOptions.ts
+function sessionConfigOptions(session) {
+  const model = findModel(session.catalog, session.model.model);
+  const options = [
+    modeConfigOption(session.mode),
+    modelConfigOption(session.catalog, session.model.model, session.gatewayGroups),
+    effortConfigOption(supportedEfforts(model), session.model.effort),
+    collaborationModeConfigOption(session.collaborationMode)
+  ];
+  if (modelSupportsFast(model))
+    options.push(fastModeConfigOption(session.fastMode));
+  return options;
+}
+async function applyConfigOption(session, codex, request) {
+  switch (request.configId) {
+    case MODE_CONFIG_ID: {
+      const mode = findAgentMode(stringValue(request));
+      if (!mode)
+        throw RequestError.invalidParams({ configId: request.configId }, `Unknown mode "${String(request.value)}"`);
+      session.mode = mode;
+      return;
     }
+    case MODEL_CONFIG_ID: {
+      const modelId = stringValue(request);
+      const model = findModel(session.catalog, modelId);
+      session.model = { model: modelId, effort: coerceEffort(model, session.model.effort) };
+      if (!modelSupportsFast(model))
+        session.fastMode = false;
+      return;
+    }
+    case EFFORT_CONFIG_ID: {
+      const effort = stringValue(request);
+      const model = findModel(session.catalog, session.model.model);
+      const efforts = supportedEfforts(model);
+      if (efforts.length > 0 && !efforts.some((option) => option.reasoningEffort === effort)) {
+        throw RequestError.invalidParams({ configId: request.configId }, `Model ${session.model.model} does not support effort "${effort}"`);
+      }
+      session.model = { ...session.model, effort };
+      return;
+    }
+    case FAST_MODE_CONFIG_ID: {
+      if (request.type !== "boolean" || typeof request.value !== "boolean") {
+        throw RequestError.invalidParams({ configId: request.configId }, "fast_mode expects a boolean value");
+      }
+      if (request.value && !modelSupportsFast(findModel(session.catalog, session.model.model))) {
+        throw RequestError.invalidParams({ configId: request.configId }, `Model ${session.model.model} does not support fast mode`);
+      }
+      session.fastMode = request.value;
+      return;
+    }
+    case COLLABORATION_MODE_CONFIG_ID: {
+      const mode = parseCollaborationMode(stringValue(request));
+      if (!mode)
+        throw RequestError.invalidParams({ configId: request.configId }, `Unknown collaboration mode "${String(request.value)}"`);
+      await codex.threadSettingsUpdate({
+        threadId: session.id,
+        collaborationMode: {
+          mode,
+          settings: { model: findModel(session.catalog, session.model.model)?.model ?? session.model.model, reasoning_effort: session.model.effort, developer_instructions: null }
+        }
+      });
+      session.collaborationMode = mode;
+      return;
+    }
+    default:
+      throw RequestError.invalidParams({ configId: request.configId }, `Unknown config option "${request.configId}"`);
   }
-  const rawMode = codex["mode"];
-  if (rawMode !== undefined && rawMode !== "route" && rawMode !== "catalog") {
-    throw RequestError.invalidParams({ mode: rawMode }, '_meta.codex.mode must be "route" or "catalog"');
-  }
-  const mode = rawMode === "catalog" ? "catalog" : "route";
-  if (mode === "catalog" && models.length === 0) {
-    throw RequestError.invalidParams(undefined, `_meta.codex.mode "catalog" needs _meta.alwith.models: the models offered next to Codex's`);
-  }
-  const catalogPath = config2["model_catalog_json"];
-  const catalogEntries = typeof catalogPath === "string" ? readCatalogFile(catalogPath) : new Map;
-  return { id, models, model, name, bearerToken, config: config2, mode, catalogEntries };
 }
-function readGatewayId(meta) {
-  const root = isRecord2(meta) ? meta : {};
-  const codex = isRecord2(root["codex"]) ? root["codex"] : {};
-  const raw = codex["id"];
-  if (raw === undefined)
-    return null;
-  if (typeof raw !== "string" || !GATEWAY_ID_PATTERN.test(raw)) {
-    throw RequestError.invalidParams({ id: raw }, "_meta.codex.id must match [a-z0-9-]+");
+function stringValue(request) {
+  if (typeof request.value !== "string" || request.value.length === 0) {
+    throw RequestError.invalidParams({ configId: request.configId }, `Config option "${request.configId}" expects a string value`);
   }
-  return raw;
+  return request.value;
 }
-function readCatalogFile(catalogPath) {
-  const resolved = catalogPath.startsWith("~/") ? path6.join(os2.homedir(), catalogPath.slice(2)) : catalogPath;
-  let parsed;
-  try {
-    parsed = JSON.parse(readFileSync(resolved, "utf8"));
-  } catch (error40) {
-    throw RequestError.invalidParams({ model_catalog_json: catalogPath }, `model_catalog_json could not be read as JSON: ${error40 instanceof Error ? error40.message : String(error40)}`);
+
+// src/agent/history.ts
+function historyUpdates(turns) {
+  const updates = [];
+  for (const turn of turns) {
+    for (const item of turn.items) {
+      updates.push(...itemSnapshot(item));
+    }
   }
-  const models = isRecord2(parsed) && Array.isArray(parsed["models"]) ? parsed["models"] : null;
-  if (models === null)
-    throw RequestError.invalidParams({ model_catalog_json: catalogPath }, "model_catalog_json must be {models: [...]} as Codex expects");
-  const entries = new Map;
-  for (const entry of models) {
-    if (!isRecord2(entry) || typeof entry["slug"] !== "string")
-      continue;
-    const levels = Array.isArray(entry["supported_reasoning_levels"]) ? entry["supported_reasoning_levels"] : [];
-    const efforts = [];
-    for (const level of levels) {
-      if (!isRecord2(level) || typeof level["effort"] !== "string")
+  return updates;
+}
+function historyTitle(thread, turns) {
+  const explicit = thread.name?.trim();
+  if (explicit)
+    return explicit;
+  for (const turn of turns) {
+    for (const item of turn.items) {
+      if (item.type !== "userMessage")
         continue;
-      efforts.push({ reasoningEffort: level["effort"], description: typeof level["description"] === "string" ? level["description"] : "" });
+      const text2 = item.content.filter((input) => input.type === "text").map((input) => input.text.trim()).find((part) => part.length > 0);
+      if (text2)
+        return firstLine(text2);
     }
-    const modalities = Array.isArray(entry["input_modalities"]) ? entry["input_modalities"].filter((value) => value === "text" || value === "image") : null;
-    entries.set(entry["slug"], {
-      displayName: typeof entry["display_name"] === "string" ? entry["display_name"] : null,
-      description: typeof entry["description"] === "string" ? entry["description"] : null,
-      efforts,
-      defaultEffort: typeof entry["default_reasoning_level"] === "string" ? entry["default_reasoning_level"] : null,
-      inputModalities: modalities
-    });
   }
-  return entries;
+  const preview = thread.preview.trim();
+  return preview.length > 0 ? firstLine(preview) : null;
 }
-function gatewayModel(model, isDefault, template, entry) {
-  const efforts = entry && entry.efforts.length > 0 ? entry.efforts : template?.supportedReasoningEfforts ?? [];
-  const defaultEffort = entry?.defaultEffort ?? template?.defaultReasoningEffort ?? "medium";
-  return {
-    id: model.id,
-    model: model.id,
-    upgrade: null,
-    upgradeInfo: null,
-    availabilityNux: null,
-    displayName: model.name !== model.id ? model.name : entry?.displayName ?? model.name,
-    description: model.description ?? entry?.description ?? "",
-    modelSpecialty: null,
-    hidden: false,
-    supportedReasoningEfforts: efforts,
-    defaultReasoningEffort: defaultEffort,
-    inputModalities: entry?.inputModalities ?? ["text", "image"],
-    supportsPersonality: false,
-    multiAgentVersion: null,
-    additionalSpeedTiers: [],
-    serviceTiers: [],
-    defaultServiceTier: null,
-    availableAccessPrograms: null,
-    isDefault
-  };
+function firstLine(text2) {
+  const line = text2.split(/\r?\n/).map((part) => part.trim()).find((part) => part.length > 0) ?? text2;
+  return line.length > 120 ? `${line.slice(0, 117)}...` : line;
 }
 
 // src/agent/session.ts
@@ -26776,7 +26794,7 @@ class CodexAgent {
           additionalDirectories: {}
         },
         providers: {},
-        _meta: { alwith: { tools: { version: 1 } }, codex: { archive: true, seedHistory: true, skills: true, plugins: true, providerCatalog: true, rename: true, account: true, fuzzyFileSearch: true } }
+        _meta: { alwith: { tools: { version: 1 }, turns: { version: 2 } }, codex: { archive: true, seedHistory: true, skills: true, plugins: true, providerCatalog: true, rename: true, account: true, fuzzyFileSearch: true } }
       },
       authMethods: authMethods(this.capabilities, this.env)
     };
@@ -27533,7 +27551,7 @@ class CodexAgent {
     return runtime;
   }
   async prompt(params) {
-    return await this.promptInternal(params, false, crypto.randomUUID());
+    return await this.promptInternal(params, false, requestedMessageId(params) ?? crypto.randomUUID());
   }
   async promptInternal(params, allowReentry, messageId) {
     this.assertRoutingAvailable();
@@ -27557,7 +27575,7 @@ class CodexAgent {
     }
     const turn = createActiveTurn(session.id, messageId);
     session.activeTurn = turn;
-    runtime.client.reportRunning();
+    runtime.client.reportRunning(messageId);
     this.runPrompt(runtime, turn, params);
     return { messageId };
   }
@@ -27781,7 +27799,7 @@ class CodexAgent {
     await runtime.bridge.finishOpenToolCalls(reason === "cancelled" ? "cancelled" : reason === "end_turn" ? "completed" : "failed");
     if (runtime.session.activeTurn === turn)
       runtime.session.activeTurn = null;
-    await runtime.client.reportIdle(reason, extra);
+    await runtime.client.reportIdle(reason, extra, turn.clientUserMessageId ?? undefined);
   }
   async reportTurnFailure(runtime, turn, error40) {
     const { stopReason, ...classification } = classifyTurnError(error40.codexErrorInfo);
@@ -27966,6 +27984,15 @@ ${stderr}` : ""}`);
 function mcpServerNames(servers) {
   return servers.flatMap((server) => typeof server.name === "string" ? [sanitizeMcpServerName(server.name)] : []);
 }
+function requestedMessageId(params) {
+  const alwith = params._meta?.["alwith"];
+  if (alwith?.messageId === undefined)
+    return;
+  if (typeof alwith.messageId !== "string" || alwith.messageId.length === 0) {
+    throw RequestError.invalidParams(undefined, "_meta.alwith.messageId must be a non-empty string");
+  }
+  return alwith.messageId;
+}
 function agentMessage(messageId, text2) {
   return { sessionUpdate: "agent_message_chunk", messageId, content: { type: "text", text: text2 } };
 }