@tiens.nguyen/gu-cli 1.0.886 → 1.0.888

package/budget-view.mjs

@@ -1,7 +1,7 @@
 /**
  * gu `/budget` (#205): the SHORT terminal version of web-v2's /providers budgets.
  *
- * Data: GET {apiBase}/api/worker/providers-budget with the logged-in worker key. The server decides
+ * Data: GET {hosted}/api/billing/cli-token/providers-budget with gu's token (else {apiBase}/api/worker/providers-budget with the worker key). The server decides
  * Pro / email / "has items" (api/src/providers/terminalBudget.ts); this module only turns its answer
  * into plain lines. Pure (fetch is injected) so every message is testable without a network.
  */
@@ -11,15 +11,11 @@ export const BUDGET_TIMEOUT_MS = 15_000;
 /** A web URL for a page under `base` — a URL, so never path.join (that eats the "//"; #205). */
 const pageUrl = (base, path) => new URL(path, `${base}/`).href;
 
-/** -> { kind: "not_logged_in" | "relogin" | "http" | "offline" | "ok", status?, body? } */
-export async function fetchProvidersBudget({ apiBase, workerKey, fetchImpl = fetch, timeoutMs = BUDGET_TIMEOUT_MS }) {
-  if (!String(workerKey ?? "").trim() || !String(apiBase ?? "").trim()) return { kind: "not_logged_in" };
+/** One GET -> { kind: "relogin" | "http" | "offline" | "ok", status?, body? } */
+async function getBudget(url, headers, fetchImpl, timeoutMs) {
   let r;
   try {
-    r = await fetchImpl(`${String(apiBase).replace(/\/+$/, "")}/api/worker/providers-budget`, {
-      headers: { "X-Worker-Key": String(workerKey).trim() },
-      signal: AbortSignal.timeout(timeoutMs),
-    });
+    r = await fetchImpl(url, { headers, signal: AbortSignal.timeout(timeoutMs) });
   } catch (e) {
     return { kind: "offline", error: e instanceof Error ? e.message : String(e) };
   }
@@ -30,6 +26,24 @@ export async function fetchProvidersBudget({ apiBase, workerKey, fetchImpl = fet
   return { kind: "ok", status: r.status, body };
 }
 
+/**
+ * -> { kind: "not_logged_in" | "relogin" | "http" | "offline" | "ok", status?, body? }
+ *
+ * The account (Pro, email, provider items) lives on the HOSTED API. A computer in Local mode has its
+ * own API with none of that, so when gu has a token it asks the hosted API with the token
+ * (/api/billing/cli-token/providers-budget). Without a token, or if that server predates the route
+ * (404), it falls back to this machine's own API with the worker key.
+ */
+export async function fetchProvidersBudget({ apiBase, workerKey, hostedBase, token, fetchImpl = fetch, timeoutMs = BUDGET_TIMEOUT_MS }) {
+  const hosted = String(hostedBase ?? "").trim().replace(/\/+$/, "");
+  if (String(token ?? "").trim() && hosted) {
+    const r = await getBudget(`${hosted}/api/billing/cli-token/providers-budget`, { authorization: `Bearer ${String(token).trim()}` }, fetchImpl, timeoutMs);
+    if (!(r.kind === "http" && r.status === 404)) return r;
+  }
+  if (!String(workerKey ?? "").trim() || !String(apiBase ?? "").trim()) return { kind: "not_logged_in" };
+  return getBudget(`${String(apiBase).replace(/\/+$/, "")}/api/worker/providers-budget`, { "X-Worker-Key": String(workerKey).trim() }, fetchImpl, timeoutMs);
+}
+
 const money = (n, cur) => {
   if (typeof n !== "number" || !Number.isFinite(n)) return "—";
   const c = String(cur || "USD").toUpperCase();

package/gu-repl.mjs

@@ -15315,7 +15315,14 @@ async function main() {
       try {
         const bv = await import("./budget-view.mjs");
         const ct = await import("./cli-token.mjs");
-        const result = await bv.fetchProvidersBudget({ apiBase, workerKey });
+        const { DEFAULT_API_BASE } = await import("./device-login.mjs");
+        const state = await ct.readState(join(homedir(), ".gonext"));
+        const result = await bv.fetchProvidersBudget({
+          apiBase,
+          workerKey,
+          hostedBase: String(process.env.GU_TOKEN_API_BASE ?? "").trim() || DEFAULT_API_BASE,
+          token: state.token,
+        });
         const out = bv.budgetLines(result, { site: ct.siteUrl() });
         for (const l of out.lines) console.log(GUTTER + (out.tone === "ok" ? l : dim(l)));
         console.log("");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiens.nguyen/gu-cli",
-  "version": "1.0.886",
+  "version": "1.0.888",
   "description": "gu: the coding agent in your terminal. It reads your repo, makes the change and runs the tests, with your own models (Ollama, MLX or any OpenAI-compatible provider). macOS, Linux and Windows.",
   "keywords": [
     "ai",