@yansigit/opencodex 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

@@ -0,0 +1,299 @@
+/** `ocx account` — list and switch provider credentials (issue #180). */
+import { loadConfig } from "../config";
+import { providerCodexAccountMode } from "../providers/registry";
+import type { OcxConfig } from "../types";
+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";
+
+export { classifyAccount } from "./account-api";
+export type { AccountDeps, AccountRow, AccountType, ClassifyResult } from "./account-api";
+type TargetProvenance = "live-oauth-list" | "config" | "codex";
+
+const MAIN_ALIAS = "main";
+const MAIN_CODEX_ID = "__main__";
+/** Replacement-style single-slot OAuth (no stable identity; not HTTP-derivable). */
+const REPLACEMENT_STYLE_OAUTH = new Set(["kiro"]);
+
+const ACCOUNT_USAGE = `Usage:
+  ocx account list [provider] [--json] [--all]
+  ocx account current <provider> [--json]
+  ocx account use <provider> <account-or-key-id|main> [--json]
+  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.`;
+
+function consumeFlag(args: string[], flag: string): boolean {
+  const idx = args.indexOf(flag);
+  if (idx === -1) return false;
+  args.splice(idx, 1);
+  return true;
+}
+
+/** Returns an error message for leftover args, or null when clean. */
+function leftoverArgsError(args: string[]): string | null {
+  if (args.length === 0) return null;
+  const unknown = args.filter(a => a.startsWith("-"));
+  return unknown.length > 0
+    ? `Unknown flag(s): ${unknown.join(", ")}`
+    : `Unexpected argument(s): ${args.join(", ")}`;
+}
+
+function candidateNames(config: OcxConfig): string {
+  const names = new Set<string>(["openai"]);
+  for (const n of Object.keys(config.providers ?? {})) names.add(n);
+  return [...names].join(", ");
+}
+
+function displayId(id: string): string {
+  return id === MAIN_CODEX_ID ? MAIN_ALIAS : id;
+}
+
+function statusText(row: AccountRow): string {
+  const parts: string[] = [];
+  if (row.active) parts.push(row.type === "codex" ? "selected" : "active");
+  if (row.needsReauth) parts.push("needs-reauth");
+  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", "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 ?? "-",
+      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();
+  return [line(header), ...data.map(line)].join("\n");
+}
+
+async function cmdList(rest: string[], deps: AccountDeps): Promise<number> {
+  const wantsJson = consumeFlag(rest, "--json");
+  const showAll = consumeFlag(rest, "--all");
+  const name = rest.shift();
+  const leftover = leftoverArgsError(rest);
+  if (leftover) {
+    console.error(leftover);
+    console.error(ACCOUNT_USAGE);
+    return 1;
+  }
+  const config = deps.loadConfigImpl?.() ?? loadConfig();
+  const baseUrl = await resolveBaseUrl(deps);
+  if (!baseUrl) return proxyUnreachable();
+
+  const targets: { name: string; type: AccountType; provenance: TargetProvenance }[] = [];
+  if (name) {
+    const c = classifyAccount(config, name);
+    if ("error" in c) {
+      console.error(`Error: ${c.error}. Known candidates: ${candidateNames(config)}`);
+      return 1;
+    }
+    targets.push({ name, type: c.type, provenance: "config" });
+  } else {
+    const seen = new Set<string>();
+    const push = (n: string, provenance: TargetProvenance) => {
+      if (seen.has(n)) return;
+      seen.add(n);
+      const c = classifyAccount(config, n);
+      if ("error" in c) return; // fan-out silently skips no-credential providers
+      targets.push({ name: n, type: c.type, provenance });
+    };
+    push("openai", "codex");
+    const providersRes = await apiJson(deps, baseUrl, "GET", "/api/oauth/providers");
+    if (providersRes.status === 0) return proxyUnreachable();
+    if (providersRes.status !== 200) return apiError(providersRes.json, "failed to list OAuth providers");
+    if (Array.isArray(providersRes.json.providers)) {
+      for (const p of providersRes.json.providers) {
+        if (typeof p === "string") push(p, "live-oauth-list");
+      }
+    }
+    for (const n of Object.keys(config.providers ?? {})) push(n, "config");
+  }
+
+  const rows: AccountRow[] = [];
+  const notes: string[] = [];
+  for (const t of targets) {
+    const r = await fetchRows(deps, baseUrl, t.name, t.type);
+    if (r.networkDown) return proxyUnreachable();
+    if (r.errorJson) {
+      if (name) return apiError(r.errorJson, `failed to list ${t.name}`);
+      const errorText = typeof r.errorJson.error === "string" ? r.errorJson.error : "";
+      const skipUnknownKey = t.type === "api-key"
+        && r.status === 404
+        && errorText.includes("unknown provider");
+      const skipConfigOAuth = t.type === "oauth"
+        && t.provenance === "config"
+        && r.status === 400
+        && errorText.includes("unknown oauth provider");
+      if (skipUnknownKey || skipConfigOAuth) continue;
+      return apiError(r.errorJson, `failed to list ${t.name}`);
+    }
+    if (r.rows.length === 0) {
+      if (showAll) notes.push(`${t.name}: no stored accounts or keys`);
+      continue;
+    }
+    rows.push(...r.rows);
+    if (t.type === "codex") {
+      if (r.activeId === null) notes.push("openai: auto (no pin — lowest-usage account is selected per request)");
+      if (providerCodexAccountMode("openai", config.providers?.openai) === "direct") {
+        notes.push("openai is in direct mode — the selection takes effect when pool mode is enabled");
+      }
+    }
+    if (t.type === "oauth" && REPLACEMENT_STYLE_OAUTH.has(t.name)) {
+      notes.push(`${t.name}: single login slot — re-login replaces the current account`);
+    }
+  }
+
+  if (wantsJson) {
+    console.log(JSON.stringify({ accounts: rows, notes }, null, 2));
+    return 0;
+  }
+  if (rows.length > 0) console.log(formatAccountTable(rows));
+  for (const n of notes) console.log(n);
+  if (rows.length === 0 && notes.length === 0) console.log("No stored accounts or keys.");
+  return 0;
+}
+
+async function cmdCurrent(rest: string[], deps: AccountDeps): Promise<number> {
+  const wantsJson = consumeFlag(rest, "--json");
+  const name = rest.shift();
+  const leftover = leftoverArgsError(rest);
+  if (!name || leftover) {
+    if (leftover) console.error(leftover);
+    console.error(ACCOUNT_USAGE);
+    return 1;
+  }
+  const config = deps.loadConfigImpl?.() ?? loadConfig();
+  const c = classifyAccount(config, name);
+  if ("error" in c) {
+    console.error(`Error: ${c.error}. Known candidates: ${candidateNames(config)}`);
+    return 1;
+  }
+  const baseUrl = await resolveBaseUrl(deps);
+  if (!baseUrl) return proxyUnreachable();
+  const r = await fetchRows(deps, baseUrl, name, c.type);
+  if (r.networkDown) return proxyUnreachable();
+  if (r.errorJson) return apiError(r.errorJson, `failed to read ${name}`);
+
+  const activeRow = r.rows.find(row => row.active) ?? null;
+  if (wantsJson) {
+    console.log(JSON.stringify({
+      provider: name,
+      type: c.type,
+      activeId: r.activeId,
+      autoSwitchThreshold: r.autoSwitchThreshold,
+      account: activeRow,
+    }, null, 2));
+    return 0;
+  }
+  if (activeRow) {
+    console.log(formatAccountTable([activeRow]));
+  } else if (c.type === "codex" && r.activeId === null) {
+    console.log("openai: auto (no pin — lowest-usage account is selected per request)");
+  } else {
+    console.log(`${name}: no active account or key`);
+  }
+  return 0;
+}
+
+async function cmdUse(rest: string[], deps: AccountDeps): Promise<number> {
+  const wantsJson = consumeFlag(rest, "--json");
+  const name = rest.shift();
+  const id = rest.shift();
+  const leftover = leftoverArgsError(rest);
+  if (!name || !id || leftover) {
+    if (leftover) console.error(leftover);
+    console.error(ACCOUNT_USAGE);
+    return 1;
+  }
+  const config = deps.loadConfigImpl?.() ?? loadConfig();
+  const c = classifyAccount(config, name);
+  if ("error" in c) {
+    console.error(`Error: ${c.error}. Known candidates: ${candidateNames(config)}`);
+    return 1;
+  }
+  const baseUrl = await resolveBaseUrl(deps);
+  if (!baseUrl) return proxyUnreachable();
+
+  let res: ApiResult;
+  let activeId: string;
+  if (c.type === "codex") {
+    activeId = id === MAIN_ALIAS ? MAIN_CODEX_ID : id;
+    res = await apiJson(deps, baseUrl, "PUT", "/api/codex-auth/active", { accountId: activeId });
+  } else if (c.type === "oauth") {
+    activeId = id;
+    res = await apiJson(deps, baseUrl, "PUT", "/api/oauth/accounts/active", { provider: name, accountId: id });
+  } else {
+    activeId = id;
+    res = await apiJson(deps, baseUrl, "PUT", "/api/providers/keys/active", { name, id });
+  }
+  if (res.status === 0) return proxyUnreachable();
+  if (res.status !== 200) return apiError(res.json, `failed to switch ${name}`);
+
+  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("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;
+}
+
+export async function cmdAccount(args: string[], deps: AccountDeps = {}): Promise<number> {
+  const [sub, ...rest] = args;
+  try {
+    if (sub === "list") return await cmdList(rest, deps);
+    if (sub === "current") return await cmdCurrent(rest, deps);
+    if (sub === "use") return await cmdUse(rest, deps);
+    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;
+    }
+    console.error(ACCOUNT_USAGE);
+    return 1;
+  } catch (err) {
+    console.error(`account: ${err instanceof Error ? err.message : String(err)}`);
+    return 1;
+  }
+}

package/src/cli/agent-driven.ts

@@ -0,0 +1,70 @@
+/**
+ * Detects whether this process was started by a coding agent rather than typed
+ * by a person.
+ *
+ * Agent harnesses run `ocx` on the user's behalf and answer prompts from their
+ * own logic, which means a consent question would be decided by the agent
+ * instead of the account owner. Prompts that act on the user's identity check
+ * this and defer instead: they stay silent so the question reaches the human on
+ * a later hand-typed run.
+ *
+ * Detection is env-var based and deliberately conservative — a false positive
+ * only postpones a prompt, while a false negative would let an agent answer for
+ * the user.
+ */
+
+/**
+ * Env vars set by agent harnesses and CI runners inside the shell they spawn.
+ *
+ * The list errs wide on purpose. A harness that is missed here is a harness
+ * whose model answers a consent question with the user's GitHub identity, which
+ * is the failure this module exists to prevent; a harness matched by mistake
+ * only postpones a prompt to the user's next hand-typed run.
+ */
+const AGENT_ENV_VARS = [
+  // Claude Code
+  "CLAUDECODE",
+  "CLAUDE_CODE_ENTRYPOINT",
+  "CLAUDE_CODE_SSE_PORT",
+  // Codex CLI / App / SDK. `CODEX_HOME` is deliberately NOT here: users export it
+  // from their own shell profile, so matching it would suppress the prompt for a
+  // person who is sitting right there.
+  "CODEX_THREAD_ID",
+  "CODEX_SHELL",
+  "CODEX_CI",
+  "CODEX_SANDBOX",
+  "CODEX_SANDBOX_NETWORK_DISABLED",
+  // Cursor
+  "CURSOR_TRACE_ID",
+  "CURSOR_SESSION_TOKEN",
+  "CURSOR_AGENT",
+  // Other coding agents
+  "AIDER_CHAT",
+  "OPENCODE_BIN_PATH",
+  "GEMINI_CLI",
+  // Generic runners and hosted environments that are never a person at a keyboard
+  "REPL_ID",
+  "CI",
+  "GITHUB_ACTIONS",
+  "GITLAB_CI",
+  "BUILDKITE",
+  "JENKINS_URL",
+  "TEAMCITY_VERSION",
+  "CODESPACES",
+] as const;
+
+/**
+ * True when an agent or automated runner is driving this process. Reads the
+ * environment on every call so tests and long-lived processes see current state.
+ */
+export function isAgentDriven(env: NodeJS.ProcessEnv = process.env): boolean {
+  return AGENT_ENV_VARS.some(name => (env[name] ?? "").trim() !== "");
+}
+
+/**
+ * The env-var names that mark this process as agent-driven. Empty for a real
+ * hand-typed run. Callers that refuse an action use it to name the reason.
+ */
+export function agentDrivenMarkers(env: NodeJS.ProcessEnv = process.env): string[] {
+  return AGENT_ENV_VARS.filter(name => (env[name] ?? "").trim() !== "");
+}