@tiens.nguyen/gonext-local-worker 1.0.230 → 1.0.232

package/gonext-repl.mjs

@@ -239,6 +239,13 @@ let slashSel = -1; // highlighted row in the current filtered list (-1 = none)
 let slashNames = []; // command names in the current filtered list (for Enter → run)
 let slashPrefix = ""; // the "/…" text the user typed (restored when ↑/↓ recall history)
 rl.on("line", (l) => {
+  // A list picker owns the keyboard (its Enter resolves via the keypress handler) — never
+  // let that Enter submit a stray empty line into the command loop.
+  if (listPickerActive) {
+    rl.line = "";
+    rl.cursor = 0;
+    return;
+  }
   // While a turn is running, IGNORE typed input entirely — no type-ahead, no queued
   // next question. Only Ctrl+C (handled via SIGINT) does anything mid-turn. Clear the
   // line buffer so nothing the user typed leaks into the next prompt.
@@ -300,6 +307,14 @@ function drawSlashHint(prefix, sel) {
 }
 if (process.stdin.isTTY) {
   process.stdin.on("keypress", (_ch, key) => {
+    // An arrow-key list picker (/server) is up → ↑/↓ move the highlight, Enter chooses.
+    if (listPickerActive) {
+      onListKey(key);
+      rl.line = "";
+      rl.cursor = 0;
+      rl.historyIndex = -1;
+      return;
+    }
     // A command-approval picker is up → arrow keys move the highlight, Enter chooses.
     if (approvalActive) {
       onApprovalKey(key);
@@ -516,6 +531,19 @@ async function loadSessionTestAuto(cwd) {
   }
 }
 
+// The /server deploy-target pick is also remembered per folder, so a fresh terminal in
+// the same project still knows where to deploy (task #69 — it was session-only and got
+// lost on restart). Returns {name,host,user} or null.
+async function loadSessionServer(cwd) {
+  try {
+    const raw = JSON.parse(await readFile(sessionFilePath(cwd), "utf8"));
+    const s = raw?.deployServer;
+    return s && typeof s.host === "string" && typeof s.user === "string" ? s : null;
+  } catch {
+    return null;
+  }
+}
+
 async function saveSession(cwd, history) {
   try {
     await mkdir(SESSIONS_DIR, { recursive: true });
@@ -523,7 +551,13 @@ async function saveSession(cwd, history) {
     await writeFile(
       sessionFilePath(cwd),
       JSON.stringify(
-        { cwd, updatedAt: new Date().toISOString(), testAuto: sessionTestAuto, history: trimmed },
+        {
+          cwd,
+          updatedAt: new Date().toISOString(),
+          testAuto: sessionTestAuto,
+          deployServer: selectedServer, // remember the /server pick per folder (task #69)
+          history: trimmed,
+        },
         null,
         2
       ) + "\n"
@@ -646,29 +680,23 @@ async function chooseServer() {
     console.log(dim("  No deployment servers yet — add them in the web app → Servers.\n"));
     return;
   }
-  const activeHost = selectedServer?.host || "";
-  console.log(dim("  Choose a deployment server for this session:"));
-  servers.forEach((s, i) => {
-    const mark = s.host === activeHost ? green(" ●") : "  ";
-    console.log(`   ${mark} ${i + 1}. ${s.name} ${dim(`(${s.user}@${s.host})`)}`);
-  });
-  console.log(`      0. ${dim("none (clear selection)")}`);
-  const pick = (await ask(dim("  number (or Enter to keep current): "))).trim();
-  if (!pick) {
-    console.log("");
+  // Arrow-key picker: ↑/↓ to move, Enter to choose (no number typing). The list ends with
+  // a "none" row to clear the selection. Pre-highlight the current pick if there is one.
+  const labels = servers.map((s) => `${s.name}  (${s.user}@${s.host})`);
+  labels.push("none (clear selection)");
+  const activeIdx = servers.findIndex((s) => s.host === selectedServer?.host);
+  console.log(dim("  Choose a deployment server  (↑/↓ then Enter):"));
+  const idx = await pickFromList(labels, activeIdx >= 0 ? activeIdx : 0);
+  if (idx < 0) {
+    console.log(dim("  (cancelled)\n"));
     return;
   }
-  const n = Number.parseInt(pick, 10);
-  if (n === 0) {
+  if (idx === servers.length) {
+    // the trailing "none" row
     selectedServer = null;
     console.log(dim("  ✓ deployment server cleared.\n"));
     return;
   }
-  const idx = n - 1;
-  if (!Number.isInteger(idx) || idx < 0 || idx >= servers.length) {
-    console.log(red("  invalid choice.\n"));
-    return;
-  }
   const s = servers[idx];
   selectedServer = { name: s.name, host: s.host, user: s.user };
   console.log(green(`  ✓ deploy target → ${s.name} (${s.user}@${s.host})`));
@@ -765,6 +793,59 @@ function approvalPrompt(command) {
     };
   });
 }
+// Generic arrow-key list picker (↑/↓ + Enter) — used by /server so you navigate instead
+// of typing a number. Same mechanism as the Yes/No approval picker above, generalized to
+// N rows. Returns the chosen index (or -1 on Esc/Ctrl+C). Works OUTSIDE a turn, so it also
+// mutes readline echo/refresh (see the _writeToOutput/_refreshLine guards) via listPickerActive.
+let listPickerActive = false;
+let listSel = 0;
+let listItems = [];
+let listResolve = null;
+function drawList(redraw) {
+  const n = listItems.length;
+  const body = listItems
+    .map((it, i) => "\x1b[K" + (i === listSel ? green("▸ " + it) : dim("  " + it)))
+    .join("\n");
+  process.stdout.write((redraw ? `\x1b[${n}A` : "") + body + "\n");
+}
+function finishList(index) {
+  if (!listPickerActive) return;
+  listPickerActive = false;
+  process.stdout.write(`\x1b[${listItems.length}A\x1b[J`); // wipe the list block
+  const r = listResolve;
+  listResolve = null;
+  listItems = [];
+  if (r) r(index);
+}
+function onListKey(key) {
+  if (!key) return;
+  const n = listItems.length;
+  if (key.name === "up") {
+    listSel = (listSel - 1 + n) % n;
+    drawList(true);
+  } else if (key.name === "down") {
+    listSel = (listSel + 1) % n;
+    drawList(true);
+  } else if (key.name === "return" || key.name === "enter") {
+    finishList(listSel);
+  } else if (key.name === "escape" || (key.ctrl && key.name === "c")) {
+    finishList(-1);
+  }
+}
+function pickFromList(items, initialSel = 0) {
+  return new Promise((resolve) => {
+    if (!process.stdin.isTTY || items.length === 0) {
+      resolve(-1);
+      return;
+    }
+    listItems = items;
+    listSel = Math.max(0, Math.min(initialSel, items.length - 1));
+    listResolve = resolve;
+    listPickerActive = true;
+    drawList(false);
+  });
+}
+
 // Per-session coding-model override chosen via /model (empty = use the account default).
 // Sent to /agent-ask as codingModelOverride; the API validates it against the whitelist.
 let sessionCodingModel = "";
@@ -782,7 +863,7 @@ let selectedServer = null;
 // writes to stdout directly, so it's unaffected — only readline's echo is swallowed.
 const _origWriteToOutput = rl._writeToOutput ? rl._writeToOutput.bind(rl) : null;
 rl._writeToOutput = (s) => {
-  if (following) return;
+  if (following || listPickerActive) return;
   if (_origWriteToOutput) _origWriteToOutput(s);
   else process.stdout.write(s);
 };
@@ -792,7 +873,7 @@ rl._writeToOutput = (s) => {
 // ZERO terminal output.
 const _origRefreshLine = rl._refreshLine ? rl._refreshLine.bind(rl) : null;
 rl._refreshLine = () => {
-  if (following) return;
+  if (following || listPickerActive) return;
   if (_origRefreshLine) _origRefreshLine();
 };
 
@@ -1321,8 +1402,10 @@ async function runAgentTurn(history) {
 async function main() {
   console.log(cyan("GoNext agent REPL") + dim(` · API ${apiBase} · key ${workerKey.slice(0, 8)}…`));
   await ensureWorkspace();
-  // Restore this folder's remembered auto-test choice so the banner + agent-ask reflect it.
+  // Restore this folder's remembered auto-test + deploy-target so the banner + agent-ask
+  // reflect them (both survive a fresh terminal in the same project).
   sessionTestAuto = await loadSessionTestAuto(resolve(process.cwd()));
+  selectedServer = await loadSessionServer(resolve(process.cwd()));
   // Show which models will answer, straight from user settings (also validates auth).
   try {
     const probe = await fetchAgentPayload([{ role: "user", content: "ping" }]);
@@ -1332,7 +1415,8 @@ async function main() {
         `agent model: ${p.agentModelId || probe?.modelKey || "?"}` +
           (p.codingModelId ? ` · coder: ${p.codingModelId}` : "") +
           (p.ragEnabled ? " · RAG on" : "") +
-          ` · auto-test: ${sessionTestAuto ? "on" : "off"}`
+          ` · auto-test: ${sessionTestAuto ? "on" : "off"}` +
+          (selectedServer ? ` · deploy: ${selectedServer.name} (${selectedServer.user}@${selectedServer.host})` : "")
       ) + (sessionTestAuto ? "" : dim(" (/test-auto to enable)"))
     );
   } catch (err) {
@@ -1355,6 +1439,8 @@ async function main() {
   // the OS delivers a real SIGINT to the process. Attach the same handler to both —
   // only one can ever fire for a given mode, so there's no double-handling.
   const onInterrupt = () => {
+    // Ctrl+C while a picker is up = cancel it.
+    if (listPickerActive) finishList(-1);
     // Ctrl+C while the approval picker is up = decline it (and fall through to also
     // cancel the turn) — otherwise the poll loop stays blocked awaiting a choice.
     if (approvalActive) finishApproval(false);
@@ -1415,6 +1501,7 @@ async function main() {
     }
     if (line === "/server") {
       await chooseServer();
+      await saveSession(cwd, history); // remember the pick for this folder
       continue;
     }
     if (line === "/test-auto") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiens.nguyen/gonext-local-worker",
-  "version": "1.0.230",
+  "version": "1.0.232",
   "description": "Polls GoNext cloud API for async local LLM jobs and runs them against Ollama/OpenAI-compatible servers on this Mac",
   "type": "module",
   "license": "MIT",