@adaptic/maestro 1.8.0 → 1.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptic/maestro",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "Maestro — Autonomous AI agent operating system. Deploy AI employees on dedicated Mac minis.",
   "type": "module",
   "bin": {

package/scripts/daemon/maestro-daemon.mjs

@@ -10,13 +10,14 @@
 // Install: launchd plist with KeepAlive: true
 // =============================================================================
 
-// The core daemon implementation lives in sophie-daemon.mjs (filename
-// preserved for launchd-plist compatibility; the content is fully
-// agent-neutral and reads identity from config/agent.json).
-// It uses AGENT_DIR (resolved from this file's location) as the base path.
+// 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 } from "node:path";
+import { resolve, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
+import { existsSync, readFileSync, readdirSync } from "node:fs";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const AGENT_DIR = process.env.AGENT_DIR || resolve(__dirname, "../..");
@@ -54,5 +55,43 @@ try {
   // Reactive daemon continues. Doctor / healthcheck will surface this.
 }
 
-// Import and run the daemon (handles its own .env loading)
-await import("./sophie-daemon.mjs");
+// 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
+function resolveCoreDaemon() {
+  const localCandidates = [];
+  const canonical = resolve(__dirname, "sophie-daemon.mjs");
+  localCandidates.push(canonical);
+
+  try {
+    const agentJson = join(AGENT_DIR, "config", "agent.json");
+    if (existsSync(agentJson)) {
+      const { firstName } = JSON.parse(readFileSync(agentJson, "utf-8"));
+      if (firstName && typeof firstName === "string") {
+        const lower = firstName.toLowerCase();
+        localCandidates.push(resolve(__dirname, `${lower}-daemon.mjs`));
+      }
+    }
+  } catch { /* identity unavailable — fall through */ }
+
+  for (const p of localCandidates) if (existsSync(p)) return p;
+
+  // Final fallback: scan the directory for *-daemon.mjs (excluding self).
+  try {
+    for (const name of readdirSync(__dirname)) {
+      if (name === "maestro-daemon.mjs") continue;
+      if (name.endsWith("-daemon.mjs")) return resolve(__dirname, name);
+    }
+  } catch { /* */ }
+
+  return null;
+}
+
+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.");
+  process.exit(78);
+}
+// Import and run the daemon (handles its own .env loading).
+await import(coreDaemon);

package/scripts/local-triggers/generate-plists.sh

@@ -36,14 +36,38 @@ MAESTRO_PLIST_ARCH_VERSION="1"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 AGENT_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
 PLIST_DIR="$SCRIPT_DIR/plists"
-AGENT_CONFIG="$AGENT_DIR/config/agent.ts"
 
-# Extract agent first name from config/agent.ts
-if [ -f "$AGENT_CONFIG" ]; then
-    AGENT_FIRST=$(grep "firstName:" "$AGENT_CONFIG" | head -1 | sed "s/.*firstName:[[:space:]]*['\"]//; s/['\"].*//" | tr '[:upper:]' '[:lower:]')
+# Resolve the agent's first name. Order of preference:
+#   1. config/agent.json  — single source of truth (SOT) introduced when
+#      maestro split identity out of TypeScript into JSON. Use jq if
+#      available, otherwise a small awk fallback.
+#   2. config/agent.ts    — legacy path; only works if firstName is
+#      defined inline (string literal), not as a type-only declaration
+#      like `firstName: string;`.
+#   3. Directory name     — last-resort fallback (e.g. ~/ravi-ai → ravi).
+AGENT_JSON="$AGENT_DIR/config/agent.json"
+AGENT_TS="$AGENT_DIR/config/agent.ts"
+AGENT_FIRST=""
+
+if [ -z "$AGENT_FIRST" ] && [ -f "$AGENT_JSON" ]; then
+    if command -v jq >/dev/null 2>&1; then
+        AGENT_FIRST=$(jq -r '.firstName // empty' "$AGENT_JSON" 2>/dev/null | tr '[:upper:]' '[:lower:]')
+    else
+        # Awk fallback — handle "firstName": "value" with optional whitespace
+        AGENT_FIRST=$(awk -F'"' '/"firstName"[[:space:]]*:/ { print tolower($4); exit }' "$AGENT_JSON")
+    fi
+fi
+
+if [ -z "$AGENT_FIRST" ] && [ -f "$AGENT_TS" ]; then
+    # Only accept a quoted inline value — `firstName: string;` (type
+    # declaration) must not match. The grep requires a quote on the line.
+    AGENT_FIRST=$(grep "firstName:[[:space:]]*['\"]" "$AGENT_TS" \
+        | head -1 \
+        | sed "s/.*firstName:[[:space:]]*['\"]//; s/['\"].*//" \
+        | tr '[:upper:]' '[:lower:]')
 fi
 
-# Fall back to directory name if config not set or UNCONFIGURED
+# Fall back to directory name if config not set or UNCONFIGURED.
 if [ -z "$AGENT_FIRST" ] || [ "$AGENT_FIRST" = "unconfigured" ]; then
     AGENT_FIRST=$(basename "$AGENT_DIR" | sed 's/-ai$//')
 fi
@@ -244,13 +268,27 @@ generate_trigger_plist "meeting-prep" "" "900"
 # 6. Meeting action capture (every 30 minutes)
 generate_trigger_plist "meeting-action-capture" "" "1800"
 
-# 7. Midday sweep (daily at 12:00 local)
+# 7a. Daily morning brief (06:30 local)
+generate_trigger_plist "daily-morning-brief" \
+    "        <key>Hour</key>
+        <integer>6</integer>
+        <key>Minute</key>
+        <integer>30</integer>"
+
+# 7b. Midday sweep (daily at 12:00 local)
 generate_trigger_plist "daily-midday-sweep" \
     "        <key>Hour</key>
         <integer>12</integer>
         <key>Minute</key>
         <integer>0</integer>"
 
+# 7c. Daily evening wrap (18:00 local)
+generate_trigger_plist "daily-evening-wrap" \
+    "        <key>Hour</key>
+        <integer>18</integer>
+        <key>Minute</key>
+        <integer>0</integer>"
+
 # 8. Weekly hiring (Monday 09:00)
 generate_trigger_plist "weekly-hiring" \
     "        <key>Weekday</key>

package/scripts/local-triggers/generate-plists.test.mjs

@@ -95,13 +95,20 @@ function listPlists(agentRoot) {
 // Tests
 // ---------------------------------------------------------------------------
 
-test("generator emits 13 plists with the agent's first name", async () => {
+test("generator emits 15 plists with the agent's first name", async () => {
+  // Inventory (as of cadence-bus v1):
+  //   daemon, poll-relay,
+  //   inbox-processor, backlog-executor, meeting-prep, meeting-action-capture,
+  //   daily-morning-brief, daily-midday-sweep, daily-evening-wrap,
+  //   weekly-hiring, weekly-priorities, weekly-execution,
+  //   weekly-engineering-health, weekly-strategic-memo,
+  //   quarterly-self-assessment.
   const root = await makeAgent("alice");
   try {
     const r = runGenerator(root);
     assert.equal(r.status, 0, r.stderr);
     const plists = listPlists(root);
-    assert.equal(plists.length, 13);
+    assert.equal(plists.length, 15);
     for (const p of plists) {
       assert.match(p, /^ai\.adaptic\.alice-/);
     }
@@ -167,6 +174,75 @@ test("daemon plist remains a KeepAlive job (not a cadence enqueue)", async () =>
   } finally { await rmRoot(root); }
 });
 
+test("generator reads firstName from agent.json when agent.ts is type-only (SOT layout)", async () => {
+  // Reproduce the SOT layout where agent.ts only declares interfaces
+  // (containing `firstName: string;` as a type, not a value) and the
+  // actual identity lives in agent.json. The legacy resolver matched the
+  // interface line and produced labels like
+  // `ai.adaptic.  firstname:   string;-…` — guard against regression.
+  const root = join(
+    tmpdir(),
+    `plist-sot-test-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`
+  );
+  await fsp.mkdir(root, { recursive: true });
+  // Manually wire the same fixture-builder used by other tests, except
+  // overwrite agent.ts to look like a type-only TypeScript file and add
+  // a real agent.json.
+  await fsp.mkdir(join(root, "config"), { recursive: true });
+  writeFileSync(
+    join(root, "config/agent.ts"),
+    `// Type declarations only — value lives in agent.json
+export interface PrincipalConfig { firstName: string; }
+export interface AgentConfig { firstName: string; }
+`,
+  );
+  writeFileSync(
+    join(root, "config/agent.json"),
+    JSON.stringify({ firstName: "Sigrid", lastName: "Test" }) + "\n",
+  );
+  writeFileSync(join(root, "package.json"), '{"name":"t"}');
+
+  await fsp.mkdir(join(root, "scripts/local-triggers"), { recursive: true });
+  await fsp.mkdir(join(root, "scripts/daemon"), { recursive: true });
+  await fsp.mkdir(join(root, "scripts/cadence"), { recursive: true });
+  // Same set of helper scripts as makeAgent().
+  const { copyFileSync } = await import("node:fs");
+  copyFileSync(GENERATOR, join(root, "scripts/local-triggers/generate-plists.sh"));
+  copyFileSync(
+    join(MAESTRO_ROOT, "scripts/local-triggers/run-trigger.sh"),
+    join(root, "scripts/local-triggers/run-trigger.sh"),
+  );
+  copyFileSync(
+    join(MAESTRO_ROOT, "scripts/daemon/launchd-wrapper.sh"),
+    join(root, "scripts/daemon/launchd-wrapper.sh"),
+  );
+  copyFileSync(
+    join(MAESTRO_ROOT, "scripts/daemon/launchd-wrapper-generic.sh"),
+    join(root, "scripts/daemon/launchd-wrapper-generic.sh"),
+  );
+  copyFileSync(
+    join(MAESTRO_ROOT, "scripts/cadence/launchd-cadence-wrapper.sh"),
+    join(root, "scripts/cadence/launchd-cadence-wrapper.sh"),
+  );
+  copyFileSync(
+    join(MAESTRO_ROOT, "scripts/cadence/enqueue-cadence-tick.mjs"),
+    join(root, "scripts/cadence/enqueue-cadence-tick.mjs"),
+  );
+  await fsp.chmod(join(root, "scripts/local-triggers/generate-plists.sh"), 0o755);
+
+  try {
+    const r = runGenerator(root);
+    assert.equal(r.status, 0, r.stderr);
+    const plists = listPlists(root);
+    assert.ok(plists.length >= 1);
+    for (const p of plists) {
+      assert.match(p, /^ai\.adaptic\.sigrid-/, `expected "sigrid" label, got: ${p}`);
+      assert.ok(!p.includes("string"),
+        `label leaked the TypeScript type: ${p}`);
+    }
+  } finally { await rmRoot(root); }
+});
+
 test("regeneration clears stale plists", async () => {
   const root = await makeAgent("frank");
   try {