opencode-usage 0.5.12 → 0.5.14

package/dist/index.js

@@ -246,7 +246,61 @@ __export(exports_plugin_adapters, {
   proactiveRefreshCodexTokens: () => proactiveRefreshCodexTokens
 });
 import { homedir as homedir6, tmpdir } from "os";
-import { join as join8 } from "path";
+import { join as join8, dirname as dirname2 } from "path";
+import { mkdir as mkdir2 } from "fs/promises";
+async function writeCodexStoreToAll(content) {
+  await Promise.all(CODEX_STORE_PATHS.map(async (p) => {
+    try {
+      await mkdir2(dirname2(p), { recursive: true });
+      await Bun.write(p, content);
+    } catch {
+    }
+  }));
+}
+async function mergeAndSyncCodexStores() {
+  const stores = [];
+  for (const p of CODEX_STORE_PATHS) {
+    try {
+      stores.push(JSON.parse(await Bun.file(p).text()));
+    } catch {
+      continue;
+    }
+  }
+  if (stores.length === 0)
+    return;
+  const merged = JSON.parse(JSON.stringify(stores[0]));
+  const mergedAccounts = merged.accounts ?? {};
+  for (const data of stores.slice(1)) {
+    const accounts = data.accounts ?? {};
+    for (const [alias, account] of Object.entries(accounts)) {
+      const existing = mergedAccounts[alias];
+      if (!existing) {
+        mergedAccounts[alias] = account;
+        continue;
+      }
+      const existingExpiry = typeof existing.expiresAt === "number" ? existing.expiresAt : 0;
+      const newExpiry = typeof account.expiresAt === "number" ? account.expiresAt : 0;
+      if (newExpiry > existingExpiry) {
+        mergedAccounts[alias] = account;
+      }
+    }
+  }
+  merged.accounts = mergedAccounts;
+  const content = JSON.stringify(merged, null, 2);
+  console.log(`[syncCodexStores] merged ${stores.length} stores, ${Object.keys(mergedAccounts).length} accounts`);
+  await writeCodexStoreToAll(content);
+}
+async function readCodexStore() {
+  for (const p of CODEX_STORE_PATHS) {
+    try {
+      const store = JSON.parse(await Bun.file(p).text());
+      return { storePath: p, store };
+    } catch {
+      continue;
+    }
+  }
+  return null;
+}
 function resolveSource2(provider) {
   const source = PROVIDER_SOURCE[provider];
   if (!source) {
@@ -256,22 +310,10 @@ function resolveSource2(provider) {
 }
 async function directCodexPing(alias) {
   console.log(`[directCodexPing] pinging "${alias}"\u2026`);
-  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 store = null;
-  for (const p of STORE_PATHS) {
-    try {
-      store = JSON.parse(await Bun.file(p).text());
-      break;
-    } catch {
-      continue;
-    }
-  }
-  if (!store)
+  const result = await readCodexStore();
+  if (!result)
     return { status: "error", error: "No codex store found" };
+  const { store } = result;
   console.log(`[directCodexPing] found account "${alias}", calling ChatGPT Codex API\u2026`);
   const accounts = store.accounts ?? {};
   const account = accounts[alias];
@@ -322,24 +364,10 @@ 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)
+  const result = await readCodexStore();
+  if (!result)
     return false;
+  const { storePath, store } = result;
   const accounts = store.accounts ?? {};
   const account = accounts[alias];
   if (!account)
@@ -411,7 +439,9 @@ async function tryImportFromCodexCli(alias, account, storePath) {
   freshAcct.expiresAt = cli.expiresAt;
   freshAcct.lastRefresh = new Date().toISOString();
   freshAcct.authInvalid = false;
-  await Bun.write(storePath, JSON.stringify(freshStore, null, 2));
+  const content = JSON.stringify(freshStore, null, 2);
+  await Bun.write(storePath, content);
+  await mergeAndSyncCodexStores();
   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;
@@ -455,7 +485,9 @@ async function refreshSingleCodexToken(alias, account, storePath) {
       freshAcct.accountId = getAccountIdFromJwt(idClaims) ?? getAccountIdFromJwt(accessClaims) ?? freshAcct.accountId;
       freshAcct.authInvalid = false;
     }
-    await Bun.write(storePath, JSON.stringify(freshStore, null, 2));
+    const content = JSON.stringify(freshStore, null, 2);
+    await Bun.write(storePath, content);
+    await mergeAndSyncCodexStores();
     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;
@@ -475,24 +507,10 @@ async function proactiveRefreshCodexTokens() {
   }
 }
 async function _proactiveRefreshCodexTokensInner() {
-  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)
+  const result = await readCodexStore();
+  if (!result)
     return;
+  const { storePath, store } = result;
   const accounts = store.accounts ?? {};
   const now = Date.now();
   let refreshed = 0;
@@ -683,11 +701,16 @@ 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, CODEX_CLI_AUTH_PATH, _proactiveRefreshRunning = false, bunxQueue, REAUTH_PROVIDERS;
+var isBun4, CODEX_STORE_PATHS, 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();
   isBun4 = typeof globalThis.Bun !== "undefined";
+  CODEX_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")
+  ];
   PROVIDER_SOURCE = {
     anthropic: "anthropic-multi-account-state",
     codex: "codex-multi-account-accounts",
@@ -863,6 +886,7 @@ var init_plugin_adapters = __esm(() => {
               }
             }
             ctx.log("info", "Direct refresh failed \u2014 trying plugin CLI\u2026");
+            await mergeAndSyncCodexStores();
             try {
               const result = await spawnPluginCli("oc-codex-multi-account", [
                 "ping",
@@ -933,6 +957,9 @@ var init_plugin_adapters = __esm(() => {
     },
     async run(ctx, input) {
       const cliCmd = reauthCliCommand(input.provider);
+      if (input.provider === "codex") {
+        await mergeAndSyncCodexStores();
+      }
       ctx.log("info", `Generating auth URL for ${input.alias}\u2026`);
       const result = await spawnPluginCli(cliCmd, ["reauth", input.alias]);
       const url = String(result.url ?? "");
@@ -971,6 +998,9 @@ var init_plugin_adapters = __esm(() => {
     },
     async run(ctx, input) {
       const cliCmd = reauthCliCommand(input.provider);
+      if (input.provider === "codex") {
+        await mergeAndSyncCodexStores();
+      }
       ctx.log("info", `Completing re-auth for ${input.alias}\u2026`);
       const result = await spawnPluginCli(cliCmd, [
         "reauth",
@@ -982,6 +1012,9 @@ var init_plugin_adapters = __esm(() => {
       ]);
       const status = String(result.status ?? "error");
       ctx.log("info", `Result: ${status}`);
+      if (status === "ok" && input.provider === "codex") {
+        await mergeAndSyncCodexStores();
+      }
       return {
         status,
         message: status === "ok" ? "Re-authenticated successfully" : String(result.error ?? "unknown error")
@@ -30491,7 +30524,7 @@ async function showConfig() {
 var CODEX_AUTH_PATH2 = join6(homedir4(), ".codex", "auth.json");
 
 // src/commander/server.ts
-import { join as join10, dirname as dirname2 } from "path";
+import { join as join10, dirname as dirname3 } from "path";
 import { readFileSync as readFileSync2 } from "fs";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
@@ -31103,7 +31136,7 @@ async function runCommanderServer(args) {
 }
 var isBun7 = typeof globalThis.Bun !== "undefined";
 var DEFAULT_PORT = 4466;
-var __dirname2 = dirname2(fileURLToPath2(import.meta.url));
+var __dirname2 = dirname3(fileURLToPath2(import.meta.url));
 var PKG_VERSION = (() => {
   for (const rel of [
     join10(__dirname2, "..", "..", "package.json"),
@@ -31241,4 +31274,4 @@ async function main2() {
 var WATCH_INTERVAL_MS = 5 * 60 * 1000;
 main2().catch(console.error);
 
-//# debugId=19998AF36F1ECDA164756E2164756E21
+//# debugId=B50D751F40066AFC64756E2164756E21