opencode-usage 0.5.13 → 0.5.14

package/dist/index.js

@@ -248,7 +248,7 @@ __export(exports_plugin_adapters, {
 import { homedir as homedir6, tmpdir } from "os";
 import { join as join8, dirname as dirname2 } from "path";
 import { mkdir as mkdir2 } from "fs/promises";
-async function syncCodexStoreToAll(content) {
+async function writeCodexStoreToAll(content) {
   await Promise.all(CODEX_STORE_PATHS.map(async (p) => {
     try {
       await mkdir2(dirname2(p), { recursive: true });
@@ -257,6 +257,39 @@ async function syncCodexStoreToAll(content) {
     }
   }));
 }
+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 {
@@ -408,7 +441,7 @@ async function tryImportFromCodexCli(alias, account, storePath) {
   freshAcct.authInvalid = false;
   const content = JSON.stringify(freshStore, null, 2);
   await Bun.write(storePath, content);
-  await syncCodexStoreToAll(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;
@@ -454,7 +487,7 @@ async function refreshSingleCodexToken(alias, account, storePath) {
     }
     const content = JSON.stringify(freshStore, null, 2);
     await Bun.write(storePath, content);
-    await syncCodexStoreToAll(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;
@@ -853,9 +886,7 @@ var init_plugin_adapters = __esm(() => {
               }
             }
             ctx.log("info", "Direct refresh failed \u2014 trying plugin CLI\u2026");
-            const primary = await readCodexStore();
-            if (primary)
-              await syncCodexStoreToAll(JSON.stringify(primary.store, null, 2));
+            await mergeAndSyncCodexStores();
             try {
               const result = await spawnPluginCli("oc-codex-multi-account", [
                 "ping",
@@ -927,9 +958,7 @@ var init_plugin_adapters = __esm(() => {
     async run(ctx, input) {
       const cliCmd = reauthCliCommand(input.provider);
       if (input.provider === "codex") {
-        const primary = await readCodexStore();
-        if (primary)
-          await syncCodexStoreToAll(JSON.stringify(primary.store, null, 2));
+        await mergeAndSyncCodexStores();
       }
       ctx.log("info", `Generating auth URL for ${input.alias}\u2026`);
       const result = await spawnPluginCli(cliCmd, ["reauth", input.alias]);
@@ -970,9 +999,7 @@ var init_plugin_adapters = __esm(() => {
     async run(ctx, input) {
       const cliCmd = reauthCliCommand(input.provider);
       if (input.provider === "codex") {
-        const primary = await readCodexStore();
-        if (primary)
-          await syncCodexStoreToAll(JSON.stringify(primary.store, null, 2));
+        await mergeAndSyncCodexStores();
       }
       ctx.log("info", `Completing re-auth for ${input.alias}\u2026`);
       const result = await spawnPluginCli(cliCmd, [
@@ -986,9 +1013,7 @@ var init_plugin_adapters = __esm(() => {
       const status = String(result.status ?? "error");
       ctx.log("info", `Result: ${status}`);
       if (status === "ok" && input.provider === "codex") {
-        const fresh = await readCodexStore();
-        if (fresh)
-          await syncCodexStoreToAll(JSON.stringify(fresh.store, null, 2));
+        await mergeAndSyncCodexStores();
       }
       return {
         status,
@@ -31249,4 +31274,4 @@ async function main2() {
 var WATCH_INTERVAL_MS = 5 * 60 * 1000;
 main2().catch(console.error);
 
-//# debugId=12CA232C2B0D985864756E2164756E21
+//# debugId=B50D751F40066AFC64756E2164756E21