groove-dev 0.27.186 → 0.27.188

package/packages/daemon/src/watcher.js

@@ -2,36 +2,52 @@
 
 import { spawn } from 'child_process';
 import { randomUUID } from 'crypto';
+import {
+  mkdirSync, writeFileSync, readFileSync, existsSync, rmSync,
+  openSync, readSync, fstatSync, closeSync,
+} from 'fs';
+import { resolve } from 'path';
 import { deliverInstruction } from './deliver.js';
 
 // Watches are bounded so a wedged process or a condition that never comes true
 // can't poll forever or hold a slot indefinitely.
 const DEFAULT_TIMEOUT_MS = 30 * 60 * 1000;
-const MAX_TIMEOUT_MS = 6 * 60 * 60 * 1000;
+const MAX_TIMEOUT_MS = 24 * 60 * 60 * 1000; // training can run for hours
 const DEFAULT_POLL_MS = 15 * 1000;
 const MIN_POLL_MS = 3 * 1000;
+// Command mode just stats a sentinel file — nearly free, so poll it fast for a
+// responsive wake. `until` mode spawns a shell each tick, hence the slower floor.
+const COMMAND_POLL_MS = 500;
 const MAX_WATCHES_PER_AGENT = 5;
 const OUTPUT_TAIL = 4000;
+const HISTORY_TTL_MS = 24 * 60 * 60 * 1000; // prune finished watches after a day
 
 /**
- * Wake-on-completion for agents.
+ * Wake-on-completion for agents — durable across daemon restarts.
  *
- * An agent promises to "report back when the tests finish", but its process
- * ends when the turn does — so nothing is left to report. A Watch lives in the
- * daemon, not the agent's session: it outlives the turn, and when its target
- * finishes it resumes the agent (from `completed` if need be, via the same
- * pipe as user chat) with the outcome.
+ * An agent promises to "report back when the training finishes", but its
+ * process ends when the turn does, so nothing is left to report. A Watch lives
+ * in the daemon, not the agent's session: it outlives the turn, and when its
+ * target finishes it resumes the agent (from `completed` if need be, via the
+ * same pipe as user chat) with the outcome.
  *
- * Two flavours:
- *   - command: the daemon runs a command detached and owns its lifecycle, so
- *     it has the real exit code and output when it finishes.
- *   - until:   the daemon polls a check command for something already running,
- *     and wakes the agent when the check first succeeds (exit 0).
+ * Crucially, watches survive a daemon restart. They are persisted to disk, and:
+ *   - command: the daemon launches the command DETACHED, redirecting output to
+ *     a file and writing its exit code to a sentinel file when it finishes. The
+ *     job keeps running if the daemon dies; on restart the watcher re-polls the
+ *     sentinel and fires when it appears. This is what makes "launch a training,
+ *     get notified when done" reliable even if the harness restarts underneath.
+ *   - until: the daemon polls a check command for something already running and
+ *     wakes the agent when the check first succeeds (exit 0). Re-polled on
+ *     restart the same way.
  */
 export class Watcher {
   constructor(daemon) {
     this.daemon = daemon;
     this.watches = new Map();
+    this.runsDir = resolve(daemon.grooveDir, 'watch-runs');
+    this.persistPath = resolve(daemon.grooveDir, 'watches.json');
+    try { mkdirSync(this.runsDir, { recursive: true }); } catch { /* exists */ }
   }
 
   create(agentId, opts = {}) {
@@ -61,84 +77,109 @@ export class Watcher {
       timeoutMs,
       status: 'active',
       createdAt: Date.now(),
-      _child: null,
-      _poll: null,
-      _deadline: null,
+      // populated for command mode:
+      pid: null, outFile: null, statusFile: null,
+      // runtime-only (never persisted):
+      _poll: null, _deadline: null,
     };
 
     this.watches.set(watch.id, watch);
-    watch._deadline = setTimeout(() => this._fireTimeout(watch), timeoutMs);
-    if (watch.mode === 'command') this._runCommand(watch);
-    else this._startPolling(watch);
+    if (watch.mode === 'command') this._launchDetached(watch);
+    this._arm(watch);
+    this._persist();
 
     this.daemon.audit?.log('watch.create', { id: watch.id, agent: agentId, mode: watch.mode });
     this.daemon.broadcast?.({ type: 'watch:created', data: this._public(watch) });
     return this._public(watch);
   }
 
-  // ── command mode: daemon owns the process ─────────────────────
-
-  _runCommand(watch) {
-    const child = spawn('/bin/sh', ['-c', watch.command], {
-      cwd: watch.cwd,
-      env: process.env,
-      detached: false,
-    });
-    watch._child = child;
+  // Start the timers for an active watch (used on both create and restore).
+  _arm(watch) {
+    // On restore the deadline may already be in the past — fire promptly rather
+    // than negative. The floor only guards against a 0/negative timer.
+    const remaining = Math.max(50, watch.timeoutMs - (Date.now() - watch.createdAt));
+    watch._deadline = setTimeout(() => this._fireTimeout(watch), remaining);
+    const interval = watch.mode === 'command' ? COMMAND_POLL_MS : watch.pollMs;
+    watch._poll = setInterval(() => this._tick(watch), interval);
+    // Check immediately — the job may have finished while the daemon was down,
+    // or the `until` condition may already hold.
+    this._tick(watch);
+  }
 
-    const chunks = [];
-    let bytes = 0;
-    const collect = (buf) => {
-      // Keep only the tail — a chatty build shouldn't grow this unbounded.
-      chunks.push(buf);
-      bytes += buf.length;
-      while (bytes > OUTPUT_TAIL * 2 && chunks.length > 1) bytes -= chunks.shift().length;
-    };
-    child.stdout?.on('data', collect);
-    child.stderr?.on('data', collect);
+  // ── command mode: detached job + exit sentinel ────────────────
+
+  _launchDetached(watch) {
+    const dir = resolve(this.runsDir, watch.id);
+    mkdirSync(dir, { recursive: true });
+    watch.outFile = resolve(dir, 'out.log');
+    watch.statusFile = resolve(dir, 'exit');
+    const scriptFile = resolve(dir, 'run.sh');
+
+    // Run the command in a SUBSHELL so its own `exit N` can't kill the wrapper
+    // before the sentinel is written; tee output to a file, then atomically
+    // publish the exit code so the poller never sees a half-written value.
+    const script = [
+      '#!/bin/sh',
+      '(',
+      watch.command,
+      `) > ${shq(watch.outFile)} 2>&1`,
+      `echo $? > ${shq(watch.statusFile)}.tmp && mv ${shq(watch.statusFile)}.tmp ${shq(watch.statusFile)}`,
+      '',
+    ].join('\n');
+    writeFileSync(scriptFile, script, { mode: 0o700 });
 
-    child.on('error', (err) => {
-      this._wake(watch, {
-        outcome: 'error',
-        summary: `Could not start the command: ${err.message}`,
+    try {
+      const child = spawn('/bin/sh', [scriptFile], {
+        cwd: watch.cwd,
+        env: process.env,
+        detached: true,      // survive daemon exit
+        stdio: 'ignore',
       });
-    });
+      child.unref();
+      watch.pid = child.pid;
+    } catch (err) {
+      // Fire synchronously via the poller path so the agent still hears about it.
+      watch._launchError = `Could not start the command: ${err.message}`;
+    }
+  }
+
+  // One poll iteration — checks for completion (sentinel for command mode, the
+  // `until` command for until mode) and wakes the agent when it's met.
+  _tick(watch) {
+    if (watch.status !== 'active') return;
+
+    if (watch._launchError) {
+      this._wake(watch, { outcome: 'error', summary: watch._launchError });
+      return;
+    }
 
-    child.on('close', (code, signal) => {
-      if (watch.status !== 'active') return; // already timed out / cancelled
-      const output = Buffer.concat(chunks).toString('utf8').slice(-OUTPUT_TAIL).trim();
+    if (watch.mode === 'command') {
+      if (!existsSync(watch.statusFile)) return; // still running
+      let code = null;
+      try { code = parseInt(readFileSync(watch.statusFile, 'utf8').trim(), 10); } catch { return; }
+      if (Number.isNaN(code)) return;
       this._wake(watch, {
         outcome: code === 0 ? 'success' : 'failure',
         exitCode: code,
-        signal,
-        summary: signal
-          ? `Terminated by signal ${signal}.`
-          : `Finished with exit code ${code}.`,
-        output,
+        summary: `Finished with exit code ${code}.`,
+        output: tailFile(watch.outFile, OUTPUT_TAIL),
       });
-    });
-  }
-
-  // ── until mode: poll something already running ────────────────
+      return;
+    }
 
-  _startPolling(watch) {
-    const tick = () => {
+    // until mode — run the check command; exit 0 means the condition holds.
+    const check = spawn('/bin/sh', ['-c', watch.until], { cwd: watch.cwd, env: process.env });
+    const chunks = [];
+    check.stdout?.on('data', (b) => chunks.push(b));
+    check.stderr?.on('data', (b) => chunks.push(b));
+    check.on('error', () => { /* transient — try again next tick */ });
+    check.on('close', (code) => {
       if (watch.status !== 'active') return;
-      const check = spawn('/bin/sh', ['-c', watch.until], { cwd: watch.cwd, env: process.env });
-      const chunks = [];
-      check.stdout?.on('data', (b) => chunks.push(b));
-      check.stderr?.on('data', (b) => chunks.push(b));
-      check.on('error', () => { /* transient — try again next tick */ });
-      check.on('close', (code) => {
-        if (watch.status !== 'active') return;
-        if (code === 0) {
-          const output = Buffer.concat(chunks).toString('utf8').slice(-OUTPUT_TAIL).trim();
-          this._wake(watch, { outcome: 'success', summary: 'Your watch condition is now true.', output });
-        }
-      });
-    };
-    watch._poll = setInterval(tick, watch.pollMs);
-    tick(); // check immediately — the condition may already hold
+      if (code === 0) {
+        const output = Buffer.concat(chunks).toString('utf8').slice(-OUTPUT_TAIL).trim();
+        this._wake(watch, { outcome: 'success', summary: 'Your watch condition is now true.', output });
+      }
+    });
   }
 
   // ── firing ────────────────────────────────────────────────────
@@ -157,34 +198,33 @@ export class Watcher {
     watch.status = 'fired';
     watch.firedAt = Date.now();
     watch.result = result;
-    this._cleanup(watch);
+    this._disarm(watch);
 
     const message = this._composeMessage(watch, result);
 
-    // Resolve by name, not the id we stored at creation: over a 30-minute
-    // watch the agent has very likely been chatted with and rotated to a new
-    // id. Names are stable across rotation, so this follows the agent; a
-    // purged/gone agent simply doesn't resolve and the watch is undeliverable
-    // rather than resurrecting a killed agent under a stale id.
+    // Resolve by name, not the id stored at creation: over a long watch the
+    // agent has very likely been chatted with and rotated to a new id. Names
+    // are stable across rotation, so this follows the agent; a purged agent
+    // simply doesn't resolve, rather than resurrecting a killed one.
     const target = this.daemon.registry.getAll().find((a) => a.name === watch.agentName);
     if (!target) {
       watch.status = 'undeliverable';
       watch.deliveryError = `Agent ${watch.agentName} no longer exists`;
       this.daemon.audit?.log('watch.undeliverable', { id: watch.id, reason: 'agent gone' });
-      this.daemon.broadcast?.({ type: 'watch:fired', data: this._public(watch) });
-      return;
-    }
-
-    try {
-      const delivered = await deliverInstruction(this.daemon, target.id, message, { recordFeedback: false });
-      watch.agentId = delivered.agentId;
-      watch.status = 'delivered';
-    } catch (err) {
-      watch.status = 'undeliverable';
-      watch.deliveryError = err.message;
-      this.daemon.audit?.log('watch.undeliverable', { id: watch.id, error: err.message });
+    } else {
+      try {
+        const delivered = await deliverInstruction(this.daemon, target.id, message, { recordFeedback: false });
+        watch.agentId = delivered.agentId;
+        watch.status = 'delivered';
+      } catch (err) {
+        watch.status = 'undeliverable';
+        watch.deliveryError = err.message;
+        this.daemon.audit?.log('watch.undeliverable', { id: watch.id, error: err.message });
+      }
     }
 
+    this._cleanupRun(watch);
+    this._persist();
     this.daemon.broadcast?.({ type: 'watch:fired', data: this._public(watch) });
   }
 
@@ -197,6 +237,45 @@ export class Watcher {
     return lines.join('\n');
   }
 
+  // ── persistence & restart recovery ────────────────────────────
+
+  _persist() {
+    try {
+      const data = [...this.watches.values()].map((w) => this._serialize(w));
+      writeFileSync(this.persistPath, JSON.stringify(data, null, 2), { mode: 0o600 });
+    } catch { /* best effort — a lost persist just means one watch won't survive */ }
+  }
+
+  // Load persisted watches and re-arm the active ones. Called once at startup,
+  // after the registry is available. This is what lets a watch survive a daemon
+  // restart: the detached job kept running (or already finished), and here we
+  // reconnect to its sentinel.
+  restore() {
+    if (!existsSync(this.persistPath)) return 0;
+    let data;
+    try { data = JSON.parse(readFileSync(this.persistPath, 'utf8')); } catch { return 0; }
+    if (!Array.isArray(data)) return 0;
+
+    let rearmed = 0;
+    const now = Date.now();
+    for (const w of data) {
+      // Drop stale finished watches; keep recent ones for history.
+      if (w.status !== 'active') {
+        if (now - (w.firedAt || w.createdAt || 0) < HISTORY_TTL_MS) {
+          this.watches.set(w.id, { ...w, _poll: null, _deadline: null });
+        }
+        continue;
+      }
+      const watch = { ...w, _poll: null, _deadline: null };
+      this.watches.set(watch.id, watch);
+      this._arm(watch);
+      rearmed++;
+    }
+    if (rearmed > 0) console.log(`[Groove:Watcher] Restored ${rearmed} active watch(es) after restart`);
+    this._persist();
+    return rearmed;
+  }
+
   // ── lifecycle ─────────────────────────────────────────────────
 
   cancel(id, agentId = null) {
@@ -205,7 +284,10 @@ export class Watcher {
     if (agentId && watch.agentId !== agentId) return false;
     if (watch.status === 'active') {
       watch.status = 'cancelled';
-      this._cleanup(watch);
+      this._disarm(watch);
+      this._killJob(watch);
+      this._cleanupRun(watch);
+      this._persist();
       this.daemon.broadcast?.({ type: 'watch:cancelled', data: this._public(watch) });
     }
     return true;
@@ -213,23 +295,35 @@ export class Watcher {
 
   // An agent that is killed/purged shouldn't leave watches firing into a void.
   cancelForAgent(agentId) {
+    let changed = false;
     for (const watch of this.watches.values()) {
       if (watch.agentId === agentId && watch.status === 'active') {
         watch.status = 'cancelled';
-        this._cleanup(watch);
+        this._disarm(watch);
+        this._killJob(watch);
+        this._cleanupRun(watch);
+        changed = true;
       }
     }
+    if (changed) this._persist();
   }
 
-  _cleanup(watch) {
+  _disarm(watch) {
     if (watch._deadline) { clearTimeout(watch._deadline); watch._deadline = null; }
     if (watch._poll) { clearInterval(watch._poll); watch._poll = null; }
-    if (watch._child && watch.mode === 'command' && watch.status === 'cancelled') {
-      // Only kill the process when the user/agent cancelled — a fired watch
-      // means it exited on its own.
-      try { watch._child.kill('SIGTERM'); } catch { /* already gone */ }
-    }
-    watch._child = null;
+  }
+
+  // Kill the detached job — only on explicit cancel. A fired watch means the
+  // job already exited on its own.
+  _killJob(watch) {
+    if (watch.mode !== 'command' || !watch.pid) return;
+    try { process.kill(-watch.pid, 'SIGTERM'); }       // negative → the whole process group
+    catch { try { process.kill(watch.pid, 'SIGTERM'); } catch { /* already gone */ } }
+  }
+
+  _cleanupRun(watch) {
+    if (watch.mode !== 'command') return;
+    try { rmSync(resolve(this.runsDir, watch.id), { recursive: true, force: true }); } catch { /* ignore */ }
   }
 
   list(agentId = null) {
@@ -237,13 +331,21 @@ export class Watcher {
     return (agentId ? all.filter((w) => w.agentId === agentId) : all).map((w) => this._public(w));
   }
 
+  // Clear in-memory timers on shutdown. Deliberately does NOT kill the detached
+  // jobs — they must survive the restart; restore() reconnects to them.
   stop() {
-    for (const watch of this.watches.values()) {
-      if (watch._deadline) clearTimeout(watch._deadline);
-      if (watch._poll) clearInterval(watch._poll);
-      if (watch._child) { try { watch._child.kill('SIGTERM'); } catch { /* gone */ } }
-      watch._deadline = watch._poll = watch._child = null;
-    }
+    for (const watch of this.watches.values()) this._disarm(watch);
+  }
+
+  _serialize(w) {
+    return {
+      id: w.id, agentId: w.agentId, agentName: w.agentName, label: w.label,
+      mode: w.mode, command: w.command, until: w.until, cwd: w.cwd,
+      pollMs: w.pollMs, timeoutMs: w.timeoutMs, status: w.status,
+      createdAt: w.createdAt, firedAt: w.firedAt || null, result: w.result || null,
+      pid: w.pid || null, outFile: w.outFile || null, statusFile: w.statusFile || null,
+      deliveryError: w.deliveryError || null,
+    };
   }
 
   _public(w) {
@@ -255,4 +357,28 @@ export class Watcher {
   }
 }
 
+// Single-quote for safe embedding in the runner script.
+function shq(s) {
+  return `'${String(s).replace(/'/g, `'\\''`)}'`;
+}
+
+// Read the last `maxBytes` of a file without loading the whole thing — a
+// training log can be huge.
+function tailFile(path, maxBytes) {
+  if (!path || !existsSync(path)) return '';
+  let fd;
+  try {
+    fd = openSync(path, 'r');
+    const size = fstatSync(fd).size;
+    const len = Math.min(size, maxBytes);
+    const buf = Buffer.alloc(len);
+    readSync(fd, buf, 0, len, size - len);
+    return buf.toString('utf8').trim();
+  } catch {
+    return '';
+  } finally {
+    if (fd !== undefined) try { closeSync(fd); } catch { /* ignore */ }
+  }
+}
+
 export { DEFAULT_TIMEOUT_MS, MAX_WATCHES_PER_AGENT };