@tiens.nguyen/gu-cli 1.0.741 → 1.0.743

package/coding-key-prompt.mjs

@@ -24,6 +24,8 @@ const identity = (s) => s;
  * and on Ctrl+K to replace one — and they were two hand-written copies of the same idea. A hint
  * added to one of them would have left the other exactly as confusing.
  */
+import { keyInUse } from "./server-keys.mjs";
+
 export const SECRET_KEY_HINT = "type or paste the key, then press Enter — it stays masked";
 
 /**
@@ -217,13 +219,26 @@ export function codingKeyFallbackLine(kj, jobId = "") {
  * when a choice HAS been made, and when only one key exists — with one there is nothing to
  * choose, and a warning on a correct setup is how warnings stop being read.
  */
-export function unchosenKeyWarning({ codingKind = "", codingUrl = "", selectedKeyId = "", keys = null } = {}) {
+export function unchosenKeyWarning({ codingKind = "", codingUrl = "", selectedKeyId = "", keys = null, backendId = "" } = {}) {
   const quiet = { warn: false, using: null, why: "" };
   // Local Ollama and MLX need no credential; the Ollama cloud does.
   if (!codingNeedsKey(codingKind, codingUrl)) return quiet;
-  if (!Array.isArray(keys) || keys.length < 2) return quiet;
+  if (!Array.isArray(keys)) return quiet;
   if (String(selectedKeyId ?? "").trim()) return quiet;
-  return { warn: true, using: keys[0], why: "none-chosen" };
+  // KEYS BELONG TO A SERVER (#245). Reported: the bar said "key not chosen" beside ollama.com while
+  // the key picker showed its one key, hsbc_ollama, "(in use)" — because this counted all seven keys
+  // on the ACCOUNT (Anthropic, OpenAI, …) where the API only ever chooses among THIS server's keys.
+  // With the server known: its keys, else the keys tied to no server; and a server default IS a
+  // choice. Without it (an older caller) the old account-wide count stands.
+  if (backendId) {
+    const own = keys.filter((k) => k && k.backendId === backendId);
+    const pool = own.length ? own : keys.filter((k) => k && !k.backendId);
+    if (own.some((k) => k.default)) return quiet;
+    if (pool.length < 2) return quiet;
+    return { warn: true, using: keyInUse(keys, backendId) ?? pool[0], why: "none-chosen", count: pool.length };
+  }
+  if (keys.length < 2) return quiet;
+  return { warn: true, using: keys[0], why: "none-chosen", count: keys.length };
 }
 
 /**
@@ -245,14 +260,14 @@ export function unchosenKeyWarning({ codingKind = "", codingUrl = "", selectedKe
  * qualified ("<kind>::<model>", task #123) stores the bare form and is still a valid pick.
  */
 /** The folder's coder — its kind AND its URL, which together decide whether it needs a key. */
-export function effectiveCoder({ sessionCodingModel = "", choices = null, defaultKind = "", defaultUrl = "" } = {}) {
+export function effectiveCoder({ sessionCodingModel = "", choices = null, defaultKind = "", defaultUrl = "", defaultBackendId = "" } = {}) {
   const want = String(sessionCodingModel ?? "").trim();
   const list = Array.isArray(choices) ? choices : [];
   if (want) {
     const hit = list.find((c) => c?.id === want || c?.model === want);
-    if (hit) return { kind: String(hit.kind ?? ""), url: String(hit.url ?? "") };
+    if (hit) return { kind: String(hit.kind ?? ""), url: String(hit.url ?? ""), backendId: String(hit.backendId ?? "") };
   }
-  return { kind: String(defaultKind ?? ""), url: String(defaultUrl ?? "") };
+  return { kind: String(defaultKind ?? ""), url: String(defaultUrl ?? ""), backendId: String(defaultBackendId ?? "") };
 }
 
 export function effectiveCoderKind({

package/gu-repl.mjs

@@ -6251,6 +6251,8 @@ async function chooseModel() {
       codingKind: "openai",
       selectedKeyId: sessionCodingKeyId,
       keys: keysNow,
+      // Only THIS server's keys are a choice to make (#245) — not every key on the account.
+      backendId: ks.backendId,
     }).warn;
     const line = codingKeyLine({
       keys: keysNow,
@@ -6272,7 +6274,8 @@ async function chooseModel() {
     // nothing else, so the screen that follows a pick answered the less common question and left
     // the more common one — "how do I change the model" — with no visible answer at all. Reported
     // three times from exactly this view, twice after being told where the picker entry was.
-    console.log(dim("    /provider to change this provider's model, URL, or remove it\n"));
+    // /provider is hidden (see HIDDEN_COMMANDS): point at the row of /model that does the same.
+    console.log(dim("    to change this provider's model or URL, or remove it: /model → add or change a provider\n"));
   }
   // Task #125: the GLOBAL lifetime total is per-backend, so re-fetch it for the newly
   // selected backend NOW — otherwise the footer would keep showing the previous backend's
@@ -10976,11 +10979,12 @@ async function main() {
           // machine an Ollama coder, which needs no key — while the folder was on gpt-5. Reading
           // it directly made this check answer about a coder nobody was using, and the mark only
           // appeared after /model, which re-probes WITH the override.
-          const { kind, url } = effectiveCoder({
+          const { kind, url, backendId } = effectiveCoder({
             sessionCodingModel,
             choices: probe?.codingChoices,
             defaultKind: p?.codingKind,
             defaultUrl: probe?.codingChoices?.find?.((c) => c?.isDefault)?.url ?? "",
+            defaultBackendId: probe?.codingChoices?.find?.((c) => c?.isDefault)?.backendId ?? "",
           });
           const allKeys =
             codingNeedsKey(kind, url) && !sessionCodingKeyId ? await fetchCodingKeys() : null;
@@ -10989,6 +10993,7 @@ async function main() {
             codingUrl: url,
             selectedKeyId: sessionCodingKeyId,
             keys: allKeys,
+            backendId,
           });
           // THE BAR CARRIES IT TOO, from the same decision — a line printed at startup scrolls
           // away within a few turns, and the report was precisely that the warning has to be
@@ -10996,7 +11001,7 @@ async function main() {
           keyChoicePending = w.warn;
           if (w.warn) {
             console.log(
-              GUTTER + orange(`  ${allKeys.length} API keys stored and this folder has not chosen one`) +
+              GUTTER + orange(`  ${w.count} API keys for this server and this folder has not chosen one`) +
                 dim(` — using ${w.using.name} ····${w.using.tail}.`)
             );
             console.log(GUTTER + dim("  ctrl+k picks the right one; a wrong key fails mid-task.\n"));

package/package.json

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

@@ -29,6 +29,8 @@
 const WIDE_RANGES =
   /[ᄀ-ᅟ⺀-〾ぁ-㏿㐀-䶿一-鿿ꀀ-꓏ꥠ-꥿가-힣豈-﫿︐-︙︰-﹯＀-｠￠-￦]/u;
 const ZERO_WIDTH = /[\p{Mn}\p{Me}​-‏⁠]/u;
+import { keyInUse } from "./server-keys.mjs";
+
 export function charWidth(ch) {
   if (!ch) return 0;
   if (ZERO_WIDTH.test(ch)) return 0;
@@ -237,6 +239,29 @@ export function codingKeyLine({
     if (keys.some((k) => k.backendId)) return `not tied to ${where}`;
     return "";
   };
+  if (!selectedId && backendId) {
+    // KEYS BELONG TO A SERVER (#245). Reported: /model said "test1 ····AqsA · not chosen for this
+    // folder — using the first key · that key is for another provider" while the picker under it
+    // showed claude2 "(in use · default · first key)" and the bar 6QAA. test1 was the first key on
+    // the ACCOUNT; the API hands a coder its SERVER's key — the one keyInUse names, the same answer
+    // the picker gives. "Not chosen" only when this server has several keys and no default.
+    const used = keyInUse(keys, backendId);
+    if (used) {
+      const own = keys.filter((k) => k && k.backendId === backendId);
+      const pool = own.length ? own : keys.filter((k) => k && !k.backendId);
+      const notes = [];
+      if (pool.length > 1 && !own.some((k) => k.default)) notes.push("not chosen for this folder — using the first key");
+      else if (used.default && own.length > 1) notes.push("this server's default");
+      const provider = noteFor(used);
+      if (provider) notes.push(provider);
+      return {
+        text: `${used.name}  ····${used.tail}`,
+        verb: pool.length > 1 ? "change" : "replace",
+        isDefault: true,
+        ...(notes.length ? { note: notes.join(" · ") } : {}),
+      };
+    }
+  }
   if (!selectedId) {
     // NEVER PICKED — AND THAT IS WORTH SAYING OUT LOUD (reported). This folder rides the account
     // default, which is simply the FIRST key in the list. With several stored, the one being used