@iislee/opencodex 2.11.0 → 2.31.0

package/src/cli/account-main.ts

@@ -0,0 +1,317 @@
+import { isAbsolute } from "node:path";
+import { codexExecInvocation } from "../codex/exec-invocation";
+import { resolveAndPersistCodexRuntime, type ResolveCodexRuntimeDeps } from "../codex/runtime";
+import type { ResolveDeps, SpawnInvocation } from "../lib/win-exec";
+import {
+  apiError,
+  apiJson,
+  proxyUnreachable,
+  resolveBaseUrl,
+  type AccountDeps,
+  type NativeMainLoginChild,
+  type StageLeaseClock,
+} from "./account-api";
+
+const USAGE = `Usage:
+  ocx account main doctor [--json]
+  ocx account main list [--json]
+  ocx account main register <label> [--json]
+  ocx account main add <label>
+  ocx account main switch <profile-id-or-label> --yes [--json]
+  ocx account main recover [--rollback --yes] [--json]
+
+Native main login profiles change the physical Codex App/CLI login in the effective CODEX_HOME.
+They are independent from the OpenCodex Pool selected by 'ocx account use openai'.`;
+
+const STAGE_LEASE_SAFETY_MARGIN_MS = 30_000;
+
+const systemStageLeaseClock: StageLeaseClock = {
+  now: Date.now,
+  setTimeout: (callback, ms) => setTimeout(callback, ms),
+  clearTimeout: timer => clearTimeout(timer),
+};
+
+interface PublicProfile {
+  id: string;
+  label: string;
+  identityHint: string;
+  state: "active" | "inactive";
+}
+
+export type NativeMainCodexLoginInvocationDeps =
+  & ResolveDeps
+  & Pick<ResolveCodexRuntimeDeps, "existsSync" | "execFileSync" | "configDir" | "readFileSync">;
+
+function flag(args: string[], name: string): boolean {
+  const index = args.indexOf(name);
+  if (index < 0) return false;
+  args.splice(index, 1);
+  return true;
+}
+
+function reject(args: string[]): number {
+  if (args.length > 0) console.error(`Unexpected argument(s): ${args.join(", ")}`);
+  console.error(USAGE);
+  return 1;
+}
+
+function effectiveCodexHome(result: Record<string, unknown>): string {
+  return typeof result.effectiveCodexHome === "string" && result.effectiveCodexHome.length > 0
+    ? result.effectiveCodexHome
+    : "the effective CODEX_HOME";
+}
+
+function printProfiles(profiles: PublicProfile[]): void {
+  if (profiles.length === 0) { console.log("No native main login profiles registered."); return; }
+  const rows = profiles.map(profile => [profile.state === "active" ? "*" : " ", profile.label, profile.id, profile.identityHint]);
+  const header = ["", "LABEL", "PROFILE ID", "IDENTITY"];
+  const widths = header.map((value, index) => Math.max(value.length, ...rows.map(row => row[index]!.length)));
+  const line = (columns: string[]) => columns.map((value, index) => value.padEnd(widths[index]!)).join("  ").trimEnd();
+  console.log([line(header), ...rows.map(line)].join("\n"));
+}
+
+export function nativeMainCodexLoginInvocation(
+  platform: NodeJS.Platform = process.platform,
+  deps: NativeMainCodexLoginInvocationDeps = {},
+): SpawnInvocation {
+  const command = resolveAndPersistCodexRuntime({
+    env: deps.env ?? process.env,
+    platform,
+    existsSync: deps.existsSync,
+    execFileSync: deps.execFileSync,
+    configDir: deps.configDir,
+    readFileSync: deps.readFileSync,
+    discoverAlternatives: false,
+  }).runtime.command || "codex";
+  return codexExecInvocation(command, ["login"], platform, deps);
+}
+
+function spawnOfficialCodexLogin(codexHome: string): NativeMainLoginChild {
+  const invocation = nativeMainCodexLoginInvocation();
+  const child = Bun.spawn([invocation.file, ...invocation.args], {
+    env: { ...process.env, CODEX_HOME: codexHome },
+    stdin: "inherit",
+    stdout: "inherit",
+    stderr: "inherit",
+    ...(invocation.options.windowsVerbatimArguments ? { windowsVerbatimArguments: true } : {}),
+  });
+  return child;
+}
+
+function abortableDelay(ms: number, signal: AbortSignal, clock: StageLeaseClock): Promise<void> {
+  if (signal.aborted) return Promise.resolve();
+  return new Promise(resolve => {
+    const timer = clock.setTimeout(done, ms);
+    signal.addEventListener("abort", done, { once: true });
+    function done(): void {
+      clock.clearTimeout(timer);
+      signal.removeEventListener("abort", done);
+      resolve();
+    }
+  });
+}
+
+async function maintainStageLease(
+  deps: AccountDeps,
+  baseUrl: string,
+  stageId: string,
+  writerToken: string,
+  initialLeaseExpiresAt: number,
+  heartbeatIntervalMs: number,
+  child: NativeMainLoginChild,
+  signal: AbortSignal,
+  clock: StageLeaseClock,
+): Promise<{ lost: boolean }> {
+  let leaseExpiresAt = initialLeaseExpiresAt;
+  for (;;) {
+    if (signal.aborted) return { lost: false };
+    const deadlineAt = leaseExpiresAt - STAGE_LEASE_SAFETY_MARGIN_MS;
+    if (clock.now() >= deadlineAt) {
+      try { child.kill(); } catch { /* child exit below is authoritative */ }
+      return { lost: true };
+    }
+
+    const heartbeatAbort = new AbortController();
+    const deadlineReached = Symbol("heartbeat-deadline");
+    const parentCancelled = Symbol("heartbeat-parent-cancelled");
+    let resolveInterruption!: (result: typeof deadlineReached | typeof parentCancelled) => void;
+    const interruption = new Promise<typeof deadlineReached | typeof parentCancelled>(resolve => {
+      resolveInterruption = resolve;
+    });
+    const cancelHeartbeat = () => {
+      heartbeatAbort.abort();
+      resolveInterruption(parentCancelled);
+    };
+    signal.addEventListener("abort", cancelHeartbeat, { once: true });
+    const deadlineTimer = clock.setTimeout(() => {
+      heartbeatAbort.abort();
+      resolveInterruption(deadlineReached);
+    }, Math.max(0, deadlineAt - clock.now()));
+    const heartbeatRequest = apiJson(
+      deps,
+      baseUrl,
+      "POST",
+      "/api/native-main-profiles/stage/heartbeat",
+      { stageId, writerToken },
+      { signal: heartbeatAbort.signal },
+    );
+    const heartbeat = await Promise.race([heartbeatRequest, interruption]);
+    clock.clearTimeout(deadlineTimer);
+    signal.removeEventListener("abort", cancelHeartbeat);
+    if (signal.aborted) return { lost: false };
+    if (heartbeat === parentCancelled) return { lost: false };
+    if (heartbeat === deadlineReached) {
+      try { child.kill(); } catch { /* child exit below is authoritative */ }
+      return { lost: true };
+    }
+    if (heartbeat.status === 200 && typeof heartbeat.json.leaseExpiresAt === "number") {
+      leaseExpiresAt = heartbeat.json.leaseExpiresAt;
+      await abortableDelay(Math.min(heartbeatIntervalMs, Math.max(0, leaseExpiresAt - STAGE_LEASE_SAFETY_MARGIN_MS - clock.now())), signal, clock);
+      continue;
+    }
+    if (heartbeat.status === 0 && clock.now() < leaseExpiresAt - STAGE_LEASE_SAFETY_MARGIN_MS) {
+      await abortableDelay(Math.min(5_000, heartbeatIntervalMs, leaseExpiresAt - STAGE_LEASE_SAFETY_MARGIN_MS - clock.now()), signal, clock);
+      continue;
+    }
+    try { child.kill(); } catch { /* child exit below is authoritative */ }
+    return { lost: true };
+  }
+}
+
+export async function cmdNativeMainAccount(args: string[], deps: AccountDeps): Promise<number> {
+  const sub = args.shift();
+  const wantsJson = flag(args, "--json");
+  const confirmed = flag(args, "--yes");
+  const rollback = flag(args, "--rollback");
+  const baseUrl = await resolveBaseUrl(deps);
+  if (!baseUrl) return proxyUnreachable();
+
+  if (sub === "doctor" || sub === "list") {
+    if (args.length > 0 || confirmed || rollback) return reject(args);
+    const path = sub === "doctor" ? "/api/native-main-profiles/doctor" : "/api/native-main-profiles";
+    const result = await apiJson(deps, baseUrl, "GET", path);
+    if (result.status === 0) return proxyUnreachable();
+    if (result.status !== 200) return apiError(result.json, `failed to ${sub} native profiles`);
+    if (wantsJson || sub === "doctor") console.log(JSON.stringify(result.json, null, 2));
+    else printProfiles(Array.isArray(result.json.profiles) ? result.json.profiles as PublicProfile[] : []);
+    return 0;
+  }
+
+  if (sub === "register") {
+    const label = args.shift();
+    if (!label || args.length > 0 || confirmed || rollback) return reject(args);
+    const result = await apiJson(deps, baseUrl, "POST", "/api/native-main-profiles/register", { label });
+    if (result.status === 0) return proxyUnreachable();
+    if (result.status !== 200) return apiError(result.json, "failed to register the current native login");
+    if (wantsJson) console.log(JSON.stringify(result.json, null, 2));
+    else console.log(`Registered '${label}' for ${effectiveCodexHome(result.json)}.`);
+    return 0;
+  }
+
+  if (sub === "add") {
+    const label = args.shift();
+    if (!label || args.length > 0 || wantsJson || confirmed || rollback) return reject(args);
+    const stage = await apiJson(deps, baseUrl, "POST", "/api/native-main-profiles/stage", {});
+    if (stage.status === 0) return proxyUnreachable();
+    if (stage.status !== 200) return apiError(stage.json, "failed to prepare native login staging");
+    const stageId = typeof stage.json.stageId === "string" ? stage.json.stageId : "";
+    const writerToken = typeof stage.json.writerToken === "string" ? stage.json.writerToken : "";
+    const stagingHome = typeof stage.json.stagingCodexHome === "string" ? stage.json.stagingCodexHome : "";
+    const leaseExpiresAt = typeof stage.json.leaseExpiresAt === "number" ? stage.json.leaseExpiresAt : 0;
+    const heartbeatIntervalMs = typeof stage.json.heartbeatIntervalMs === "number"
+      ? Math.min(5 * 60_000, Math.max(deps.stageHeartbeatIntervalMinMs ?? 5_000, stage.json.heartbeatIntervalMs))
+      : 60_000;
+    const stageLeaseClock = deps.stageLeaseClock ?? systemStageLeaseClock;
+    const stagedEffectiveHome = effectiveCodexHome(stage.json);
+    let exitCode = 1;
+    let finished = false;
+    let leaseLost = false;
+    try {
+      if (!stageId || !writerToken || !isAbsolute(stagingHome) || leaseExpiresAt <= stageLeaseClock.now()) {
+        throw new Error("The proxy returned an invalid staging session.");
+      }
+      console.error(`Effective CODEX_HOME: ${stagedEffectiveHome}`);
+      console.error(`Starting official Codex login in restricted staging home: ${stagingHome}`);
+      const child = deps.spawnCodexLoginImpl
+        ? deps.spawnCodexLoginImpl(stagingHome)
+        : deps.runCodexLoginImpl
+          ? { exited: deps.runCodexLoginImpl(stagingHome), kill: () => {} }
+          : spawnOfficialCodexLogin(stagingHome);
+      const heartbeatAbort = new AbortController();
+      const heartbeat = maintainStageLease(
+        deps,
+        baseUrl,
+        stageId,
+        writerToken,
+        leaseExpiresAt,
+        heartbeatIntervalMs,
+        child,
+        heartbeatAbort.signal,
+        stageLeaseClock,
+      );
+      try {
+        exitCode = await child.exited;
+      } finally {
+        heartbeatAbort.abort();
+        leaseLost = (await heartbeat).lost;
+      }
+      if (leaseLost) throw new Error("The native-login staging lease was lost before login completed.");
+      if (exitCode !== 0) throw new Error("Official Codex login did not complete successfully.");
+      const finish = await apiJson(deps, baseUrl, "POST", "/api/native-main-profiles/stage/finish", { stageId, writerToken, label });
+      if (finish.status === 0) return proxyUnreachable();
+      if (finish.status !== 200) return apiError(finish.json, "failed to encrypt the staged native login");
+      finished = true;
+      console.log(`Added encrypted native profile '${label}' for ${effectiveCodexHome(finish.json)}.`);
+      return 0;
+    } catch (error) {
+      console.error(`Error: ${error instanceof Error ? error.message : "Official Codex login failed."}`);
+      return exitCode === 0 ? 1 : exitCode;
+    } finally {
+      if (stageId && !finished) {
+        const cleanup = await apiJson(deps, baseUrl, "POST", "/api/native-main-profiles/stage/cancel", { stageId, writerToken });
+        if (cleanup.status !== 200 || cleanup.json.plaintextMayRemain === true) {
+          console.error("Error: the proxy could not confirm native-login staging cleanup; run account main doctor.");
+        }
+      }
+    }
+  }
+
+  if (sub === "switch") {
+    const target = args.shift();
+    if (!target || args.length > 0 || rollback || !confirmed) {
+      if (!confirmed) console.error("Close Codex App/CLI, then pass --yes to confirm it is stopped.");
+      return reject(args);
+    }
+    const result = await apiJson(deps, baseUrl, "POST", "/api/native-main-profiles/switch", { target, confirmedStopped: true });
+    if (result.status === 0) return proxyUnreachable();
+    if (result.status !== 200) return apiError(result.json, "failed to switch the native login");
+    if (wantsJson) console.log(JSON.stringify(result.json, null, 2));
+    else {
+      const profile = result.json.activeProfile as PublicProfile | undefined;
+      console.log(`Native Codex login for ${effectiveCodexHome(result.json)} is now '${profile?.label ?? target}'. Restart Codex App/CLI before continuing.`);
+    }
+    return 0;
+  }
+
+  if (sub === "recover") {
+    if (args.length > 0 || (rollback && !confirmed)) {
+      if (rollback && !confirmed) console.error("--rollback changes the native login and requires --yes.");
+      return reject(args);
+    }
+    const result = await apiJson(deps, baseUrl, "POST", "/api/native-main-profiles/recover", rollback
+      ? { rollback: true, confirmedStopped: true }
+      : { rollback: false });
+    if (result.status === 0) return proxyUnreachable();
+    if (result.status !== 200) return apiError(result.json, "failed to recover the native-profile transaction");
+    if (wantsJson) console.log(JSON.stringify(result.json, null, 2));
+    else {
+      const home = effectiveCodexHome(result.json);
+      console.log(result.json.recovered === true
+        ? `Recovery completed for ${home}: ${String(result.json.action ?? "converged")}.`
+        : `No recovery journal is pending for ${home}.`);
+    }
+    return 0;
+  }
+
+  return reject(args);
+}

package/src/cli/account.ts

@@ -2,7 +2,7 @@
 import { loadConfig } from "../config";
 import { providerCodexAccountMode } from "../providers/registry";
 import type { OcxConfig } from "../types";
-import { cmdAddKey, cmdAlias, cmdAutoSwitch, cmdClearCooldown, cmdRefresh, cmdRemove } from "./account-extended";
+import { cmdAddKey, cmdAlias, cmdAutoSwitch, cmdClearCooldown, cmdImport, cmdPriority, cmdRefresh, cmdRemove } from "./account-extended";
 import { apiError, apiJson, classifyAccount, fetchRows, proxyUnreachable, resolveBaseUrl, type AccountDeps, type AccountRow, type AccountType, type ApiResult }
   from "./account-api";
 
@@ -22,13 +22,16 @@ const ACCOUNT_USAGE = `Usage:
   ocx account refresh <provider> [--json]
   ocx account auto-switch <provider> <on|off|status|threshold <0-100>> [--json]
   ocx account alias <provider> <account-or-key-id> <display-name|-> [--json]
+  ocx account priority <provider> <account-id|main> [<-100..100|first|earlier|normal|later|last|reset>] [--json]
   ocx account remove <provider> <account-or-key-id|main> --yes [--json]
   ocx account clear-cooldown <provider> <account-id|main> [--json]
   ocx account add-key <provider> [--label <label>] [--json]
+  ocx account import <provider> --format <format> (--file <path>|--stdin) [--json]
   ocx account login <provider> [--id <account-id>] [--reauth] [--code -] [--no-wait] [--json]
   ocx account code <provider> [--flow <flow-id>] [--json]   (reads the code from stdin)
   ocx account cancel <provider> [--flow <flow-id>] [--json]
   ocx account reset-credits <account-id|main> [--consume --yes] [--json]
+  ocx account main <doctor|list|register|add|switch|recover> ...
 
 List and switch provider accounts and API-key pools (masked output only).
 'main' selects the Codex App login for the openai account pool.`;
@@ -66,11 +69,24 @@ function statusText(row: AccountRow): string {
   return parts.join(" ");
 }
 
+/** Signed so the sort direction reads off the column; "-" where ordering does not apply. */
+function priorityText(row: AccountRow): string {
+  if (row.priority === undefined) return "-";
+  return row.priority > 0 ? `+${row.priority}` : String(row.priority);
+}
+
 export function formatAccountTable(rows: AccountRow[]): string {
-  const header = ["PROVIDER", "TYPE", "ID", "PLAN/LABEL", "STATUS"];
+  const header = ["PROVIDER", "TYPE", "ID", "PLAN/LABEL", "PRIORITY", "STATUS"];
   const data = rows.map(r => {
     const keyLabel = r.masked && r.label !== r.masked ? `${r.masked} (${r.label})` : r.masked;
-    return [r.provider, r.type, displayId(r.id), r.type === "api-key" ? keyLabel ?? "-" : r.label ?? "-", statusText(r)];
+    return [
+      r.provider,
+      r.type,
+      displayId(r.id),
+      r.type === "api-key" ? keyLabel ?? "-" : r.label ?? "-",
+      priorityText(r),
+      statusText(r),
+    ];
   });
   const widths = header.map((h, i) => Math.max(h.length, ...data.map(d => d[i]!.length)));
   const line = (cols: string[]) => cols.map((c, i) => c.padEnd(widths[i]!)).join("  ").trimEnd();
@@ -243,9 +259,11 @@ async function cmdUse(rest: string[], deps: AccountDeps): Promise<number> {
   if (wantsJson) console.log(JSON.stringify({ ok: true, provider: name, type: c.type, activeId }, null, 2));
   else console.log(`${name}: active ${c.type === "api-key" ? "key" : "account"} is now ${displayId(activeId)}`);
   if (c.type === "codex") {
-    console.error("Applies to the next request after clearing existing pool affinity; in-flight requests keep their captured account.");
-    console.error("Note: pool strategy, quota/cooldown/reauthentication state, and failure recovery may later select another eligible account.");
-    console.error("Conversation context is replayed after account changes, but the provider-side prompt cache may be cold.");
+    console.error("Takes effect immediately; running threads move on their next request, and in-flight requests keep the account they captured.");
+    const active = await apiJson(deps, baseUrl, "GET", "/api/codex-auth/active");
+    if (active.status === 200 && typeof active.json.autoSwitchThreshold === "number" && active.json.autoSwitchThreshold > 0) {
+      console.error(`Note: auto-switch (threshold ${active.json.autoSwitchThreshold}%) may override this pin.`);
+    }
   }
   return 0;
 }
@@ -259,9 +277,15 @@ export async function cmdAccount(args: string[], deps: AccountDeps = {}): Promis
     if (sub === "refresh") return await cmdRefresh(rest, deps);
     if (sub === "auto-switch") return await cmdAutoSwitch(rest, deps);
     if (sub === "alias" || sub === "rename") return await cmdAlias(rest, deps);
+    if (sub === "priority") return await cmdPriority(rest, deps);
     if (sub === "remove") return await cmdRemove(rest, deps);
     if (sub === "clear-cooldown") return await cmdClearCooldown(rest, deps);
     if (sub === "add-key") return await cmdAddKey(rest, deps);
+    if (sub === "import") return await cmdImport(rest, deps);
+    if (sub === "main") {
+      const { cmdNativeMainAccount } = await import("./account-main");
+      return await cmdNativeMainAccount(rest, deps);
+    }
     if (["login", "reauth", "code", "cancel", "reset-credits"].includes(sub ?? "")) {
       const { handleAccountAuthCommand } = await import("./account-auth");
       return await handleAccountAuthCommand(sub!, rest, deps) ?? 1;

package/src/cli/agent.ts

@@ -13,6 +13,13 @@ import {
   type RuntimeApiDeps,
 } from "./runtime-api";
 
+interface WebSearchModelOption {
+  value: string;
+  model: string;
+  backend: "openai" | "anthropic";
+  authSlot?: boolean;
+}
+
 const USAGE = `Usage:
   ocx agent [status] [--json]
   ocx agent injection <status|set> [--model <id|->] [--effort <level|->]
@@ -20,7 +27,8 @@ const USAGE = `Usage:
   ocx agent effort <status|set> [--main <level|->] [--subagent <level|->] [--json]
   ocx agent subagents <status|set|clear> [model,model...] [--json]
   ocx agent fallback <status|set|clear> [model,model...] [--poll-ms <5000-600000>] [--json]
-  ocx agent sidecar <status|web|vision> [--model <id|->] [--backend <openai|anthropic|->]
+  ocx agent sidecar <status|web|vision> [--list] [--model <id|->]
+      [--backend web:<openai|anthropic|xai|gemini|exa|-> vision:<openai|anthropic|routed|->]
       [--reasoning <level>] [--max-descriptions <n>] [--json]`;
 
 function clearable(value: string | undefined): string | null | undefined {
@@ -152,6 +160,29 @@ async function sidecar(argv: string[], deps: RuntimeApiDeps): Promise<void> {
     return;
   }
   if (section !== "web" && section !== "vision") throw new CliUsageError("sidecar must be web, vision, or status", USAGE);
+  // --list must be consumed BEFORE rejectArgs sees it. It prints the server's
+  // candidate set — the exact list the GUI picker shows (#2188): the server
+  // computes it once and every surface consumes it, so the CLI cannot drift.
+  const wantsList = takeFlag(args, "--list");
+  if (wantsList) {
+    rejectArgs(args, USAGE);
+    const settings = await runtimeRequest("/api/sidecar-settings", {}, deps) as {
+      webSearchModels?: WebSearchModelOption[];
+      visionModels?: Array<{ value: string; backend?: string; baseline?: boolean }>;
+    };
+    if (section === "web") {
+      const options = settings.webSearchModels ?? [];
+      printData(options, wantsJson, options.length === 0
+        ? ["no runnable web-search sidecar models (log in to ChatGPT or Anthropic)"]
+        : options.map(option => `${option.value} [${option.backend}]${option.authSlot ? " (auth slot)" : ""}`));
+    } else {
+      const options = settings.visionModels ?? [];
+      printData(options, wantsJson, options.length === 0
+        ? ["no eligible vision describers"]
+        : options.map(option => `${option.value}${option.backend ? ` [${option.backend}]` : ""}${option.baseline ? " (baseline)" : ""}`));
+    }
+    return;
+  }
   const model = takeOption(args, "--model");
   const backend = takeOption(args, "--backend");
   const reasoning = takeOption(args, "--reasoning");
@@ -163,6 +194,19 @@ async function sidecar(argv: string[], deps: RuntimeApiDeps): Promise<void> {
   if (reasoning !== undefined) settings.reasoning = reasoning;
   if (maxDescriptionsPerTurn !== undefined) settings.maxDescriptionsPerTurn = maxDescriptionsPerTurn;
   if (Object.keys(settings).length === 0) throw new CliUsageError("at least one sidecar option is required", USAGE);
+  if (section === "web" && model !== undefined && model !== "-") {
+    const offered = await runtimeRequest("/api/sidecar-settings", {}, deps) as {
+      webSearchModels?: WebSearchModelOption[];
+    };
+    const requestedBackend = backend === "-" ? "openai" : backend;
+    const option = offered.webSearchModels?.find(candidate =>
+      (candidate.value === model || candidate.model === model)
+      && (requestedBackend === undefined || candidate.backend === requestedBackend));
+    if (option) {
+      settings.model = option.model;
+      if (backend !== "-") settings.backend = option.backend;
+    }
+  }
   const body = section === "web" ? { webSearch: settings } : { vision: settings };
   const result = await runtimeRequest("/api/sidecar-settings", { method: "PUT", body: JSON.stringify(body) }, deps);
   printData(result, wantsJson, [`${section} sidecar settings updated.`]);

package/src/cli/claude-agent-startup-sync.ts

@@ -0,0 +1,73 @@
+import type { OcxConfig } from "../types";
+import { injectClaudeAgentDefs } from "../claude/agents-inject";
+import { fetchClaudeContextWindows } from "./claude";
+import type { ReadinessGate } from "../server/readiness";
+
+export interface ClaudeAgentStartupSyncDeps {
+  fetchContextWindows?: typeof fetchClaudeContextWindows;
+  injectAgentDefs?: typeof injectClaudeAgentDefs;
+  warn?: (message: string) => void;
+}
+
+/**
+ * Keep the public readiness gate pending until both startup reconciliations have settled.
+ *
+ * The Codex sync remains the authority for ready versus failed. Claude roster repair is
+ * deliberately best-effort (#2200), but readiness must not become observable between the
+ * Codex write and that repair: a service manager could otherwise launch Claude Code against
+ * stale `ocx-*.md` files. A small forwarding gate delays only the successful transition;
+ * terminal Codex failure is still published immediately.
+ */
+export async function reconcileClientStartupBeforeReady<T>(
+  readinessGate: ReadinessGate,
+  syncCodex: (deferredGate: ReadinessGate) => Promise<T>,
+  syncClaudeRoster: () => Promise<unknown>,
+): Promise<T> {
+  let codexReady = false;
+  const deferredGate: ReadinessGate = {
+    getStatus: () => readinessGate.getStatus(),
+    markReady: () => { codexReady = true; },
+    markFailed: () => readinessGate.markFailed(),
+  };
+
+  const result = await syncCodex(deferredGate);
+  await syncClaudeRoster();
+  if (codexReady) readinessGate.markReady();
+  return result;
+}
+
+/**
+ * Reconcile the generated Claude Code roster after the proxy listener is live.
+ *
+ * This belongs to the owning CLI lifecycle rather than `startServer`: the latter is also a
+ * library/test primitive and must not mutate a developer's real `~/.claude` directory merely
+ * because an in-process test server was created. The live Management API supplies the same bounded
+ * context-window map used by `ocx claude`; failure keeps startup available and falls back to an
+ * unmarked roster. Disabled integrations skip discovery and prune verified-owned definitions.
+ */
+export async function syncClaudeAgentDefsAtProxyStartup(
+  config: OcxConfig,
+  port: number,
+  deps: ClaudeAgentStartupSyncDeps = {},
+): Promise<string[] | null> {
+  const inject = deps.injectAgentDefs ?? injectClaudeAgentDefs;
+  const warn = deps.warn ?? (message => console.warn(message));
+
+  try {
+    if (config.claudeCode?.enabled === false || config.claudeCode?.injectAgents === false) {
+      return inject(config, {});
+    }
+
+    let windows: Record<string, number> = {};
+    try {
+      windows = await (deps.fetchContextWindows ?? fetchClaudeContextWindows)(config, port);
+    } catch {
+      // Startup remains best-effort. The next management mutation or `ocx claude` launch can
+      // restore context markers after a transient catalog/Management API failure.
+    }
+    return inject(config, windows);
+  } catch (error) {
+    warn(`⚠ Claude agent definitions could not be synced at proxy startup: ${error instanceof Error ? error.message : String(error)}`);
+    return null;
+  }
+}

package/src/cli/claude-desktop.ts

@@ -1,6 +1,7 @@
 import { readFileSync, writeFileSync } from "node:fs";
 import { resolve } from "node:path";
 import { loadConfig, saveConfigPreservingClaudeCode } from "../config";
+import { setIntegrationEnabled } from "../codex/desired-state";
 import {
   DESKTOP_FAMILIES,
   moveDesktopRoute,
@@ -10,10 +11,11 @@ import {
   type DesktopProfile,
 } from "../claude/desktop-profile";
 import { writeDesktop3pConfig, type Desktop3pConfigMode, parseDesktop3pModeArgs } from "../claude/desktop-3p";
-import { filterCatalogVisibleModels, desktopVisibleNativeSlugs } from "../codex/catalog";
+import { filterCatalogVisibleModels, desktopVisibleNativeSlugs, nativeContextLimits } from "../codex/catalog";
 import { buildClaudeDesktopState, fetchAllModels } from "../server/management-api";
 import { findLiveProxy } from "../server/proxy-liveness";
 import { runtimeRequest } from "./runtime-api";
+import { OPENAI_CODEX_PROVIDER_ID } from "../providers/openai-tiers";
 
 function isFamily(value: string | undefined): value is DesktopFamily {
   return !!value && (DESKTOP_FAMILIES as readonly string[]).includes(value);
@@ -41,7 +43,11 @@ export async function applyProfile(
   profile: DesktopProfile,
   mode: Desktop3pConfigMode,
   deps: ApplyProfileDeps = {},
-): Promise<{ ok: boolean; path: string; reason?: string }> {
+): Promise<{ ok: boolean; path: string; reason?: string; warning?: string }> {
+  // Explicit apply is an enable action. Persist intent before any Desktop write
+  // so a process crash cannot leave a gateway profile that startup immediately removes.
+  const desired = setIntegrationEnabled("claude-desktop", true);
+  if (!desired.ok) return { ok: false, path: "", reason: desired.message };
   const config = loadConfig();
   const state = await buildClaudeDesktopState(config, profile);
   config.claudeCode = { ...(config.claudeCode ?? {}), desktopProfile: state.profile };
@@ -52,7 +58,7 @@ export async function applyProfile(
     // serving process installs the map there; a local-only write leaves the
     // daemon unable to decode aliases, and the provider rejects them (400).
     const post = deps.postApplyImpl ?? (async (m: Desktop3pConfigMode, p: DesktopProfile) =>
-      runtimeRequest<{ ok?: boolean; path?: string; error?: string }>(
+      runtimeRequest<{ ok?: boolean; path?: string; error?: string; saved?: boolean; warning?: string }>(
         "/api/claude-desktop/apply",
         // The daemon's config may be older than what we just saved, so the
         // profile travels with the request instead of being re-read there.
@@ -61,12 +67,26 @@ export async function applyProfile(
     try {
       const applied = await post(mode, state.profile);
       if (applied.ok === false) return { ok: false, path: applied.path ?? "", reason: applied.error ?? "daemon apply failed" };
-      return { ok: true, path: applied.path ?? "" };
+      // Partial success: Desktop was written but the applied marker was not
+      // persisted. Pass the degradation up instead of reporting a clean apply.
+      const partial = (applied as { saved?: boolean; warning?: string }).saved === false;
+      return {
+        ok: true,
+        path: applied.path ?? "",
+        ...(partial ? { warning: (applied as { warning?: string }).warning ?? "applied marker was not saved" } : {}),
+      };
     } catch (error) {
       return { ok: false, path: "", reason: error instanceof Error ? error.message : String(error) };
     }
   }
   const allModels = await fetchAllModels(config);
+  // The toggle can persist OFF while fetchAllModels was awaiting (same race the
+  // management writers fence). Re-read persisted intent immediately before the
+  // writer; a lost race is a discriminated skip, not a write.
+  const { claudeDesktopIntegrationEnabledNow } = await import("../codex/desired-state");
+  if (!claudeDesktopIntegrationEnabledNow()) {
+    return { ok: false, path: "", reason: "desired_state_changed" };
+  }
   const routed = filterCatalogVisibleModels(allModels, config).map(model => ({
     provider: model.provider,
     id: model.id,
@@ -79,6 +99,7 @@ export async function applyProfile(
     config.apiKeys?.[0]?.key,
     mode,
     state.profile,
+    nativeContextLimits(config),
   );
   return { ok: result.written, path: result.path, reason: result.reason };
 }
@@ -111,6 +132,9 @@ export async function handleClaudeDesktopCommand(argv: string[], deps: ApplyProf
         return 1;
       }
       console.log(`Claude Desktop 설정을 적용했습니다: ${result.path}`);
+      // The write landed; only the bookkeeping marker did not. Saying nothing
+      // would leave the saved-vs-applied display wrong with no explanation.
+      if (result.warning) console.warn(`⚠️  ${result.warning}`);
       console.log("Claude Desktop을 완전히 종료한 뒤 다시 열어 주세요.");
       return 0;
     } catch (error) {
@@ -175,6 +199,7 @@ export async function handleClaudeDesktopCommand(argv: string[], deps: ApplyProf
       if (flags.includes("--apply")) {
         const result = await applyProfile(reconciled, "static", deps);
         if (!result.ok) { console.error(`프로필은 저장했지만 Desktop 적용에 실패했습니다: ${result.reason ?? "unknown error"}`); return 1; }
+        if (result.warning) console.warn(`⚠️  ${result.warning}`);
       }
       console.log("Claude Desktop 프로필을 가져왔습니다.");
       return 0;