@kmmao/happy-agent 0.4.1 → 0.5.0

package/dist/index.mjs

@@ -16,7 +16,7 @@ import { join as join$1, resolve } from 'path';
 import { realpathSync } from 'fs';
 import { tmpdir } from 'os';
 
-var version = "0.4.1";
+var version = "0.5.0";
 
 function loadConfig() {
   const serverUrl = (process.env.HAPPY_SERVER_URL ?? "https://happyserve.xycloud.info").replace(/\/+$/, "");
@@ -2023,11 +2023,11 @@ function stopSession(pid) {
   }
 }
 
-const PROMPT_DIR = join$1(tmpdir(), "happy", "agent-prompts");
+const PROMPT_DIR$1 = join$1(tmpdir(), "happy", "agent-prompts");
 async function writePromptFile(prefix, content) {
-  await mkdir(PROMPT_DIR, { recursive: true });
+  await mkdir(PROMPT_DIR$1, { recursive: true });
   const filename = `${prefix}-${Date.now()}.md`;
-  const filepath = join$1(PROMPT_DIR, filename);
+  const filepath = join$1(PROMPT_DIR$1, filename);
   await writeFile(filepath, content, "utf-8");
   return filepath;
 }
@@ -2211,6 +2211,8 @@ class MachineClient {
   automationServerUrl = "";
   automationAuthToken = "";
   scheduler = null;
+  loopCoordinator = null;
+  auditStore = null;
   constructor(opts) {
     this.token = opts.token;
     this.machine = opts.machine;
@@ -2252,6 +2254,34 @@ class MachineClient {
       return { sessions };
     });
   }
+  registerLoopHandlers() {
+    const coord = this.loopCoordinator;
+    this.rpcHandlerManager.registerHandler("create-loop", async (data) => {
+      const loop = coord.createLoop(data);
+      return { loop: { id: loop.id, name: loop.name, state: loop.state } };
+    });
+    this.rpcHandlerManager.registerHandler("list-loops", async () => {
+      return { loops: coord.listLoops() };
+    });
+    this.rpcHandlerManager.registerHandler("pause-loop", async (data) => {
+      return { success: coord.pauseLoop(data.loopId) };
+    });
+    this.rpcHandlerManager.registerHandler("resume-loop", async (data) => {
+      return { success: coord.resumeLoop(data.loopId) };
+    });
+    this.rpcHandlerManager.registerHandler("delete-loop", async (data) => {
+      return { success: coord.deleteLoop(data.loopId) };
+    });
+  }
+  registerAuditHandlers() {
+    const audit = this.auditStore;
+    this.rpcHandlerManager.registerHandler("query-audit-log", async (data) => {
+      return { events: audit.query(data) };
+    });
+    this.rpcHandlerManager.registerHandler("audit-summary", async () => {
+      return { summary: audit.summarize() };
+    });
+  }
   // -----------------------------------------------------------------------
   // Connection
   // -----------------------------------------------------------------------
@@ -2433,11 +2463,19 @@ class MachineClient {
    * Enable automation handling — agent will process webhook, supervisor,
    * and task triggers from the server by spawning Happy CLI sessions.
    */
-  enableAutomation(serverUrl, authToken, scheduler) {
+  enableAutomation(serverUrl, authToken, scheduler, loopCoordinator, auditStore) {
     this.automationEnabled = true;
     this.automationServerUrl = serverUrl;
     this.automationAuthToken = authToken;
     this.scheduler = scheduler;
+    this.loopCoordinator = loopCoordinator ?? null;
+    this.auditStore = auditStore ?? null;
+    if (this.loopCoordinator) {
+      this.registerLoopHandlers();
+    }
+    if (this.auditStore) {
+      this.registerAuditHandlers();
+    }
     logger.debug("[MACHINE] Automation enabled");
   }
   /** Internal dispatch for ephemeral events that need automation handling. */
@@ -2558,6 +2596,7 @@ class AutomationScheduler {
   retryDelayMs;
   defaultMaxAttempts;
   maxRecentCompletions;
+  onAudit;
   /** Active jobs indexed by id. */
   jobs = /* @__PURE__ */ new Map();
   /** dedupeKey → jobId for fast dedup lookups. */
@@ -2571,6 +2610,7 @@ class AutomationScheduler {
     this.retryDelayMs = options?.retryDelayMs ?? 5e3;
     this.defaultMaxAttempts = options?.maxAttempts ?? 3;
     this.maxRecentCompletions = options?.maxRecentCompletions ?? 50;
+    this.onAudit = options?.onAudit ?? null;
     this.pumpTimer = setInterval(() => this.pump(), 1e3);
   }
   // -----------------------------------------------------------------------
@@ -2601,6 +2641,7 @@ class AutomationScheduler {
     this.jobs.set(job.id, job);
     this.dedupeIndex.set(job.dedupeKey, job.id);
     logger.debug(`[SCHEDULER] Enqueued: ${job.kind} ${job.dedupeKey} (${job.priority}) id=${job.id}`);
+    this.onAudit?.({ kind: "job_enqueued", jobId: job.id, dedupeKey: job.dedupeKey, message: `${job.kind}:${job.priority}` });
     this.pump();
     return { job, deduped: false };
   }
@@ -2610,6 +2651,7 @@ class AutomationScheduler {
     job.status = "completed";
     job.updatedAt = Date.now();
     logger.debug(`[SCHEDULER] Completed: ${job.kind} ${job.dedupeKey} id=${jobId}`);
+    this.onAudit?.({ kind: "job_completed", jobId, dedupeKey: job.dedupeKey });
     this.finalize(job);
   }
   markFailed(jobId, error) {
@@ -2621,11 +2663,13 @@ class AutomationScheduler {
       job.status = "queued";
       job.nextRunAt = Date.now() + job.attempt * this.retryDelayMs;
       logger.debug(`[SCHEDULER] Retry queued: ${job.dedupeKey} attempt=${job.attempt}/${job.maxAttempts} nextRunAt=+${job.attempt * this.retryDelayMs}ms`);
+      this.onAudit?.({ kind: "job_retried", jobId, dedupeKey: job.dedupeKey, errorMessage: error, message: `attempt ${job.attempt}/${job.maxAttempts}` });
       this.pump();
       return;
     }
     job.status = "failed";
     logger.debug(`[SCHEDULER] Failed (exhausted): ${job.kind} ${job.dedupeKey} id=${jobId}: ${error}`);
+    this.onAudit?.({ kind: "job_failed", jobId, dedupeKey: job.dedupeKey, errorMessage: error });
     this.finalize(job);
   }
   getStatus() {
@@ -2685,6 +2729,7 @@ class AutomationScheduler {
     job.attempt++;
     job.updatedAt = Date.now();
     logger.debug(`[SCHEDULER] Dispatching: ${job.kind} ${job.dedupeKey} attempt=${job.attempt}`);
+    this.onAudit?.({ kind: "job_dispatched", jobId: job.id, dedupeKey: job.dedupeKey, message: `attempt ${job.attempt}` });
     job.run(job.id).then(({ pid }) => {
       if (job.status === "dispatching") {
         job.status = "running";
@@ -2720,6 +2765,364 @@ class AutomationScheduler {
   }
 }
 
+const PROMPT_DIR = join$1(tmpdir(), "happy", "agent-loop-prompts");
+const DEFAULT_MAX_CONSECUTIVE_FAILURES = 5;
+const DEFAULT_MAX_ITERATIONS = 0;
+class AgentLoopCoordinator {
+  loops = /* @__PURE__ */ new Map();
+  scheduler;
+  serverUrl;
+  authToken;
+  guardian;
+  tickTimer = null;
+  constructor(scheduler, serverUrl, authToken, guardian) {
+    this.scheduler = scheduler;
+    this.serverUrl = serverUrl;
+    this.authToken = authToken;
+    this.guardian = guardian ?? null;
+  }
+  // -----------------------------------------------------------------------
+  // Lifecycle
+  // -----------------------------------------------------------------------
+  start() {
+    if (this.tickTimer) return;
+    this.tickTimer = setInterval(() => this.tick(), 1e3);
+    logger.debug("[LOOP] Coordinator started");
+  }
+  shutdown() {
+    if (this.tickTimer) {
+      clearInterval(this.tickTimer);
+      this.tickTimer = null;
+    }
+    logger.debug("[LOOP] Coordinator shutdown");
+  }
+  // -----------------------------------------------------------------------
+  // CRUD
+  // -----------------------------------------------------------------------
+  createLoop(input) {
+    const loop = {
+      id: randomUUID(),
+      name: input.name,
+      prompt: input.prompt,
+      directory: input.directory,
+      intervalMs: Math.max(input.intervalMs, 1e4),
+      // min 10s
+      createdAt: Date.now(),
+      state: "idle",
+      iteration: 0,
+      nextRunAt: Date.now() + Math.max(input.intervalMs, 1e4),
+      consecutiveFailures: 0,
+      maxConsecutiveFailures: input.maxConsecutiveFailures ?? DEFAULT_MAX_CONSECUTIVE_FAILURES,
+      maxIterations: input.maxIterations ?? DEFAULT_MAX_ITERATIONS
+    };
+    this.loops.set(loop.id, loop);
+    logger.debug(`[LOOP] Created: ${loop.name} (${loop.id}) interval=${loop.intervalMs}ms`);
+    return loop;
+  }
+  getLoop(id) {
+    return this.loops.get(id);
+  }
+  listLoops() {
+    return [...this.loops.values()].map((l) => ({
+      id: l.id,
+      name: l.name,
+      state: l.state,
+      iteration: l.iteration,
+      intervalMs: l.intervalMs,
+      nextRunAt: l.nextRunAt,
+      lastCompletedAt: l.lastCompletedAt
+    }));
+  }
+  pauseLoop(id) {
+    const loop = this.loops.get(id);
+    if (!loop || loop.state === "paused") return false;
+    loop.state = "paused";
+    logger.debug(`[LOOP] Paused: ${loop.name} (${id})`);
+    return true;
+  }
+  resumeLoop(id) {
+    const loop = this.loops.get(id);
+    if (!loop || loop.state !== "paused") return false;
+    loop.state = "idle";
+    loop.nextRunAt = Date.now() + loop.intervalMs;
+    loop.consecutiveFailures = 0;
+    loop.errorMessage = void 0;
+    logger.debug(`[LOOP] Resumed: ${loop.name} (${id})`);
+    return true;
+  }
+  deleteLoop(id) {
+    const deleted = this.loops.delete(id);
+    if (deleted) logger.debug(`[LOOP] Deleted: ${id}`);
+    return deleted;
+  }
+  // -----------------------------------------------------------------------
+  // Scheduler callback
+  // -----------------------------------------------------------------------
+  onJobTerminal(loopId, status, errorMessage) {
+    const loop = this.loops.get(loopId);
+    if (!loop) return;
+    loop.activeJobId = void 0;
+    loop.lastCompletedAt = Date.now();
+    if (status === "completed") {
+      loop.consecutiveFailures = 0;
+      loop.state = "idle";
+      loop.nextRunAt = Date.now() + loop.intervalMs;
+      logger.debug(`[LOOP] Iteration ${loop.iteration} completed: ${loop.name}`);
+    } else {
+      loop.consecutiveFailures++;
+      loop.errorMessage = errorMessage;
+      if (loop.consecutiveFailures >= loop.maxConsecutiveFailures) {
+        loop.state = "blocked";
+        logger.debug(`[LOOP] Blocked after ${loop.consecutiveFailures} failures: ${loop.name}`);
+      } else {
+        loop.state = "idle";
+        loop.nextRunAt = Date.now() + loop.intervalMs;
+        logger.debug(`[LOOP] Iteration ${loop.iteration} failed (${loop.consecutiveFailures}/${loop.maxConsecutiveFailures}): ${loop.name}`);
+      }
+    }
+  }
+  // -----------------------------------------------------------------------
+  // Tick
+  // -----------------------------------------------------------------------
+  tick() {
+    const now = Date.now();
+    for (const loop of this.loops.values()) {
+      if (loop.state !== "idle") continue;
+      if (loop.nextRunAt > now) continue;
+      if (loop.maxIterations > 0 && loop.iteration >= loop.maxIterations) {
+        loop.state = "paused";
+        logger.debug(`[LOOP] Max iterations reached (${loop.maxIterations}): ${loop.name}`);
+        continue;
+      }
+      this.enqueueLoop(loop);
+    }
+  }
+  enqueueLoop(loop) {
+    loop.iteration++;
+    loop.state = "active";
+    loop.lastStartedAt = Date.now();
+    const iterationNum = loop.iteration;
+    const loopId = loop.id;
+    const coordinator = this;
+    const guardianSessionId = this.guardian?.resolve({ loopId: loop.id }) ?? void 0;
+    const { job, deduped } = this.scheduler.enqueue({
+      kind: "task",
+      dedupeKey: `agent-loop:${loop.id}:${loop.iteration}`,
+      priority: "background",
+      run: async (jobId) => {
+        const promptFile = await writeLoopPromptFile(loop.name, loop.prompt, iterationNum);
+        const result = await spawnSession({
+          directory: loop.directory,
+          approvedNewDirectoryCreation: false,
+          happySessionId: guardianSessionId,
+          automationContext: {
+            kind: "agent_loop",
+            trigger: `loop:${loop.name}:iteration-${iterationNum}`
+          },
+          environmentVariables: {
+            HAPPY_INITIAL_PROMPT_FILE: promptFile,
+            HAPPY_LOOP_ID: loopId,
+            HAPPY_LOOP_NAME: loop.name,
+            HAPPY_LOOP_ITERATION: String(iterationNum),
+            HAPPY_SERVER_URL: coordinator.serverUrl,
+            HAPPY_AUTH_TOKEN: coordinator.authToken
+          }
+        });
+        if (result.type !== "success") {
+          throw new Error(result.type === "error" ? result.errorMessage : "Directory not approved");
+        }
+        const tracked = (await Promise.resolve().then(function () { return trackedSessions; })).getTrackedSession(result.pid);
+        if (tracked?.childProcess) {
+          tracked.childProcess.on("exit", (code) => {
+            const status = code === 0 ? "completed" : "failed";
+            coordinator.onJobTerminal(loopId, status, code !== 0 ? `exit code ${code}` : void 0);
+            if (code === 0) coordinator.scheduler.markCompleted(jobId);
+            else coordinator.scheduler.markFailed(jobId, `exit code ${code}`);
+          });
+        }
+        return { pid: result.pid };
+      }
+    });
+    if (deduped) {
+      loop.iteration--;
+      loop.state = "idle";
+      logger.debug(`[LOOP] Enqueue deduped: ${loop.name} iteration ${iterationNum}`);
+    } else {
+      loop.activeJobId = job.id;
+      logger.debug(`[LOOP] Enqueued: ${loop.name} iteration ${iterationNum} job=${job.id}`);
+    }
+  }
+}
+async function writeLoopPromptFile(name, prompt, iteration) {
+  await mkdir(PROMPT_DIR, { recursive: true });
+  const filename = `loop-${name.replace(/[^a-zA-Z0-9-]/g, "_")}-${iteration}-${Date.now()}.md`;
+  const filepath = join$1(PROMPT_DIR, filename);
+  const content = [
+    `# Agent Loop: ${name}`,
+    `Iteration: ${iteration}`,
+    "",
+    prompt
+  ].join("\n");
+  await writeFile(filepath, content, "utf-8");
+  return filepath;
+}
+
+class GuardianSessionRegistry {
+  entries = /* @__PURE__ */ new Map();
+  /**
+   * Find an existing session to reuse.
+   * Tries loop key first, then project key.
+   */
+  resolve(input) {
+    if (input.loopId) {
+      const entry = this.entries.get(`loop:${input.loopId}`);
+      if (entry) {
+        logger.debug(`[GUARDIAN] Resolved session ${entry.sessionId} for loop:${input.loopId}`);
+        return entry.sessionId;
+      }
+    }
+    if (input.projectId) {
+      const entry = this.entries.get(`project:${input.projectId}`);
+      if (entry) {
+        logger.debug(`[GUARDIAN] Resolved session ${entry.sessionId} for project:${input.projectId}`);
+        return entry.sessionId;
+      }
+    }
+    return null;
+  }
+  /**
+   * Remember a session for future reuse.
+   * Stores under both loop and project keys if available.
+   */
+  remember(sessionId, input) {
+    const now = Date.now();
+    if (input.loopId) {
+      const key = `loop:${input.loopId}`;
+      this.entries.set(key, {
+        key,
+        sessionId,
+        loopId: input.loopId,
+        projectId: input.projectId,
+        updatedAt: now
+      });
+      logger.debug(`[GUARDIAN] Remembered ${sessionId} for ${key}`);
+    }
+    if (input.projectId) {
+      const key = `project:${input.projectId}`;
+      if (!this.entries.has(key)) {
+        this.entries.set(key, {
+          key,
+          sessionId,
+          projectId: input.projectId,
+          updatedAt: now
+        });
+        logger.debug(`[GUARDIAN] Remembered ${sessionId} for ${key}`);
+      }
+    }
+  }
+  /**
+   * Forget a specific session (e.g., after it exits).
+   */
+  forgetSession(sessionId) {
+    let removed = 0;
+    for (const [key, entry] of this.entries) {
+      if (entry.sessionId === sessionId) {
+        this.entries.delete(key);
+        removed++;
+      }
+    }
+    if (removed > 0) {
+      logger.debug(`[GUARDIAN] Forgot session ${sessionId} (${removed} entries)`);
+    }
+    return removed;
+  }
+  /**
+   * Forget all entries for a loop.
+   */
+  forgetLoop(loopId) {
+    return this.entries.delete(`loop:${loopId}`);
+  }
+  /**
+   * Get all entries (for observability).
+   */
+  getSnapshot() {
+    return [...this.entries.values()].sort((a, b) => b.updatedAt - a.updatedAt);
+  }
+  /**
+   * Number of tracked guardian entries.
+   */
+  get size() {
+    return this.entries.size;
+  }
+}
+
+class AutomationAuditStore {
+  maxEntries;
+  events = [];
+  nextId = 1;
+  constructor(options) {
+    this.maxEntries = options?.maxEntries ?? 500;
+  }
+  /**
+   * Record an audit event.
+   */
+  record(event) {
+    const entry = {
+      ...event,
+      id: this.nextId++,
+      timestamp: Date.now()
+    };
+    this.events.push(entry);
+    while (this.events.length > this.maxEntries) {
+      this.events.shift();
+    }
+    logger.debug(`[AUDIT] ${entry.kind}: ${entry.message ?? entry.dedupeKey ?? entry.jobId ?? ""}`);
+    return entry;
+  }
+  /**
+   * Query events with optional filters.
+   */
+  query(filter) {
+    const limit = filter?.limit ?? 50;
+    let results = this.events;
+    if (filter?.kind) {
+      results = results.filter((e) => e.kind === filter.kind);
+    }
+    if (filter?.loopId) {
+      results = results.filter((e) => e.loopId === filter.loopId);
+    }
+    if (filter?.since) {
+      results = results.filter((e) => e.timestamp >= filter.since);
+    }
+    return results.slice(-limit).reverse();
+  }
+  /**
+   * Summary counts by kind.
+   */
+  summarize() {
+    const counts = {
+      job_enqueued: 0,
+      job_dispatched: 0,
+      job_completed: 0,
+      job_failed: 0,
+      job_retried: 0,
+      loop_started: 0,
+      loop_blocked: 0,
+      loop_paused: 0
+    };
+    for (const event of this.events) {
+      counts[event.kind]++;
+    }
+    return counts;
+  }
+  /**
+   * Total number of stored events.
+   */
+  get size() {
+    return this.events.length;
+  }
+}
+
 function pidFilePath(homeDir) {
   return join(homeDir, "agent-daemon.pid");
 }
@@ -2787,9 +3190,16 @@ async function startDaemon(options) {
     agentVersion: version,
     workingDirectory: workDir
   });
-  const scheduler = new AutomationScheduler({ maxConcurrentJobs: 2 });
+  const auditStore = new AutomationAuditStore();
+  const scheduler = new AutomationScheduler({
+    maxConcurrentJobs: 2,
+    onAudit: (event) => auditStore.record(event)
+  });
+  const guardian = new GuardianSessionRegistry();
+  const loopCoordinator = new AgentLoopCoordinator(scheduler, config.serverUrl, creds.token, guardian);
   client.setTailscaleInfo(fullTailscale);
-  client.enableAutomation(config.serverUrl, creds.token, scheduler);
+  client.enableAutomation(config.serverUrl, creds.token, scheduler, loopCoordinator, auditStore);
+  loopCoordinator.start();
   client.connect();
   writePidFile(config.homeDir, process.pid);
   console.log(`Daemon started (PID ${process.pid})`);
@@ -2800,6 +3210,7 @@ async function startDaemon(options) {
     logger.debug(`[DAEMON] Received ${signal}, shutting down...`);
     console.log(`
 Received ${signal}, shutting down...`);
+    loopCoordinator.shutdown();
     scheduler.shutdown();
     client.shutdown();
     removePidFile(config.homeDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmmao/happy-agent",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "CLI client for controlling Happy Coder agents remotely",
   "author": "Kirill Dubovitskiy",
   "license": "MIT",
@@ -43,7 +43,7 @@
     "release": "npx --no-install release-it"
   },
   "dependencies": {
-    "@kmmao/happy-wire": "^0.11.0",
+    "@kmmao/happy-wire": "^0.11.1",
     "axios": "^1.13.5",
     "chalk": "^5.6.2",
     "commander": "^13.1.0",