@iislee/opencodex 2.11.0 → 2.31.0

package/src/cli/account-extended.ts

@@ -1,4 +1,11 @@
 import { loadConfig } from "../config";
+import { closeSync, openSync, readSync } from "node:fs";
+import {
+  MAX_ACCOUNT_PRIORITY,
+  MIN_ACCOUNT_PRIORITY,
+  normalizeAccountPriority,
+  parseAccountPriority,
+} from "../codex/pool-rotation";
 import {
   apiError,
   apiJson,
@@ -11,6 +18,20 @@ import {
   type AccountDeps, type AccountStdin, type FamilyRows,
   type ProviderQuotaDto, type ProviderQuotaReportDto,
 } from "./account-api";
+import {
+  codexCatalogRefreshPending,
+  warnIfCodexCatalogRefreshPending,
+} from "./account-catalog-refresh";
+import {
+  ACCOUNT_IMPORT_DEADLINE_MS,
+  ACCOUNT_IMPORT_FORMAT,
+  ACCOUNT_IMPORT_MAX_BYTES,
+  ACCOUNT_IMPORT_PROVIDER,
+  type AccountImportCode,
+  type AccountImportRecordResult,
+  type AccountImportResult,
+  type AccountImportStatus,
+} from "../oauth/account-import";
 
 const MAIN_ID = "__main__";
 const AUTO_NOTE = "auto (no pin — lowest-usage account is selected per request)";
@@ -18,12 +39,15 @@ const EXTENDED_USAGE = `Usage:
   ocx account refresh <provider> [--json]
   ocx account auto-switch <provider> <on|off|status|threshold <0-100>> [--json]
   ocx account alias <provider> <id|main> <display-name|-> [--json]
+  ocx account priority <provider> <id|main> [<-100..100|first|earlier|normal|later|last|reset>] [--json]
   ocx account remove <provider> <id|main> --yes [--json]
   ocx account clear-cooldown <provider> <id|main> [--json]
-  ocx account add-key <provider> [--label <label>] [--json]`;
+  ocx account add-key <provider> [--label <label>] [--json]
+  ocx account import <provider> --format <format> (--file <path>|--stdin) [--json]`;
 const PIPE_GUIDANCE = `Pipe the API key on stdin, for example:
   ocx account add-key <provider> <<< "$MY_KEY"
   security find-generic-password -w <item> | ocx account add-key <provider>`;
+const ACCOUNT_IMPORT_TIMEOUT_MS = ACCOUNT_IMPORT_DEADLINE_MS;
 
 function flag(args: string[], value: string): boolean {
   const index = args.indexOf(value);
@@ -41,6 +65,162 @@ function flagValue(args: string[], value: string): { found: boolean; value?: str
   return { found: true, value: result };
 }
 
+function boundedUtf8(bytes: Uint8Array): string {
+  try {
+    return new TextDecoder("utf-8", { fatal: true }).decode(bytes);
+  } catch {
+    throw new Error("invalid_document");
+  }
+}
+
+function readBoundedImportFile(path: string): string {
+  let descriptor: number | undefined;
+  try {
+    descriptor = openSync(path, "r");
+    const buffer = Buffer.allocUnsafe(ACCOUNT_IMPORT_MAX_BYTES + 1);
+    let offset = 0;
+    while (offset < buffer.length) {
+      const read = readSync(descriptor, buffer, offset, buffer.length - offset, null);
+      if (read === 0) break;
+      offset += read;
+    }
+    if (offset > ACCOUNT_IMPORT_MAX_BYTES) throw new Error("invalid_document");
+    return boundedUtf8(buffer.subarray(0, offset));
+  } catch (error) {
+    if (error instanceof Error && error.message === "invalid_document") throw error;
+    throw new Error("source_read_failed");
+  } finally {
+    if (descriptor !== undefined) closeSync(descriptor);
+  }
+}
+
+async function readBoundedImportStdin(deps: AccountDeps): Promise<string> {
+  const input: AccountStdin = deps.stdinImpl ?? process.stdin;
+  if (input.isTTY) throw new Error("stdin_required");
+  const timeoutMs = deps.stdinTimeoutMs ?? 15_000;
+  return await new Promise<string>((resolve, reject) => {
+    const chunks: Buffer[] = [];
+    let bytes = 0;
+    let settled = false;
+    const cleanup = () => {
+      clearTimeout(timer);
+      input.removeListener("data", onData);
+      input.removeListener("end", onEnd);
+      input.removeListener("error", onError);
+    };
+    const finish = (fn: () => void) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      fn();
+    };
+    const onData = (chunk: unknown) => {
+      const encoded = Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk));
+      bytes += encoded.byteLength;
+      if (bytes > ACCOUNT_IMPORT_MAX_BYTES) {
+        finish(() => reject(new Error("invalid_document")));
+        return;
+      }
+      chunks.push(encoded);
+    };
+    const onEnd = () => finish(() => {
+      try { resolve(boundedUtf8(Buffer.concat(chunks, bytes))); }
+      catch (error) { reject(error); }
+    });
+    const onError = () => finish(() => reject(new Error("source_read_failed")));
+    const timer = setTimeout(() => finish(() => reject(new Error("stdin_timeout"))), timeoutMs);
+    input.on("data", onData);
+    input.on("end", onEnd);
+    input.on("error", onError);
+  });
+}
+
+const IMPORT_STATUSES = new Set<AccountImportStatus>(["imported", "updated", "failed", "unsupported"]);
+const IMPORT_CODES = new Set<AccountImportCode>([
+  "imported", "updated", "import_cancelled", "unsupported_provider", "unsupported_format", "invalid_document",
+  "invalid_record", "credential_rejected", "identity_mismatch", "missing_project", "persist_failed",
+]);
+const IMPORT_RESULT_FIELDS = new Set([
+  "totalCount", "importedCount", "updatedCount", "failedCount", "unsupportedCount", "results",
+]);
+const IMPORT_RECORD_FIELDS = new Set(["index", "status", "code"]);
+const IMPORT_STATUS_CODES: Record<AccountImportStatus, ReadonlySet<AccountImportCode>> = {
+  imported: new Set(["imported"]),
+  updated: new Set(["updated"]),
+  failed: new Set(["invalid_record", "credential_rejected", "identity_mismatch", "missing_project", "persist_failed"]),
+  unsupported: new Set(["unsupported_provider", "unsupported_format"]),
+};
+
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+  const prototype = Object.getPrototypeOf(value);
+  return prototype === Object.prototype || prototype === null;
+}
+
+function hasExactFields(value: Record<string, unknown>, allowed: ReadonlySet<string>): boolean {
+  const fields = Object.keys(value);
+  return fields.length === allowed.size && fields.every(field => allowed.has(field));
+}
+
+function isNonNegativeSafeInteger(value: unknown): value is number {
+  return typeof value === "number" && Number.isFinite(value) && Number.isSafeInteger(value) && value >= 0;
+}
+
+function safeImportResult(json: unknown): AccountImportResult | null {
+  if (!isPlainObject(json) || !hasExactFields(json, IMPORT_RESULT_FIELDS)) return null;
+  if (
+    !isNonNegativeSafeInteger(json.totalCount)
+    || !isNonNegativeSafeInteger(json.importedCount)
+    || !isNonNegativeSafeInteger(json.updatedCount)
+    || !isNonNegativeSafeInteger(json.failedCount)
+    || !isNonNegativeSafeInteger(json.unsupportedCount)
+  ) return null;
+  if (!Array.isArray(json.results)) return null;
+  if (json.results.length !== json.totalCount) return null;
+
+  const results: AccountImportRecordResult[] = [];
+  const indices = new Set<number>();
+  const aggregate: Record<AccountImportStatus, number> = {
+    imported: 0,
+    updated: 0,
+    failed: 0,
+    unsupported: 0,
+  };
+  for (const raw of json.results) {
+    if (!isPlainObject(raw) || !hasExactFields(raw, IMPORT_RECORD_FIELDS)) return null;
+    const item = raw;
+    if (!isNonNegativeSafeInteger(item.index) || item.index >= json.totalCount || indices.has(item.index)) return null;
+    if (!IMPORT_STATUSES.has(item.status as AccountImportStatus)) return null;
+    if (!IMPORT_CODES.has(item.code as AccountImportCode)) return null;
+    const status = item.status as AccountImportStatus;
+    const code = item.code as AccountImportCode;
+    if (!IMPORT_STATUS_CODES[status].has(code)) return null;
+    indices.add(item.index);
+    aggregate[status] += 1;
+    results.push({
+      index: item.index,
+      status,
+      code,
+    });
+  }
+  if (
+    indices.size !== json.totalCount
+    || aggregate.imported !== json.importedCount
+    || aggregate.updated !== json.updatedCount
+    || aggregate.failed !== json.failedCount
+    || aggregate.unsupported !== json.unsupportedCount
+  ) return null;
+
+  return {
+    totalCount: json.totalCount,
+    importedCount: json.importedCount,
+    updatedCount: json.updatedCount,
+    failedCount: json.failedCount,
+    unsupportedCount: json.unsupportedCount,
+    results,
+  };
+}
+
 function usage(message?: string): number {
   if (message) console.error(message);
   console.error(EXTENDED_USAGE);
@@ -234,18 +414,28 @@ export async function cmdRemove(args: string[], deps: AccountDeps): Promise<numb
   const response = await apiJson(deps, baseUrl, "DELETE", deletePath(classified.type, name, id));
   if (response.status === 0) return fail("Proxy not reachable. Start it with 'ocx start' or 'ocx ensure'.");
   if (response.status !== 200) return fail(errorText(response.json, `failed to remove ${requestedId}`));
+  const catalogRefreshPending = classified.type === "codex"
+    && codexCatalogRefreshPending(response.json);
   const after = await fetchRows(deps, baseUrl, name, classified.type);
   if (after.networkDown || after.errorJson) {
     const detail = after.networkDown ? "proxy not reachable" : typeof after.errorJson?.error === "string" ? after.errorJson.error : "unknown error";
     return fail(`post-delete verification failed; delete may have succeeded: ${detail}`);
   }
   const removedActive = before.activeId === id;
-  const result = { ok: true, provider: name, id, removedActive, promotedActiveId: after.activeId };
+  const result = {
+    ok: true,
+    provider: name,
+    id,
+    removedActive,
+    promotedActiveId: after.activeId,
+    ...(classified.type === "codex" ? { catalogRefreshPending } : {}),
+  };
   if (wantsJson) console.log(JSON.stringify(result, null, 2));
   else if (classified.type === "codex" && removedActive && after.activeId === null) console.log(`openai: ${AUTO_NOTE}`);
   else if (classified.type === "oauth") console.log(after.rows.length ? `${name}: active account is now ${after.activeId}` : `${name}: no accounts remaining`);
   else if (classified.type === "api-key") console.log(after.rows.length ? `${name}: active key is now ${after.activeId}` : `${name}: no keys remaining`);
   else console.log(`${name}: removed account ${requestedId}`);
+  if (!wantsJson && catalogRefreshPending) warnIfCodexCatalogRefreshPending(response.json);
   return 0;
 }
 
@@ -283,6 +473,98 @@ export async function cmdAddKey(args: string[], deps: AccountDeps): Promise<numb
   return 0;
 }
 
+export async function cmdImport(args: string[], deps: AccountDeps): Promise<number> {
+  const wantsJson = flag(args, "--json");
+  const formatArg = flagValue(args, "--format");
+  const fileArg = flagValue(args, "--file");
+  const fromStdin = flag(args, "--stdin");
+  const provider = args.shift();
+
+  // Admission happens before source I/O. In particular, an inline JSON positional argument is
+  // rejected without inspecting or echoing it, keeping secrets out of any subsequent surface.
+  if (
+    provider !== ACCOUNT_IMPORT_PROVIDER
+    || formatArg.value !== ACCOUNT_IMPORT_FORMAT
+    || formatArg.found !== true
+  ) {
+    const code = provider === ACCOUNT_IMPORT_PROVIDER ? "unsupported_format" : "unsupported_provider";
+    console.error(`Error: ${code}`);
+    return 1;
+  }
+  const hasFile = fileArg.found && typeof fileArg.value === "string" && fileArg.value.length > 0;
+  if (args.length > 0 || hasFile === fromStdin || (fileArg.found && !hasFile)) {
+    return usage("Error: choose exactly one bounded source: --file <path> or --stdin");
+  }
+
+  let source: string;
+  try {
+    source = hasFile ? readBoundedImportFile(fileArg.value!) : await readBoundedImportStdin(deps);
+  } catch (error) {
+    const code = error instanceof Error ? error.message : "source_read_failed";
+    console.error(`Error: ${["invalid_document", "source_read_failed", "stdin_required", "stdin_timeout"].includes(code) ? code : "source_read_failed"}`);
+    return 1;
+  }
+
+  let document: unknown;
+  try {
+    document = JSON.parse(source) as unknown;
+  } catch {
+    console.error("Error: invalid_document");
+    return 1;
+  }
+
+  const baseUrl = await resolveBaseUrl(deps);
+  if (!baseUrl) return proxyUnreachable();
+  const configuredImportTimeout = deps.importTimeoutMs;
+  const importTimeoutMs = typeof configuredImportTimeout === "number" && Number.isFinite(configuredImportTimeout)
+    ? Math.min(ACCOUNT_IMPORT_TIMEOUT_MS, Math.max(1, Math.floor(configuredImportTimeout)))
+    : ACCOUNT_IMPORT_TIMEOUT_MS;
+  const controller = new AbortController();
+  let timedOut = false;
+  const timer = setTimeout(() => {
+    timedOut = true;
+    controller.abort();
+  }, importTimeoutMs);
+  let response;
+  try {
+    response = await apiJson(deps, baseUrl, "POST", "/api/oauth/accounts/import", {
+      provider,
+      format: formatArg.value,
+      document,
+    }, { signal: controller.signal });
+  } finally {
+    clearTimeout(timer);
+  }
+  if (response.status === 0) {
+    if (!timedOut) return proxyUnreachable();
+    console.error(`Error: import_timeout after ${importTimeoutMs}ms`);
+    return 1;
+  }
+  if (response.status !== 200) {
+    if (IMPORT_CODES.has(response.json.code as AccountImportCode)) {
+      console.error(`Error: ${response.json.code as AccountImportCode}`);
+    } else {
+      console.error(`Error: import_request_failed (status ${response.status})`);
+    }
+    return 1;
+  }
+  const result = safeImportResult(response.json);
+  if (!result) {
+    console.error("Error: invalid_response");
+    return 1;
+  }
+
+  if (wantsJson) {
+    console.log(JSON.stringify(result, null, 2));
+  } else {
+    console.log(
+      `${provider}: ${result.importedCount} imported, ${result.updatedCount} updated, ${result.failedCount} failed, ${result.unsupportedCount} unsupported`,
+    );
+    for (const item of result.results) console.log(`  #${item.index + 1} ${item.status} (${item.code})`);
+  }
+  return result.failedCount > 0 || result.unsupportedCount > 0 ? 1 : 0;
+}
+
 /**
  * Lift a quota cooldown on a Codex account.
  *
@@ -316,6 +598,111 @@ export async function cmdClearCooldown(args: string[], deps: AccountDeps): Promi
   return 0;
 }
 
+/**
+ * Named selection orders. The words convey sequence rather than rank because the
+ * pool moves down the list only when everything above it is drained — "high
+ * priority" would suggest the account gets more traffic, which is not what
+ * ordering does.
+ */
+const PRIORITY_PRESETS: Record<string, number> = {
+  first: 2,
+  earlier: 1,
+  normal: 0,
+  later: -1,
+  last: -2,
+};
+
+function priorityPresetName(priority: number): string | null {
+  return Object.entries(PRIORITY_PRESETS).find(([, value]) => value === priority)?.[0] ?? null;
+}
+
+function formatPriority(priority: number): string {
+  const preset = priorityPresetName(priority);
+  const signed = priority > 0 ? `+${priority}` : String(priority);
+  return preset ? `${signed} (${preset})` : signed;
+}
+
+/** `null` = reset to the default; `undefined` = unparseable. */
+function parsePriorityArgument(raw: string): number | null | undefined {
+  const word = raw.trim().toLowerCase();
+  if (word === "reset") return null;
+  // Own keys only: `in` also matches "constructor", "__proto__", and friends.
+  if (Object.hasOwn(PRIORITY_PRESETS, word)) return PRIORITY_PRESETS[word];
+  // The regex only rules out shapes Number() would coerce ("1e2", " 1 ", ""); the range
+  // itself comes from the core parser so the CLI cannot drift from what the API accepts.
+  if (!/^[+-]?\d+$/.test(word)) return undefined;
+  return parseAccountPriority(Number(word)) ?? undefined;
+}
+
+export async function cmdPriority(args: string[], deps: AccountDeps): Promise<number> {
+  const wantsJson = flag(args, "--json");
+  const name = args.shift();
+  const requestedId = args.shift();
+  const requestedPriority = args.shift();
+  if (!name || !requestedId || args.length) return usage();
+  const classified = configAndType(deps, name);
+  if ("error" in classified) return usage(`Error: ${classified.error}`);
+  if (classified.type !== "codex") {
+    return usage("Error: selection order only applies to the openai Codex account pool");
+  }
+  const id = requestedId === "main" ? MAIN_ID : requestedId;
+
+  // Validate before touching the network so a typo never reaches the proxy.
+  let priority: number | null | undefined;
+  if (requestedPriority !== undefined) {
+    priority = parsePriorityArgument(requestedPriority);
+    if (priority === undefined) {
+      return usage(`Error: selection order must be an integer ${MIN_ACCOUNT_PRIORITY}..${MAX_ACCOUNT_PRIORITY}, one of ${Object.keys(PRIORITY_PRESETS).join("/")}, or reset`);
+    }
+  }
+
+  const baseUrl = await resolveBaseUrl(deps);
+  if (!baseUrl) return proxyUnreachable();
+
+  // No value means "show" — a read must not rewrite what it is reporting.
+  if (priority === undefined) {
+    const result = await fetchCodexRows(deps, baseUrl);
+    const failed = familyFailure(result, `failed to read ${name} accounts`);
+    if (failed !== null) return failed;
+    const row = result.rows.find(candidate => candidate.id === id);
+    if (!row) return usage(`Error: no ${name} account ${requestedId}`);
+    const current = normalizeAccountPriority(row.priority);
+    if (wantsJson) {
+      console.log(JSON.stringify(
+        { ok: true, provider: name, id, priority: current, preset: priorityPresetName(current) },
+        null,
+        2,
+      ));
+    } else {
+      console.log(`${name}: ${requestedId} selection order is ${formatPriority(current)}`);
+    }
+    return 0;
+  }
+
+  const response = await apiJson(deps, baseUrl, "PUT", "/api/codex-auth/accounts/priority", { id, priority });
+  if (response.status === 0) return proxyUnreachable();
+  if (response.status !== 200) return apiError(response.json, `failed to set selection order for ${requestedId}`);
+  const applied = typeof response.json.priority === "number" ? response.json.priority : (priority ?? 0);
+  if (wantsJson) {
+    console.log(JSON.stringify(
+      { ok: true, provider: name, id, priority: applied, preset: priorityPresetName(applied) },
+      null,
+      2,
+    ));
+  } else {
+    console.log(`${name}: ${requestedId} selection order is now ${formatPriority(applied)}`);
+  }
+  // Not cmdUse's note: re-ordering takes effect on the next unbound request rather than
+  // only on new sessions, because preemption moves those requests up immediately.
+  console.error("Takes effect from the next unbound request; running threads keep their current account until drained.");
+  // The release is not optional and not conditional on the value changing, so it has to be
+  // stated: this route is the only way to clear a pin without immediately setting another,
+  // which means a write storing the order an account already had still releases it. Without
+  // this line that is a silent side effect of a command that looks purely declarative.
+  console.error('Also releases any manual "use this account now" pin, on any account.');
+  return 0;
+}
+
 export async function cmdAlias(args: string[], deps: AccountDeps): Promise<number> {
   const wantsJson = flag(args, "--json");
   const name = args.shift();