@adaptic/maestro 1.9.2 → 1.9.4

package/scripts/daemon/cadence-consumer.mjs

@@ -59,6 +59,7 @@ import {
   logBusEvent,
   busDepth,
 } from "../../lib/cadence-bus.mjs";
+import { resolveClaudeBin as sharedResolveClaude, augmentedPath } from "../../lib/claude-bin.mjs";
 import { getCadenceDef } from "./cadence-handlers.mjs";
 
 // ---------------------------------------------------------------------------
@@ -104,39 +105,10 @@ function defaultLogger(entry) {
   }
 }
 
-/**
- * Resolve an absolute path to the Claude CLI. launchd's bare environment
- * does NOT include /Users/<u>/.local/bin or homebrew on PATH, so a plain
- * `spawn('claude', …)` fails with ENOENT — which is exactly what was
- * stuck in ravi-ai's DLQ. This resolver returns the first existing
- * candidate among:
- *
- *   1. $CLAUDE_BIN env var (if set + executable)
- *   2. ~/.local/bin/claude              (default Claude Code install path)
- *   3. /opt/homebrew/bin/claude          (homebrew on Apple Silicon)
- *   4. /usr/local/bin/claude             (homebrew on Intel)
- *   5. /usr/bin/claude
- *
- * Falls back to bare "claude" so the spawn's own error stays informative
- * when nothing is found.
- */
-let _resolvedClaude = null;
-function resolveClaudeBin() {
-  if (_resolvedClaude) return _resolvedClaude;
-  const envOverride = process.env.CLAUDE_BIN;
-  const candidates = [
-    envOverride,
-    join(homedir(), ".local/bin/claude"),
-    "/opt/homebrew/bin/claude",
-    "/usr/local/bin/claude",
-    "/usr/bin/claude",
-  ].filter(Boolean);
-  for (const c of candidates) {
-    if (existsSync(c)) { _resolvedClaude = c; return c; }
-  }
-  _resolvedClaude = "claude"; // last-resort; spawn will report ENOENT
-  return _resolvedClaude;
-}
+// Claude binary resolution moved to lib/claude-bin.mjs (shared by
+// dispatcher, responder, and this consumer). See that file for the
+// candidate search order.
+const resolveClaudeBin = sharedResolveClaude;
 
 /**
  * Spawn a sub-session running the cadence's trigger prompt and resolve
@@ -164,24 +136,12 @@ function realSpawnSession({ agentRoot, cadence, promptPath, timeoutMs, log }) {
 
     const bin = resolveClaudeBin();
     const args = ["--print", "--dangerously-skip-permissions", body];
-    // Augment PATH so any tool the subsession invokes (jq, node, etc.)
-    // can still be found. launchd's bare env strips /opt/homebrew/bin etc.
-    const augmentedPath = [
-      process.env.PATH || "",
-      `${homedir()}/.local/bin`,
-      "/opt/homebrew/bin",
-      "/opt/homebrew/sbin",
-      "/usr/local/bin",
-      "/usr/bin",
-      "/bin",
-      "/usr/sbin",
-      "/sbin",
-    ].filter(Boolean).join(":");
+    // PATH augmented via lib/claude-bin.mjs so subsession can find jq/node.
     const env = {
       ...process.env,
       AGENT_ROOT: agentRoot,
       AGENT_DIR: agentRoot,
-      PATH: augmentedPath,
+      PATH: augmentedPath(),
     };
     // Auth handling. Claude Code authenticates via macOS Keychain
     // (OAuth from the user's Pro/Max subscription) when no API key is

package/scripts/daemon/classifier.mjs

@@ -102,8 +102,9 @@ function loadAgentRegistry() {
 
 const ANTHROPIC_MODEL = "claude-haiku-4-5-20251001";
 const OPENAI_MODEL = "gpt-4o-mini";
-// Default to `claude` from PATH; CLAUDE_BIN env var overrides for non-standard installs.
-const CLAUDE_BIN = process.env.CLAUDE_BIN || "claude";
+// Resolve claude against the agent's PATH (not launchd's bare env).
+import { resolveClaudeBin, augmentedPath } from "../../lib/claude-bin.mjs";
+const CLAUDE_BIN = resolveClaudeBin();
 const CLAUDE_CLI_TIMEOUT_MS = 30_000;
 
 // ── System prompt shared by both LLM classifiers ────────────────────────────
@@ -321,7 +322,8 @@ async function runClaudeCLI(systemPrompt, userPrompt) {
       stdio: ["pipe", "pipe", "pipe"],
       // Force claude CLI onto keychain OAuth (Max subscription); strip any
       // stale ANTHROPIC_API_KEY/AUTH_TOKEN inherited from the daemon env.
-      env: { ...process.env, ANTHROPIC_API_KEY: "", ANTHROPIC_AUTH_TOKEN: "" },
+      // Augment PATH so spawned subsessions find homebrew/nvm binaries.
+      env: { ...process.env, PATH: augmentedPath(), ANTHROPIC_API_KEY: "", ANTHROPIC_AUTH_TOKEN: "" },
     });
 
     let stdout = "";

package/scripts/daemon/dispatcher.mjs

@@ -9,7 +9,10 @@ import { releaseLock, releaseThreadLock, releaseRequestClaim, claimItem, release
 import { recordSession } from "./health.mjs";
 
 const AGENT_REPO_DIR = process.env.AGENT_DIR || join(new URL(".", import.meta.url).pathname, "../..");
-const CLAUDE_BIN = process.env.CLAUDE_BIN || "claude";
+// Resolve the claude binary against the agent's PATH (not launchd's bare
+// env). Without this, every daemon-spawned `claude --print` exits ENOENT.
+import { resolveClaudeBin, augmentedPath } from "../../lib/claude-bin.mjs";
+const CLAUDE_BIN = resolveClaudeBin();
 const MAX_CONCURRENT = parseInt(process.env.DAEMON_MAX_CONCURRENT || "10", 10);
 const RESERVED_INBOX_SLOTS = 3;    // Always keep 3 slots free for real-time inbox items
 
@@ -281,9 +284,10 @@ function spawnSession(entry) {
   // to the keychain OAuth (Max subscription) per CEO directive 2026-04-27.
   // A stale ANTHROPIC_API_KEY in the daemon's inherited env will otherwise
   // override the OAuth token and cause "Invalid API key" failures.
+  // PATH is augmented so the spawn finds homebrew/nvm tools (jq, node, etc).
   const proc = spawn(CLAUDE_BIN, args, {
     cwd: AGENT_REPO_DIR,
-    env: { ...process.env, ANTHROPIC_API_KEY: "", ANTHROPIC_AUTH_TOKEN: "" },
+    env: { ...process.env, PATH: augmentedPath(), ANTHROPIC_API_KEY: "", ANTHROPIC_AUTH_TOKEN: "" },
     stdio: ["ignore", "pipe", "pipe"],
   });
 

package/scripts/daemon/maestro-daemon.mjs

@@ -3,18 +3,23 @@
 // Maestro Daemon — Reactive event-driven message processor
 // =============================================================================
 //
-// Generic entry point that loads agent identity from config/agent.ts and
+// Generic entry point that loads agent identity from config/agent.json and
 // delegates to the core daemon logic. This file is agent-name-agnostic.
 //
+// Lifecycle:
+//   1. Honour .emergency-stop BEFORE doing anything (don't acquire singleton
+//      lock, don't start consumer, don't import the core daemon). Stops the
+//      launchd restart treadmill cold.
+//   2. Acquire the daemon singleton lock so only one instance runs.
+//   3. Start the cadence consumer (state/cadence-bus/ drain loop).
+//   4. Import the core daemon (agent-daemon.mjs canonical, with fallbacks
+//      to legacy sophie-daemon.mjs or <firstName>-daemon.mjs for back-compat).
+//
 // Run: node scripts/daemon/maestro-daemon.mjs
-// Install: launchd plist with KeepAlive: true
+// Install: launchd plist with KeepAlive.SuccessfulExit: false (clean exits
+// during emergency-stop should NOT trigger restart; non-zero exits should).
 // =============================================================================
 
-// The core daemon implementation is in sophie-daemon.mjs by default, but
-// older agent repos may have a renamed copy at <firstname>-daemon.mjs (a
-// pre-1.7 convention). This entry-point auto-detects the correct file so
-// the launchd plist stays stable regardless of agent identity history.
-
 import { resolve, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
@@ -22,25 +27,44 @@ import { existsSync, readFileSync, readdirSync } from "node:fs";
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const AGENT_DIR = process.env.AGENT_DIR || resolve(__dirname, "../..");
 
-// Set AGENT_DIR as env var so all modules can use it
 process.env.AGENT_DIR = AGENT_DIR;
 process.env.AGENT_ROOT = AGENT_DIR;
 
-// Singleton guard — prevent duplicate daemon instances
+// ---------------------------------------------------------------------------
+// 1. Emergency-stop gate
+// ---------------------------------------------------------------------------
+// If the operator dropped .emergency-stop, we exit cleanly (code 0). With
+// KeepAlive.SuccessfulExit:false this means launchd will NOT restart us
+// until the flag is lifted + the plist is reloaded by resume-operations.sh.
+// Older plists with plain KeepAlive:true will still restart, so we hold
+// the process for 30s before exiting to give launchd's ThrottleInterval
+// something to throttle.
+if (existsSync(join(AGENT_DIR, ".emergency-stop"))) {
+  console.error("[DAEMON] .emergency-stop flag present — refusing to start.");
+  console.error("[DAEMON] Lift with: scripts/resume-operations.sh");
+  await new Promise((r) => setTimeout(r, 30_000));
+  process.exit(0);
+}
+
+// ---------------------------------------------------------------------------
+// 2. Singleton guard
+// ---------------------------------------------------------------------------
 try {
   const { acquireLock } = await import(resolve(process.env.HOME, "maestro/lib/singleton.js"));
   if (!acquireLock("daemon")) {
     console.log("[DAEMON] Already running — exiting");
     process.exit(0);
   }
-} catch { /* maestro singleton not available */ }
+} catch { /* maestro singleton not available — proceed without lock */ }
 
-// Start the cadence consumer alongside the reactive event loop. This is the
-// single persistent owner of cadence housekeeping — launchd plists enqueue
-// cadence ticks onto state/cadence-bus/ and the consumer drains them here,
-// either handling them inline or escalating to a sub-session when warranted.
-// Failure to start the consumer must NOT take the reactive daemon down, so
-// we isolate startup errors.
+// ---------------------------------------------------------------------------
+// 3. Cadence consumer (cadence bus drain loop)
+// ---------------------------------------------------------------------------
+// Start alongside the reactive event loop. This is the single persistent
+// owner of cadence housekeeping — launchd plists enqueue cadence ticks
+// onto state/cadence-bus/ and the consumer drains them here, either
+// handling them inline or escalating to a sub-session when warranted.
+// Failure to start the consumer must NOT take the reactive daemon down.
 try {
   const { startConsumer } = await import("./cadence-consumer.mjs");
   const consumer = startConsumer({ agentRoot: AGENT_DIR });
@@ -55,14 +79,19 @@ try {
   // Reactive daemon continues. Doctor / healthcheck will surface this.
 }
 
-// Locate the core daemon module. Try, in order:
-//   1. ./sophie-daemon.mjs  — canonical filename (post-Phase-2.5 SOT)
-//   2. ./<firstName>-daemon.mjs — legacy rename from init-maestro Phase 1
-//   3. The first scripts/daemon/*-daemon.mjs that isn't this file
+// ---------------------------------------------------------------------------
+// 4. Core daemon import
+// ---------------------------------------------------------------------------
+// Resolve the core daemon module. Try, in order:
+//   1. ./agent-daemon.mjs   — canonical filename (1.9.4+)
+//   2. ./sophie-daemon.mjs  — legacy canonical (pre-1.9.4)
+//   3. ./<firstName>-daemon.mjs — even older per-agent rename
+//   4. The first scripts/daemon/*-daemon.mjs that isn't this file
 function resolveCoreDaemon() {
-  const localCandidates = [];
-  const canonical = resolve(__dirname, "sophie-daemon.mjs");
-  localCandidates.push(canonical);
+  const localCandidates = [
+    resolve(__dirname, "agent-daemon.mjs"),
+    resolve(__dirname, "sophie-daemon.mjs"),
+  ];
 
   try {
     const agentJson = join(AGENT_DIR, "config", "agent.json");
@@ -90,7 +119,7 @@ function resolveCoreDaemon() {
 
 const coreDaemon = resolveCoreDaemon();
 if (!coreDaemon) {
-  console.error("[DAEMON] could not locate a core daemon module under scripts/daemon/. Expected sophie-daemon.mjs or <firstName>-daemon.mjs.");
+  console.error("[DAEMON] could not locate a core daemon module under scripts/daemon/. Expected agent-daemon.mjs (canonical) or sophie-daemon.mjs / <firstName>-daemon.mjs (legacy).");
   process.exit(78);
 }
 // Import and run the daemon (handles its own .env loading).

package/scripts/daemon/responder.mjs

@@ -25,7 +25,9 @@ import { routingKey as deriveRoutingKey, createRouter } from "./lib/session-rout
 
 const AGENT_REPO_DIR = process.env.AGENT_DIR || join(new URL(".", import.meta.url).pathname, "../..");
 const SONNET_MODEL = "claude-sonnet-4-6";
-const CLAUDE_BIN = process.env.CLAUDE_BIN || "claude";
+// Resolve claude against the agent's PATH (not launchd's bare env).
+import { resolveClaudeBin, augmentedPath } from "../../lib/claude-bin.mjs";
+const CLAUDE_BIN = resolveClaudeBin();
 const CLAUDE_CLI_TIMEOUT_MS = 60_000;
 const SESSION_REGISTRY_PATH = join(AGENT_REPO_DIR, "state", "daemon", "session-router-registry.json");
 
@@ -140,7 +142,8 @@ function runClaudeCLI(systemPrompt, userPrompt, model, opts = {}) {
       stdio: ["pipe", "pipe", "pipe"],
       // Force claude CLI onto keychain OAuth (Max subscription); strip any
       // stale ANTHROPIC_API_KEY/AUTH_TOKEN inherited from the daemon env.
-      env: { ...process.env, ANTHROPIC_API_KEY: "", ANTHROPIC_AUTH_TOKEN: "" },
+      // Augment PATH so the subsession finds homebrew/nvm tools.
+      env: { ...process.env, PATH: augmentedPath(), ANTHROPIC_API_KEY: "", ANTHROPIC_AUTH_TOKEN: "" },
     });
 
     let stdout = "";