opencode-usage 0.5.5 → 0.5.7

package/dist/index.js

@@ -321,6 +321,31 @@ async function directCodexPing(alias) {
     };
   }
 }
+async function tryDirectCodexRefresh(alias) {
+  const STORE_PATHS = [
+    join8(homedir6(), ".config", "opencode", "codex-multi-account-accounts.json"),
+    join8(homedir6(), ".config", "opencode", "codex-multi-accounts.json"),
+    join8(homedir6(), ".config", "oc-codex-multi-account", "accounts.json")
+  ];
+  let storePath = null;
+  let store = null;
+  for (const p of STORE_PATHS) {
+    try {
+      store = JSON.parse(await Bun.file(p).text());
+      storePath = p;
+      break;
+    } catch {
+      continue;
+    }
+  }
+  if (!store || !storePath)
+    return false;
+  const accounts = store.accounts ?? {};
+  const account = accounts[alias];
+  if (!account)
+    return false;
+  return refreshSingleCodexToken(alias, account, storePath);
+}
 function decodeJwtPayload(token) {
   try {
     const parts = token.split(".");
@@ -341,7 +366,7 @@ function getAccountIdFromJwt(claims) {
   const auth = claims?.["https://api.openai.com/auth"];
   return auth?.chatgpt_account_id ?? null;
 }
-async function refreshSingleCodexToken(alias, account, storePath, store) {
+async function refreshSingleCodexToken(alias, account, storePath) {
   const refreshToken = account.refreshToken;
   if (typeof refreshToken !== "string" || !refreshToken) {
     console.log(`[proactiveRefresh] ${alias}: no refresh token, skipping`);
@@ -366,16 +391,21 @@ async function refreshSingleCodexToken(alias, account, storePath, store) {
     const accessClaims = decodeJwtPayload(tokens.access_token);
     const idClaims = tokens.id_token ? decodeJwtPayload(tokens.id_token) : null;
     const expiresAt = getExpiryFromJwt(accessClaims) ?? getExpiryFromJwt(idClaims) ?? Date.now() + tokens.expires_in * 1000;
-    account.accessToken = tokens.access_token;
-    if (tokens.refresh_token)
-      account.refreshToken = tokens.refresh_token;
-    if (tokens.id_token)
-      account.idToken = tokens.id_token;
-    account.expiresAt = expiresAt;
-    account.lastRefresh = new Date().toISOString();
-    account.accountId = getAccountIdFromJwt(idClaims) ?? getAccountIdFromJwt(accessClaims) ?? account.accountId;
-    account.authInvalid = false;
-    await Bun.write(storePath, JSON.stringify(store, null, 2));
+    const freshStore = JSON.parse(await Bun.file(storePath).text());
+    const freshAccounts = freshStore.accounts ?? {};
+    const freshAcct = freshAccounts[alias];
+    if (freshAcct) {
+      freshAcct.accessToken = tokens.access_token;
+      if (tokens.refresh_token)
+        freshAcct.refreshToken = tokens.refresh_token;
+      if (tokens.id_token)
+        freshAcct.idToken = tokens.id_token;
+      freshAcct.expiresAt = expiresAt;
+      freshAcct.lastRefresh = new Date().toISOString();
+      freshAcct.accountId = getAccountIdFromJwt(idClaims) ?? getAccountIdFromJwt(accessClaims) ?? freshAcct.accountId;
+      freshAcct.authInvalid = false;
+    }
+    await Bun.write(storePath, JSON.stringify(freshStore, null, 2));
     const daysLeft = ((expiresAt - Date.now()) / (24 * 60 * 60 * 1000)).toFixed(1);
     console.log(`[proactiveRefresh] ${alias}: refreshed in ${Date.now() - t0}ms, new expiry in ${daysLeft}d`);
     return true;
@@ -412,7 +442,13 @@ async function proactiveRefreshCodexTokens() {
     const timeSinceRefresh = now - lastRefresh;
     const timeToExpiry = expiresAt - now;
     if (timeToExpiry <= 0) {
-      console.log(`[proactiveRefresh] ${alias}: token expired, needs reauth`);
+      console.log(`[proactiveRefresh] ${alias}: token expired, attempting refresh\u2026`);
+      const ok2 = await refreshSingleCodexToken(alias, account, storePath);
+      if (ok2) {
+        refreshed++;
+      } else {
+        console.log(`[proactiveRefresh] ${alias}: refresh failed \u2014 needs reauth`);
+      }
       continue;
     }
     if (timeSinceRefresh < REFRESH_COOLDOWN_MS) {
@@ -422,7 +458,7 @@ async function proactiveRefreshCodexTokens() {
     }
     const hoursStale = (timeSinceRefresh / (60 * 60 * 1000)).toFixed(1);
     console.log(`[proactiveRefresh] ${alias}: ${hoursStale}h since refresh, refreshing\u2026`);
-    const ok = await refreshSingleCodexToken(alias, account, storePath, store);
+    const ok = await refreshSingleCodexToken(alias, account, storePath);
     if (ok)
       refreshed++;
   }
@@ -537,8 +573,8 @@ async function clearStaleMetrics(provider, alias) {
           const rl = acct.rateLimits;
           for (const key of ["fiveHour", "weekly"]) {
             const w2 = rl[key];
-            if (w2?.resetAt && typeof w2.resetAt === "string") {
-              if (new Date(w2.resetAt).getTime() < now) {
+            if (w2?.resetAt && typeof w2.resetAt === "number") {
+              if (w2.resetAt < now) {
                 w2.remaining = w2.limit;
                 delete w2.resetAt;
                 changed = true;
@@ -730,7 +766,16 @@ var init_plugin_adapters = __esm(() => {
             return { status: "ok", message: "pong" };
           }
           if (direct.status === "expired") {
-            ctx.log("info", "Token expired \u2014 trying plugin CLI for refresh\u2026");
+            ctx.log("info", "Token expired \u2014 attempting direct token refresh\u2026");
+            const directRefreshOk = await tryDirectCodexRefresh(input.alias);
+            if (directRefreshOk) {
+              const rePing = await directCodexPing(input.alias);
+              if (rePing.status === "ok") {
+                await clearStaleMetrics(input.provider, input.alias);
+                return { status: "ok", message: "pong (token refreshed)" };
+              }
+            }
+            ctx.log("info", "Direct refresh failed \u2014 trying plugin CLI\u2026");
             try {
               const result = await spawnPluginCli("oc-codex-multi-account", [
                 "ping",
@@ -31109,4 +31154,4 @@ async function main2() {
 var WATCH_INTERVAL_MS = 5 * 60 * 1000;
 main2().catch(console.error);
 
-//# debugId=DF21C38AB467E5FE64756E2164756E21
+//# debugId=31E49E1C5B0730A864756E2164756E21