@tiens.nguyen/gu-cli 1.0.781 → 1.0.782

package/client-expert-run.mjs

@@ -1111,7 +1111,7 @@ export async function runClientExpertSetup({
       console.log("");
       console.log("  " + cyan("✓ Model setup skipped") + dim(loadPreset
         ? " — the preset picker opens as soon as gu starts"
-        : " — set them any time with /model (or /load-presets)"));
+        : " — set them any time with /model (or /open-presets)"));
     } else if (Object.keys(written).length === 0) {
       console.log("  " + cyan("✓ Models and RAG") + dim(" — already configured, left alone"));
     } else {

package/gu-repl.mjs

@@ -882,7 +882,7 @@ const COMMANDS = [
   // before writing. A preset file HOLDS its API key (0600, home folder — the settings files'
   // location), so it is marked "gu": "preset" and the two commands never offer each other's files.
   { name: "/save-preset", usage: "/save-preset <name> [{json}]", desc: "save a named preset — server, API key and the agent/coding/embedding models — in your editor ($EDITOR, nano…), or as one line of JSON; all validated" },
-  { name: "/load-presets", usage: "/load-presets [name]", desc: "pick a saved preset: Enter applies it (asks first) · v view · c copy as a command · j copy JSON · e edit" },
+  { name: "/open-presets", aliases: ["/load-presets"], usage: "/open-presets [name]", desc: "pick a saved preset: Enter applies it (asks first) · v view · c copy as a command · j copy JSON · e edit" },
   { name: "/doctor", desc: "check every configured model ANSWERS — especially the embedder, which a turn only reaches after several steps" },
   { name: "/tokens", desc: "break down the last prompt sent to the coding model — how much of it was RAG" },
   // ONE name, /new (user, #278). /reset and /clear still work (HIDDEN_COMMANDS) for habit and
@@ -6915,7 +6915,7 @@ async function runSavePresetCommand(line) {
     const v = pr.validatePresetFile(JSON.stringify(out));
     console.log(GUTTER + `Preset "${name}" saved to ${file} — your whole setup:`);
     if (v.ok && v.full) for (const l of pr.fullPresetSummary(v.value, v.codingDefault)) console.log(GUTTER + dim(l));
-    console.log(GUTTER + dim("It CONTAINS your API keys — keep it private. /load-presets → v to view it, c to copy it for another machine."));
+    console.log(GUTTER + dim("It CONTAINS your API keys — keep it private. /open-presets → v to view it, c to copy it for another machine."));
     console.log("");
   };
   const ed = await import("./preset-editor.mjs");
@@ -7118,27 +7118,31 @@ async function runUndoCommand(line) {
  */
 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."));
+  const editor = ed.pickEditor();
   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;
+    // AN EDITOR FIRST (#322): a preset is many lines — on an Ubuntu server over SSH, nano is the
+    // natural place to paste it. The one-line prompt is only the fallback with no editor/terminal.
+    if (editor && process.stdin.isTTY) {
+      // One short line (#322): the save keys are in the file's own header, where they are needed.
+      console.log(GUTTER + dim(`Opening ${basename(editor.cmd)} — paste your preset there, then save and quit.`));
+      parsed = await fixPresetInEditor(ed, ed.pasteTemplate(editor.saveHint), { editor });
+      if (!parsed) return "";
+    } else {
+      if (!editor) console.log(GUTTER + yellow(ed.NO_EDITOR_HINT) + dim(" — or paste it here, on one line."));
+      console.log(GUTTER + "Paste a preset you already have — its JSON, a preset file, or a /save-preset command.");
+      console.log(GUTTER + dim("Esc cancels."));
+      while (!parsed) {
+        const text = String((await ask("preset: ")) ?? "");
+        if (!text.trim()) return "";
+        const p = ed.parsePastedPreset(text);
+        if (p.ok) {
+          parsed = p;
+          break;
+        }
+        console.log(GUTTER + yellow(`Not a preset yet — ${p.problem}`));
+        console.log(GUTTER + dim("Paste it again, or Esc to cancel."));
       }
-      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 "";
@@ -7158,10 +7162,9 @@ async function presetFromPaste(pr, home) {
 }
 
 /** 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();
+async function fixPresetInEditor(ed, text, { 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)."));
+    console.log(GUTTER + (editor ? "an editor needs a terminal." : ed.NO_EDITOR_HINT + "."));
     return null;
   }
   let t = text;
@@ -7173,9 +7176,14 @@ async function fixPresetInEditor(ed, text) {
     }
     const p = ed.parsePastedPreset(r.text);
     if (p.ok) return p;
-    console.log(GUTTER + yellow(`Not saved yet — ${p.problem}`));
+    // Nothing pasted (only the // header left, or quit without saving) → a cancel, not an error.
+    if (p.empty || ed.parseEdited(r.text).empty) {
+      console.log(GUTTER + dim("Nothing pasted — cancelled."));
+      return null;
+    }
+    console.log(GUTTER + yellow(`Not a preset yet — ${p.problem}`));
     if (!(await askYesNo("Edit again?", true))) return null;
-    t = r.text;
+    t = r.text; // their text, with the mistake in it — not the empty template again
   }
 }
 
@@ -7194,7 +7202,8 @@ async function runLoadPresetsCommand(line) {
   const home = homedir();
   console.log("");
   let file = "";
-  const typed = line.trim().slice("/load-presets".length).trim();
+  // /open-presets (#322), or its old name /load-presets — the printed undo lines of older backups use it.
+  const typed = line.trim().replace(/^\/(open|load)-presets\b/, "").trim();
   if (typed) {
     file = pr.presetFilePath(typed, home);
     if (!file) return; // a cancel word
@@ -7223,7 +7232,7 @@ async function runLoadPresetsCommand(line) {
         return;
       }
     } else {
-      console.log(dim(`  Presets in ${home}  (${ed.PICKER_HINT}):`));
+      console.log(dim(`  Presets in ${home === homedir() ? "~" : 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) {
@@ -7265,7 +7274,7 @@ async function runLoadPresetsCommand(line) {
           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(GUTTER + dim(`/open-presets ${pname} applies it.`));
           console.log("");
           return;
         }
@@ -12452,9 +12461,9 @@ async function main() {
   if (openPresetsAtStart) {
     openPresetsAtStart = false;
     try {
-      await runLoadPresetsCommand("/load-presets");
+      await runLoadPresetsCommand("/open-presets");
     } catch (e) {
-      console.log(GUTTER + dim(`(could not open the presets: ${e?.message ?? e} — run /load-presets)`));
+      console.log(GUTTER + dim(`(could not open the presets: ${e?.message ?? e} — run /open-presets)`));
     }
   }
 
@@ -12669,7 +12678,8 @@ async function main() {
       await runSavePresetCommand(line);
       continue;
     }
-    if (line === "/load-presets" || line.startsWith("/load-presets ")) {
+    // #322: /open-presets, and its old name /load-presets (older backups print it in their undo line)
+    if (line === "/open-presets" || line.startsWith("/open-presets ") || line === "/load-presets" || line.startsWith("/load-presets ")) {
       await runLoadPresetsCommand(line);
       continue;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiens.nguyen/gu-cli",
-  "version": "1.0.781",
+  "version": "1.0.782",
   "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",
@@ -40,7 +40,7 @@
     "test:steps": "python3 scripts/py-tap.py tests/test_read_caps.py tests/test_trim_payback.py tests/test_explore.py tests/test_and_chains.py tests/test_edit_file_primary.py tests/test_bare_code_rescue.py tests/test_batching_rule.py tests/test_no_pdf_routing.py",
     "check:image": "node scripts/image-paste-check.mjs",
     "check:image-clipboard": "node scripts/image-paste-check.mjs --clipboard",
-    "test:presets": "node --test tests/preset-safety.test.mjs tests/preset-more.test.mjs tests/preset-apply.test.mjs tests/preset-full.test.mjs tests/presets-transfer.test.mjs tests/preset-editor.test.mjs tests/load-preset-paste.test.mjs",
+    "test:presets": "node --test tests/open-presets.test.mjs tests/preset-safety.test.mjs tests/preset-more.test.mjs tests/preset-apply.test.mjs tests/preset-full.test.mjs tests/presets-transfer.test.mjs tests/preset-editor.test.mjs tests/load-preset-paste.test.mjs",
     "test:skills": "python3 scripts/py-tap.py tests/test_skills_mcp_turn.py tests/test_hooks_turn.py tests/test_mcp_client.py && node --test tests/skills.test.mjs tests/mcp-config.test.mjs tests/hooks-config.test.mjs tests/slash-menu.test.mjs tests/conversation-archive.test.mjs",
     "capture:turn": "GONEXT_OLLAMA1_LIVE=1 node scripts/capture-turn-fixture.mjs",
     "test:bearer": "node --test tests/bearer-routing.test.mjs tests/bearer-verify.test.mjs",

package/preset-apply.mjs

@@ -101,7 +101,7 @@ export async function applyTransfer(value, { api, io, fromLine = "", carriesSecr
     }
     out.backup = b.file;
     say(`backup of your current setup: ${b.file}`);
-    say(`to undo: /load-presets ${b.file}`);
+    say(`to undo: /open-presets ${b.file}`);
   }
   const patch = toSettingsPatch(value, current);
   const saved = Object.keys(patch).length ? await api.saveSettings(patch) : true;

package/preset-editor.mjs

@@ -30,21 +30,56 @@ export const isFullPreset = (doc) => Boolean(doc && typeof doc === "object" && (
 
 const clean = (v) => (typeof v === "string" ? v.trim() : "");
 
+/** GUI editors — no use in an SSH session or on a server with no display: they hang or fail. */
+const GUI_EDITORS = /^(code|code-insiders|cursor|codium|subl|sublime_text|gedit|kate|kwrite|mousepad|xed|pluma|atom|mate|zed|gvim|mvim|macvim|notepad\+\+|notepad|textedit|bbedit|open|xdg-open)(\.exe)?$/i;
+
 /**
- * Which editor to run → { cmd, args }. $VISUAL then $EDITOR (either may carry arguments, e.g.
- * "code --wait"), then the first of nano / vi that exists; Notepad on Windows, which blocks until
- * its window closes. `has(cmd)` says whether a program is on PATH (injected for tests).
+ * Are we in a terminal with no graphical display — an SSH session, or a Linux server? (#322: the user
+ * often runs gu on an Ubuntu server over SSH.)
+ */
+export function isHeadless({ env = process.env, platform = process.platform } = {}) {
+  if (env.SSH_CONNECTION || env.SSH_TTY || env.SSH_CLIENT) return true;
+  return platform === "linux" && !env.DISPLAY && !env.WAYLAND_DISPLAY;
+}
+
+/**
+ * Which editor to run → { cmd, args, saveHint }. $VISUAL then $EDITOR (either may carry arguments, e.g.
+ * "code --wait"); then nano, vim, vi; Notepad on Windows.
+ *
+ * HEADLESS (SSH, a server — #322): a GUI editor named in $VISUAL/$EDITOR is skipped, because it would
+ * hang or fail with no display; a terminal one is used instead. nano gets -w (no hard-wrapping): a
+ * pasted preset's long lines carry API keys, and a wrapped line would split a key and break it.
+ * `saveHint` is what the header tells the person to press — editors differ, and a server's nano is
+ * often someone's first.
  */
 export function pickEditor({ env = process.env, platform = process.platform, has = onPath } = {}) {
-  for (const v of [env.VISUAL, env.EDITOR]) {
-    const words = splitCommand(v);
-    if (words.length) return { cmd: words[0], args: words.slice(1) };
+  const headless = isHeadless({ env, platform });
+  const named = [env.VISUAL, env.EDITOR].map(splitCommand).filter((w) => w.length);
+  for (const words of named) {
+    const base = words[0].split(/[\\/]/).pop();
+    if (headless && GUI_EDITORS.test(base)) continue;
+    return withHints({ cmd: words[0], args: words.slice(1) });
   }
-  if (platform === "win32") return { cmd: "notepad", args: [] };
-  for (const cmd of ["nano", "vi"]) if (has(cmd)) return { cmd, args: [] };
+  if (platform === "win32" && !headless) return withHints({ cmd: "notepad", args: [] });
+  for (const cmd of ["nano", "vim", "vi"]) if (has(cmd)) return withHints({ cmd, args: [] });
   return null;
 }
 
+function withHints(ed) {
+  const base = ed.cmd.split(/[\\/]/).pop().replace(/\.exe$/i, "").toLowerCase();
+  if (base === "nano" && !ed.args.some((a) => /^(-w|--nowrap|-b|--breaklonglines)$/.test(a))) ed = { ...ed, args: ["-w", ...ed.args] };
+  const saveHint =
+    base === "nano" ? "nano: Ctrl+O, Enter, Ctrl+X to save · Ctrl+X, N to cancel"
+    : /^(vim?|nvim|gvim)$/.test(base) ? "vi: Esc, then :wq Enter to save · :q! Enter to cancel"
+    : base === "notepad" ? "Notepad: Ctrl+S, then close the window"
+    : base === "emacs" ? "emacs: Ctrl+X Ctrl+S, then Ctrl+X Ctrl+C"
+    : "save, then quit the editor";
+  return { ...ed, saveHint };
+}
+
+/** What to say when a server has no editor at all. */
+export const NO_EDITOR_HINT = "no editor found — install one (Ubuntu: sudo apt install nano) or set $EDITOR";
+
 /** "code --wait" → ["code", "--wait"]; quotes group ("'/Applications/My Editor' -w"). */
 export function splitCommand(s) {
   const out = [];
@@ -292,7 +327,24 @@ 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";
+// Short enough for one 80-column row with "  Presets in ~  (…):" around it (#322 — it wrapped).
+export const PICKER_HINT = "Enter use · v view · c copy · j JSON · e edit · Esc";
+
+/**
+ * The file the editor opens for "paste a preset" (#322: "load preset doesn't give me any editor so
+ * that I can copy-paste the JSON" — and mostly on an Ubuntu server over SSH). Empty below the header;
+ * the header says how to save in THIS editor.
+ */
+export function pasteTemplate(saveHint = "save, then quit the editor") {
+  return [
+    // Each line fits an 80-column SSH terminal — nano cuts longer ones off, save keys and all.
+    "// Paste your gu preset below (JSON, a preset file or a /save-preset line).",
+    `// ${saveHint}`,
+    "// Lines starting with // are ignored. Quit without saving to cancel.",
+    "",
+    "",
+  ].join("\n");
+}
 
 /**
  * A PRESET SOMEONE ALREADY HAS, pasted into /load-presets (#317: "I need a place to input a preset
@@ -310,11 +362,12 @@ 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);
+  // The editor's // header (#322) sits above a pasted command — look past it.
+  const cmd = /^\/save-preset\s+(\S+)\s+([\s\S]+)$/.exec(src.replace(/^[ \t]*\/\/.*$/gm, "").trim());
   if (cmd) {
     name = cmd[1];
     src = cmd[2].trim();
-  } else if (/^\/save-preset\b/.test(src)) {
+  } else if (/^\/save-preset\b/.test(src.replace(/^[ \t]*\/\/.*$/gm, "").trim())) {
     return { ok: false, problem: "that /save-preset command has no JSON after its name." };
   }
   const parsed = parseEdited(src);