@tiens.nguyen/gu-cli 1.0.877 → 1.0.879

package/gu-repl.mjs

@@ -550,6 +550,7 @@ const orange = (s) => color256(208, s); // peak-token label (task #84)
 // A menu's ACTION rows (pick another model…, API keys…, add a provider…) in orange, apart from the
 // models above them (#248). \x1b[22m first: an unselected picker row is wrapped in dim, which would
 // turn the orange grey. Plain text when colour is off (NO_COLOR, TERM=dumb).
+const ACTION_ROW_START = "\x1b[22m\x1b[38;5;208m";
 const actionRow = (s) => (dim("x") === "x" ? s : `\x1b[22m${orange(s)}`);
 // Compact token count: 950 → "950", 12300 → "12.3k", 1500000 → "1.5M" (task #83).
 const fmtTokens = (n) => {
@@ -568,6 +569,10 @@ const fmtTokens = (n) => {
  * naming it here would imply the picker is something you have to break out of.
  */
 const PICK_HINT = "↑/↓ then Enter · Esc to cancel";
+// #249: a list whose last rows are orange actions says Esc UNDER them (pickFromList's footer);
+// its header keeps only the arrows, so the instruction is not given twice.
+const PICK_ARROWS = "↑/↓ then Enter";
+const ESC_FOOTER = "Esc to cancel";
 const PICK_MANY_HINT = "↑/↓ · space toggles · ctrl+a all · Enter saves · Esc cancels";
 // How many EXTRA models one server offers alongside its default. Task #245 made it a rule, not a
 // readability cap: a server URL offers AT MOST 3 models, default included (MAX_MODELS_PER_SERVER
@@ -7157,8 +7162,8 @@ async function chooseModel() {
   // enough in name to have already been mixed up. The fix is to say which one THIS is — not to
   // print the other two here: the agent model and the embedder are independent settings with
   // their own commands, and listing them together implies a relationship that does not exist.
-  console.log(dim(`   Choose the CODING model — the one that writes code  (${PICK_HINT}):`));
-  const idx = await pickFromList(labels, activeIdx >= 0 ? activeIdx : 0);
+  console.log(dim(`   Choose the CODING model — the one that writes code  (${PICK_ARROWS}):`));
+  const idx = await pickFromList(labels, activeIdx >= 0 ? activeIdx : 0, { footer: ESC_FOOTER });
   if (idx < 0) {
     console.log(dim("   (cancelled)\n"));
     return;
@@ -8883,12 +8888,12 @@ async function chooseEmbedModel() {
   const ADD = labels.length;
   labels.push(actionRow("add a provider — OpenAI, Ollama…"));
   const head = `   Embedding model (now ${current} on ${host || currentUrl})`;
-  const hint = `(${PICK_HINT}):`;
+  const hint = `(${PICK_ARROWS}):`;
   const cols = Math.max(20, process.stdout.columns || 80);
   console.log(dim(head.length + 2 + hint.length < cols ? `${head}  ${hint}` : `${head}\n   ${hint}`));
   // The cursor starts on the one in use: the set one, else the default.
   const inUse = rows.findIndex((r) => ec.sameEmbedModel(r.model, current));
-  const mi = await pickFromList(labels, Math.max(0, inUse));
+  const mi = await pickFromList(labels, Math.max(0, inUse), { footer: ESC_FOOTER });
   if (mi < 0) {
     console.log(dim("   (cancelled)\n"));
     return;
@@ -9078,10 +9083,10 @@ async function chooseAgentModel() {
     labels.push(actionRow("add a provider — Claude API, OpenAI, Kimi, Ollama…"));
     // The hint drops to its own row when the header would wrap (80 columns over SSH).
     const head = `   Agent model — the one that TALKS (now ${current || "unset"}${curHost ? ` on ${curHost}` : ""})`;
-    const hint = `(${PICK_HINT}):`;
+    const hint = `(${PICK_ARROWS}):`;
     const cols = Math.max(20, process.stdout.columns || 80);
     console.log(dim(head.length + 2 + hint.length < cols ? `${head}  ${hint}` : `${head}\n   ${hint}`));
-    const idx = await pickFromList(labels, Math.max(0, saved.findIndex((c) => c.current)));
+    const idx = await pickFromList(labels, Math.max(0, saved.findIndex((c) => c.current)), { footer: ESC_FOOTER });
     if (idx < 0) {
       console.log(dim("   (cancelled)\n"));
       return;
@@ -11245,6 +11250,8 @@ let listChecked = new Set();
 // arrive after the choosing is over.
 let listMax = 0;
 let listNote = "";
+/** #249: a dim line under the rows (pickFromList's `footer`), drawn and erased with the block. */
+let listFooter = "";
 // When true, ctrl+d in a single-select picker finishes with a DELETE request for the
 // highlighted row instead of choosing it (task #222). Off unless a caller asks for it, so no
 // existing picker gains a destructive key by accident.
@@ -11274,7 +11281,7 @@ function drawList(redraw) {
   // provider's /v1/models was taller than the terminal: the screen scrolled, the highlighted row
   // went off the top, and the ESC[nA walk below then counted rows that had moved — "cannot scroll
   // up or down, stuck here". Two rows of margin keep the block clear of the line above it.
-  const maxBlock = Math.max(5, viewportHeight() - 2) - (listNote ? 1 : 0) - (listHeader ? listHeaderRows : 0);
+  const maxBlock = Math.max(5, viewportHeight() - 2) - (listNote ? 1 : 0) - (listFooter ? 1 : 0) - (listHeader ? listHeaderRows : 0);
   const win = listWindow(listItems.length, listSel, listTop, maxBlock);
   listTop = win.top;
   const row = (i) => {
@@ -11284,7 +11291,11 @@ function drawList(redraw) {
     const box = listMulti ? (listChecked.has(i) ? "[x] " : "[ ] ") : "";
     const left = listDeadline && i === listTimeoutIndex ? "  (auto in " + countdownLabel(listDeadline - Date.now()) + ")" : "";
     const body = box + listItems[i] + left;
-    return clipVisible(GUTTER + (i === listSel ? accent("▸ " + body) : dim("  " + body)), width - 1);
+    // An orange action row (#249) gets an orange ▸ too — the cursor in the row's own colour.
+    const cursor = i === listSel
+      ? (String(listItems[i]).startsWith(ACTION_ROW_START) ? orange("▸ ") + body : accent("▸ " + body))
+      : dim("  " + body);
+    return clipVisible(GUTTER + cursor, width - 1);
   };
   const marker = (text) => clipVisible(GUTTER + dim(text), width - 1);
   const rows = [];
@@ -11302,6 +11313,8 @@ function drawList(redraw) {
   // The cap's message rides UNDER the list, in the same block, so it is erased and redrawn with
   // it — a note printed into the scrolling output would stay on screen after the list is gone.
   if (listNote) rows.push(clipVisible(GUTTER + yellow(listNote), width - 1));
+  // Indented like the rows' text (past the "▸ " column), not like the ▸ itself.
+  if (listFooter) rows.push(clipVisible(GUTTER + dim("  " + listFooter), width - 1));
   // On a redraw the caret sits one row BELOW the block (each draw ends with "\n").
   const up = redraw ? physicalRows(listRowsDrawn, width) : 0;
   // #321: what the screen held under the picker when it opened, and how far it reaches — so the
@@ -11346,6 +11359,7 @@ function finishList(index) {
   listChecked = new Set();
   listMax = 0;
   listNote = "";
+  listFooter = "";
   const allowDelete = listAllowDelete;
   const deleting = listDeleteRequested;
   listAllowDelete = false;
@@ -11486,6 +11500,7 @@ function pickFromList(items, initialSel = 0, opts = {}) {
       return;
     }
     listMulti = false; // explicit: a cancelled multi-select must not leak its mode into this one
+    listFooter = typeof opts.footer === "string" ? opts.footer : "";
     listAllowDelete = opts.allowDelete === true;
     listDeleteRequested = false;
     listKeys = opts.keys && typeof opts.keys === "object" ? opts.keys : null;

package/package.json

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