npm - opencode-usage - Versions diffs - 0.5.2 → 0.5.4 - Mend

opencode-usage 0.5.2 → 0.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

package/dist/commander-ui/dist/assets/instrument-sans-latin-ext-wght-normal-B5bTHO_g.woff2 ADDED Viewed

Binary file

package/dist/commander-ui/dist/assets/instrument-sans-latin-wght-normal-BbzFLZTg.woff2 ADDED Viewed

Binary file

package/dist/commander-ui/dist/assets/jetbrains-mono-cyrillic-wght-normal-D73BlboJ.woff2 ADDED Viewed

Binary file

package/dist/commander-ui/dist/assets/jetbrains-mono-greek-wght-normal-Bw9x6K1M.woff2 ADDED Viewed

Binary file

package/dist/commander-ui/dist/assets/jetbrains-mono-latin-ext-wght-normal-DBQx-q_a.woff2 ADDED Viewed

Binary file

package/dist/commander-ui/dist/assets/jetbrains-mono-latin-wght-normal-B9CIFXIH.woff2 ADDED Viewed

Binary file

package/dist/commander-ui/dist/assets/jetbrains-mono-vietnamese-wght-normal-Bt-aOZkq.woff2 ADDED Viewed

Binary file

package/dist/commander-ui/dist/index.html ADDED Viewed

@@ -0,0 +1,23 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>commander-ui</title>
+    <script>
+      (function () {
+        var t = localStorage.getItem("commander-theme");
+        var d =
+          t === "dark" ||
+          (t !== "light" && matchMedia("(prefers-color-scheme:dark)").matches);
+        if (d) document.documentElement.classList.add("dark");
+      })();
+    </script>
+    <script type="module" crossorigin src="/assets/index-ybRDM9XN.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-BQeHKMP0.css">
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>

package/dist/commander-ui/dist/vite.svg ADDED Viewed

@@ -0,0 +1 @@

+ <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

package/dist/commander-ui/index.html ADDED Viewed

@@ -0,0 +1,23 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>commander-ui</title>
+    <script>
+      (function () {
+        var t = localStorage.getItem("commander-theme");
+        var d =
+          t === "dark" ||
+          (t !== "light" && matchMedia("(prefers-color-scheme:dark)").matches);
+        if (d) document.documentElement.classList.add("dark");
+      })();
+    </script>
+    <script type="module" crossorigin src="/assets/index-ybRDM9XN.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-BQeHKMP0.css">
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>

package/dist/commander-ui/vite.svg ADDED Viewed

@@ -0,0 +1 @@

package/dist/index.js CHANGED Viewed

@@ -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