@tiens.nguyen/gu-cli 1.0.716 → 1.0.717

package/gu-repl.mjs

@@ -4473,6 +4473,26 @@ async function loadSessionMaxCodeTokens(cwd) {
  * and the URL is what the global output-token total is keyed to (task #125) — restoring a
  * subset would leave the footer describing one backend while the turns went to another.
  */
+/**
+ * Mirror this folder's coding choice to the SAME database that stores the key
+ * material (task #225) — cloud Mongo in hosted mode, localhost Mongo in Client
+ * Expert — so the choice and the credentials always live in one consistent store.
+ * The local session file stays as a fast offline cache. A failure is reported,
+ * never silent, so a lost connection is visible rather than a stale choice later.
+ */
+async function persistCodingChoiceToServer(cwd) {
+  try {
+    await saveCodingChoice(folderHashFor(cwd), {
+      codingKeyId: sessionCodingKeyId,
+      codingModel: sessionCodingModel,
+      codingLabel: sessionCodingLabel,
+      codingUrl: sessionCodingUrl,
+    });
+  } catch (err) {
+    console.error(dim(`(coding choice could not reach the database: ${err.message})`));
+  }
+}
+
 /**
  * Persist the /model pick THE MOMENT IT IS MADE.
  *
@@ -4497,6 +4517,8 @@ async function saveSessionCoding(cwd) {
     // carry on with the pick applied for this session.
     console.error(dim(`(coding model save failed: ${err.message})`));
   }
+  // ALSO mirrored to the database store (task #225), same place the credentials live.
+  await persistCodingChoiceToServer(cwd);
 }
 
 /**
@@ -4516,6 +4538,8 @@ async function saveSessionCodingKeyId(cwd) {
   } catch (err) {
     console.error(dim(`(coding key choice save failed: ${err.message})`));
   }
+  // ALSO mirrored to the same database store that holds the credentials (task #225).
+  await persistCodingChoiceToServer(cwd);
 }
 
 async function loadSessionCodingKeyId(cwd) {
@@ -7500,6 +7524,46 @@ async function deleteCodingKey(id) {
   }
 }
 
+/**
+ * This folder's stored coding choice, from the SAME Mongo that holds the key secrets
+ * (task #225). Returns {codingKeyId, codingModel, codingLabel, codingUrl} or null when none
+ * is stored for this folder. THROWS on a network/HTTP failure so the caller can say WHY —
+ * the choice and the secret now live in one store, so "cannot reach it" is a real error,
+ * not a silent fall-back.
+ */
+async function fetchCodingChoice(folderHash) {
+  const r = await fetch(`${apiBase}/api/worker/coding-choice?folder=${encodeURIComponent(folderHash)}`, {
+    headers: { "X-Worker-Key": workerKey },
+    signal: AbortSignal.timeout(API_CALL_TIMEOUT_MS),
+  });
+  if (!r.ok) throw new Error(`coding-choice GET failed: HTTP ${r.status}`);
+  const j = await r.json().catch(() => ({}));
+  const c = j?.choice;
+  if (!c || typeof c !== "object") return null;
+  const str = (x) => (typeof x === "string" ? x : "");
+  return {
+    codingKeyId: str(c.codingKeyId),
+    codingModel: str(c.codingModel),
+    codingLabel: str(c.codingLabel),
+    codingUrl: str(c.codingUrl),
+  };
+}
+
+/** Persist this folder's coding choice to the SAME Mongo that holds the key secrets (task #225). */
+async function saveCodingChoice(folderHash, choice) {
+  const r = await fetch(`${apiBase}/api/worker/coding-choice`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json", "X-Worker-Key": workerKey },
+    body: JSON.stringify({ folder: folderHash, ...choice }),
+    signal: AbortSignal.timeout(API_CALL_TIMEOUT_MS),
+  });
+  if (!r.ok) throw new Error(`coding-choice POST failed: HTTP ${r.status}`);
+}
+
+/** The folder-hash key the choice is stored under — the SAME sha256-32 the session file uses. */
+function folderHashFor(cwd) {
+  return createHash("sha256").update(cwd).digest("hex").slice(0, 32);
+}
 /**
  * Ask for a name, then the secret, and store it. Returns the new id or "".
  *
@@ -10000,15 +10064,56 @@ async function main() {
   sessionMaxCodeTokens = await loadSessionMaxCodeTokens(resolve(process.cwd()));
   sessionRagStorage = await loadSessionRagStorage(resolve(process.cwd())); // task #133/#180
   // Restored here, VALIDATED below once the probe says what this account actually allows.
+  // The CHOICE lives in the SAME Mongo as the key secrets (task #225) — the local session file
+  // is only a cache. The database is read FIRST; a failure to reach it is a real error, said
+  // aloud, never a silent fall-back to a stale file.
   {
-    const c = await loadSessionCoding(resolve(process.cwd()));
-    if (c) {
-      sessionCodingModel = c.model;
-      sessionCodingLabel = c.label;
-      sessionCodingUrl = c.url;
+    const folderHash = folderHashFor(resolve(process.cwd()));
+    let dbChoice = null;
+    let dbUnreachable = false;
+    try {
+      dbChoice = await fetchCodingChoice(folderHash);
+    } catch (err) {
+      // Local mode has no "offline" — the database is on THIS machine, so a failure means the
+      // local mongodb is unreachable. Cloud mode failing to reach the hosted API means the
+      // computer has lost its internet connection. Two different messages, one per mode.
+      dbUnreachable = true;
+      if (isLocalApiBase(apiBase)) {
+        console.error(dim("(cannot access local mongodb — your saved model/key choice is unavailable)"));
+      } else {
+        console.error(dim("(your computer has lost its internet connection — your saved model/key choice is unavailable)"));
+      }
+    }
+    if (dbChoice) {
+      if (dbChoice.codingModel) {
+        sessionCodingModel = dbChoice.codingModel;
+        sessionCodingLabel = dbChoice.codingLabel;
+        sessionCodingUrl = dbChoice.codingUrl;
+      }
+      if (dbChoice.codingKeyId) sessionCodingKeyId = dbChoice.codingKeyId;
+      // Refresh the local cache so the file matches the database.
+      try {
+        await updateSessionFile(resolve(process.cwd()), (raw) => {
+          raw.codingKeyId = dbChoice.codingKeyId;
+          raw.codingModel = dbChoice.codingModel;
+          raw.codingLabel = dbChoice.codingLabel;
+          raw.codingUrl = dbChoice.codingUrl;
+          raw.updatedAt = new Date().toISOString();
+        });
+      } catch { /* cache write is best-effort */ }
+    } else if (!dbUnreachable) {
+      // The database WAS reached but has no choice for this folder — fall back to the local file
+      // (a folder chosen before task #225 existed has its choice ONLY in the file). When the
+      // database could NOT be reached, the error above already said so and there is no fallback.
+      const c = await loadSessionCoding(resolve(process.cwd()));
+      if (c) {
+        sessionCodingModel = c.model;
+        sessionCodingLabel = c.label;
+        sessionCodingUrl = c.url;
+      }
+      sessionCodingKeyId = await loadSessionCodingKeyId(resolve(process.cwd())); // task #222
     }
   }
-  sessionCodingKeyId = await loadSessionCodingKeyId(resolve(process.cwd())); // task #222
   // Fetch the API key tail after loading the session, if a key is configured
   if (sessionCodingKeyId) {
     try {

package/package.json

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