codex-multi-auth 2.0.1 → 2.1.0

package/dist/lib/usage/redaction.js

@@ -0,0 +1,129 @@
+import { createHash, randomUUID } from "node:crypto";
+import { estimateUsageCostUsd } from "./pricing.js";
+const VALID_SOURCES = new Set([
+    "runtime-proxy",
+    "plugin-host",
+    "local-bridge",
+    "cli",
+    "unknown",
+]);
+const VALID_OPERATIONS = new Set([
+    "responses",
+    "models",
+    "auth-refresh",
+    "diagnostic",
+    "unknown",
+]);
+const VALID_OUTCOMES = new Set([
+    "success",
+    "failure",
+    "blocked",
+    "cancelled",
+]);
+function normalizeFiniteNumber(value) {
+    return typeof value === "number" && Number.isFinite(value) ? value : null;
+}
+function normalizeNonNegativeInteger(value) {
+    const numeric = normalizeFiniteNumber(value);
+    return numeric === null ? 0 : Math.max(0, Math.trunc(numeric));
+}
+function normalizeOptionalString(value) {
+    if (typeof value !== "string")
+        return null;
+    const trimmed = value.trim();
+    return trimmed.length > 0 ? trimmed : null;
+}
+function normalizeStatusCode(value) {
+    const numeric = normalizeFiniteNumber(value);
+    if (numeric === null)
+        return null;
+    const statusCode = Math.trunc(numeric);
+    return statusCode >= 100 && statusCode <= 599 ? statusCode : null;
+}
+function normalizeDurationMs(value) {
+    const numeric = normalizeFiniteNumber(value);
+    return numeric === null ? null : Math.max(0, Math.trunc(numeric));
+}
+function normalizeSource(value) {
+    return typeof value === "string" && VALID_SOURCES.has(value)
+        ? value
+        : "unknown";
+}
+function normalizeOperation(value) {
+    return typeof value === "string" &&
+        VALID_OPERATIONS.has(value)
+        ? value
+        : "unknown";
+}
+function normalizeOutcome(value) {
+    if (typeof value === "string" &&
+        VALID_OUTCOMES.has(value)) {
+        return value;
+    }
+    return "failure";
+}
+export function hashUsageIdentifier(value) {
+    return `sha256:${createHash("sha256").update(value.trim()).digest("hex")}`;
+}
+export function createUsageAccountRef(input) {
+    const accountId = normalizeOptionalString(input.accountId);
+    const email = normalizeOptionalString(input.email)?.toLowerCase() ?? null;
+    const index = typeof input.accountIndex === "number" &&
+        Number.isInteger(input.accountIndex) &&
+        input.accountIndex >= 0
+        ? input.accountIndex
+        : null;
+    if (!accountId && !email && index === null) {
+        return null;
+    }
+    return {
+        accountHash: accountId ? hashUsageIdentifier(accountId) : undefined,
+        emailHash: email ? hashUsageIdentifier(email) : undefined,
+        index: index ?? undefined,
+    };
+}
+function normalizeTokens(input) {
+    const inputTokens = normalizeNonNegativeInteger(input.inputTokens);
+    const outputTokens = normalizeNonNegativeInteger(input.outputTokens);
+    const cachedInputTokens = normalizeNonNegativeInteger(input.cachedInputTokens);
+    const reasoningTokens = normalizeNonNegativeInteger(input.reasoningTokens);
+    const providedTotal = normalizeFiniteNumber(input.totalTokens);
+    const computedTotal = inputTokens + outputTokens + reasoningTokens;
+    return {
+        inputTokens,
+        outputTokens,
+        cachedInputTokens,
+        reasoningTokens,
+        totalTokens: providedTotal === null
+            ? computedTotal
+            : Math.max(0, Math.trunc(providedTotal)),
+    };
+}
+export function normalizeUsageLedgerRow(input) {
+    const model = normalizeOptionalString(input.model);
+    const tokens = normalizeTokens(input);
+    const explicitCost = normalizeFiniteNumber(input.costUsd);
+    return {
+        version: 1,
+        id: normalizeOptionalString(input.id) ?? randomUUID(),
+        createdAt: normalizeFiniteNumber(input.createdAt) ?? Date.now(),
+        source: normalizeSource(input.source),
+        operation: normalizeOperation(input.operation),
+        outcome: normalizeOutcome(input.outcome),
+        model,
+        projectKey: normalizeOptionalString(input.projectKey),
+        account: createUsageAccountRef(input),
+        requestId: normalizeOptionalString(input.requestId),
+        statusCode: normalizeStatusCode(input.statusCode),
+        errorCode: normalizeOptionalString(input.errorCode),
+        durationMs: normalizeDurationMs(input.durationMs),
+        tokens,
+        costUsd: explicitCost === null
+            ? estimateUsageCostUsd(model, tokens)
+            : Math.max(0, explicitCost),
+    };
+}
+export function usageRowToJsonLine(row) {
+    return `${JSON.stringify(row)}\n`;
+}
+//# sourceMappingURL=redaction.js.map

package/dist/lib/usage/redaction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redaction.js","sourceRoot":"","sources":["../../../lib/usage/redaction.ts"],"names":[],"mappings":"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"}

package/dist/lib/usage/types.d.ts

@@ -0,0 +1,89 @@
+export type UsageLedgerSource = "runtime-proxy" | "plugin-host" | "local-bridge" | "cli" | "unknown";
+export type UsageLedgerOperation = "responses" | "models" | "auth-refresh" | "diagnostic" | "unknown";
+export type UsageLedgerOutcome = "success" | "failure" | "blocked" | "cancelled";
+export interface UsageTokenCounts {
+    inputTokens: number;
+    outputTokens: number;
+    cachedInputTokens: number;
+    reasoningTokens: number;
+    totalTokens: number;
+}
+export interface UsageLedgerAccountRef {
+    accountHash?: string;
+    emailHash?: string;
+    index?: number;
+}
+export interface UsageLedgerRow {
+    version: 1;
+    id: string;
+    createdAt: number;
+    source: UsageLedgerSource;
+    operation: UsageLedgerOperation;
+    outcome: UsageLedgerOutcome;
+    model: string | null;
+    projectKey: string | null;
+    account: UsageLedgerAccountRef | null;
+    requestId: string | null;
+    statusCode: number | null;
+    errorCode: string | null;
+    durationMs: number | null;
+    tokens: UsageTokenCounts;
+    costUsd: number | null;
+}
+export interface UsageLedgerAppendInput {
+    id?: string;
+    createdAt?: number;
+    source?: UsageLedgerSource;
+    operation?: UsageLedgerOperation;
+    outcome: UsageLedgerOutcome;
+    model?: string | null;
+    projectKey?: string | null;
+    accountId?: string | null;
+    email?: string | null;
+    accountIndex?: number | null;
+    requestId?: string | null;
+    statusCode?: number | null;
+    errorCode?: string | null;
+    durationMs?: number | null;
+    inputTokens?: number | null;
+    outputTokens?: number | null;
+    cachedInputTokens?: number | null;
+    reasoningTokens?: number | null;
+    totalTokens?: number | null;
+    costUsd?: number | null;
+}
+export type UsageSummaryGroupBy = "model" | "account" | "project" | "outcome" | "day";
+export interface UsageLedgerQuery {
+    since?: number | Date | string;
+    until?: number | Date | string;
+    includeArchives?: boolean;
+}
+export interface UsageSummaryQuery extends UsageLedgerQuery {
+    by?: UsageSummaryGroupBy;
+}
+export interface UsageSummaryBucket {
+    key: string;
+    requests: number;
+    successes: number;
+    failures: number;
+    blocked: number;
+    cancelled: number;
+    inputTokens: number;
+    outputTokens: number;
+    cachedInputTokens: number;
+    reasoningTokens: number;
+    totalTokens: number;
+    costUsd: number;
+}
+export interface UsageSummary {
+    since: number | null;
+    until: number | null;
+    by: UsageSummaryGroupBy;
+    totals: UsageSummaryBucket;
+    buckets: UsageSummaryBucket[];
+}
+export interface UsageLedgerPaths {
+    dir: string;
+    current: string;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/lib/usage/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../lib/usage/types.ts"],"names":[],"mappings":"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"}

package/dist/lib/usage/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/lib/usage/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../lib/usage/types.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "codex-multi-auth",
-	"version": "2.0.1",
+	"version": "2.1.0",
 	"description": "Multi-account OAuth manager and codex auth wrapper for the official @openai/codex CLI, with switching, health checks, and recovery tools",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",

package/scripts/bench-format/codex-host.mjs

@@ -1,39 +1,39 @@
-import { spawnSync } from "node:child_process";
-import { existsSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
+import { spawnSync } from "node:child_process";
+import { existsSync } from "node:fs";
+import { dirname, join, 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;
-}
-
-function resolveWindowsNpmShim(command) {
-  if (!/\.(cmd|bat)$/i.test(command)) {
-    return { command, shell: false };
-  }
-
-  const codexScript = join(dirname(command), "node_modules", "codex-multi-auth", "scripts", "codex.js");
-  if (existsSync(codexScript)) {
-    return {
-      command: process.execPath,
-      shell: false,
-      argsPrefix: [codexScript],
-      shimCommand: command,
-    };
-  }
-
-  return { command, shell: true };
-}
-
-export function resolveCodexExecutable() {
-  const envOverride = process.env.CODEX_BIN;
-  if (envOverride && envOverride.trim().length > 0) {
-    const command = envOverride.trim();
-    return process.platform === "win32" ? resolveWindowsNpmShim(command) : { command, shell: false };
-  }
+export function getRepoRoot() {
+  return repoRoot;
+}
+
+function resolveWindowsNpmShim(command) {
+  if (!/\.(cmd|bat)$/i.test(command)) {
+    return { command, shell: false };
+  }
+
+  const codexScript = join(dirname(command), "node_modules", "codex-multi-auth", "scripts", "codex.js");
+  if (existsSync(codexScript)) {
+    return {
+      command: process.execPath,
+      shell: false,
+      argsPrefix: [codexScript],
+      shimCommand: command,
+    };
+  }
+
+  return { command, shell: true };
+}
+
+export function resolveCodexExecutable() {
+  const envOverride = process.env.CODEX_BIN;
+  if (envOverride && envOverride.trim().length > 0) {
+    const command = envOverride.trim();
+    return process.platform === "win32" ? resolveWindowsNpmShim(command) : { command, shell: false };
+  }
 
   if (process.platform !== "win32") {
     return { command: "codex", shell: false };
@@ -57,15 +57,15 @@ export function resolveCodexExecutable() {
     return { command: exactExe, shell: false };
   }
 
-  const exactCmd = candidates.find((candidate) => /npm\\Codex\.cmd$/i.test(candidate));
-  if (exactCmd) {
-    return resolveWindowsNpmShim(exactCmd);
-  }
-
-  const anyCmd = candidates.find((candidate) => /\.cmd$/i.test(candidate));
-  if (anyCmd) {
-    return resolveWindowsNpmShim(anyCmd);
-  }
+  const exactCmd = candidates.find((candidate) => /npm\\Codex\.cmd$/i.test(candidate));
+  if (exactCmd) {
+    return resolveWindowsNpmShim(exactCmd);
+  }
+
+  const anyCmd = candidates.find((candidate) => /\.cmd$/i.test(candidate));
+  if (anyCmd) {
+    return resolveWindowsNpmShim(anyCmd);
+  }
 
   return { command: candidates[0], shell: false };
 }
@@ -86,35 +86,35 @@ export function parseNdjson(text) {
   return events;
 }
 
-export function getToolEvents(events) {
-  const legacyToolEvents = 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,
+export function getToolEvents(events) {
+  const legacyToolEvents = 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,
-    }));
-  const execToolEvents = events
-    .filter((event) => event?.type === "item.completed" && event?.item?.type === "command_execution")
-    .map((event) => ({
-      tool: "command_execution",
-      input: { command: event.item.command },
-      output: event.item.aggregated_output,
-      status: event.item.status,
-      start: null,
-      end: null,
-      durationMs: null,
-    }));
-  return [...legacyToolEvents, ...execToolEvents];
-}
+          ? event.part.state.time.end - event.part.state.time.start
+          : null,
+    }));
+  const execToolEvents = events
+    .filter((event) => event?.type === "item.completed" && event?.item?.type === "command_execution")
+    .map((event) => ({
+      tool: "command_execution",
+      input: { command: event.item.command },
+      output: event.item.aggregated_output,
+      status: event.item.status,
+      start: null,
+      end: null,
+      durationMs: null,
+    }));
+  return [...legacyToolEvents, ...execToolEvents];
+}
 
 export function getSessionDuration(events) {
   const starts = events
@@ -129,12 +129,12 @@ export function getSessionDuration(events) {
   return Math.max(...finishes) - Math.min(...starts);
 }
 
-export function getTokenTotals(events) {
-  const stepFinishes = events.filter((event) => event?.type === "step_finish" && event?.part?.tokens);
-  const turnCompletions = events.filter((event) => event?.type === "turn.completed" && event?.usage);
-  if (stepFinishes.length === 0 && turnCompletions.length === 0) {
-    return null;
-  }
+export function getTokenTotals(events) {
+  const stepFinishes = events.filter((event) => event?.type === "step_finish" && event?.part?.tokens);
+  const turnCompletions = events.filter((event) => event?.type === "turn.completed" && event?.usage);
+  if (stepFinishes.length === 0 && turnCompletions.length === 0) {
+    return null;
+  }
   const total = {
     total: 0,
     input: 0,
@@ -153,49 +153,49 @@ export function getTokenTotals(events) {
     total.input += input;
     total.output += output;
     total.reasoning += reasoning;
-    total.cacheRead += Number(tokens.cache?.read ?? 0);
-    total.cacheWrite += Number(tokens.cache?.write ?? 0);
-  }
-  for (const event of turnCompletions) {
-    const usage = event.usage ?? {};
-    const input = Number(usage.input_tokens ?? 0);
-    const output = Number(usage.output_tokens ?? 0);
-    const reasoning = Number(usage.reasoning_output_tokens ?? 0);
-    total.total += input + output;
-    total.input += input;
-    total.output += output;
-    total.reasoning += reasoning;
-    total.cacheRead += Number(usage.cached_input_tokens ?? 0);
-  }
-  return total;
-}
+    total.cacheRead += Number(tokens.cache?.read ?? 0);
+    total.cacheWrite += Number(tokens.cache?.write ?? 0);
+  }
+  for (const event of turnCompletions) {
+    const usage = event.usage ?? {};
+    const input = Number(usage.input_tokens ?? 0);
+    const output = Number(usage.output_tokens ?? 0);
+    const reasoning = Number(usage.reasoning_output_tokens ?? 0);
+    total.total += input + output;
+    total.input += input;
+    total.output += output;
+    total.reasoning += reasoning;
+    total.cacheRead += Number(usage.cached_input_tokens ?? 0);
+  }
+  return total;
+}
 
-export function getTextOutput(events) {
-  const legacyText = events
-    .filter((event) => event?.type === "text" && typeof event?.part?.text === "string")
-    .map((event) => event.part.text)
-    .join("\n");
-  const execText = events
-    .filter((event) => event?.type === "item.completed" && event?.item?.type === "agent_message" && typeof event.item.text === "string")
-    .map((event) => event.item.text)
-    .join("\n");
-  return [legacyText, execText].filter(Boolean).join("\n");
-}
-
-export function getEventError(events) {
-  const lastCompletedIndex = events.findLastIndex((event) => event?.type === "turn.completed");
-  const failureIndex = events.findLastIndex(
-    (event, index) => index > lastCompletedIndex && (event?.type === "error" || event?.type === "turn.failed"),
-  );
-  if (failureIndex < 0) {
-    return null;
-  }
-  const errorEvent = events[failureIndex];
-  return {
-    name: errorEvent.error?.name ?? errorEvent.type ?? "UnknownError",
-    message: errorEvent.error?.data?.message ?? errorEvent.error?.message ?? errorEvent.message ?? "Unknown error",
-  };
-}
+export function getTextOutput(events) {
+  const legacyText = events
+    .filter((event) => event?.type === "text" && typeof event?.part?.text === "string")
+    .map((event) => event.part.text)
+    .join("\n");
+  const execText = events
+    .filter((event) => event?.type === "item.completed" && event?.item?.type === "agent_message" && typeof event.item.text === "string")
+    .map((event) => event.item.text)
+    .join("\n");
+  return [legacyText, execText].filter(Boolean).join("\n");
+}
+
+export function getEventError(events) {
+  const lastCompletedIndex = events.findLastIndex((event) => event?.type === "turn.completed");
+  const failureIndex = events.findLastIndex(
+    (event, index) => index > lastCompletedIndex && (event?.type === "error" || event?.type === "turn.failed"),
+  );
+  if (failureIndex < 0) {
+    return null;
+  }
+  const errorEvent = events[failureIndex];
+  return {
+    name: errorEvent.error?.name ?? errorEvent.type ?? "UnknownError",
+    message: errorEvent.error?.data?.message ?? errorEvent.error?.message ?? errorEvent.message ?? "Unknown error",
+  };
+}
 
 export function runCodexJson({
   executable,
@@ -207,33 +207,33 @@ export function runCodexJson({
   homeDir,
   timeoutMs,
   extraEnv,
-}) {
-  const startWall = Date.now();
-  const args = [
-    "exec",
-    "--json",
-    "--model",
-    model,
-    "--skip-git-repo-check",
-    "--sandbox",
-    "danger-full-access",
-    "-c",
-    "approval_policy='never'",
-  ];
-  if (variant) {
-    args.push("-c", `model_reasoning_effort='${variant}'`);
-  }
-  void agent;
-  args.push(prompt);
-  const childArgs = [...(executable.argsPrefix ?? []), ...args];
-
-  const child = spawnSync(executable.command, childArgs, {
+}) {
+  const startWall = Date.now();
+  const args = [
+    "exec",
+    "--json",
+    "--model",
+    model,
+    "--skip-git-repo-check",
+    "--sandbox",
+    "danger-full-access",
+    "-c",
+    "approval_policy='never'",
+  ];
+  if (variant) {
+    args.push("-c", `model_reasoning_effort='${variant}'`);
+  }
+  void agent;
+  args.push(prompt);
+  const childArgs = [...(executable.argsPrefix ?? []), ...args];
+
+  const child = spawnSync(executable.command, childArgs, {
     cwd: cwd ?? repoRoot,
     encoding: "utf8",
-    windowsHide: true,
-    shell: executable.shell,
-    stdio: ["ignore", "pipe", "pipe"],
-    timeout: timeoutMs,
+    windowsHide: true,
+    shell: executable.shell,
+    stdio: ["ignore", "pipe", "pipe"],
+    timeout: timeoutMs,
     maxBuffer: 30 * 1024 * 1024,
     env: {
       ...process.env,
@@ -254,11 +254,11 @@ export function runCodexJson({
   if (child.error && !timedOut) {
     throw child.error;
   }
-  const failed = (child.status ?? 1) !== 0 || eventError !== null;
-  const modelNotFound =
-    failed &&
-    (/Model not found|ProviderModelNotFoundError|model is not supported|not supported when using Codex/i.test(`${stdout}\n${stderr}`) ||
-      /Model not found|model is not supported|not supported when using Codex/i.test(eventError?.message ?? ""));
+  const failed = (child.status ?? 1) !== 0 || eventError !== null;
+  const modelNotFound =
+    failed &&
+    (/Model not found|ProviderModelNotFoundError|model is not supported|not supported when using Codex/i.test(`${stdout}\n${stderr}`) ||
+      /Model not found|model is not supported|not supported when using Codex/i.test(eventError?.message ?? ""));
 
   return {
     status: child.status ?? 1,

package/scripts/bench-format/models.mjs

@@ -1,12 +1,12 @@
 import { spawnSync } from "node:child_process";
 import { resolveCodexExecutable } from "./codex-host.mjs";
 
-const FALLBACK_OPENAI_CODEX_STABLE = [
-  "openai/gpt-5.3-codex",
-  "openai/gpt-5.4",
-  "openai/gpt-5.4-mini",
-  "openai/gpt-5.5",
-];
+const FALLBACK_OPENAI_CODEX_STABLE = [
+  "openai/gpt-5.3-codex",
+  "openai/gpt-5.4",
+  "openai/gpt-5.4-mini",
+  "openai/gpt-5.5",
+];
 
 const OPENAI_CODEX_PREFIXES = ["openai/", "openai-multi/"];
 
@@ -23,14 +23,14 @@ 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([tail, modelId, ...candidates])];
-}
+export function aliasCandidatesForCodexModel(modelId) {
+  if (!isOpenAiCodexProviderPrefix(modelId)) {
+    return [modelId];
+  }
+  const tail = codexTail(modelId);
+  const candidates = [`openai/${tail}`, `openai-multi/${tail}`];
+  return [...new Set([tail, modelId, ...candidates])];
+}
 
 export function isStableOpenAiCodexModel(modelId) {
   if (!isOpenAiCodexProviderPrefix(modelId)) {
@@ -45,15 +45,15 @@ export function isStableOpenAiCodexModel(modelId) {
   return true;
 }
 
-export function listCodexModels() {
-  const executable = resolveCodexExecutable();
-  const child = spawnSync(executable.command, [...(executable.argsPrefix ?? []), "models"], {
-    encoding: "utf8",
-    windowsHide: true,
-    shell: executable.shell,
-    stdio: ["ignore", "pipe", "pipe"],
-    maxBuffer: 10 * 1024 * 1024,
-    timeout: Number.parseInt(process.env.CODEX_MODELS_TIMEOUT_MS ?? "30000", 10),
+export function listCodexModels() {
+  const executable = resolveCodexExecutable();
+  const child = spawnSync(executable.command, [...(executable.argsPrefix ?? []), "models"], {
+    encoding: "utf8",
+    windowsHide: true,
+    shell: executable.shell,
+    stdio: ["ignore", "pipe", "pipe"],
+    maxBuffer: 10 * 1024 * 1024,
+    timeout: Number.parseInt(process.env.CODEX_MODELS_TIMEOUT_MS ?? "30000", 10),
     killSignal: "SIGKILL",
   });
   if (child.error && child.error.code === "ETIMEDOUT") {