codex-multi-auth 0.1.0 → 0.1.1

package/scripts/bench-format/{opencode.mjs → codex-host.mjs}

@@ -1,205 +1,206 @@
-import { spawnSync } from "node:child_process";
-import { dirname, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const scriptDir = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(scriptDir, "..", "..");
-
-export function getRepoRoot() {
-  return repoRoot;
-}
-
-export function resolveOpencodeExecutable() {
-  const envOverride = process.env.OPENCODE_BIN;
-  if (envOverride && envOverride.trim().length > 0) {
-    const command = envOverride.trim();
-    return { command, shell: /\.cmd$/i.test(command) };
-  }
-
-  if (process.platform !== "win32") {
-    return { command: "opencode", shell: false };
-  }
-
-  const whereResult = spawnSync("where", ["opencode"], {
-    encoding: "utf8",
-    windowsHide: true,
-  });
-  const candidates = `${whereResult.stdout ?? ""}\n${whereResult.stderr ?? ""}`
-    .split(/\r?\n/)
-    .map((line) => line.trim())
-    .filter(Boolean);
-
-  if (candidates.length === 0) {
-    return { command: "opencode", shell: false };
-  }
-
-  const exactExe = candidates.find((candidate) => /npm\\opencode\.exe$/i.test(candidate));
-  if (exactExe) {
-    return { command: exactExe, shell: false };
-  }
-
-  const exactCmd = candidates.find((candidate) => /npm\\opencode\.cmd$/i.test(candidate));
-  if (exactCmd) {
-    return { command: exactCmd, shell: true };
-  }
-
-  const anyCmd = candidates.find((candidate) => /\.cmd$/i.test(candidate));
-  if (anyCmd) {
-    return { command: anyCmd, shell: true };
-  }
-
-  return { command: candidates[0], shell: false };
-}
-
-export function parseNdjson(text) {
-  const events = [];
-  for (const line of text.split(/\r?\n/)) {
-    const trimmed = line.trim();
-    if (!trimmed) {
-      continue;
-    }
-    try {
-      events.push(JSON.parse(trimmed));
-    } catch {
-      // Ignore non-JSON lines emitted by wrappers (bun install, warnings, etc.).
-    }
-  }
-  return events;
-}
-
-export function getToolEvents(events) {
-  return events
-    .filter((event) => event?.type === "tool_use" && event?.part?.type === "tool")
-    .map((event) => ({
-      tool: event.part.tool,
-      input: event.part.state?.input ?? {},
-      output: event.part.state?.output,
-      status: event.part.state?.status,
-      start: event.part.state?.time?.start,
-      end: event.part.state?.time?.end,
-      durationMs:
-        typeof event.part.state?.time?.start === "number" &&
-        typeof event.part.state?.time?.end === "number"
-          ? event.part.state.time.end - event.part.state.time.start
-          : null,
-    }));
-}
-
-export function getSessionDuration(events) {
-  const starts = events
-    .filter((event) => event?.type === "step_start" && typeof event.timestamp === "number")
-    .map((event) => event.timestamp);
-  const finishes = events
-    .filter((event) => event?.type === "step_finish" && typeof event.timestamp === "number")
-    .map((event) => event.timestamp);
-  if (starts.length === 0 || finishes.length === 0) {
-    return null;
-  }
-  return Math.max(...finishes) - Math.min(...starts);
-}
-
-export function getTokenTotals(events) {
-  const stepFinishes = events.filter((event) => event?.type === "step_finish" && event?.part?.tokens);
-  if (stepFinishes.length === 0) {
-    return null;
-  }
-  const total = {
-    total: 0,
-    input: 0,
-    output: 0,
-    reasoning: 0,
-    cacheRead: 0,
-    cacheWrite: 0,
-  };
-  for (const event of stepFinishes) {
-    const tokens = event.part.tokens ?? {};
-    const input = Number(tokens.input ?? 0);
-    const output = Number(tokens.output ?? 0);
-    const reasoning = Number(tokens.reasoning ?? 0);
-    const explicitTotal = Number(tokens.total ?? NaN);
-    total.total += Number.isFinite(explicitTotal) ? explicitTotal : input + output + reasoning;
-    total.input += input;
-    total.output += output;
-    total.reasoning += reasoning;
-    total.cacheRead += Number(tokens.cache?.read ?? 0);
-    total.cacheWrite += Number(tokens.cache?.write ?? 0);
-  }
-  return total;
-}
-
-export function getTextOutput(events) {
-  return events
-    .filter((event) => event?.type === "text" && typeof event?.part?.text === "string")
-    .map((event) => event.part.text)
-    .join("\n");
-}
-
-export function getEventError(events) {
-  const errorEvent = events.find((event) => event?.type === "error");
-  if (!errorEvent) {
-    return null;
-  }
-  return {
-    name: errorEvent.error?.name ?? "UnknownError",
-    message: errorEvent.error?.data?.message ?? errorEvent.error?.message ?? "Unknown error",
-  };
-}
-
-export function runOpencodeJson({
-  executable,
-  prompt,
-  model,
-  variant,
-  agent,
-  cwd,
-  homeDir,
-  timeoutMs,
-  extraEnv,
-}) {
-  const startWall = Date.now();
-  const args = ["run", "--format", "json", "--agent", agent, "--model", model];
-  if (variant) {
-    args.push("--variant", variant);
-  }
-  args.push(prompt);
-
-  const child = spawnSync(executable.command, args, {
-    cwd: cwd ?? repoRoot,
-    encoding: "utf8",
-    windowsHide: true,
-    shell: executable.shell,
-    timeout: timeoutMs,
-    maxBuffer: 30 * 1024 * 1024,
-    env: {
-      ...process.env,
-      ...(homeDir ? { HOME: homeDir, USERPROFILE: homeDir } : {}),
-      ...extraEnv,
-    },
-  });
-
-  const wallMs = Date.now() - startWall;
-  const stdout = child.stdout ?? "";
-  const stderr = child.stderr ?? "";
-  const events = parseNdjson(stdout);
-  const eventError = getEventError(events);
-  const timedOut =
-    child.error?.code === "ETIMEDOUT" ||
-    child.signal === "SIGTERM" ||
-    /timed out/i.test(String(child.error?.message ?? ""));
-  if (child.error && !timedOut) {
-    throw child.error;
-  }
-  const modelNotFound = /Model not found|ProviderModelNotFoundError/i.test(`${stdout}\n${stderr}`) || /Model not found/i.test(eventError?.message ?? "");
-
-  return {
-    status: child.status ?? 1,
-    signal: child.signal ?? null,
-    stdout,
-    stderr,
-    wallMs,
-    events,
-    eventError,
-    timedOut,
-    modelNotFound,
-  };
-}
+import { spawnSync } from "node:child_process";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const scriptDir = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(scriptDir, "..", "..");
+
+export function getRepoRoot() {
+  return repoRoot;
+}
+
+export function resolveCodexExecutable() {
+  const envOverride = process.env.CODEX_BIN;
+  if (envOverride && envOverride.trim().length > 0) {
+    const command = envOverride.trim();
+    return { command, shell: /\.cmd$/i.test(command) };
+  }
+
+  if (process.platform !== "win32") {
+    return { command: "codex", shell: false };
+  }
+
+  const whereResult = spawnSync("where", ["Codex"], {
+    encoding: "utf8",
+    windowsHide: true,
+  });
+  const candidates = `${whereResult.stdout ?? ""}`
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter((line) => /^[A-Za-z]:\\.+\.(exe|cmd)$/i.test(line));
+
+  if (candidates.length === 0) {
+    return { command: "codex", shell: false };
+  }
+
+  const exactExe = candidates.find((candidate) => /npm\\Codex\.exe$/i.test(candidate));
+  if (exactExe) {
+    return { command: exactExe, shell: false };
+  }
+
+  const exactCmd = candidates.find((candidate) => /npm\\Codex\.cmd$/i.test(candidate));
+  if (exactCmd) {
+    return { command: exactCmd, shell: true };
+  }
+
+  const anyCmd = candidates.find((candidate) => /\.cmd$/i.test(candidate));
+  if (anyCmd) {
+    return { command: anyCmd, shell: true };
+  }
+
+  return { command: candidates[0], shell: false };
+}
+
+export function parseNdjson(text) {
+  const events = [];
+  for (const line of text.split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (!trimmed) {
+      continue;
+    }
+    try {
+      events.push(JSON.parse(trimmed));
+    } catch {
+      // Ignore non-JSON lines emitted by wrappers (bun install, warnings, etc.).
+    }
+  }
+  return events;
+}
+
+export function getToolEvents(events) {
+  return events
+    .filter((event) => event?.type === "tool_use" && event?.part?.type === "tool")
+    .map((event) => ({
+      tool: event.part.tool,
+      input: event.part.state?.input ?? {},
+      output: event.part.state?.output,
+      status: event.part.state?.status,
+      start: event.part.state?.time?.start,
+      end: event.part.state?.time?.end,
+      durationMs:
+        typeof event.part.state?.time?.start === "number" &&
+        typeof event.part.state?.time?.end === "number"
+          ? event.part.state.time.end - event.part.state.time.start
+          : null,
+    }));
+}
+
+export function getSessionDuration(events) {
+  const starts = events
+    .filter((event) => event?.type === "step_start" && typeof event.timestamp === "number")
+    .map((event) => event.timestamp);
+  const finishes = events
+    .filter((event) => event?.type === "step_finish" && typeof event.timestamp === "number")
+    .map((event) => event.timestamp);
+  if (starts.length === 0 || finishes.length === 0) {
+    return null;
+  }
+  return Math.max(...finishes) - Math.min(...starts);
+}
+
+export function getTokenTotals(events) {
+  const stepFinishes = events.filter((event) => event?.type === "step_finish" && event?.part?.tokens);
+  if (stepFinishes.length === 0) {
+    return null;
+  }
+  const total = {
+    total: 0,
+    input: 0,
+    output: 0,
+    reasoning: 0,
+    cacheRead: 0,
+    cacheWrite: 0,
+  };
+  for (const event of stepFinishes) {
+    const tokens = event.part.tokens ?? {};
+    const input = Number(tokens.input ?? 0);
+    const output = Number(tokens.output ?? 0);
+    const reasoning = Number(tokens.reasoning ?? 0);
+    const explicitTotal = Number(tokens.total ?? NaN);
+    total.total += Number.isFinite(explicitTotal) ? explicitTotal : input + output + reasoning;
+    total.input += input;
+    total.output += output;
+    total.reasoning += reasoning;
+    total.cacheRead += Number(tokens.cache?.read ?? 0);
+    total.cacheWrite += Number(tokens.cache?.write ?? 0);
+  }
+  return total;
+}
+
+export function getTextOutput(events) {
+  return events
+    .filter((event) => event?.type === "text" && typeof event?.part?.text === "string")
+    .map((event) => event.part.text)
+    .join("\n");
+}
+
+export function getEventError(events) {
+  const errorEvent = events.find((event) => event?.type === "error");
+  if (!errorEvent) {
+    return null;
+  }
+  return {
+    name: errorEvent.error?.name ?? "UnknownError",
+    message: errorEvent.error?.data?.message ?? errorEvent.error?.message ?? "Unknown error",
+  };
+}
+
+export function runCodexJson({
+  executable,
+  prompt,
+  model,
+  variant,
+  agent,
+  cwd,
+  homeDir,
+  timeoutMs,
+  extraEnv,
+}) {
+  const startWall = Date.now();
+  const args = ["run", "--format", "json", "--agent", agent, "--model", model];
+  if (variant) {
+    args.push("--variant", variant);
+  }
+  args.push(prompt);
+
+  const child = spawnSync(executable.command, args, {
+    cwd: cwd ?? repoRoot,
+    encoding: "utf8",
+    windowsHide: true,
+    shell: executable.shell,
+    timeout: timeoutMs,
+    maxBuffer: 30 * 1024 * 1024,
+    env: {
+      ...process.env,
+      ...(homeDir ? { HOME: homeDir, USERPROFILE: homeDir } : {}),
+      ...extraEnv,
+    },
+  });
+
+  const wallMs = Date.now() - startWall;
+  const stdout = child.stdout ?? "";
+  const stderr = child.stderr ?? "";
+  const events = parseNdjson(stdout);
+  const eventError = getEventError(events);
+  const timedOut =
+    child.error?.code === "ETIMEDOUT" ||
+    child.signal === "SIGTERM" ||
+    /timed out/i.test(String(child.error?.message ?? ""));
+  if (child.error && !timedOut) {
+    throw child.error;
+  }
+  const modelNotFound = /Model not found|ProviderModelNotFoundError/i.test(`${stdout}\n${stderr}`) || /Model not found/i.test(eventError?.message ?? "");
+
+  return {
+    status: child.status ?? 1,
+    signal: child.signal ?? null,
+    stdout,
+    stderr,
+    wallMs,
+    events,
+    eventError,
+    timedOut,
+    modelNotFound,
+  };
+}
+

package/scripts/bench-format/models.mjs

@@ -1,105 +1,111 @@
-import { spawnSync } from "node:child_process";
-import { resolveOpencodeExecutable } from "./opencode.mjs";
-
-const FALLBACK_OPENAI_CODEX_STABLE = [
-  "openai/gpt-5-codex",
-  "openai/gpt-5.1-codex",
-  "openai/gpt-5.1-codex-mini",
-  "openai/gpt-5.1-codex-max",
-  "openai/gpt-5.2-codex",
-  "openai/gpt-5.3-codex",
-];
-
-const OPENAI_CODEX_PREFIXES = ["openai/", "openai-multi/"];
-
-export function isOpenAiCodexProviderPrefix(modelId) {
-  return OPENAI_CODEX_PREFIXES.some((prefix) => modelId.startsWith(prefix));
-}
-
-export function codexTail(modelId) {
-  const slash = modelId.indexOf("/");
-  return slash >= 0 ? modelId.slice(slash + 1) : modelId;
-}
-
-export function canonicalCodexModelId(modelId) {
-  return `openai/${codexTail(modelId)}`;
-}
-
-export function aliasCandidatesForCodexModel(modelId) {
-  if (!isOpenAiCodexProviderPrefix(modelId)) {
-    return [modelId];
-  }
-  const tail = codexTail(modelId);
-  const candidates = [`openai/${tail}`, `openai-multi/${tail}`];
-  return [...new Set([modelId, ...candidates])];
-}
-
-export function isStableOpenAiCodexModel(modelId) {
-  if (!isOpenAiCodexProviderPrefix(modelId)) {
-    return false;
-  }
-  if (!modelId.includes("codex")) {
-    return false;
-  }
-  if (modelId.includes("-spark") || modelId.includes("-latest")) {
-    return false;
-  }
-  return true;
-}
-
-export function listOpencodeModels() {
-  const executable = resolveOpencodeExecutable();
-  const child = spawnSync(executable.command, ["models"], {
-    encoding: "utf8",
-    windowsHide: true,
-    shell: executable.shell,
-    maxBuffer: 10 * 1024 * 1024,
-  });
-  const text = `${child.stdout ?? ""}\n${child.stderr ?? ""}`;
-  if ((child.status ?? 1) !== 0) {
-    throw new Error(`Failed to list OpenCode models (exit=${child.status ?? 1})`);
-  }
-  return text
-    .split(/\r?\n/)
-    .map((line) => line.trim())
-    .filter((line) => line.length > 0)
-    .filter((line) => !line.startsWith("Using Node "));
-}
-
-function dedupeCodexModels(models) {
-  const byCanonical = new Map();
-  for (const modelId of models) {
-    const canonical = canonicalCodexModelId(modelId);
-    const existing = byCanonical.get(canonical);
-    if (!existing) {
-      byCanonical.set(canonical, modelId);
-      continue;
-    }
-    // Prefer the shorter/default provider form when both exist.
-    if (existing.startsWith("openai-multi/") && modelId.startsWith("openai/")) {
-      byCanonical.set(canonical, modelId);
-    }
-  }
-  return [...byCanonical.values()].sort((a, b) => canonicalCodexModelId(a).localeCompare(canonicalCodexModelId(b)));
-}
-
-export function resolveModelPreset(presetName, explicitModels) {
-  if (explicitModels && explicitModels.length > 0) {
-    return explicitModels;
-  }
-
-  if (presetName !== "codex-core") {
-    throw new Error(`Unsupported preset: ${presetName}`);
-  }
-
-  try {
-    const models = dedupeCodexModels(listOpencodeModels().filter(isStableOpenAiCodexModel));
-    if (models.length > 0) {
-      return models;
-    }
-  } catch {
-    // Fall back to static list.
-  }
-
-  return [...FALLBACK_OPENAI_CODEX_STABLE];
-}
+import { spawnSync } from "node:child_process";
+import { resolveCodexExecutable } from "./codex-host.mjs";
+
+const FALLBACK_OPENAI_CODEX_STABLE = [
+  "openai/gpt-5-codex",
+  "openai/gpt-5.1-codex",
+  "openai/gpt-5.1-codex-mini",
+  "openai/gpt-5.1-codex-max",
+  "openai/gpt-5.2-codex",
+  "openai/gpt-5.3-codex",
+];
+
+const OPENAI_CODEX_PREFIXES = ["openai/", "openai-multi/"];
+
+export function isOpenAiCodexProviderPrefix(modelId) {
+  return OPENAI_CODEX_PREFIXES.some((prefix) => modelId.startsWith(prefix));
+}
+
+export function codexTail(modelId) {
+  const slash = modelId.indexOf("/");
+  return slash >= 0 ? modelId.slice(slash + 1) : modelId;
+}
+
+export function canonicalCodexModelId(modelId) {
+  return `openai/${codexTail(modelId)}`;
+}
+
+export function aliasCandidatesForCodexModel(modelId) {
+  if (!isOpenAiCodexProviderPrefix(modelId)) {
+    return [modelId];
+  }
+  const tail = codexTail(modelId);
+  const candidates = [`openai/${tail}`, `openai-multi/${tail}`];
+  return [...new Set([modelId, ...candidates])];
+}
+
+export function isStableOpenAiCodexModel(modelId) {
+  if (!isOpenAiCodexProviderPrefix(modelId)) {
+    return false;
+  }
+  if (!modelId.includes("codex")) {
+    return false;
+  }
+  if (modelId.includes("-spark") || modelId.includes("-latest")) {
+    return false;
+  }
+  return true;
+}
+
+export function listCodexModels() {
+  const executable = resolveCodexExecutable();
+  const child = spawnSync(executable.command, ["models"], {
+    encoding: "utf8",
+    windowsHide: true,
+    shell: executable.shell,
+    maxBuffer: 10 * 1024 * 1024,
+    timeout: Number.parseInt(process.env.CODEX_MODELS_TIMEOUT_MS ?? "30000", 10),
+    killSignal: "SIGKILL",
+  });
+  if (child.error && child.error.code === "ETIMEDOUT") {
+    throw new Error(`Timed out while listing Codex models after ${process.env.CODEX_MODELS_TIMEOUT_MS ?? "30000"}ms`);
+  }
+  const text = `${child.stdout ?? ""}\n${child.stderr ?? ""}`;
+  if ((child.status ?? 1) !== 0) {
+    throw new Error(`Failed to list Codex models (exit=${child.status ?? 1})`);
+  }
+  return text
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0)
+    .filter((line) => !line.startsWith("Using Node "));
+}
+
+function dedupeCodexModels(models) {
+  const byCanonical = new Map();
+  for (const modelId of models) {
+    const canonical = canonicalCodexModelId(modelId);
+    const existing = byCanonical.get(canonical);
+    if (!existing) {
+      byCanonical.set(canonical, modelId);
+      continue;
+    }
+    // Prefer the shorter/default provider form when both exist.
+    if (existing.startsWith("openai-multi/") && modelId.startsWith("openai/")) {
+      byCanonical.set(canonical, modelId);
+    }
+  }
+  return [...byCanonical.values()].sort((a, b) => canonicalCodexModelId(a).localeCompare(canonicalCodexModelId(b)));
+}
+
+export function resolveModelPreset(presetName, explicitModels) {
+  if (explicitModels && explicitModels.length > 0) {
+    return explicitModels;
+  }
+
+  if (presetName !== "codex-core") {
+    throw new Error(`Unsupported preset: ${presetName}`);
+  }
+
+  try {
+    const models = dedupeCodexModels(listCodexModels().filter(isStableOpenAiCodexModel));
+    if (models.length > 0) {
+      return models;
+    }
+  } catch {
+    // Fall back to static list.
+  }
+
+  return [...FALLBACK_OPENAI_CODEX_STABLE];
+}
+