0agent 1.0.35 → 1.0.37

package/bin/chat.js

@@ -39,6 +39,18 @@ class Spinner {
     if (clearIt) 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.
+   */
+  pauseFor(fn) {
+    const wasActive = this._active;
+    const savedMsg  = this._msg;
+    if (wasActive) this.stop(true);
+    fn();
+    if (wasActive) this.start(savedMsg);
+  }
 }
 
 // ─── ANSI helpers ─────────────────────────────────────────────────────────────
@@ -124,6 +136,8 @@ function getCurrentProvider(cfg) {
 // ─── State ────────────────────────────────────────────────────────────────────
 let cfg         = loadConfig();
 let sessionId      = null;
+const messageQueue = [];       // queued tasks while session is running
+let lastFailedTask = null;     // for retry-on-abort
 let streaming      = false;
 let ws             = null;
 let wsReady        = false;
@@ -280,13 +294,34 @@ function handleWsEvent(event) {
       confirmServer(r, lineBuffer);
       lineBuffer = '';
       if (pendingResolve) { pendingResolve(); pendingResolve = null; }
-      rl.prompt();
+      sessionId = null;
+      // auto-drain queued messages
+      drainQueue();
       break;
     }
     case 'session.failed': {
       spinner.stop();
       if (streaming) { process.stdout.write('\n'); streaming = false; }
+      const isAbort = /aborted|timeout|AbortError/i.test(event.error ?? '');
       console.log(`\n  ${fmt(C.red, '✗')} ${event.error}\n`);
+      // Offer retry if it was a timeout/abort
+      if (isAbort && event.task) {
+        lastFailedTask = event.task;
+        process.stdout.write(`  ${fmt(C.yellow, '↺')} Retry this task? ${fmt(C.bold, '[y/N]')} `);
+        process.stdin.once('data', async (buf) => {
+          const ans = buf.toString().trim().toLowerCase();
+          process.stdout.write(ans + '\n');
+          if (ans === 'y' && lastFailedTask) {
+            messageQueue.unshift(lastFailedTask); // put at front of queue
+            lastFailedTask = null;
+          }
+          const resolve_ = pendingResolve;
+          pendingResolve = null; sessionId = null;
+          resolve_?.();
+          await drainQueue();
+        });
+        return; // don't fall through to pendingResolve below
+      }
       lineBuffer = '';
       if (pendingResolve) { pendingResolve(); pendingResolve = null; }
       rl.prompt();
@@ -348,7 +383,9 @@ async function runTask(input) {
     });
     const s = await res.json();
     sessionId = s.session_id ?? s.id;
-    spinner.start('Thinking');  // show immediately after session created
+    // 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');
 
     // Polling fallback — runs concurrently with WS events.
     // Catches completion when WS is disconnected (e.g. daemon just restarted).
@@ -402,8 +439,8 @@ async function runTask(input) {
           const resolve_ = pendingResolve;
           pendingResolve = null;
           sessionId = null;
-          resolve_();
-          rl.prompt();
+          resolve_?.();
+          drainQueue(); // auto-process queued messages
         }
       } catch {}
     }, 800);
@@ -505,6 +542,37 @@ async function handleCommand(input) {
     }
 
     // /status
+    // /update — check for updates and install immediately
+    case '/update': {
+      process.stdout.write(`  ${fmt(C.dim, 'Checking for updates...')}\n`);
+      try {
+        const pkgPath = resolve(new URL(import.meta.url).pathname, '..', '..', 'package.json');
+        const currentVersion = existsSync(pkgPath)
+          ? JSON.parse(readFileSync(pkgPath, 'utf8')).version
+          : '?';
+        const reg = await fetch('https://registry.npmjs.org/0agent/latest', {
+          signal: AbortSignal.timeout(5000),
+        }).then(r => r.json()).catch(() => null);
+        const latest = reg?.version;
+        if (!latest) { console.log(`  ${fmt(C.yellow, '⚠')} Could not reach npm registry\n`); break; }
+        if (!isNewerVersion(latest, currentVersion)) {
+          console.log(`  ${fmt(C.green, '✓')} Already on latest (${currentVersion})\n`);
+          break;
+        }
+        console.log(`  ${fmt(C.cyan, '↑')} Updating ${currentVersion} → ${latest}...`);
+        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();
+      } catch (e) {
+        console.log(`  ${fmt(C.red, '✗')} Update failed: ${e.message}\n`);
+      }
+      break;
+    }
+
     case '/status': {
       try {
         const h = await fetch(`${BASE_URL}/api/health`).then(r => r.json());
@@ -843,20 +911,53 @@ function isNewerVersion(a, b) {
 }
 
 
-rl.on('line', async (input) => {
-  const line = input.trim();
-  if (!line) { rl.prompt(); return; }
+// ─── Message queue + serial executor ─────────────────────────────────────────
 
-  if (line.startsWith('/') || ['/model','/key','/status','/skills','/graph','/clear','/help','/schedule'].some(c => line.startsWith(c))) {
+const COMMAND_PREFIXES = ['/model','/key','/status','/skills','/graph','/clear','/help','/schedule','/update'];
+
+async function executeInput(line) {
+  const isCmd = line.startsWith('/') || COMMAND_PREFIXES.some(c => line.startsWith(c));
+  if (isCmd) {
     await handleCommand(line);
-    rl.prompt();
   } else {
+    lastFailedTask = null;
     await runTask(line);
-    // runTask resolves when session completes (via WS or polling fallback)
-    // rl.prompt() may already have been called by the handler that resolved it,
-    // but calling it again is a safe no-op if readline is already prompting
-    if (!streaming) rl.prompt();
   }
+  // After this input completes, drain the queue
+  await drainQueue();
+}
+
+async function drainQueue() {
+  if (messageQueue.length === 0) { if (!streaming) rl.prompt(); return; }
+  const next = messageQueue.shift();
+  if (messageQueue.length > 0) {
+    console.log(`  ${fmt(C.dim, `[${messageQueue.length} more in queue]`)}`);
+  }
+  await executeInput(next);
+}
+
+rl.on('line', async (input) => {
+  const line = input.trim();
+  if (!line) { rl.prompt(); return; }
+
+  // If a session is already running, queue the message.
+  // pauseFor() stops the spinner briefly so the user can see the confirmation,
+  // then resumes — prevents spinner from overwriting their typed text.
+  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`);
+      }
+    });
+    return;
+  }
+
+  await executeInput(line);
 });
 
 rl.on('close', () => {

package/dist/daemon.mjs

@@ -2617,11 +2617,12 @@ var init_capabilities = __esm({
 import { spawn as spawn2 } from "node:child_process";
 import { writeFileSync as writeFileSync2, readFileSync as readFileSync3, readdirSync as readdirSync2, mkdirSync as mkdirSync2, existsSync as existsSync3 } from "node:fs";
 import { resolve as resolve3, dirname as dirname2, relative } from "node:path";
-var AgentExecutor;
+var SELF_MOD_PATTERN, AgentExecutor;
 var init_AgentExecutor = __esm({
   "packages/daemon/src/AgentExecutor.ts"() {
     "use strict";
     init_capabilities();
+    SELF_MOD_PATTERN = /\b(yourself|the agent|this agent|this cli|0agent|your code|your source|agent cli|improve.*agent|update.*agent|add.*to.*agent|fix.*agent|self.?improv)\b/i;
     AgentExecutor = class {
       constructor(llm, config, onStep, onToken) {
         this.llm = llm;
@@ -2631,21 +2632,28 @@ var init_AgentExecutor = __esm({
         this.cwd = config.cwd;
         this.maxIterations = config.max_iterations ?? 20;
         this.maxCommandMs = config.max_command_ms ?? 3e4;
+        this.agentRoot = config.agent_root;
         this.registry = new CapabilityRegistry();
       }
       cwd;
       maxIterations;
       maxCommandMs;
       registry;
+      agentRoot;
       async execute(task, systemContext) {
         const filesWritten = [];
         const commandsRun = [];
         let totalTokens = 0;
         let modelName = "";
-        const systemPrompt = this.buildSystemPrompt(systemContext);
+        const isSelfMod = this.isSelfModTask(task);
+        const systemPrompt = this.buildSystemPrompt(systemContext, task);
         const messages = [
           { role: "user", content: task }
         ];
+        if (isSelfMod) {
+          this.maxIterations = Math.max(this.maxIterations, 30);
+          this.onStep("Self-modification mode \u2014 reading source files\u2026");
+        }
         let finalOutput = "";
         for (let i = 0; i < this.maxIterations; i++) {
           this.onStep(i === 0 ? "Thinking\u2026" : "Continuing\u2026");
@@ -2879,7 +2887,8 @@ content = element.text if element else page.get_all_text()` : `content = page.ge
         const resolved = resolve3(this.cwd, p);
         return resolved.startsWith(this.cwd) ? resolved : null;
       }
-      buildSystemPrompt(extra) {
+      buildSystemPrompt(extra, task) {
+        const isSelfMod = !!(task && SELF_MOD_PATTERN.test(task));
         const lines = [
           `You are 0agent, an AI software engineer. You can execute shell commands and manage files.`,
           `Working directory: ${this.cwd}`,
@@ -2889,7 +2898,6 @@ content = element.text if element else page.get_all_text()` : `content = page.ge
           `- For web servers/background processes: ALWAYS redirect output to avoid hanging:`,
           `  cmd > /tmp/0agent-server.log 2>&1 &`,
           `  Example: python3 -m http.server 3000 > /tmp/0agent-server.log 2>&1 &`,
-          `  Example: node server.js > /tmp/0agent-server.log 2>&1 &`,
           `  NEVER run background commands without redirecting output.`,
           `- For npm/node projects: check package.json first with read_file or list_dir`,
           `- After write_file, verify with read_file if needed`,
@@ -2898,9 +2906,39 @@ content = element.text if element else page.get_all_text()` : `content = page.ge
           `- Use relative paths from the working directory`,
           `- Be concise in your final response: state what was done and where to find it`
         ];
+        if (isSelfMod && this.agentRoot) {
+          lines.push(
+            ``,
+            `\u2550\u2550\u2550 SELF-MODIFICATION MODE \u2550\u2550\u2550`,
+            `You are being asked to improve YOUR OWN SOURCE CODE.`,
+            ``,
+            `Your source is at: ${this.agentRoot}`,
+            `Key files (edit THESE, not dist/):`,
+            `  ${this.agentRoot}/bin/chat.js                    \u2190 the chat TUI you are running in`,
+            `  ${this.agentRoot}/bin/0agent.js                  \u2190 CLI entry point`,
+            `  ${this.agentRoot}/packages/daemon/src/           \u2190 daemon source`,
+            `  ${this.agentRoot}/packages/daemon/src/capabilities/ \u2190 tools (shell, browser, etc.)`,
+            ``,
+            `\u26A0 CRITICAL TOKEN LIMIT RULES:`,
+            `  - Use shell_exec("head -100 FILE") or ("sed -n '50,100p' FILE") to read SECTIONS of files`,
+            `  - NEVER cat an entire source file \u2014 they are thousands of lines`,
+            `  - Read only the function/section you need to modify`,
+            `  - When writing changes, write ONLY the modified function/section, not the entire file`,
+            `  - Use shell_exec("grep -n 'functionName' FILE") to find the right line numbers first`,
+            ``,
+            `After making changes:`,
+            `  1. cd ${this.agentRoot} && node scripts/bundle.mjs`,
+            `  2. pkill -f "daemon.mjs"`,
+            `\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550`
+          );
+        }
         if (extra) lines.push(``, `Context:`, extra);
         return lines.join("\n");
       }
+      /** Returns true if task is a self-modification request. Self-mod tasks get longer LLM timeouts. */
+      isSelfModTask(task) {
+        return SELF_MOD_PATTERN.test(task);
+      }
       summariseInput(toolName, input) {
         if (toolName === "shell_exec") return `"${String(input.command ?? "").slice(0, 60)}"`;
         if (toolName === "write_file") return `"${input.path}"`;
@@ -3489,7 +3527,7 @@ var init_ProactiveSurface = __esm({
 
 // packages/daemon/src/ZeroAgentDaemon.ts
 init_src();
-import { writeFileSync as writeFileSync8, unlinkSync as unlinkSync2, existsSync as existsSync14, mkdirSync as mkdirSync6 } from "node:fs";
+import { writeFileSync as writeFileSync8, unlinkSync as unlinkSync2, existsSync as existsSync14, mkdirSync as mkdirSync6, readFileSync as readFileSync14 } from "node:fs";
 import { resolve as resolve13 } from "node:path";
 import { homedir as homedir8 } from "node:os";
 
@@ -3793,7 +3831,7 @@ var LLMExecutor = class {
         "anthropic-version": "2023-06-01"
       },
       body: JSON.stringify(body),
-      signal: AbortSignal.timeout(6e4)
+      signal: AbortSignal.timeout(12e4)
       // 60s timeout
     });
     if (!res.ok) {
@@ -3918,7 +3956,7 @@ var LLMExecutor = class {
         "Authorization": `Bearer ${this.config.api_key}`
       },
       body: JSON.stringify(body),
-      signal: AbortSignal.timeout(6e4)
+      signal: AbortSignal.timeout(12e4)
     });
     if (!res.ok) {
       const err = await res.text();
@@ -4347,6 +4385,7 @@ var SessionManager = class {
   conversationStore;
   weightUpdater;
   anthropicFetcher = new AnthropicSkillFetcher();
+  agentRoot;
   constructor(deps = {}) {
     this.inferenceEngine = deps.inferenceEngine;
     this.eventBus = deps.eventBus;
@@ -4355,6 +4394,7 @@ var SessionManager = class {
     this.cwd = deps.cwd ?? process.cwd();
     this.identity = deps.identity;
     this.projectContext = deps.projectContext;
+    this.agentRoot = deps.agentRoot;
     if (deps.adapter) {
       this.conversationStore = new ConversationStore(deps.adapter);
       this.conversationStore.init();
@@ -4557,7 +4597,7 @@ var SessionManager = class {
       if (activeLLM?.isConfigured) {
         const executor = new AgentExecutor(
           activeLLM,
-          { cwd: this.cwd },
+          { cwd: this.cwd, agent_root: this.agentRoot },
           // step callback → emit session.step events
           (step) => this.addStep(sessionId, step),
           // token callback → emit session.token events
@@ -4589,7 +4629,7 @@ Current task:`;
           const { SelfHealLoop: SelfHealLoop2 } = await Promise.resolve().then(() => (init_SelfHealLoop(), SelfHealLoop_exports));
           const healLoop = new SelfHealLoop2(
             activeLLM,
-            { cwd: this.cwd },
+            { cwd: this.cwd, agent_root: this.agentRoot },
             (step) => this.addStep(sessionId, step),
             (token) => this.emit({ type: "session.token", session_id: sessionId, token })
           );
@@ -6760,6 +6800,8 @@ var CodespaceManager = class {
 
 // packages/daemon/src/ZeroAgentDaemon.ts
 init_RuntimeSelfHeal();
+import { fileURLToPath as fileURLToPath3 } from "node:url";
+import { dirname as dirname6 } from "node:path";
 var ZeroAgentDaemon = class {
   config = null;
   adapter = null;
@@ -6845,6 +6887,14 @@ var ZeroAgentDaemon = class {
     if (teams.length > 0) {
       console.log(`[0agent] Teams: ${teams.map((t) => t.team_name).join(", ")}`);
     }
+    const _daemonFile = fileURLToPath3(import.meta.url);
+    const _agentRoot = resolve13(dirname6(_daemonFile), "..");
+    let agentRoot;
+    try {
+      const _pkg = JSON.parse(readFileSync14(resolve13(_agentRoot, "package.json"), "utf8"));
+      if (_pkg.name === "0agent") agentRoot = _agentRoot;
+    } catch {
+    }
     this.eventBus = new WebSocketEventBus();
     this.sessionManager = new SessionManager({
       inferenceEngine: this.inferenceEngine,
@@ -6854,8 +6904,9 @@ var ZeroAgentDaemon = class {
       cwd,
       identity: identity ?? void 0,
       projectContext: projectContext ?? void 0,
-      adapter: this.adapter
-      // enables ConversationStore + weight feedback
+      adapter: this.adapter,
+      agentRoot
+      // agent source path — self-improvement tasks read the right files
     });
     const teamSync = identity && teams.length > 0 ? new TeamSync(teamManager, this.adapter, identity.entity_node_id) : null;
     if (this.githubMemorySync) {

package/package.json

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