@tiens.nguyen/gu-cli 1.0.736 → 1.0.738

package/cli-token.mjs

@@ -88,7 +88,9 @@ export function verifyCliToken(token, publicKeyB64) {
     !(p.activeDevices === null || (Number.isInteger(p.activeDevices) && p.activeDevices >= 0)) ||
     !(Number.isInteger(p.deviceLimit) && p.deviceLimit > 0) ||
     // Missing means OFF — tokens issued before the switch existed (#238) are in CLIs right now.
-    !(p.enforce === undefined || typeof p.enforce === "boolean")
+    !(p.enforce === undefined || typeof p.enforce === "boolean") ||
+    // Missing is every token before #267; present, it must be an address.
+    !(p.email === undefined || isEmail(p.email))
   ) {
     return { ok: false, why: "bad-payload" };
   }
@@ -315,6 +317,37 @@ const planName = (plan) => (plan === "pro" ? "Pro plan" : "Free plan");
 const computers = (n) => `${n} ${n === 1 ? "computer" : "computers"}`;
 
 /** What `gu token` prints about a valid token — plain lines, no colour, for the command to style. */
+/** A plain address, as the API signs it (#267). */
+export function isEmail(v) {
+  return typeof v === "string" && v.trim().length <= 254 && /^[^\s@]+@[^\s@]+$/.test(v.trim());
+}
+
+/**
+ * THE BANNER'S ACCOUNT LINE, under the worker key (#267): which account, and whether it is Pro.
+ *   · email — the signed token's (private mode's only source: its local API knows no email), else
+ *     the one the API reports (client mode);
+ *   · plan  — from the VERIFIED token, judged NOW: a token signed while Pro can outlive the
+ *     subscription, and the line must not keep saying Pro after it ended.
+ * → { email, plan, pro } — empty strings when unknown; the caller prints nothing for nothing.
+ */
+export function accountLine({ payload = null, settingsEmail = "", now = new Date() } = {}) {
+  const email = (payload && isEmail(payload.email) ? payload.email.trim() : "") || (isEmail(settingsEmail) ? settingsEmail.trim() : "");
+  let plan = "";
+  let pro = false;
+  if (payload) {
+    const until = Date.parse(payload.paidUntil ?? "");
+    if (payload.plan === "pro" && Number.isFinite(until) && until > now.getTime()) {
+      plan = `Pro until ${shortDate(payload.paidUntil)}`;
+      pro = true;
+    } else if (payload.paidUntil) {
+      plan = `Free — Pro ended ${shortDate(payload.paidUntil)}`;
+    } else {
+      plan = "Free";
+    }
+  }
+  return { email, plan, pro };
+}
+
 export function tokenSummary(payload, now = new Date()) {
   const lines = [];
   if (payload.plan === "pro" && payload.paidUntil && Date.parse(payload.paidUntil) > now.getTime()) {

package/gu-repl.mjs

@@ -6415,6 +6415,19 @@ function listJsonFiles(dir) {
 
 /** The email of the account this worker key belongs to, or "" (older API, none on record, offline). */
 let accountEmailPromise = null;
+/** The banner's account line (#267): the saved gu token, verified offline, plus the API's email. */
+async function bannerAccount(settingsEmail = "") {
+  try {
+    const ct = await import("./cli-token.mjs");
+    const pk = ct.publicKey();
+    const state = pk ? await ct.readState(join(homedir(), ".gonext")) : { token: "" };
+    const check = state.token ? ct.verifyCliToken(state.token, pk) : { ok: false };
+    return ct.accountLine({ payload: check.ok ? check.payload : null, settingsEmail });
+  } catch {
+    return { email: settingsEmail || "", plan: "", pro: false };
+  }
+}
+
 async function fetchAccountEmail() {
   const s = await fetchWorkerSettings();
   const e = typeof s?.userEmail === "string" ? s.userEmail.trim() : "";
@@ -10514,8 +10527,9 @@ async function main() {
   // Show which models will answer, straight from user settings (also validates auth).
   try {
     const probe = await probeWithRecovery();
-    // WHICH ACCOUNT, shown under the key in the banner (client mode). Asked for now and read when
-    // the banner is drawn, so startup never waits on it; private mode has no web account to name.
+    // WHICH ACCOUNT, shown under the key in the banner. Asked for now and read when the banner is
+    // drawn, so startup never waits on it. Private mode's local API knows no email — there it comes
+    // from the signed gu token instead (bannerAccount, #267).
     accountEmailPromise = isClientExpert() ? Promise.resolve("") : fetchAccountEmail();
     // A NEW gu SESSION: where does its scaffold come from? (task #246) Your file ("loaded") or the
     // gu service ("fetched" — the refresh the session then reuses). Background: never delays startup.
@@ -10641,11 +10655,16 @@ async function main() {
       // shown when it is actually routing, and never the credentials — host and user only.
       if (bannerProxy) statusRows.push(lbl("proxy") + bannerProxy);
       statusRows.push(dim(`key ${workerKey.slice(0, 8)}…`));
-      // Under the key, in client mode: the account this machine signs in as — so a machine paired
-      // to the wrong account is obvious at a glance. Nothing when the API does not say (older API,
-      // or no email on record): an absent line is better than a guessed one.
+      // Under the key: the account this machine signs in as, and its PLAN (#267) — so a machine
+      // paired to the wrong account, or a lapsed Pro, is obvious at a glance. Both from the VERIFIED
+      // gu token (no network call), which is the only source in private mode; client mode falls back
+      // to the email its API reports. Nothing known → no line: absent beats guessed.
       const accountEmail = await (accountEmailPromise ?? Promise.resolve(""));
-      if (accountEmail) statusRows.push(dim(`account ${accountEmail}`));
+      const acct = await bannerAccount(accountEmail);
+      if (acct.email || acct.plan) {
+        const plan = acct.plan ? (acct.pro ? accent(acct.plan) : dim(acct.plan)) : "";
+        statusRows.push(acct.email ? dim(`account ${acct.email}`) + (plan ? dim(" · ") + plan : "") : dim("plan ") + plan);
+      }
       console.log(renderBanner(statusRows));
     }
     // Task #127, Phase 3: if the base chat model server isn't answering, offer to set it up

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiens.nguyen/gu-cli",
-  "version": "1.0.736",
+  "version": "1.0.738",
   "description": "Gu CLI — the gu terminal plus the local worker that runs agent / OCR / PDF / embedding jobs on your Mac (Ollama / MLX / OpenAI-compatible).",
   "type": "module",
   "license": "MIT",