@tiens.nguyen/gu-cli 1.0.885 → 1.0.887

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

@@ -154,7 +154,7 @@ import { readSkillSource, sourceLabel, SKILL_SOURCE_KEY } from "./skill-source.m
 import { codingBannerLabel, isOllamaCloudUrl, SECRET_KEY_HINT } from "./coding-key-prompt.mjs";
 import { questionEchoText, thoughtPrintSeq, wrapDiffText } from "./terminal-layout.mjs";
 import { globalPrefixOf } from "./install-path.mjs";
-import { indentBlock, commandBlockRows } from "./terminal-layout.mjs"; // every line of an Allow-prompt detail indented (#189); wrapped + collapsible command (#204)
+import { indentBlock, commandBlockRows, wrapIndented } from "./terminal-layout.mjs"; // every line of an Allow-prompt detail indented (#189); wrapped + collapsible command (#204)
 import { firstGuOnPath, pathGuMismatch, guOnPathIsCurrent, updateAttemptRecord, repeatUpdateNotice } from "./update-verify.mjs";
 import { embedNotice, embedState, setupNoticeRows } from "./embed-model-command.mjs";
 import { HINTS, pickHint, hintRow, hintFits, HINT_AFTER_SECONDS } from "./hints.mjs";
@@ -7714,6 +7714,14 @@ async function afterStoppedTurn({ taskLine, submittedInput, turnStartMs, stopped
   if (barPinned()) paintBar();
 }
 
+/**
+ * A message line under the gutter, cut to the terminal's width with a hanging indent (#293): a
+ * long line used to be left to the terminal, which wraps it back to COLUMN 0 ("…as they do ther" /
+ * "e."). `paint` colours each row after wrapping, so colour codes never count toward the width.
+ */
+function sayWrapped(text, paint = (s) => s, hang = "  ") {
+  for (const row of wrapIndented(String(text ?? ""), { width: commandWidth(), indent: GUTTER, hang })) console.log(paint(row));
+}
 /**
  * /switch-skill — whose skills, MCP servers and hooks THIS FOLDER uses (task #325): Claude Code's,
  * read where Claude keeps them (~/.claude, ./.claude, ~/.claude.json), or gu's own (~/.gonext,
@@ -7758,9 +7766,10 @@ async function runSwitchSkillCommand(line) {
     return;
   }
   _skillScan = { at: 0, skills: [] }; // the "/" menu and Tab follow at once
-  const say = (l) => console.log(GUTTER + l);
-  say(accent(`✓ ${pick === current ? "this folder uses" : "this folder now uses"} ${sourceLabel(pick)}`));
-  say(dim(`   skills, MCP servers and hooks are read from ${where(pick)}`));
+  // #293: wrapped under the line's own indent (never back to column 0); one 2-space indent under "✓".
+  const say = (text, paint) => sayWrapped(text, paint);
+  say(`✓ ${pick === current ? "this folder uses" : "this folder now uses"} ${sourceLabel(pick)}`, accent);
+  say(`  skills, MCP servers and hooks are read from ${where(pick)}`, dim);
   // What was found there — and what was not, said rather than shown as an empty list.
   try {
     const sk = discoverSkills({ cwd: process.cwd(), reserved: COMMAND_NAMES });
@@ -7769,23 +7778,23 @@ async function runSwitchSkillCommand(line) {
     const nHooks = (h) => Object.values(h).reduce((a, groups) => a + groups.reduce((b, g) => b + g.hooks.length, 0), 0);
     const count = (n, word) => `${n} ${word}${n === 1 ? "" : "s"}`;
     const running = mcp.servers.filter((x) => x.runnable).length;
-    say(dim(`  ${count(sk.skills.length, "skill")}${sk.skills.length ? ` (${sk.skills.map((x) => "/" + x.name).join(", ")})` : ""} · ${count(running, "MCP server")} · ${count(nHooks(hk.user) + (hk.projectApproved ? nHooks(hk.project) : 0), "hook")}`));
+    say(`  ${count(sk.skills.length, "skill")}${sk.skills.length ? ` (${sk.skills.map((x) => "/" + x.name).join(", ")})` : ""} · ${count(running, "MCP server")} · ${count(nHooks(hk.user) + (hk.projectApproved ? nHooks(hk.project) : 0), "hook")}`, dim);
     // Nothing there at all is a normal state, not a fault: say so, and that gu needs none of it.
     if (!sk.skills.length && !mcp.servers.length && !nHooks(hk.user) && !nHooks(hk.project) && !hk.notes.length) {
-      say(dim("   Nothing is set up there yet — gu works the same without any of them."));
+      say("  Nothing is set up there yet — gu works the same without any of them.", dim);
     }
-    for (const w of [...sk.warnings, ...mcp.warnings, ...hk.warnings]) say(yellow("  " + w));
+    for (const w of [...sk.warnings, ...mcp.warnings, ...hk.warnings]) say("  " + w, yellow);
     const unsupported = mcp.servers.filter((x) => x.error);
-    if (unsupported.length) say(yellow(`  ${count(unsupported.length, "MCP server")} cannot run here: ${unsupported.map((x) => `${x.name} (${x.error})`).join("; ")}`));
+    if (unsupported.length) say(`  ${count(unsupported.length, "MCP server")} cannot run here: ${unsupported.map((x) => `${x.name} (${x.error})`).join("; ")}`, yellow);
     const waiting = mcp.servers.filter((x) => x.scope === "project" && !x.approved && !x.error);
-    if (waiting.length) say(yellow(`  ${count(waiting.length, "project MCP server")} waiting for your approval: ${waiting.map((x) => x.name).join(", ")} — /mcp approve <name>`));
-    if (hk.projectPending) say(yellow(`   this folder's ${hk.projectFile.replace(/^\.\//, "")} has hooks that will not run until you approve them — /hooks approve`));
-    if (hk.notes.length) say(yellow(`  ${count(hk.notes.length, "hook")} in Claude's settings ${hk.notes.length === 1 ? "is" : "are"} NOT run by gu — /hooks says which and why`));
-    if (pick === "claude" && (nHooks(hk.user) || nHooks(hk.project))) say(dim("   Claude's hooks get Claude's event and tool names from gu, so they record here as they do there."));
+    if (waiting.length) say(`  ${count(waiting.length, "project MCP server")} waiting for your approval: ${waiting.map((x) => x.name).join(", ")} — /mcp approve <name>`, yellow);
+    if (hk.projectPending) say(`  this folder's ${hk.projectFile.replace(/^\.\//, "")} has hooks that will not run until you approve them — /hooks approve`, yellow);
+    if (hk.notes.length) say(`  ${count(hk.notes.length, "hook")} in Claude's settings ${hk.notes.length === 1 ? "is" : "are"} NOT run by gu — /hooks says which and why`, yellow);
+    if (pick === "claude" && (nHooks(hk.user) || nHooks(hk.project))) say("  Claude's hooks get Claude's event and tool names from gu, so they record here as they do there.", dim);
   } catch (err) {
-    say(yellow(`   (could not read it back: ${err.message})`));
+    say(`  (could not read it back: ${err.message})`, yellow);
   }
-  say(dim(`   It holds from your next question. ${pick === "claude" ? "/switch-skill gu" : "/switch-skill claude"} switches back.`));
+  say(`  It holds from your next question. ${pick === "claude" ? "/switch-skill gu" : "/switch-skill claude"} switches back.`, dim);
   console.log("");
   if (barPinned()) paintBar();
 }
@@ -7815,7 +7824,11 @@ async function runResumeCommand() {
     say(dim("Nothing to resume here: every recent session finished its plan.\n"));
     return null;
   }
-  for (const l of r.block.split("\n").filter((l) => !l.startsWith("If the user wants"))) say(l.startsWith("## ") ? bold(l.slice(3)) : dim(l));
+  // #293: Goal and Plan are long; wrapped under their own indent, not back to column 0.
+  for (const l of r.block.split("\n").filter((l) => !l.startsWith("If the user wants"))) {
+    if (l.startsWith("## ")) sayWrapped(l.slice(3), bold);
+    else sayWrapped(l, dim);
+  }
   console.log("");
   if (!(await askYesNo(rm.resumeQuestion(r.resume), true))) {
     console.log("");
@@ -15302,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.885",
+  "version": "1.0.887",
   "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",