@tiens.nguyen/gu-cli 1.0.755 → 1.0.757

package/cli-token.mjs

@@ -289,26 +289,38 @@ export function barNotice({ token, publicKeyB64, mode, now = new Date(), attempt
   if (check.ok) {
     const p = check.payload;
     const ended = p.paidUntil && Date.parse(p.paidUntil) <= now.getTime();
-    if (ended) return { kind: "plan-ended", text: `Your gu Pro plan ended on ${shortDate(p.paidUntil)} — renew at ${pricingUrl}` };
+    // SHORT AND CALM (#292: "make it simpler … seems so serious"): the fact, then the one thing to
+    // do. `urgent` is what the bar colours by — only these two need the user to act.
+    if (ended) return { kind: "plan-ended", urgent: true, text: `Pro ended ${shortDate(p.paidUntil)} · renew at ${pricingUrl}` };
     if (Number.isInteger(p.activeDevices) && p.activeDevices > p.deviceLimit) {
       return {
         kind: "over-limit",
+        urgent: true,
         // PLAIN WORDS (asked: "make it simple to understand"). It read "gu is active on 4 devices —
         // Free covers 1", which leaves the reader to work out that "active" means "used gu in the
         // last 30 days" and "covers" means "the plan allows". Kept short: the bar drops it entirely
         // when it does not fit the terminal's width.
-        text: `${planName(p.plan)} allows ${computers(p.deviceLimit)} — you've used gu on ${p.activeDevices} this month`,
+        text: `${planName(p.plan)}: ${computers(p.deviceLimit)} · used on ${p.activeDevices} this month`,
       };
     }
     const age = now.getTime() - Date.parse(p.issuedAt);
     if (age <= STALE_AFTER_DAYS * 86_400_000) return null;
   } else if (mode === "client" && !attempted) {
     return null; // Client mode fetches one by itself; do not complain before it has tried.
+  } else if (mode === "expert") {
+    // NO TOKEN on a Client Expert machine (#292): not "old" — there is none — and not said twice.
+    // Startup already prints the linking steps, and the first turn asks for the token in place, so
+    // the bar repeating it was the same message in two places (reported with a screenshot).
+    return null;
+  } else {
+    // Hosted client, its automatic fetch has failed: the bar is the only place this is said.
+    return { kind: "missing", urgent: false, text: "gu isn't signed in · run gu login" };
   }
 
+  // ROUTINE, so not an alarm (#292): a token getting old only means updates will stop one day.
   return mode === "expert"
-    ? { kind: "stale", text: `Get a fresh gu token at ${accountUrl} to keep getting updates` }
-    : { kind: "stale", text: "Sign in to keep getting gu updates — run gu login" };
+    ? { kind: "stale", urgent: false, text: `gu token is old · get a new one at ${accountUrl}` }
+    : { kind: "stale", urgent: false, text: "gu token is old · run gu login" };
 }
 
 /** "Free plan" / "Pro plan" — the name a person uses. */

package/gonext_agent_chat.py

@@ -12950,8 +12950,6 @@ def run_agent_chat(cfg):
                 task_with_hint = _label_failed_images(task_with_hint, _img_failed)
                 _log(f"attached {len(_turn_images)} image(s) to the question"
                      + (f", {len(_img_failed)} could not be opened" if _img_failed else ""))
-                if _turn_images:
-                    _emit({"type": "step", "text": f"Sending {len(_turn_images)} image(s) with the question"})
                 for _lbl, _why in _img_failed:
                     _emit({"type": "step", "text": f"⚠ {_lbl} not sent — {_why}"})
             else:

package/gu-repl.mjs

@@ -128,7 +128,7 @@ import { unapprovedProjectServers } from "./mcp-command.mjs";
 import { readHooks } from "./hooks-config.mjs";
 import { codingBannerLabel, isOllamaCloudUrl, SECRET_KEY_HINT } from "./coding-key-prompt.mjs";
 import { codingChoiceTags, coderDisplayName, coderWhere, whereOfActiveCoder } from "./coding-choice-tags.mjs";
-import { IMAGE_NEEDS_CLAUDE, clipboardImageToFile, fitImageNotice, createImageStore, imagePasteKey, imagePathFromPaste, isClaudeCoderUrl, isImagePasteKey, storeImageFile } from "./image-paste.mjs";
+import { IMAGE_NEEDS_CLAUDE, clipboardImageToFile, fitImageNotice, imageMarkersForDisplay, createImageStore, imagePasteKey, imagePathFromPaste, isClaudeCoderUrl, isImagePasteKey, storeImageFile } from "./image-paste.mjs";
 import {
   isDoubleClick,
   clickRun,
@@ -2474,7 +2474,10 @@ function frozenZone() {
     // it whole → the condition above lets the agents count (or nothing) have the row instead.
     const len = visibleLen(tokenNotice.text);
     const from = width - 1 - len;
-    rows[sep] = clipVisible(dim("\u2500".repeat(Math.max(0, from - 1)) + " ") + yellow(tokenNotice.text), width - 1);
+    // Yellow only when the user must act (plan ended, over the computer limit); an old token is
+    // routine and reads in the rule's own dim grey (#292 — the yellow line "seems so serious").
+    const paint = tokenNotice.urgent ? yellow : dim;
+    rows[sep] = clipVisible(dim("\u2500".repeat(Math.max(0, from - 1)) + " ") + paint(tokenNotice.text), width - 1);
   } else if (agentsIndicator(otherAgents)) {
     // …and when there is no update to offer, the same row carries the agents count (task #195).
     // THREE THINGS CANNOT SHARE ONE ROW, so they are ranked by how time-critical they are:
@@ -9205,9 +9208,15 @@ async function localScaffoldState() {
 /** Print the startup scaffold line — deferred while a turn owns the transcript. */
 function announceScaffold() {
   if (!scaffoldNotice || following) return;
-  const { kind, text } = scaffoldNotice;
+  const { kind, text, steps } = scaffoldNotice;
   scaffoldNotice = null;
-  console.log(GUTTER + (kind === "ok" ? accent("✓ " + text) : kind === "warn" ? yellow("⚠ " + text) : red("✗ " + text)));
+  if (kind === "link") {
+    // A setup step, said calmly (#292): the headline, then the steps on their own lines.
+    console.log(GUTTER + yellow("! " + text));
+    for (const s of steps ?? []) console.log(GUTTER + "  " + dim(s));
+  } else {
+    console.log(GUTTER + (kind === "ok" ? accent("✓ " + text) : kind === "warn" ? yellow("⚠ " + text) : red("✗ " + text)));
+  }
   if (barPinned()) paintBar();
 }
 
@@ -11423,7 +11432,8 @@ async function main() {
       // against the ">>" row. Unlike the live block's separator, this one belongs to the
       // TRANSCRIPT: the echo is written exactly once per submitted line and never repainted,
       // so there is nothing here for a blank to accumulate against.
-      process.stdout.write(PROMPT_PAST + line + "\n\n");
+      // As typed, not as sent: "[Image #1]", never the file path the agent needs (#51).
+      process.stdout.write(PROMPT_PAST + imageMarkersForDisplay(line) + "\n\n");
     }
     // ESC AT ANY QUESTION LANDS HERE (see PromptCancelled). Every command below is wrapped as
     // one block rather than each flow catching for itself, because the request was to be able to

package/image-paste.mjs

@@ -214,6 +214,15 @@ export function clipboardImageToFile({ home = homedir(), platform = process.plat
   return { path: dest };
 }
 
+/**
+ * A sent line as the USER should see it again: "[Image #1: /Users/…/x.png]" → "[Image #1]".
+ * The file path is for the agent, which reads the image from it; on screen it is noise (the echo
+ * of the question showed it). Claude Code shows the placeholder the same way.
+ */
+export function imageMarkersForDisplay(text) {
+  return String(text ?? "").replace(/\[Image #(\d+): [^\]\n]+\]/g, "[Image #$1]");
+}
+
 /** Placeholders shown in the input, and the files behind them. */
 export function createImageStore() {
   const store = new Map(); // token -> absolute path

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiens.nguyen/gu-cli",
-  "version": "1.0.755",
+  "version": "1.0.757",
   "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",

package/terminal-layout.mjs

@@ -1890,6 +1890,22 @@ export function scaffoldStartupNotice({ local = null, refresh = null, private: p
   }
   if (refresh.ok) return { kind: "ok", text: `scaffold fetched from the gu service (v${refresh.version})` };
   const why = String(refresh.error ?? "unknown error").replace(/\.$/, "");
+  // NOT LINKED YET (#292): the one "error" a new Client Expert machine always shows, and it is a
+  // setup step, not a failure — gu asks for the token before the first turn anyway. It used to be
+  // one red sentence ("× scaffold: … Please run `gu token` — copy … then: gu token …") wrapping
+  // mid-word across three rows; now a calm headline and two numbered steps. The account address is
+  // taken from the API's own text, so it follows the site the API was set up for.
+  if (/isn't linked to your gu account/i.test(why)) {
+    const url = (/(https?:\/\/[^\s)]+\/account)/.exec(why)?.[1] ?? "https://gu.getmarsic.cc/account").replace(/^https?:\/\//, "");
+    return {
+      kind: "link",
+      text: "This computer isn't linked to your gu account yet.",
+      steps: [
+        `1. Copy your gu CLI token from ${url}`,
+        "2. Run: gu token <your token>   (or just ask something — gu will ask for it)",
+      ],
+    };
+  }
   return refresh.kept !== undefined
     ? { kind: "warn", text: `scaffold: couldn't fetch — ${why}. Still using v${refresh.kept}.` }
     : { kind: "err", text: `scaffold: ${why}.` };