codexuse-cli 5.1.5 → 5.1.6

package/dist/index.js

@@ -4635,7 +4635,7 @@ var import_node_crypto6 = require("crypto");
 var import_fs = require("fs");
 var import_path = __toESM(require("path"), 1);
 var import_path2 = require("path");
-var import_toml2 = __toESM(require_toml(), 1);
+var import_toml = __toESM(require_toml(), 1);
 
 // ../../packages/contracts/src/profiles/identity.ts
 function normalizeValue(value) {
@@ -4693,7 +4693,6 @@ var import_node_readline = __toESM(require("readline"), 1);
 var import_node_fs3 = require("fs");
 var import_node_os2 = __toESM(require("os"), 1);
 var import_node_path5 = __toESM(require("path"), 1);
-var import_toml = __toESM(require_toml(), 1);
 
 // ../../packages/runtime-codex/src/codex/cli.ts
 var import_node_fs2 = require("fs");
@@ -4930,12 +4929,6 @@ var ACTIVATION_MODEL = "gpt-5.1-codex-mini";
 var MAX_STDERR_CAPTURE_CHARS = 32768;
 var REFRESH_TOKEN_REDEEMED_SNIPPET = "refresh token was already used";
 var authFileCache = /* @__PURE__ */ new Map();
-var CODEX_OAUTH_REFRESH_URL = "https://auth.openai.com/oauth/token";
-var CODEX_OAUTH_CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann";
-var CODEX_OAUTH_REFRESH_MAX_AGE_MS = 8 * 24 * 60 * 60 * 1e3;
-var CODEX_OAUTH_ACCESS_TOKEN_REFRESH_SKEW_MS = 2 * 60 * 1e3;
-var CODEX_USAGE_DEFAULT_BASE_URL = "https://chatgpt.com/backend-api";
-var CODEX_USAGE_TIMEOUT_MS = 3e4;
 function isRecord4(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
@@ -5159,17 +5152,6 @@ function extractJwtIssuedAtMs(token) {
   }
   return issuedAt * 1e3;
 }
-function extractJwtExpiresAtMs(token) {
-  const payload = decodeJwtPayload(token);
-  if (!payload) {
-    return null;
-  }
-  const expiresAt = payload["exp"];
-  if (typeof expiresAt !== "number" || !Number.isFinite(expiresAt)) {
-    return null;
-  }
-  return expiresAt * 1e3;
-}
 function parseAuthRecord(content) {
   try {
     const parsed = JSON.parse(content);
@@ -5258,353 +5240,6 @@ async function writeAuthFileCached(filePath, content) {
     authFileCache.delete(filePath);
   }
 }
-function nonEmptyString(value) {
-  return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
-}
-function resolveCodexAuthPathForEnv(envOverride) {
-  return envOverride?.CODEX_HOME ? import_node_path5.default.join(envOverride.CODEX_HOME, "auth.json") : import_node_path5.default.join(
-    envOverride?.HOME ?? process.env.HOME ?? import_node_os2.default.homedir(),
-    ".codex",
-    "auth.json"
-  );
-}
-function parseCodexOAuthCredentials(content) {
-  const parsed = parseAuthRecord(content);
-  if (!parsed) {
-    return null;
-  }
-  const tokens = isRecord4(parsed.tokens) ? parsed.tokens : {};
-  const accessToken = nonEmptyString(tokens.access_token) ?? nonEmptyString(parsed.access_token);
-  const refreshToken = nonEmptyString(tokens.refresh_token) ?? nonEmptyString(parsed.refresh_token);
-  if (!accessToken && !refreshToken) {
-    return null;
-  }
-  return {
-    accessToken: accessToken ?? "",
-    refreshToken: refreshToken ?? "",
-    idToken: nonEmptyString(tokens.id_token) ?? nonEmptyString(parsed.id_token),
-    accountId: nonEmptyString(tokens.account_id) ?? nonEmptyString(parsed.account_id),
-    lastRefreshMs: parseTimestamp2(tokens.last_refresh) ?? parseTimestamp2(parsed.last_refresh)
-  };
-}
-function shouldRefreshCodexOAuthToken(credentials) {
-  if (!credentials.refreshToken) {
-    return false;
-  }
-  const accessExpiresAt = extractJwtExpiresAtMs(credentials.accessToken);
-  if (accessExpiresAt !== null && accessExpiresAt - Date.now() <= CODEX_OAUTH_ACCESS_TOKEN_REFRESH_SKEW_MS) {
-    return true;
-  }
-  if (credentials.lastRefreshMs === null) {
-    return true;
-  }
-  return Date.now() - credentials.lastRefreshMs > CODEX_OAUTH_REFRESH_MAX_AGE_MS;
-}
-async function writeCodexOAuthCredentials(authPath, content, credentials) {
-  let json = {};
-  try {
-    const parsed = JSON.parse(content);
-    if (isRecord4(parsed)) {
-      json = { ...parsed };
-    }
-  } catch {
-    json = {};
-  }
-  const existingTokens = isRecord4(json.tokens) ? json.tokens : {};
-  json.tokens = {
-    ...existingTokens,
-    access_token: credentials.accessToken,
-    refresh_token: credentials.refreshToken,
-    ...credentials.idToken ? { id_token: credentials.idToken } : {},
-    ...credentials.accountId ? { account_id: credentials.accountId } : {},
-    last_refresh: (/* @__PURE__ */ new Date()).toISOString()
-  };
-  json.last_refresh = (/* @__PURE__ */ new Date()).toISOString();
-  await writeAuthFileCached(authPath, `${JSON.stringify(json, null, 2)}
-`);
-}
-async function refreshCodexOAuthCredentials(credentials) {
-  if (!credentials.refreshToken) {
-    return credentials;
-  }
-  const response = await fetch(CODEX_OAUTH_REFRESH_URL, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    signal: AbortSignal.timeout(CODEX_USAGE_TIMEOUT_MS),
-    body: JSON.stringify({
-      client_id: CODEX_OAUTH_CLIENT_ID,
-      grant_type: "refresh_token",
-      refresh_token: credentials.refreshToken,
-      scope: "openid profile email"
-    })
-  });
-  const body = await response.text();
-  if (!response.ok) {
-    let code = "";
-    try {
-      const parsed2 = JSON.parse(body);
-      if (isRecord4(parsed2)) {
-        const error = isRecord4(parsed2.error) ? parsed2.error : {};
-        code = nonEmptyString(error.code) ?? nonEmptyString(parsed2.error) ?? nonEmptyString(parsed2.code) ?? "";
-      }
-    } catch {
-      code = "";
-    }
-    if (code === "refresh_token_reused") {
-      throw new Error("refresh token was already used");
-    }
-    if (code === "refresh_token_expired") {
-      throw new Error("refresh token expired");
-    }
-    if (code === "invalid_grant" || code === "refresh_token_invalidated") {
-      throw new Error("refresh token was revoked");
-    }
-    throw new Error(`Codex OAuth refresh failed HTTP ${response.status}`);
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(body);
-  } catch {
-    throw new Error("Codex OAuth refresh returned invalid JSON");
-  }
-  if (!isRecord4(parsed)) {
-    throw new Error("Codex OAuth refresh returned invalid data");
-  }
-  return {
-    accessToken: nonEmptyString(parsed.access_token) ?? credentials.accessToken,
-    refreshToken: nonEmptyString(parsed.refresh_token) ?? credentials.refreshToken,
-    idToken: nonEmptyString(parsed.id_token) ?? credentials.idToken,
-    accountId: credentials.accountId,
-    lastRefreshMs: Date.now()
-  };
-}
-async function loadCodexConfigContents(envOverride) {
-  const codexHome = envOverride?.CODEX_HOME?.trim();
-  const root = codexHome || import_node_path5.default.join(envOverride?.HOME ?? process.env.HOME ?? import_node_os2.default.homedir(), ".codex");
-  try {
-    return await import_node_fs3.promises.readFile(import_node_path5.default.join(root, "config.toml"), "utf8");
-  } catch {
-    return null;
-  }
-}
-function parseChatGPTBaseUrl(contents) {
-  if (!contents) {
-    return CODEX_USAGE_DEFAULT_BASE_URL;
-  }
-  try {
-    const parsed = (0, import_toml.parse)(contents);
-    if (isRecord4(parsed)) {
-      return nonEmptyString(parsed.chatgpt_base_url) ?? CODEX_USAGE_DEFAULT_BASE_URL;
-    }
-  } catch {
-    return CODEX_USAGE_DEFAULT_BASE_URL;
-  }
-  return CODEX_USAGE_DEFAULT_BASE_URL;
-}
-async function resolveCodexUsageUrl(envOverride) {
-  let base = parseChatGPTBaseUrl(await loadCodexConfigContents(envOverride));
-  while (base.endsWith("/")) {
-    base = base.slice(0, -1);
-  }
-  if ((base.startsWith("https://chatgpt.com") || base.startsWith("https://chat.openai.com")) && !base.includes("/backend-api")) {
-    base += "/backend-api";
-  }
-  return `${base}${base.includes("/backend-api") ? "/wham/usage" : "/api/codex/usage"}`;
-}
-function numberFromUnknown(value) {
-  if (typeof value === "number" && Number.isFinite(value)) {
-    return value;
-  }
-  if (typeof value === "string" && value.trim()) {
-    const parsed = Number(value.trim());
-    return Number.isFinite(parsed) ? parsed : null;
-  }
-  return null;
-}
-function toOAuthWindow(window) {
-  if (!window) {
-    return void 0;
-  }
-  const usedPercent = numberFromUnknown(window.used_percent);
-  const resetAt = numberFromUnknown(window.reset_at);
-  const limitWindowSeconds = numberFromUnknown(window.limit_window_seconds);
-  if (usedPercent === null && resetAt === null && limitWindowSeconds === null) {
-    return void 0;
-  }
-  const result = {};
-  if (usedPercent !== null) {
-    result.usedPercent = Math.max(0, Math.min(100, usedPercent));
-  }
-  if (limitWindowSeconds !== null) {
-    result.windowMinutes = Math.round(limitWindowSeconds / 60);
-  }
-  if (resetAt !== null) {
-    const resetMs = resetAt > 1e10 ? resetAt : resetAt * 1e3;
-    result.resetsAt = new Date(resetMs).toISOString();
-    result.resetsInSeconds = Math.max(0, Math.round((resetMs - Date.now()) / 1e3));
-  }
-  return result;
-}
-function firstNonEmptyString(...values) {
-  for (const value of values) {
-    const text = nonEmptyString(value);
-    if (text) {
-      return text;
-    }
-  }
-  return null;
-}
-function slugForRateLimitId(value) {
-  return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
-}
-function isSparkRateLimit(limitName, meteredFeature) {
-  return [limitName, meteredFeature].filter((value) => Boolean(value)).some((value) => value.toLowerCase().includes("spark"));
-}
-function sparkWindowIdentity(window, fallback) {
-  const limitWindowSeconds = numberFromUnknown(window.limit_window_seconds);
-  const windowMinutes = limitWindowSeconds !== null ? Math.round(limitWindowSeconds / 60) : null;
-  const kind = windowMinutes !== null && windowMinutes > 0 && windowMinutes <= 6 * 60 ? "five-hour" : windowMinutes !== null && windowMinutes >= 6 * 24 * 60 ? "weekly" : fallback;
-  return kind === "weekly" ? { id: "codex-spark-weekly", label: "Codex Spark Weekly" } : { id: "codex-spark", label: "Codex Spark 5-hour" };
-}
-function toExtraRateLimitWindow(args) {
-  const window = toOAuthWindow(args.window);
-  if (!window) {
-    return null;
-  }
-  return {
-    id: args.id,
-    label: args.label,
-    ...args.meteredFeature ? { meteredFeature: args.meteredFeature } : {},
-    ...window
-  };
-}
-function parseExtraRateLimitWindows(additionalRateLimits) {
-  if (!Array.isArray(additionalRateLimits)) {
-    return [];
-  }
-  const usedIds = /* @__PURE__ */ new Set();
-  const extraWindows = [];
-  for (const entry of additionalRateLimits) {
-    if (!isRecord4(entry)) {
-      continue;
-    }
-    const limitName = firstNonEmptyString(entry.limit_name);
-    const meteredFeature = firstNonEmptyString(entry.metered_feature);
-    const rateLimit = isRecord4(entry.rate_limit) ? entry.rate_limit : null;
-    if (!rateLimit) {
-      continue;
-    }
-    const primary = isRecord4(rateLimit.primary_window) ? rateLimit.primary_window : null;
-    const secondary = isRecord4(rateLimit.secondary_window) ? rateLimit.secondary_window : null;
-    if (isSparkRateLimit(limitName, meteredFeature)) {
-      const candidates = [
-        { window: primary, fallback: "five-hour" },
-        { window: secondary, fallback: "weekly" }
-      ];
-      for (const candidate of candidates) {
-        if (!candidate.window) {
-          continue;
-        }
-        const identity = sparkWindowIdentity(candidate.window, candidate.fallback);
-        if (usedIds.has(identity.id)) {
-          continue;
-        }
-        const extraWindow2 = toExtraRateLimitWindow({
-          ...identity,
-          meteredFeature,
-          window: candidate.window
-        });
-        if (extraWindow2) {
-          usedIds.add(identity.id);
-          extraWindows.push(extraWindow2);
-        }
-      }
-      continue;
-    }
-    const idSource = firstNonEmptyString(meteredFeature, limitName);
-    const slug = idSource ? slugForRateLimitId(idSource) : "";
-    if (!slug) {
-      continue;
-    }
-    const id = `codex-${slug}`;
-    if (usedIds.has(id)) {
-      continue;
-    }
-    const extraWindow = toExtraRateLimitWindow({
-      id,
-      label: firstNonEmptyString(limitName, meteredFeature) ?? "Codex extra limit",
-      meteredFeature,
-      window: primary ?? secondary
-    });
-    if (extraWindow) {
-      usedIds.add(id);
-      extraWindows.push(extraWindow);
-    }
-  }
-  return extraWindows;
-}
-function parseRateLimitSnapshotFromOAuthUsage(value) {
-  if (!isRecord4(value)) {
-    throw new Error("Codex usage API returned invalid data");
-  }
-  const usage = value;
-  const primary = toOAuthWindow(usage.rate_limit?.primary_window ?? null);
-  const secondary = toOAuthWindow(usage.rate_limit?.secondary_window ?? null);
-  const extraWindows = parseExtraRateLimitWindows(usage.additional_rate_limits);
-  if (!primary && !secondary && extraWindows.length === 0) {
-    return null;
-  }
-  return {
-    lastUpdated: (/* @__PURE__ */ new Date()).toISOString(),
-    source: "codex-oauth-estimate",
-    ...primary ? { primary } : {},
-    ...secondary ? { secondary } : {},
-    ...extraWindows.length > 0 ? { extraWindows } : {}
-  };
-}
-async function fetchRateLimitsViaOAuth(envOverride) {
-  const authPath = resolveCodexAuthPathForEnv(envOverride);
-  const authContent = await readAuthFileCached(authPath);
-  if (!authContent) {
-    return null;
-  }
-  let credentials = parseCodexOAuthCredentials(authContent);
-  if (!credentials) {
-    return null;
-  }
-  if (shouldRefreshCodexOAuthToken(credentials)) {
-    credentials = await refreshCodexOAuthCredentials(credentials);
-    await writeCodexOAuthCredentials(authPath, authContent, credentials);
-  }
-  if (!credentials.accessToken) {
-    return null;
-  }
-  const usageUrl = await resolveCodexUsageUrl(envOverride);
-  const response = await fetch(usageUrl, {
-    method: "GET",
-    headers: {
-      Authorization: `Bearer ${credentials.accessToken}`,
-      Accept: "application/json",
-      "User-Agent": "CodexUse",
-      ...credentials.accountId ? { "ChatGPT-Account-Id": credentials.accountId } : {}
-    },
-    signal: AbortSignal.timeout(CODEX_USAGE_TIMEOUT_MS)
-  });
-  const body = await response.text();
-  if (response.status === 401 || response.status === 403) {
-    throw new Error(`Codex OAuth usage failed HTTP ${response.status} (${usageUrl})`);
-  }
-  if (!response.ok) {
-    throw new Error(`Codex usage API failed HTTP ${response.status} (${usageUrl}): ${body.slice(0, 500)}`);
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(body);
-  } catch {
-    throw new Error("Codex usage API returned invalid JSON");
-  }
-  return parseRateLimitSnapshotFromOAuthUsage(parsed);
-}
 function inferRefreshFailureHint(stderrOutput) {
   if (!stderrOutput) {
     return null;
@@ -7357,7 +6992,7 @@ var ProfileManager = class {
     }
     let parsed;
     try {
-      parsed = (0, import_toml2.parse)(raw);
+      parsed = (0, import_toml.parse)(raw);
     } catch (error) {
       logWarn(`Failed to parse config.toml for profile home '${profileHome}':`, error);
       return;
@@ -7367,7 +7002,7 @@ var ProfileManager = class {
     }
     delete parsed["model_reasoning_effort"];
     const sanitized = this.ensureTrailingNewline(
-      (0, import_toml2.stringify)(parsed)
+      (0, import_toml.stringify)(parsed)
     );
     try {
       await import_fs.promises.writeFile(configPath, sanitized, "utf8");
@@ -7729,16 +7364,7 @@ var ProfileManager = class {
         profileName,
         () => this.runWithPreparedProfileHome(
           profileName,
-          async (env) => {
-            try {
-              const rpcSnapshot = await fetchRateLimitsViaRpc(env, { codexPath: options.codexPath });
-              if (rpcSnapshot) {
-                return rpcSnapshot;
-              }
-            } catch {
-            }
-            return fetchRateLimitsViaOAuth(env);
-          },
+          (env) => fetchRateLimitsViaRpc(env, { codexPath: options.codexPath }),
           { syncFromActiveAuthBeforeAction: false }
         )
       );
@@ -9369,10 +8995,6 @@ function snapshotResetSeconds(snapshot) {
   ].filter((value) => typeof value === "number" && Number.isFinite(value));
   return values.length > 0 ? Math.min(...values) : null;
 }
-function fallbackUsedPercent(profile) {
-  const cached = maxUsedPercent(profile.rateLimit ?? null);
-  return typeof cached === "number" && Number.isFinite(cached) ? cached : null;
-}
 function compareCandidates(left, right) {
   const leftUsage = left.usedPercent ?? Number.POSITIVE_INFINITY;
   const rightUsage = right.usedPercent ?? Number.POSITIVE_INFINITY;
@@ -9430,16 +9052,17 @@ async function selectBestProfile(manager, profiles, codexPath) {
     }
     try {
       const snapshot = await manager.readLiveRateLimits(profile.name, { codexPath });
+      const usedPercent = maxUsedPercent(snapshot);
       candidates.push({
         profile,
-        usedPercent: typeof maxUsedPercent(snapshot) === "number" ? maxUsedPercent(snapshot) : fallbackUsedPercent(profile),
+        usedPercent: typeof usedPercent === "number" ? usedPercent : null,
         resetSeconds: snapshotResetSeconds(snapshot)
       });
     } catch {
       candidates.push({
         profile,
-        usedPercent: fallbackUsedPercent(profile),
-        resetSeconds: snapshotResetSeconds(profile.rateLimit ?? null)
+        usedPercent: null,
+        resetSeconds: null
       });
     }
   }
@@ -9574,6 +9197,9 @@ Picks the healthiest saved profile, then runs Codex. Auto-run requires Pro or an
   if (!best) {
     throw new Error("No valid saved profiles found. Add one with `codexuse profile add <name>`.");
   }
+  if (best.usedPercent === null) {
+    throw new Error("No live rate-limit usage found. Skipping best profile run.");
+  }
   const dryRun = hasFlag(flags, "--dry-run");
   const summary = `${best.profile.name} (${formatUsagePercent(best.usedPercent)} used)`;
   if (dryRun) {
@@ -15661,7 +15287,7 @@ function summarizeRateLimitSnapshot(snapshot) {
   return summary;
 }
 function fallbackUsage(profile) {
-  const usageSummary = summarizeRateLimitSnapshot(profile.rateLimit ?? null);
+  const usageSummary = summarizeRateLimitSnapshot(null);
   if (!profile.isValid) {
     return { summary: "invalid", rows: null, usageSummary };
   }
@@ -15677,8 +15303,7 @@ async function resolveProfileUsage(manager, profile, codexPath) {
   try {
     const snapshot = await manager.readLiveRateLimits(profile.name, { codexPath });
     if (!snapshot) {
-      const usageSummary = summarizeRateLimitSnapshot(profile.rateLimit ?? null);
-      return { summary: "n/a", rows: null, usageSummary };
+      return fallbackUsage(profile);
     }
     const rows = [];
     if (snapshot.primary) {
@@ -15730,7 +15355,7 @@ function computeAutoRollCandidate(profiles, usageMap, currentProfileName, curren
     (profile) => profile.name !== currentProfileName && !blockedProfileNames.has(profile.name) && profile.isValid && !profile.tokenStatus?.requiresUserAction
   ).map((profile) => ({
     profile,
-    usageSummary: usageMap.get(profile.name)?.usageSummary ?? summarizeRateLimitSnapshot(profile.rateLimit ?? null)
+    usageSummary: usageMap.get(profile.name)?.usageSummary ?? summarizeRateLimitSnapshot(null)
   }));
   if (candidates.length === 0) {
     return null;
@@ -16145,7 +15770,7 @@ async function runAutoRollPass(manager, options) {
       target: null
     };
   }
-  const currentUsage = usageMap.get(current.name)?.usageSummary ?? summarizeRateLimitSnapshot(currentProfile.rateLimit ?? null);
+  const currentUsage = usageMap.get(current.name)?.usageSummary ?? summarizeRateLimitSnapshot(null);
   if (!currentUsage.hasUsage) {
     return {
       switched: false,
@@ -16263,7 +15888,7 @@ async function handleProfileCommand(args, version) {
             usageMap.set(profile.name, {
               summary: "codex cli missing",
               rows: null,
-              usageSummary: summarizeRateLimitSnapshot(profile.rateLimit ?? null)
+              usageSummary: summarizeRateLimitSnapshot(null)
             });
           }
         } else {
@@ -16634,7 +16259,7 @@ async function pushRemoteSnapshot(access, snapshot, options) {
 }
 
 // ../../packages/runtime-codex/src/codex/config.ts
-var import_toml3 = __toESM(require_toml(), 1);
+var import_toml2 = __toESM(require_toml(), 1);
 
 // ../../packages/runtime-codex/src/codex/config-metadata.ts
 var import_node_child_process8 = require("child_process");
@@ -17273,7 +16898,7 @@ function formatUserFacingError(error, options = {}) {
 // ../../packages/runtime-codex/src/codex/config.ts
 function tryParseToml(content) {
   try {
-    const parsed = (0, import_toml3.parse)(content);
+    const parsed = (0, import_toml2.parse)(content);
     return { data: parsed ?? {}, error: null };
   } catch (error) {
     const maybe = error;
@@ -18312,7 +17937,7 @@ async function ensureCliStorageReady() {
 }
 
 // src/app/main.ts
-var VERSION = true ? "5.1.5" : "0.0.0";
+var VERSION = true ? "5.1.6" : "0.0.0";
 async function runCli() {
   const args = process.argv.slice(2);
   if (args.length === 0) {