opencode-usage 0.5.10 → 0.5.11

package/dist/index.js

@@ -366,6 +366,56 @@ function getAccountIdFromJwt(claims) {
   const auth = claims?.["https://api.openai.com/auth"];
   return auth?.chatgpt_account_id ?? null;
 }
+async function tryReadCodexCliAuth() {
+  try {
+    const raw = JSON.parse(await Bun.file(CODEX_CLI_AUTH_PATH).text());
+    const tokens = raw.tokens;
+    if (!tokens?.access_token)
+      return null;
+    const accessClaims = decodeJwtPayload(tokens.access_token);
+    const idClaims = tokens.id_token ? decodeJwtPayload(tokens.id_token) : null;
+    const expiresAt = getExpiryFromJwt(accessClaims) ?? getExpiryFromJwt(idClaims) ?? 0;
+    if (expiresAt <= Date.now())
+      return null;
+    return {
+      accessToken: tokens.access_token,
+      refreshToken: tokens.refresh_token ?? "",
+      idToken: tokens.id_token ?? null,
+      accountId: getAccountIdFromJwt(idClaims) ?? getAccountIdFromJwt(accessClaims),
+      expiresAt
+    };
+  } catch {
+    return null;
+  }
+}
+async function tryImportFromCodexCli(alias, account, storePath) {
+  const cli = await tryReadCodexCliAuth();
+  if (!cli || !cli.refreshToken)
+    return false;
+  const pluginAccountId = account.accountId;
+  if (!pluginAccountId || cli.accountId !== pluginAccountId)
+    return false;
+  const pluginExpiry = typeof account.expiresAt === "number" ? account.expiresAt : 0;
+  if (cli.expiresAt <= pluginExpiry)
+    return false;
+  console.log(`[proactiveRefresh] ${alias}: importing fresher token from ~/.codex/auth.json`);
+  const freshStore = JSON.parse(await Bun.file(storePath).text());
+  const freshAccounts = freshStore.accounts ?? {};
+  const freshAcct = freshAccounts[alias];
+  if (!freshAcct)
+    return false;
+  freshAcct.accessToken = cli.accessToken;
+  freshAcct.refreshToken = cli.refreshToken;
+  if (cli.idToken)
+    freshAcct.idToken = cli.idToken;
+  freshAcct.expiresAt = cli.expiresAt;
+  freshAcct.lastRefresh = new Date().toISOString();
+  freshAcct.authInvalid = false;
+  await Bun.write(storePath, JSON.stringify(freshStore, null, 2));
+  const daysLeft = ((cli.expiresAt - Date.now()) / (24 * 60 * 60 * 1000)).toFixed(1);
+  console.log(`[proactiveRefresh] ${alias}: imported from CLI, expiry in ${daysLeft}d`);
+  return true;
+}
 async function refreshSingleCodexToken(alias, account, storePath) {
   const refreshToken = account.refreshToken;
   if (typeof refreshToken !== "string" || !refreshToken) {
@@ -385,7 +435,7 @@ async function refreshSingleCodexToken(alias, account, storePath) {
     });
     if (!res.ok) {
       console.log(`[proactiveRefresh] ${alias}: refresh failed HTTP ${res.status} in ${Date.now() - t0}ms`);
-      return false;
+      return tryImportFromCodexCli(alias, account, storePath);
     }
     const tokens = await res.json();
     const accessClaims = decodeJwtPayload(tokens.access_token);
@@ -633,7 +683,7 @@ function reauthCliCommand(provider) {
     throw new Error(`Re-auth not supported for provider: ${provider}`);
   return cmd;
 }
-var isBun4, PROVIDER_SOURCE, CODEX_TOKEN_URL = "https://auth.openai.com/oauth/token", CODEX_CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann", REFRESH_COOLDOWN_MS, _proactiveRefreshRunning = false, bunxQueue, REAUTH_PROVIDERS;
+var isBun4, PROVIDER_SOURCE, CODEX_TOKEN_URL = "https://auth.openai.com/oauth/token", CODEX_CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann", REFRESH_COOLDOWN_MS, CODEX_CLI_AUTH_PATH, _proactiveRefreshRunning = false, bunxQueue, REAUTH_PROVIDERS;
 var init_plugin_adapters = __esm(() => {
   init_command_runner();
   init_config_service();
@@ -735,6 +785,7 @@ var init_plugin_adapters = __esm(() => {
     }
   });
   REFRESH_COOLDOWN_MS = 24 * 60 * 60 * 1000;
+  CODEX_CLI_AUTH_PATH = join8(homedir6(), ".codex", "auth.json");
   bunxQueue = new Map;
   registerCommand({
     id: "accounts.ping",
@@ -31172,4 +31223,4 @@ async function main2() {
 var WATCH_INTERVAL_MS = 5 * 60 * 1000;
 main2().catch(console.error);
 
-//# debugId=8161BB1074E571D664756E2164756E21
+//# debugId=F9964D445D944A6564756E2164756E21