0agent 1.0.37 → 1.0.39

package/bin/chat.js

@@ -23,33 +23,64 @@ class Spinner {
     this._msg = msg;
     this._frames = ['⠋','⠙','⠹','⠸','⠼','⠴','⠦','⠧','⠇','⠏'];
     this._i = 0; this._timer = null; this._active = false;
+    this._sessionMode = false; // true during agent sessions — no \r animation
   }
+
+  // Animated spinner — safe only at startup when user cannot type yet.
+  // Uses \r which conflicts with readline when user is typing.
   start(msg) {
     if (this._active) return;
     if (msg) this._msg = msg;
     this._active = true;
+    this._sessionMode = false;
     this._timer = setInterval(() => {
       process.stdout.write(`\r  \x1b[36m${this._frames[this._i++ % this._frames.length]}\x1b[0m \x1b[2m${this._msg}\x1b[0m  `);
     }, 80);
   }
+
+  // Session mode — prints a one-time static status line, NO \r animation.
+  // readline owns the cursor; call rl.prompt(true) after this to show › .
+  startSession(msg) {
+    if (this._active) return;
+    if (msg) this._msg = msg;
+    this._active = true;
+    this._sessionMode = true;
+    process.stdout.write(`  \x1b[2m⠋ ${this._msg}...\x1b[0m\n`);
+  }
+
   update(msg) { this._msg = msg; }
+
   stop(clearIt = true) {
     if (!this._active) return;
-    clearInterval(this._timer); this._timer = null; this._active = false;
-    if (clearIt) process.stdout.write('\r\x1b[2K');
+    if (this._timer) { clearInterval(this._timer); this._timer = null; }
+    const wasSession = this._sessionMode;
+    this._active = false;
+    this._sessionMode = false;
+    // Only clear the \r-based animation line; session mode output flows naturally
+    if (clearIt && !wasSession) {
+      process.stdout.write('\r\x1b[2K');
+    }
   }
+
   get active() { return this._active; }
 
-  /**
-   * Pause spinner, run fn() (which may print lines), then resume.
-   * Prevents spinner from overwriting printed content.
-   */
+  // Pause to print something cleanly, then resume.
   pauseFor(fn) {
-    const wasActive = this._active;
-    const savedMsg  = this._msg;
-    if (wasActive) this.stop(true);
+    const wasActive  = this._active;
+    const wasSession = this._sessionMode;
+    const savedMsg   = this._msg;
+    this.stop(!wasSession); // clear animated spinner; session mode: just deactivate
     fn();
-    if (wasActive) this.start(savedMsg);
+    if (wasActive) {
+      if (wasSession) {
+        // Re-mark active without printing again — readline is showing the prompt
+        this._active = true;
+        this._sessionMode = true;
+        this._msg = savedMsg;
+      } else {
+        this.start(savedMsg);
+      }
+    }
   }
 }
 
@@ -192,13 +223,20 @@ function handleWsEvent(event) {
     case 'session.step': {
       spinner.stop();
       if (streaming) { process.stdout.write('\n'); streaming = false; }
+      // Clear current readline line, print step, then restore › prompt
+      process.stdout.write('\r\x1b[2K');
       console.log(`  ${fmt(C.dim, '›')} ${event.step}`);
-      spinner.start(event.step.slice(0, 50));  // resume with current step label
+      spinner.startSession(event.step.slice(0, 50));
+      rl.prompt(true); // restore › so user can keep typing
       break;
     }
     case 'session.token': {
       spinner.stop();
-      if (!streaming) { process.stdout.write('\n  '); streaming = true; }
+      if (!streaming) {
+        // Clear › prompt line before streaming response
+        process.stdout.write('\r\x1b[2K\n  ');
+        streaming = true;
+      }
       process.stdout.write(event.token);
       lineBuffer += event.token;
       break;
@@ -383,9 +421,10 @@ async function runTask(input) {
     });
     const s = await res.json();
     sessionId = s.session_id ?? s.id;
-    // Show affordance so user knows they can queue messages while agent works
-    process.stdout.write(`\n  \x1b[2m(type and press Enter to queue next message)\x1b[0m\n`);
-    spinner.start('Thinking');
+    // Start session-mode status (no \r animation) then restore › so user can type
+    process.stdout.write('\n');
+    spinner.startSession('Thinking');
+    rl.prompt(true); // keep › visible — user can queue next message while agent works
 
     // Polling fallback — runs concurrently with WS events.
     // Catches completion when WS is disconnected (e.g. daemon just restarted).
@@ -416,8 +455,10 @@ async function runTask(input) {
         const steps = session.steps ?? [];
         for (let j = lastPolledStep; j < steps.length; j++) {
           spinner.stop();
+          process.stdout.write('\r\x1b[2K');
           console.log(`  \x1b[2m›\x1b[0m ${steps[j].description}`);
-          spinner.start(steps[j].description.slice(0, 50));
+          spinner.startSession(steps[j].description.slice(0, 50));
+          rl.prompt(true);
         }
         lastPolledStep = steps.length;
 
@@ -563,10 +604,7 @@ async function handleCommand(input) {
         const { execSync: exs } = await import('node:child_process');
         exs('npm install -g 0agent@latest --silent', { stdio: 'ignore', timeout: 120_000 });
         process.stdout.write(`  ${fmt(C.green, '✓')} Updated to ${latest} — restarting...\n\n`);
-        const { spawn: sp } = await import('node:child_process');
-        const child = sp(process.argv[0], process.argv.slice(1), { stdio: 'inherit' });
-        child.on('close', (code) => process.exit(code ?? 0));
-        process.stdin.pause();
+        await restartWithLatest();
       } catch (e) {
         console.log(`  ${fmt(C.red, '✗')} Update failed: ${e.message}\n`);
       }
@@ -887,11 +925,7 @@ async function _safeJsonFetch(url, opts) {
       exs('npm install -g 0agent@latest --silent', { stdio: 'ignore', timeout: 120_000 });
       process.stdout.write(`  ${fmt(C.green, '✓')} Updated to ${latest} — restarting...\n\n`);
 
-      // Restart cleanly
-      const { spawn: sp } = await import('node:child_process');
-      const child = sp(process.argv[0], process.argv.slice(1), { stdio: 'inherit' });
-      child.on('close', (code) => process.exit(code ?? 0));
-      process.stdin.pause();
+      await restartWithLatest();
     } catch {
       // Non-fatal — update failure never crashes the agent
     }
@@ -900,6 +934,35 @@ async function _safeJsonFetch(url, opts) {
   rl.prompt();
 })();
 
+// Restart using the GLOBAL install, not the npx cache that's currently running.
+// After `npm install -g 0agent@latest`, the new binary is in npm's global bin dir.
+// Using process.argv would re-run the OLD npx-cached file → infinite loop.
+async function restartWithLatest() {
+  try {
+    const { execSync: ex } = await import('node:child_process');
+    const { resolve: res } = await import('node:path');
+    const { existsSync: ef } = await import('node:fs');
+    const { spawn: sp } = await import('node:child_process');
+
+    // Find the global npm bin directory (e.g. ~/.nvm/.../bin or /usr/local/bin)
+    const globalBin = ex('npm bin -g 2>/dev/null || true', { encoding: 'utf8' }).trim().split('\n')[0];
+    const newBin = globalBin ? res(globalBin, '0agent') : null;
+
+    let child;
+    if (newBin && ef(newBin)) {
+      // Run the freshly installed global script
+      child = sp(process.execPath, [newBin], { stdio: 'inherit' });
+    } else {
+      // Fallback: let the shell find 0agent in PATH
+      child = sp('0agent', [], { stdio: 'inherit', shell: true });
+    }
+    child.on('close', (code) => process.exit(code ?? 0));
+    process.stdin.pause();
+  } catch {
+    process.exit(0); // just exit; user can re-open
+  }
+}
+
 function isNewerVersion(a, b) {
   const pa = a.split('.').map(Number);
   const pb = b.split('.').map(Number);
@@ -946,14 +1009,16 @@ rl.on('line', async (input) => {
   if (pendingResolve) {
     messageQueue.push(line);
     const qLen = messageQueue.length;
-    spinner.pauseFor(() => {
-      process.stdout.write(
-        `  ${fmt(C.magenta, '↳')} ${fmt(C.bold, `[queued #${qLen}]`)} ${fmt(C.dim, line.slice(0, 70))}\n`
-      );
-      if (qLen > 1) {
-        process.stdout.write(`  ${fmt(C.dim, `${qLen} tasks waiting`)}\n`);
-      }
-    });
+    // No spinner.pauseFor() needed — session mode has no \r animation
+    // Just print the queued confirmation and restore the › prompt
+    process.stdout.write('\r\x1b[2K');
+    process.stdout.write(
+      `  ${fmt(C.magenta, '↳')} ${fmt(C.bold, `[queued #${qLen}]`)} ${fmt(C.dim, line.slice(0, 70))}\n`
+    );
+    if (qLen > 1) {
+      process.stdout.write(`  ${fmt(C.dim, `${qLen} tasks waiting`)}\n`);
+    }
+    rl.prompt(true); // keep › visible
     return;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "0agent",
-  "version": "1.0.37",
+  "version": "1.0.39",
   "description": "A persistent, learning AI agent that runs on your machine. An agent that learns.",
   "private": false,
   "license": "Apache-2.0",