@adaptic/maestro 1.1.7 → 1.4.1

package/scripts/daemon/launchd-wrapper-generic.sh

@@ -0,0 +1,96 @@
+#!/bin/bash
+# launchd-wrapper-generic.sh — Universal env bootstrap for ANY maestro
+# script spawned under launchd.
+#
+# Usage in a plist:
+#   <key>ProgramArguments</key>
+#   <array>
+#     <string>/path/to/scripts/daemon/launchd-wrapper-generic.sh</string>
+#     <string>/path/to/script-to-run.sh</string>
+#     <string>arg1</string>
+#     <string>arg2</string>
+#   </array>
+#
+# What it does:
+#   1. Sets HOME, PATH, USER, AGENT_ROOT (launchd's bare env doesn't include them)
+#   2. Detects external SSD and sets CLAUDE_CODE_TMPDIR + creates SSD_AGENT_ROOT
+#   3. Picks a node binary (nvm, homebrew, system fallback)
+#   4. Redirects stdout/stderr to a date-stamped log file on the SSD
+#   5. Exec's the target script with all remaining args
+#
+# Why a wrapper instead of a plist EnvironmentVariables block?
+# Putting these env vars directly in the plist has been observed to cause
+# EX_CONFIG (78) failures on macOS Sequoia + when symlinks are involved.
+# A wrapper script is more portable and easier to debug.
+
+set -e
+
+if [ $# -lt 1 ]; then
+  echo "[wrapper] FATAL: no target script provided" >&2
+  exit 64
+fi
+
+TARGET="$1"
+shift
+
+# AGENT_ROOT is the parent of the script being run, going up two levels.
+# E.g. /Users/lucas/lucas-ai/scripts/local-triggers/run-trigger.sh → /Users/lucas/lucas-ai
+TARGET_DIR="$(cd "$(dirname "$TARGET")" && pwd -P)"
+# Walk up until we find package.json or config/agent.ts
+CANDIDATE="$TARGET_DIR"
+while [ "$CANDIDATE" != "/" ]; do
+  if [ -f "$CANDIDATE/package.json" ] && [ -d "$CANDIDATE/config" ]; then
+    AGENT_ROOT="$CANDIDATE"
+    break
+  fi
+  CANDIDATE="$(dirname "$CANDIDATE")"
+done
+AGENT_ROOT="${AGENT_ROOT:-$TARGET_DIR}"
+
+export AGENT_ROOT
+export HOME="${HOME:-/Users/$(whoami)}"
+export USER="${USER:-$(whoami)}"
+export PATH="/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:$PATH"
+
+# ── SSD detection ───────────────────────────────────────────────────────────
+SSD_VOLUME="${MAESTRO_SSD_VOLUME:-}"
+if [ -z "$SSD_VOLUME" ]; then
+  for v in /Volumes/*-SSD /Volumes/*SSD* /Volumes/maestro-data; do
+    if [ -d "$v" ] && [ "$v" != "/Volumes/Macintosh HD" ]; then
+      SSD_VOLUME="$v"
+      break
+    fi
+  done
+fi
+
+AGENT_NAME="$(basename "$AGENT_ROOT" | sed 's/-ai$//')"
+SSD_AGENT_ROOT=""
+SSD_WRITABLE=0
+if [ -n "$SSD_VOLUME" ] && [ -d "$SSD_VOLUME" ]; then
+  SSD_AGENT_ROOT="$SSD_VOLUME/maestro/$AGENT_NAME"
+  if mkdir -p "$SSD_AGENT_ROOT/claude-tmp" "$SSD_AGENT_ROOT/logs/launchd" 2>/dev/null && \
+     touch "$SSD_AGENT_ROOT/.write-test-$$" 2>/dev/null; then
+    rm -f "$SSD_AGENT_ROOT/.write-test-$$"
+    SSD_WRITABLE=1
+    export CLAUDE_CODE_TMPDIR="$SSD_AGENT_ROOT/claude-tmp"
+    export MAESTRO_SSD_AGENT_ROOT="$SSD_AGENT_ROOT"
+  fi
+fi
+
+cd "$AGENT_ROOT"
+
+# Determine the log file name from the target script's basename
+SCRIPT_NAME="$(basename "$TARGET" | sed 's/\.[^.]*$//')"
+LOG_DATE="$(date +%Y-%m-%d)"
+
+if [ "$SSD_WRITABLE" = "1" ]; then
+  LOG_FILE="$SSD_AGENT_ROOT/logs/launchd/${SCRIPT_NAME}-${LOG_DATE}.log"
+  echo "[wrapper $(date -u +%H:%M:%SZ)] starting $SCRIPT_NAME (SSD log: $LOG_FILE)" >> "$LOG_FILE" 2>/dev/null || true
+  exec bash "$TARGET" "$@" >> "$LOG_FILE" 2>&1
+else
+  # Fall back to internal disk log if SSD isn't writable (e.g. macOS denies launchd
+  # write access to external volumes until the user grants it via System Settings).
+  FALLBACK_LOG="$AGENT_ROOT/logs/launchd/${SCRIPT_NAME}-${LOG_DATE}.log"
+  mkdir -p "$(dirname "$FALLBACK_LOG")" 2>/dev/null || true
+  exec bash "$TARGET" "$@" >> "$FALLBACK_LOG" 2>&1
+fi

package/scripts/daemon/launchd-wrapper-slack-events.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+# launchd-wrapper-slack-events.sh — Bootstraps env for the slack-events server.
+set -e
+AGENT_ROOT="$(cd "$(dirname "$0")/../.." && pwd -P)"
+export AGENT_ROOT
+export HOME="${HOME:-/Users/$(whoami)}"
+export USER="${USER:-$(whoami)}"
+export PATH="/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:$PATH"
+if [ -d "/Volumes/4TB-SSD" ]; then
+  AGENT_NAME="$(basename "$AGENT_ROOT" | sed 's/-ai$//')"
+  CLAUDE_TMP_DIR="/Volumes/4TB-SSD/maestro/$AGENT_NAME/claude-tmp"
+  mkdir -p "$CLAUDE_TMP_DIR"
+  export CLAUDE_CODE_TMPDIR="$CLAUDE_TMP_DIR"
+fi
+cd "$AGENT_ROOT"
+NODE_BIN=""
+for candidate in \
+  "$HOME/.nvm/versions/node/v24.11.1/bin/node" \
+  "$HOME/.nvm/versions/node/v24/bin/node" \
+  "$HOME/.nvm/versions/node/v22/bin/node" \
+  "$HOME/.nvm/versions/node/v20/bin/node" \
+  /opt/homebrew/bin/node \
+  /usr/local/bin/node \
+  /usr/bin/node; do
+  if [ -x "$candidate" ]; then
+    NODE_BIN="$candidate"
+    break
+  fi
+done
+if [ -z "$NODE_BIN" ] && [ -d "$HOME/.nvm/versions/node" ]; then
+  NODE_BIN=$(ls -1d "$HOME/.nvm/versions/node"/v*/bin/node 2>/dev/null | sort -V | tail -1)
+fi
+if [ -z "$NODE_BIN" ] || [ ! -x "$NODE_BIN" ]; then
+  echo "[wrapper] FATAL: could not find node binary" >&2
+  exit 127
+fi
+exec "$NODE_BIN" "$AGENT_ROOT/scripts/slack-events-server.mjs"

package/scripts/daemon/launchd-wrapper.sh

@@ -0,0 +1,91 @@
+#!/bin/bash
+# launchd-wrapper.sh — Bootstraps env for the maestro daemon under launchd.
+#
+# launchd's default environment is bare and doesn't include HOME, PATH, or
+# AGENT_ROOT. We set them here, then exec the daemon. This avoids putting
+# them in the .plist directly, which has been observed to cause EX_CONFIG
+# (78) failures on some macOS versions when symlinks are involved.
+#
+# Storage: when /Volumes/{SSD_NAME} is mounted, all daemon runtime data goes
+# to the SSD. The plist's StandardErrorPath/StandardOutPath remain on the
+# internal disk (launchd refuses external volumes there), but those files
+# only capture launchd-level startup errors. The daemon's own stdout/stderr
+# is redirected into /Volumes/{SSD_NAME}/maestro/{agent}/logs/daemon/ at the
+# bottom of this script via shell redirection.
+#
+# This wrapper is exec'd by ai.adaptic.{firstname}-daemon.plist.
+
+set -e
+
+AGENT_ROOT="$(cd "$(dirname "$0")/../.." && pwd -P)"
+export AGENT_ROOT
+export HOME="${HOME:-/Users/$(whoami)}"
+export USER="${USER:-$(whoami)}"
+export PATH="/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:$PATH"
+
+# ── SSD redirect ────────────────────────────────────────────────────────────
+# If an external SSD is mounted at /Volumes/{name}, redirect:
+#   - Claude Code per-cwd temp (CLAUDE_CODE_TMPDIR)
+#   - Daemon stdout/stderr (via shell redirection at exec time)
+#   - state/, outputs/, memory/, knowledge/ are already symlinked at init time
+
+# Detect SSD volume — first volume under /Volumes that's not a system mount.
+# Override with MAESTRO_SSD_VOLUME env var if you have multiple SSDs.
+SSD_VOLUME="${MAESTRO_SSD_VOLUME:-}"
+if [ -z "$SSD_VOLUME" ]; then
+  for v in /Volumes/*-SSD /Volumes/*SSD* /Volumes/maestro-data; do
+    if [ -d "$v" ] && [ "$v" != "/Volumes/Macintosh HD" ]; then
+      SSD_VOLUME="$v"
+      break
+    fi
+  done
+fi
+
+AGENT_NAME="$(basename "$AGENT_ROOT" | sed 's/-ai$//')"
+SSD_AGENT_ROOT=""
+SSD_WRITABLE=0
+if [ -n "$SSD_VOLUME" ] && [ -d "$SSD_VOLUME" ]; then
+  SSD_AGENT_ROOT="$SSD_VOLUME/maestro/$AGENT_NAME"
+  if mkdir -p "$SSD_AGENT_ROOT/claude-tmp" "$SSD_AGENT_ROOT/logs/daemon" 2>/dev/null && \
+     touch "$SSD_AGENT_ROOT/.write-test-$$" 2>/dev/null; then
+    rm -f "$SSD_AGENT_ROOT/.write-test-$$"
+    SSD_WRITABLE=1
+    export CLAUDE_CODE_TMPDIR="$SSD_AGENT_ROOT/claude-tmp"
+  fi
+fi
+
+cd "$AGENT_ROOT"
+# Resolve node binary — prefer nvm, fall back to homebrew, then system
+NODE_BIN=""
+for candidate in \
+  "$HOME/.nvm/versions/node/v24.11.1/bin/node" \
+  "$HOME/.nvm/versions/node/v24/bin/node" \
+  "$HOME/.nvm/versions/node/v22/bin/node" \
+  "$HOME/.nvm/versions/node/v20/bin/node" \
+  /opt/homebrew/bin/node \
+  /usr/local/bin/node \
+  /usr/bin/node; do
+  if [ -x "$candidate" ]; then
+    NODE_BIN="$candidate"
+    break
+  fi
+done
+if [ -z "$NODE_BIN" ] && [ -d "$HOME/.nvm/versions/node" ]; then
+  NODE_BIN=$(ls -1d "$HOME/.nvm/versions/node"/v*/bin/node 2>/dev/null | sort -V | tail -1)
+fi
+if [ -z "$NODE_BIN" ] || [ ! -x "$NODE_BIN" ]; then
+  echo "[wrapper] FATAL: could not find node binary" >&2
+  exit 127
+fi
+
+# Exec the daemon. Prefer SSD log path if writable, otherwise fall back to
+# internal disk so the daemon stays up even when macOS denies launchd write
+# access to /Volumes/{name}.
+if [ "$SSD_WRITABLE" = "1" ]; then
+  DAEMON_LOG="$SSD_AGENT_ROOT/logs/daemon/daemon-$(date +%Y-%m-%d).log"
+  exec "$NODE_BIN" "$AGENT_ROOT/scripts/daemon/maestro-daemon.mjs" >> "$DAEMON_LOG" 2>&1
+else
+  DAEMON_LOG="$AGENT_ROOT/logs/daemon/daemon-$(date +%Y-%m-%d).log"
+  mkdir -p "$(dirname "$DAEMON_LOG")" 2>/dev/null || true
+  exec "$NODE_BIN" "$AGENT_ROOT/scripts/daemon/maestro-daemon.mjs" >> "$DAEMON_LOG" 2>&1
+fi

package/scripts/daemon/lib/session-router.mjs

@@ -0,0 +1,274 @@
+/**
+ * session-router.mjs — Routes daemon Claude CLI invocations to either an
+ * existing live session (RESUME) or a fresh ephemeral spawn (EPHEMERAL).
+ *
+ * Per design memo `outputs/drafts/2026-04-27-claude-cli-session-router.md`
+ * §4 (architecture) and §5 (migration plan, step 2). This module is
+ * scaffold-only and is NOT yet wired into dispatcher.mjs / responder.mjs.
+ * It is intended to ship behind a SESSION_ROUTER_ENABLED=1 env flag
+ * (memo §8 step 4) so its mere existence cannot alter daemon behaviour.
+ *
+ * Public API:
+ *   - routingKey(item)   — pure function, derives a stable conversation key
+ *   - createRouter(opts) — async factory returning { route, touch,
+ *                          recordExit, evictExpired, _readForTests }
+ *
+ * Registry on disk: a single JSON file with shape
+ *   { sessions: { <key>: { ... } }, lru: [ <key>, <key>, ... ] }
+ * Concurrent writes use the temp-file + fs.rename atomic pattern. Memo §4.1
+ * explicitly rejects flock — "no stale lock files if the daemon dies".
+ */
+
+import { promises as fsp } from "fs";
+import { dirname } from "path";
+
+// canonicalizeSlackChannel exists in some installs of scripts/daemon/session-lock.mjs.
+// In maestro, it may not be exported (sophie-ai-only helper). Both failure modes
+// — import throws OR import succeeds but the symbol is undefined — degrade to
+// identity so this module never breaks the daemon. The fallback only fires at
+// load time, not per-call.
+let canonicalizeSlackChannel;
+try {
+  const mod = await import("../session-lock.mjs");
+  canonicalizeSlackChannel = typeof mod.canonicalizeSlackChannel === "function"
+    ? mod.canonicalizeSlackChannel
+    : (c) => c;
+} catch {
+  // TODO(session-router): session-lock.mjs unavailable or canonicaliser missing
+  // — using identity. Fix the import or invent a shared canon helper.
+  canonicalizeSlackChannel = (c) => c;
+}
+
+const EMPTY_REGISTRY = () => ({ sessions: {}, lru: [] });
+
+/**
+ * Pure key-derivation function (memo §4.2 table).
+ *
+ * @param {object} item Inbound queue/inbox item
+ * @returns {string} Routing key, e.g. "slack:D099N1JGKRQ:1777283277.123456"
+ */
+export function routingKey(item) {
+  if (!item || typeof item !== "object") {
+    throw new TypeError("routingKey: item must be an object");
+  }
+  const source = item.source;
+
+  if (source === "slack") {
+    const channel = canonicalizeSlackChannel(item.channel || item.channel_id || "");
+    if (!channel) throw new Error("routingKey: slack item missing channel");
+    if (item.thread_ts) return `slack:${channel}:${item.thread_ts}`;
+    if (typeof channel === "string" && channel.startsWith("D")) {
+      return `slack:${channel}`;
+    }
+    // Channel non-DM, no thread → single-message bucket (effectively ephemeral)
+    const ts = item.ts || item.event_ts || "";
+    return `slack:${channel}:${ts}`;
+  }
+
+  if (source === "gmail") {
+    const tid = item.thread_id || item.threadId;
+    if (!tid) throw new Error("routingKey: gmail item missing thread_id");
+    return `gmail:${tid}`;
+  }
+
+  if (source === "calendar") {
+    const eid = item.event_id || item.eventId;
+    if (!eid) throw new Error("routingKey: calendar item missing event_id");
+    return `calendar:${eid}`;
+  }
+
+  if (source === "internal") {
+    if (!item.id) throw new Error("routingKey: internal item missing id");
+    return `internal:${item.id}`;
+  }
+
+  if (source === "backlog") {
+    if (item.topic_slug) return `backlog:${item.topic_slug}`;
+    if (item.id) return `internal:${item.id}`;
+    throw new Error("routingKey: backlog item missing topic_slug and id");
+  }
+
+  throw new Error(`routingKey: unknown source "${source}"`);
+}
+
+/**
+ * Read the registry from disk. Missing file → empty registry shape.
+ * Corrupted JSON also degrades to empty (memo §6: "Read failure on the
+ * main file falls back to an empty registry").
+ */
+async function readRegistry(path) {
+  try {
+    const raw = await fsp.readFile(path, "utf-8");
+    const parsed = JSON.parse(raw);
+    // Defensive: ensure shape
+    if (!parsed || typeof parsed !== "object") return EMPTY_REGISTRY();
+    if (!parsed.sessions || typeof parsed.sessions !== "object") parsed.sessions = {};
+    if (!Array.isArray(parsed.lru)) parsed.lru = [];
+    return parsed;
+  } catch (err) {
+    if (err && err.code === "ENOENT") return EMPTY_REGISTRY();
+    return EMPTY_REGISTRY();
+  }
+}
+
+/**
+ * Atomic write: temp file + fs.rename. Memo §4.1 specifies this exact
+ * pattern instead of flock to avoid stale-lock pathologies.
+ */
+async function writeRegistryAtomic(path, registry) {
+  const dir = dirname(path);
+  await fsp.mkdir(dir, { recursive: true });
+  const tmp = `${path}.tmp.${process.pid}.${Date.now()}`;
+  await fsp.writeFile(tmp, JSON.stringify(registry, null, 2), "utf-8");
+  await fsp.rename(tmp, path);
+}
+
+/**
+ * Move a key to the back of the LRU array (most-recently-used).
+ */
+function bumpLru(lru, key) {
+  const idx = lru.indexOf(key);
+  if (idx !== -1) lru.splice(idx, 1);
+  lru.push(key);
+}
+
+/**
+ * Create a session router bound to a registry path.
+ *
+ * @param {object} opts
+ * @param {string} opts.registryPath  Path to the JSON registry file.
+ * @param {number} [opts.ttlSeconds=1800]   Idle TTL (memo §4.3 default 30m).
+ * @param {number} [opts.maxLiveSessions=8] LRU cap (memo §4.3, matches MAX_CLAUDE_PROCS).
+ * @param {() => number} [opts.now]   Injectable clock for tests.
+ */
+export async function createRouter({
+  registryPath,
+  ttlSeconds = 1800,
+  maxLiveSessions = 8,
+  now = () => Date.now(),
+} = {}) {
+  if (!registryPath) {
+    throw new Error("createRouter: registryPath is required");
+  }
+
+  // Eagerly load so first call doesn't race with concurrent writers.
+  let registry = await readRegistry(registryPath);
+
+  /**
+   * Decide RESUME / EPHEMERAL / EPHEMERAL_REPLACE for a key (memo §4.4).
+   * If RESUME, also touches last_used_at in memory (persisted on next mutation).
+   *
+   * @param {string} key
+   * @returns {{ decision: "EPHEMERAL"|"EPHEMERAL_REPLACE"|"RESUME", resumeId: string|null }}
+   */
+  function route(key) {
+    const entry = registry.sessions[key];
+    if (!entry) return { decision: "EPHEMERAL", resumeId: null };
+
+    const ttlMs = ttlSeconds * 1000;
+    if (now() - entry.last_used_at > ttlMs) {
+      return { decision: "EPHEMERAL_REPLACE", resumeId: null };
+    }
+    if (entry.status !== "live") {
+      return { decision: "EPHEMERAL_REPLACE", resumeId: null };
+    }
+    if (entry.last_exit_code !== 0) {
+      return { decision: "EPHEMERAL_REPLACE", resumeId: null };
+    }
+
+    // Touch in-memory; persisted on next touch()/recordExit() write.
+    entry.last_used_at = now();
+    bumpLru(registry.lru, key);
+    return { decision: "RESUME", resumeId: entry.claude_session_id };
+  }
+
+  /**
+   * Insert or refresh a session entry after a successful spawn.
+   * Enforces the LRU cap by evicting the oldest entry when at capacity.
+   *
+   * @param {string} key
+   * @param {object} info
+   * @param {string} info.claudeSessionId   CLI-resolved session id from JSON stdout.
+   * @param {string} [info.daemonSessionId] Daemon-local id (s-<epoch>-<n>).
+   * @param {string} [info.model]           "sonnet" | "opus" | "haiku" | etc.
+   */
+  async function touch(key, { claudeSessionId, daemonSessionId, model } = {}) {
+    const ts = now();
+    const isoNow = new Date(ts).toISOString();
+    const existing = registry.sessions[key];
+
+    const entry = {
+      daemon_session_id: daemonSessionId || existing?.daemon_session_id || null,
+      claude_session_id: claudeSessionId ?? existing?.claude_session_id ?? null,
+      key,
+      model: model || existing?.model || null,
+      created_at: existing?.created_at || isoNow,
+      last_used_at: ts,
+      ttl_seconds: ttlSeconds,
+      status: "live",
+      last_exit_code: 0,
+    };
+    registry.sessions[key] = entry;
+    bumpLru(registry.lru, key);
+
+    // Enforce LRU cap. The lru array stores keys ordered oldest → newest.
+    while (registry.lru.length > maxLiveSessions) {
+      const evictKey = registry.lru.shift();
+      if (evictKey && evictKey !== key) {
+        delete registry.sessions[evictKey];
+      }
+    }
+    // Defensive: drop sessions that fell out of the lru array entirely.
+    for (const k of Object.keys(registry.sessions)) {
+      if (!registry.lru.includes(k)) delete registry.sessions[k];
+    }
+
+    await writeRegistryAtomic(registryPath, registry);
+  }
+
+  /**
+   * Record process exit. Non-zero codes flip status to "killed" so the
+   * next route() returns EPHEMERAL_REPLACE.
+   */
+  async function recordExit(key, exitCode) {
+    const entry = registry.sessions[key];
+    if (!entry) return; // No-op — key was never touched.
+    entry.last_exit_code = exitCode;
+    if (exitCode !== 0) {
+      entry.status = "killed";
+    }
+    await writeRegistryAtomic(registryPath, registry);
+  }
+
+  /**
+   * Sweep expired entries (memo §4.3 — runs at top of each dispatcher tick).
+   * Returns the count evicted.
+   */
+  async function evictExpired() {
+    const ttlMs = ttlSeconds * 1000;
+    const cutoff = now() - ttlMs;
+    let evicted = 0;
+    for (const [k, e] of Object.entries(registry.sessions)) {
+      if (e.last_used_at < cutoff) {
+        delete registry.sessions[k];
+        const idx = registry.lru.indexOf(k);
+        if (idx !== -1) registry.lru.splice(idx, 1);
+        evicted++;
+      }
+    }
+    if (evicted > 0) {
+      await writeRegistryAtomic(registryPath, registry);
+    }
+    return evicted;
+  }
+
+  /**
+   * Test hook — returns a deep-cloned snapshot so tests cannot mutate
+   * the live registry by accident.
+   */
+  function _readForTests() {
+    return JSON.parse(JSON.stringify(registry));
+  }
+
+  return { route, touch, recordExit, evictExpired, _readForTests };
+}