opencode-usage 0.5.3 → 0.5.4

package/dist/index.js

@@ -241,36 +241,106 @@ function resolveSource2(provider) {
   }
   return source;
 }
+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)
+    return { status: "error", error: "No codex store found" };
+  console.log(`[directCodexPing] found account "${alias}", calling ChatGPT Codex API\u2026`);
+  const accounts = store.accounts ?? {};
+  const account = accounts[alias];
+  if (!account)
+    return { status: "error", error: `Account "${alias}" not found` };
+  const token = account.accessToken;
+  const accountId = account.accountId;
+  if (typeof token !== "string" || !token) {
+    return { status: "error", error: "Missing access token" };
+  }
+  if (typeof accountId !== "string" || !accountId) {
+    return { status: "error", error: "Missing accountId" };
+  }
+  try {
+    const res = await fetch("https://chatgpt.com/backend-api/codex/responses", {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
+        "chatgpt-account-id": accountId,
+        "OpenAI-Beta": "responses=experimental",
+        originator: "codex_cli_rs",
+        accept: "text/event-stream"
+      },
+      body: JSON.stringify({
+        model: "gpt-5.3-codex",
+        instructions: "reply ok",
+        input: [{ type: "message", role: "user", content: "hi" }],
+        store: false,
+        stream: true
+      })
+    });
+    if (res.ok || res.status === 429) {
+      console.log(`[directCodexPing] "${alias}" \u2192 ok (HTTP ${res.status})`);
+      return { status: "ok" };
+    }
+    if (res.status === 401 || res.status === 403) {
+      console.log(`[directCodexPing] "${alias}" \u2192 expired (HTTP ${res.status})`);
+      return { status: "expired", error: `HTTP ${res.status}` };
+    }
+    console.log(`[directCodexPing] "${alias}" \u2192 error (HTTP ${res.status})`);
+    return { status: "error", error: `HTTP ${res.status}` };
+  } catch (err) {
+    return {
+      status: "error",
+      error: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
 async function readCredentialFile(filename) {
   const filePath = join8(homedir6(), ".config", "opencode", filename);
   const text = await Bun.file(filePath).text();
   return JSON.parse(text);
 }
 async function spawnPluginCli(command, args, timeoutMs = 15000) {
-  const localBin = `./node_modules/${command}/dist/cli.js`;
-  const useLocal = await Bun.file(localBin).exists();
-  if (!useLocal) {
-    const existing = bunxBarrier.get(command);
-    if (existing) {
-      await existing.catch(() => {
-      });
-      return runPluginCli(command, args, timeoutMs, false);
+  const candidates = [
+    `./node_modules/${command}/dist/cli.js`,
+    join8(homedir6(), ".config", "opencode", "node_modules", command, "dist", "cli.js")
+  ];
+  let localBin = null;
+  for (const c of candidates) {
+    if (await Bun.file(c).exists()) {
+      localBin = c;
+      break;
     }
-    const warmup = runPluginCli(command, args, timeoutMs, false);
-    const barrier = warmup.then(() => {
+  }
+  const useLocal = localBin !== null;
+  if (!useLocal) {
+    const prev = bunxQueue.get(command) ?? Promise.resolve();
+    const run = prev.catch(() => {
+    }).then(() => runPluginCli(command, args, timeoutMs, null));
+    bunxQueue.set(command, run.then(() => {
     }, () => {
-    });
-    bunxBarrier.set(command, barrier);
-    barrier.finally(() => bunxBarrier.delete(command));
-    return warmup;
+    }));
+    return run;
   }
-  return runPluginCli(command, args, timeoutMs, true);
+  return runPluginCli(command, args, timeoutMs, localBin);
 }
-async function runPluginCli(command, args, timeoutMs, useLocal) {
+async function runPluginCli(command, args, timeoutMs, localBin) {
   const t0 = Date.now();
-  const localBin = `./node_modules/${command}/dist/cli.js`;
-  const cmd = useLocal ? ["bun", localBin, ...args] : ["bunx", `${command}@latest`, ...args];
-  const cwd = useLocal ? undefined : join8(tmpdir(), `bunx-${crypto.randomUUID()}`);
+  const cmd = localBin ? ["bun", localBin, ...args] : ["bunx", `${command}@latest`, ...args];
+  const cwd = localBin ? undefined : join8(tmpdir(), `bunx-${crypto.randomUUID()}`);
   if (cwd)
     await Bun.$`mkdir -p ${cwd}`.quiet();
   console.log(`[spawnPluginCli] starting: ${cmd.join(" ")}`);
@@ -391,7 +461,7 @@ function reauthCliCommand(provider) {
     throw new Error(`Re-auth not supported for provider: ${provider}`);
   return cmd;
 }
-var isBun4, PROVIDER_SOURCE, bunxBarrier, REAUTH_PROVIDERS;
+var isBun4, PROVIDER_SOURCE, bunxQueue, REAUTH_PROVIDERS;
 var init_plugin_adapters = __esm(() => {
   init_command_runner();
   init_config_service();
@@ -492,7 +562,7 @@ var init_plugin_adapters = __esm(() => {
       return { ok: true };
     }
   });
-  bunxBarrier = new Map;
+  bunxQueue = new Map;
   registerCommand({
     id: "accounts.ping",
     timeoutMs: 30000,
@@ -527,19 +597,41 @@ var init_plugin_adapters = __esm(() => {
           };
         }
         case "codex": {
-          ctx.log("info", "Calling oc-codex-multi-account ping\u2026");
-          const result = await spawnPluginCli("oc-codex-multi-account", [
-            "ping",
-            input.alias
-          ]);
-          const status = String(result.status ?? "error");
-          ctx.log("info", `Result: ${status}`);
-          if (status === "ok") {
+          ctx.log("info", `Direct-pinging codex account "${input.alias}"\u2026`);
+          const direct = await directCodexPing(input.alias);
+          ctx.log("info", `Direct ping result: ${direct.status}`);
+          if (direct.status === "ok") {
             await clearStaleMetrics(input.provider, input.alias);
+            return { status: "ok", message: "pong" };
+          }
+          if (direct.status === "expired") {
+            ctx.log("info", "Token expired \u2014 trying plugin CLI for refresh\u2026");
+            try {
+              const result = await spawnPluginCli("oc-codex-multi-account", [
+                "ping",
+                input.alias
+              ]);
+              const cliStatus = String(result.status ?? "error");
+              ctx.log("info", `Plugin CLI result: ${cliStatus}`);
+              if (cliStatus === "ok") {
+                await clearStaleMetrics(input.provider, input.alias);
+                return { status: "ok", message: "pong (token refreshed)" };
+              }
+              return {
+                status: cliStatus,
+                message: String(result.error ?? "Token refresh failed")
+              };
+            } catch (cliErr) {
+              ctx.log("info", `Plugin CLI failed: ${cliErr instanceof Error ? cliErr.message : String(cliErr)}`);
+              return {
+                status: "error",
+                message: direct.error ?? "Token expired and plugin refresh failed"
+              };
+            }
           }
           return {
-            status,
-            message: status === "ok" ? "pong" : String(result.error ?? "unknown error")
+            status: "error",
+            message: direct.error ?? "unknown error"
           };
         }
         case "antigravity": {
@@ -30887,4 +30979,4 @@ async function main2() {
 var WATCH_INTERVAL_MS = 5 * 60 * 1000;
 main2().catch(console.error);
 
-//# debugId=2B2A0EC747EBB71864756E2164756E21
+//# debugId=E047BEB14D24A3D264756E2164756E21