@tiens.nguyen/gu-cli 1.0.778 → 1.0.779

package/gu-repl.mjs

@@ -1579,12 +1579,11 @@ let imageNoticeTimer = null;
 let agentMissing = false; // no agent model chosen → agent falls back to the coding model
 let embedMissing = false; // no embed model chosen → RAG is off until /embed-model picks one
 // One footer row; the two halves are independent so a model that IS set is never named.
-const missingNoticeText = () => {
-  const parts = [];
-  if (agentMissing) parts.push("agent model is not set — using the coding model (/agent-model to choose one)");
-  if (embedMissing) parts.push("no embed model — RAG is off; choose one with /embed-model");
-  return parts.length ? "⚠ " + parts.join("  ·  ") : "";
-};
+// ONE SHORT ROW EACH (#317): joined, they ran past 80 columns and were cut mid-word.
+const missingNoticeRows = () => [
+  ...(agentMissing ? ["⚠ agent model not set — using the coding model · /agent-model"] : []),
+  ...(embedMissing ? ["⚠ no embed model — RAG is off · /embed-model"] : []),
+];
 
 // #307: the calm note after a quick change of mind — dim, not the ⚠ orange of a warning, and in the
 // bar rather than the transcript (which the whole point is to leave untouched).
@@ -2533,7 +2532,7 @@ const footerRows = () =>
         ? dim(clipVisible(stopNotice, (process.stdout.columns || 80) - visibleLen(GUTTER) - 1))
         : "",
     // Task #14: the skipped-setup warning — persistent (not a timed notice), red, its own row.
-    missing: missingNoticeText() ? red(missingNoticeText()) : "",
+    missing: missingNoticeRows().map((r) => red(r)),
   });
 // An ask()'s hint lines (#305), drawn in yellow under its input while it waits. Plain text.
 let askHint = [];
@@ -7060,6 +7059,83 @@ async function runUndoCommand(line) {
   if (runId === lastStoppedRun) lastStoppedRun = null;
 }
 
+/**
+ * #317: a preset the person ALREADY HAS, brought in by pasting — its JSON, a whole preset file, or
+ * the `/save-preset <name> {…}` command copied from another computer (#312). A multi-line paste
+ * arrives as "[Pasted text #N +M lines]" and is expanded before it is read, so the key is never
+ * echoed. A mistake is named; Enter then opens it IN THE EDITOR with the pasted text (not a blank
+ * template), and Enter on nothing opens the editor on the current setup. Esc cancels.
+ * Saved 0600 like /save-preset. → the file, or "" when cancelled.
+ */
+async function presetFromPaste(pr, home) {
+  const ed = await import("./preset-editor.mjs");
+  console.log(GUTTER + "Paste a preset you already have — its JSON, a preset file, or a /save-preset command.");
+  console.log(GUTTER + dim("Enter on an empty line opens your editor instead  ·  Esc cancels."));
+  let parsed = null;
+  let lastText = "";
+  try {
+    while (!parsed) {
+      const text = String((await ask("preset: ")) ?? "");
+      if (!text.trim()) {
+        const seed = lastText || ed.editorText("preset", ed.presetFromSettings((await fetchWorkerSettings()) ?? {}));
+        parsed = await fixPresetInEditor(ed, seed);
+        if (!parsed) return "";
+        break;
+      }
+      const p = ed.parsePastedPreset(text);
+      if (p.ok) {
+        parsed = p;
+        break;
+      }
+      lastText = text;
+      console.log(GUTTER + yellow(`Not a preset yet — ${p.problem}`));
+      console.log(GUTTER + dim("Paste it again, or press Enter to fix it in your editor."));
+    }
+    const name = await askPresetName(pr, parsed.name || "preset");
+    if (!name) return "";
+    const file = pr.presetFilePath(name, home);
+    if (existsSync(file) && !(await askYesNo(`A preset called "${name}" exists — replace it?`, false))) return "";
+    writeFileSync(file, JSON.stringify(pr.buildPreset({ name, preset: parsed.preset, host: hostname() }), null, 2) + "\n", { mode: 0o600 });
+    console.log(GUTTER + `Preset "${name}" saved to ${file}`);
+    return file;
+  } catch (e) {
+    if (wasPromptCancelled(e)) return "";
+    throw e;
+  }
+}
+
+/** The editor loop of #312, seeded with `text`: → a parsed preset, or null when given up. */
+async function fixPresetInEditor(ed, text) {
+  const editor = ed.pickEditor();
+  if (!editor || !process.stdin.isTTY) {
+    console.log(GUTTER + (editor ? "an editor needs a terminal." : "no editor found (set $EDITOR, e.g. export EDITOR=nano)."));
+    return null;
+  }
+  let t = text;
+  for (;;) {
+    const r = withTerminalHandedOver(() => ed.editText(t, { editor, fileName: "preset.json" }));
+    if (!r.ok) {
+      console.log(GUTTER + `Not saved — ${r.why}.`);
+      return null;
+    }
+    const p = ed.parsePastedPreset(r.text);
+    if (p.ok) return p;
+    console.log(GUTTER + yellow(`Not saved yet — ${p.problem}`));
+    if (!(await askYesNo("Edit again?", true))) return null;
+    t = r.text;
+  }
+}
+
+/** A preset name, defaulting to `dflt` (Enter). "" when cancelled. */
+async function askPresetName(pr, dflt) {
+  for (;;) {
+    const n = String((await ask(`preset name${dflt ? ` [${dflt}]` : ""}: `)) ?? "").trim() || dflt;
+    if (!n) return "";
+    if (pr.isPresetName(n)) return n;
+    console.log(GUTTER + yellow(`"${n}" is not a preset name — one word, no slashes.`));
+  }
+}
+
 async function runLoadPresetsCommand(line) {
   const pr = await import("./presets-transfer.mjs");
   const home = homedir();
@@ -7082,53 +7158,72 @@ async function runLoadPresetsCommand(line) {
     // picker that stayed open could not be clicked until it closed.
     const ed = await import("./preset-editor.mjs");
     const found = pr.presetFilesIn(listJsonFiles(home));
+    // NO DEAD END (#317: "I need a place to input a preset I have already"): with nothing saved,
+    // the command asks for one right here; with presets saved, the picker's LAST row does (last, so
+    // Enter still applies the newest preset, as it always has).
     if (found.length === 0) {
-      console.log(GUTTER + `no presets in ${home} — save one with /save-preset <name>`);
-      console.log("");
-      return;
-    }
-    console.log(dim(`  Presets in ${home}  (${ed.PICKER_HINT}):`));
-    const pick = await pickFromList(found, 0, { keys: ed.PICKER_KEYS });
-    if (!pick || pick.index < 0) {
-      console.log(GUTTER + "load cancelled.");
-      console.log("");
-      return;
-    }
-    file = pr.presetFilePath(found[pick.index], home);
-    if (pick.action === "edit") {
-      await runSavePresetCommand(`/save-preset ${found[pick.index]}`);
-      return;
-    }
-    if (pick.action !== "select") {
-      const shown = pr.validatePresetFile(readFileSync(file, "utf8"));
-      if (!shown.ok) {
-        console.log(GUTTER + `Can't show it — ${shown.problem}`);
+      console.log(GUTTER + "No presets saved yet.");
+      file = await presetFromPaste(pr, home);
+      if (!file) {
+        console.log(GUTTER + "load cancelled.");
         console.log("");
         return;
       }
-      const pname = shown.name || found[pick.index];
-      const command = ed.presetCopyCommand(pname, shown.preset);
-      if (pick.action === "view") {
-        const block = ed.presetBlock(pname, shown.preset, { width: process.stdout.columns || 80, gutter: GUTTER });
-        const [top, ...restRows] = block.rows;
-        const cut = block.button.from;
-        console.log(dim(top.slice(0, cut)) + accent(top.slice(cut, block.button.to)) + dim(top.slice(block.button.to)));
-        for (const r of restRows) console.log(r);
-        registerCopyBlock(block.rows.length, command, 0, { button: block.button, note: "✓ copied — includes the API key" });
-        console.log(GUTTER + dim("click ⧉ copy for a /save-preset command to paste anywhere — it includes the real key."));
-        console.log(GUTTER + dim(`/load-presets ${pname} applies it.`));
+    } else {
+      console.log(dim(`  Presets in ${home}  (${ed.PICKER_HINT}):`));
+      const PASTE_ROW = "+ Paste a preset I already have…";
+      const pick = await pickFromList([...found, PASTE_ROW], 0, { keys: ed.PICKER_KEYS });
+      if (!pick || pick.index < 0) {
+        console.log(GUTTER + "load cancelled.");
+        console.log("");
+        return;
+      }
+      if (pick.index === found.length) {
+        file = await presetFromPaste(pr, home);
+        if (!file) {
+          console.log(GUTTER + "load cancelled.");
+          console.log("");
+          return;
+        }
+        pick.action = "select"; // a pasted preset goes on to be applied, whatever key opened the row
+      } else {
+        file = pr.presetFilePath(found[pick.index], home);
+      }
+      if (pick.action === "edit") {
+        await runSavePresetCommand(`/save-preset ${found[pick.index]}`);
+        return;
+      }
+      if (pick.action !== "select") {
+        const shown = pr.validatePresetFile(readFileSync(file, "utf8"));
+        if (!shown.ok) {
+          console.log(GUTTER + `Can't show it — ${shown.problem}`);
+          console.log("");
+          return;
+        }
+        const pname = shown.name || found[pick.index];
+        const command = ed.presetCopyCommand(pname, shown.preset);
+        if (pick.action === "view") {
+          const block = ed.presetBlock(pname, shown.preset, { width: process.stdout.columns || 80, gutter: GUTTER });
+          const [top, ...restRows] = block.rows;
+          const cut = block.button.from;
+          console.log(dim(top.slice(0, cut)) + accent(top.slice(cut, block.button.to)) + dim(top.slice(block.button.to)));
+          for (const r of restRows) console.log(r);
+          registerCopyBlock(block.rows.length, command, 0, { button: block.button, note: "✓ copied — includes the API key" });
+          console.log(GUTTER + dim("click ⧉ copy for a /save-preset command to paste anywhere — it includes the real key."));
+          console.log(GUTTER + dim(`/load-presets ${pname} applies it.`));
+          console.log("");
+          return;
+        }
+        const res = await writeClipboard(pick.action === "json" ? ed.presetCopyJson(shown.preset) : command);
+        console.log(
+          GUTTER +
+            (res.ok
+              ? accent(`✓ copied ${pick.action === "json" ? "the JSON" : "the /save-preset command"} for "${pname}" — includes the API key.`)
+              : yellow(`couldn't copy (${res.why}) — the preset is in ${file}.`))
+        );
         console.log("");
         return;
       }
-      const res = await writeClipboard(pick.action === "json" ? ed.presetCopyJson(shown.preset) : command);
-      console.log(
-        GUTTER +
-          (res.ok
-            ? accent(`✓ copied ${pick.action === "json" ? "the JSON" : "the /save-preset command"} for "${pname}" — includes the API key.`)
-            : yellow(`couldn't copy (${res.why}) — the preset is in ${file}.`))
-      );
-      console.log("");
-      return;
     }
   }
   const checked = pr.validatePresetFile(readFileSync(file, "utf8"));

package/model-setup-ui.mjs

@@ -98,7 +98,7 @@ export function modelSetupMenu({ presets = 0 } = {}) {
     "  1  Guided — pick the servers and models   (Enter)",
     presets > 0
       ? `  2  Load a saved preset   (${presets} saved)`
-      : "  2  Load a saved preset   (none saved yet — /save-preset makes one)",
+      : "  2  Load a preset   (none saved yet — paste one you already have)",
     "  3  Skip for now — set them later with /model",
   ];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiens.nguyen/gu-cli",
-  "version": "1.0.778",
+  "version": "1.0.779",
   "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/preset-editor.mjs

@@ -185,3 +185,38 @@ export function presetBlock(name, preset, { width = 80, gutter = "   " } = {}) {
 /** The keys the /load-presets picker takes, in the order its hint line names them. */
 export const PICKER_KEYS = { v: "view", c: "copy", j: "json", e: "edit" };
 export const PICKER_HINT = "↑↓ · Enter apply · v view · c copy command · j copy JSON · e edit · Esc back";
+
+/**
+ * A PRESET SOMEONE ALREADY HAS, pasted into /load-presets (#317: "I need a place to input a preset
+ * I have already, which is in JSON format"). Three shapes are accepted, because those are the three
+ * things a person could be holding:
+ *
+ *   · the JSON itself            { "apiUrl": …, "apiKey": …, "agentModel": …, … }
+ *   · a whole preset FILE        { "gu": "preset", "name": "home", "version": 1, … }
+ *   · the command copied with c  /save-preset home {"apiUrl":…}   (#312, from another computer)
+ *
+ * → { ok: true, preset, name } (name = the one the text carries, or "") | { ok: false, problem }.
+ * JSON problems name the line and column (parseEdited), and `//` lines are allowed, as in the editor.
+ */
+export function parsePastedPreset(text) {
+  let src = String(text ?? "").trim();
+  if (!src) return { ok: false, empty: true, problem: "nothing was pasted." };
+  let name = "";
+  const cmd = /^\/save-preset\s+(\S+)\s+([\s\S]+)$/.exec(src);
+  if (cmd) {
+    name = cmd[1];
+    src = cmd[2].trim();
+  } else if (/^\/save-preset\b/.test(src)) {
+    return { ok: false, problem: "that /save-preset command has no JSON after its name." };
+  }
+  const parsed = parseEdited(src);
+  if (!parsed.ok) return parsed;
+  // A whole preset file carries its name inside; the command's own name wins when both exist.
+  try {
+    const doc = JSON.parse(src.replace(/^[ \t]*\/\/.*$/gm, ""));
+    if (!name && doc && typeof doc.name === "string" && doc.gu === "preset") name = doc.name.trim();
+  } catch {
+    /* parseEdited already accepted it — a name is optional */
+  }
+  return { ok: true, preset: parsed.preset, name };
+}

package/terminal-layout.mjs

@@ -522,7 +522,9 @@ export function buildFooterRows({
     // Task #14: a skipped model setup stays VISIBLE. When private/client-expert setup was
     // declined the agent model and/or the embed model is unset — say so at the bottom, every
     // frame, until one is chosen. Its own row, under the passing notice, so it persists.
-    ...(missing ? [clipVisible(gutter + missing, w - 1)] : []),
+    // One row EACH (#317): the two warnings joined on one row ran past 80 columns and were cut
+    // mid-word ("…(/agent-model to choose on"). A string still works — one row, as before.
+    ...(Array.isArray(missing) ? missing : missing ? [missing] : []).filter(Boolean).map((m) => clipVisible(gutter + m, w - 1)),
   ];
 }