@tiens.nguyen/gonext-local-worker 1.0.239 → 1.0.241

package/gonext-local-worker.mjs

@@ -1830,6 +1830,32 @@ async function runAgentChatJob(job) {
       (process.env.GONEXT_PROBE_PYTHON ?? process.env.GONEXT_MLX_LM_PYTHON ?? "")
         .trim() || "python3";
     const scriptPath = join(WORKER_DIR, "gonext_agent_chat.py");
+
+    // Workspace scope depends on WHERE the job came from (task #75). The `gonext`
+    // terminal always sends its launch cwd as activeWorkspace; the web app never does —
+    // that's the discriminator.
+    //   • Terminal: the real `gonext-local-worker workspace add` registry + that cwd.
+    //   • Web agent chat: ONE isolated temp scratch folder — NOT the Mac's registered
+    //     project folders. Inheriting them leaked their paths into the web prompt and
+    //     let terminal state drive web routing. run_command stays off (not a code repo).
+    const terminalActiveWs = String(payload?.activeWorkspace ?? "").trim();
+    let jobWorkspaces;
+    let jobActiveWorkspace;
+    if (terminalActiveWs) {
+      jobWorkspaces = await readFile(join(homedir(), ".gonext", "workspaces.json"), "utf8")
+        .then((raw) => {
+          const parsed = JSON.parse(raw);
+          return Array.isArray(parsed?.workspaces) ? parsed.workspaces : [];
+        })
+        .catch(() => []);
+      jobActiveWorkspace = terminalActiveWs;
+    } else {
+      const webWork = join(homedir(), ".gonext", "web-agent-work");
+      await mkdir(webWork, { recursive: true }).catch(() => {});
+      jobWorkspaces = [{ name: "web", path: webWork, allowRun: false }];
+      jobActiveWorkspace = webWork;
+    }
+
     const input = JSON.stringify({
       messages: payload?.messages ?? [],
       agentBaseURL: payload?.agentBaseURL ?? "",
@@ -1889,17 +1915,12 @@ async function runAgentChatJob(job) {
       ragEmbedModel: payload?.ragEmbedModel ?? "",
       ragEmbedUrl: payload?.ragEmbedUrl ?? "",
       ragTopK: payload?.ragTopK ?? 6,
-      // Workspaces the agent may read/edit/test code in — read fresh each job so a
-      // `gonext-local-worker workspace add` applies without restarting the worker.
-      workspaces: await readFile(join(homedir(), ".gonext", "workspaces.json"), "utf8")
-        .then((raw) => {
-          const parsed = JSON.parse(raw);
-          return Array.isArray(parsed?.workspaces) ? parsed.workspaces : [];
-        })
-        .catch(() => []),
-      // The `gonext` terminal REPL's launch folder — download_file/unzip_file output
-      // lands here (must be a registered workspace; the python side re-validates).
-      activeWorkspace: payload?.activeWorkspace ?? "",
+      // Workspaces the agent may read/edit/test code in (see the terminal-vs-web split
+      // computed above): the real registry for the terminal, a lone temp folder for web.
+      workspaces: jobWorkspaces,
+      // download_file/unzip_file output lands here (a registered workspace; python
+      // re-validates). Terminal = its launch cwd; web = the temp scratch folder.
+      activeWorkspace: jobActiveWorkspace,
     });
     // 30 min max for an agent run: multi-step ReAct on a 14B/31B with a cold prompt
     // cache — or a remote Ollama box on slow GPU cold-loading a big model — can run

package/gonext-repl.mjs

@@ -106,8 +106,22 @@ const THINKING_WORDS = (() => {
 })();
 const pickWord = () =>
   THINKING_WORDS[Math.floor(Math.random() * THINKING_WORDS.length)] || "Thinking";
-// Rotating half-circle = an in-progress ("blinking") bullet for the step being worked on.
-const SPINNER = ["◐", "◓", "◑", "◒"];
+// In-progress ("blinking") spinner for the step being worked on. 30 styles that rotate
+// ~every 8s so a long CPU-bound wait stays interesting — mirrors the web agent's set
+// (keep in sync with the .spin-N @keyframes in web/src/App.css). Single-width glyphs so
+// they never shift the text after them.
+const SPINNERS = [
+  "⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏", "│╱─╲", "▁▃▄▅▆▇▆▅▄▃", "←↖↑↗→↘↓↙", "▏▎▍▌▋▊▉▊▋▌▍▎",
+  "◴◷◶◵", "◐◓◑◒", "⣾⣽⣻⢿⡿⣟⣯⣷", "▖▘▝▗", "✶✸✹✺✹✷",
+  "⠁⠂⠄⡀⢀⠠⠐⠈", "dqpb", "◢◣◤◥", "✦✧", "◜◝◞◟",
+  "▌▀▐▄", "◰◳◲◱", "┤┘┴└├┌┬┐", "▘▝▗▖", "▸▹",
+  "⢄⢂⢁⡁⡈⡐⡠", "▙▛▜▟", "▂▃▄▅▆▇█▇▆▅▄▃", "⣿⣷⣯⣟⡿⢿⣻⣽", "⎺⎻⎼⎽",
+  "•◦", "░▒▓█▓▒", "◇◈◆", "·✢✳✽", "◠◡",
+].map((s) => [...s]);
+// The playful word's color cycles ~every 2.5s (xterm-256 palette matching the web accents:
+// green, cyan, blue, indigo, pink, amber).
+const WAIT_COLORS_256 = [120, 87, 111, 147, 218, 221];
+const color256 = (n, s) => `\x1b[38;5;${n}m${s}\x1b[0m`;
 const BULLET = "●"; // a completed action
 
 // ---------- flags ----------
@@ -1014,6 +1028,7 @@ async function runAgentTurn(history) {
   let thinking = false;
   let thinkingSince = 0;
   let thinkWord = pickWord(); // playful word shown UNDER the in-progress line (flavor)
+  let lastWordBucket = -1; // 12s window index → rotate the word once per window (task: 30-spinner)
   let almostDone = false; // set from the worker's "…almost completed thinking…" heartbeat
   let runningCmd = null; // the command currently executing (from a "Running → …" event)
   // The model's CURRENT Thought (task #64): while it streams its reasoning inside the
@@ -1042,10 +1057,20 @@ async function runAgentTurn(history) {
     // silent once any of THIS line has already been shown (see carryFlushedLen).
     if (plainReplyFlow && carryFlushedLen > 0) return;
     // Count from when this phase went quiet, so the seconds reflect the current wait/run.
-    if (!thinking) { thinking = true; thinkingSince = lastContentAt; thinkWord = pickWord(); }
+    if (!thinking) {
+      thinking = true; thinkingSince = lastContentAt; thinkWord = pickWord(); lastWordBucket = 0;
+    }
+    const now = Date.now();
     const secs = thinkSecs();
-    if (secs % 12 === 0) thinkWord = pickWord(); // rotate the word on long waits
-    const glyph = SPINNER[secs % SPINNER.length]; // rotates → reads as "in progress"
+    // Rotate the playful word once per 12s window (guarded so the fast ticker doesn't
+    // re-roll it many times within the same second).
+    const wordBucket = Math.floor((now - thinkingSince) / 12000);
+    if (wordBucket !== lastWordBucket) { lastWordBucket = wordBucket; thinkWord = pickWord(); }
+    // Spinner: STYLE rotates ~every 8s, FRAME advances ~every 120ms, color cycles ~every
+    // 2.5s — all off the wall clock so they keep moving smoothly across phases.
+    const frames = SPINNERS[Math.floor(now / 8000) % SPINNERS.length];
+    const glyph = frames[Math.floor(now / 120) % frames.length];
+    const wc = WAIT_COLORS_256[Math.floor(now / 2500) % WAIT_COLORS_256.length];
     // Line 1 = WHAT is happening now: the running command, else the phase (Thinking /
     // Almost done). Line 2 = the playful word (flavor). Truncate so neither wraps.
     // Priority: a live command > the model's current Thought clause (task #64, so a
@@ -1057,12 +1082,17 @@ async function runAgentTurn(history) {
     const max = Math.max(24, (process.stdout.columns || 80) - 14);
     const fit = (s) => (s.length > max ? s.slice(0, max - 1) + "…" : s);
     clearStatus();
+    // Line 1: cycling-color spinner + yellow phase/seconds. Line 2: the word in the same
+    // cycling color (the web colors the spinner + word together; primary stays the theme).
     process.stdout.write(
-      yellow(`${glyph} ${fit(primary)}… (${secs}s)`) + "\n" + dim(`  ${thinkWord}…`)
+      `${color256(wc, glyph)} ${yellow(`${fit(primary)}… (${secs}s)`)}` +
+        "\n" + color256(wc, `  ${thinkWord}…`)
     );
     statusShown = true;
   };
-  const ticker = setInterval(tick, 1000);
+  // 120ms so the spinner animates smoothly (the frame math above uses the wall clock, so
+  // seconds still tick once/sec). Only redraws when the model has gone quiet >QUIET_MS.
+  const ticker = setInterval(tick, 120);
 
   // Called right before any real (bullet/edit-card/answer) content prints: drop the
   // status lines so content lands cleanly, and end the current phase (so the next phase's

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiens.nguyen/gonext-local-worker",
-  "version": "1.0.239",
+  "version": "1.0.241",
   "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",