@cohortapp/agent-sdk 2.11.14 → 2.12.0

package/scripts/setup/init-agent.test.mjs

@@ -13,7 +13,8 @@
 
 import { test } from "node:test";
 import assert from "node:assert/strict";
-import { readFileSync, writeFileSync, mkdtempSync, rmSync } from "node:fs";
+import { readFileSync, writeFileSync, mkdtempSync, mkdirSync, chmodSync, existsSync, rmSync, readdirSync } from "node:fs";
+import { spawnSync } from "node:child_process";
 import { execFileSync } from "node:child_process";
 import { join, dirname } from "node:path";
 import { tmpdir } from "node:os";
@@ -137,6 +138,14 @@ test("init-agent.sh additions contain no allow-all permissions or dangerous-skip
   assert.ok(!m[1].includes("Bash(*)"), "additions must not contain Bash(*) allow-all");
 });
 
+test("init-agent.sh creates the front-door session state and log directories", () => {
+  // launchd creates StandardOutPath's FILE but not its directory; the session
+  // plist logs to logs/session/. The feed/supervisor write under state/session/.
+  for (const d of ["logs/session", "state/session", "state/session/handoffs/done"]) {
+    assert.ok(scriptSrc.includes(`"${d}"`), `DIRS must include ${d}`);
+  }
+});
+
 test("init-agent.sh chmods the .env to 600", () => {
   assert.ok(/chmod 600 "\$ENV_FILE"/.test(scriptSrc),
     "the agent .env must be chmod 600 after writing (no world-readable credentials)");
@@ -149,3 +158,213 @@ test("init-agent.sh deep-merges rather than cat>-overwriting settings.json", ()
   assert.ok(scriptSrc.includes("node -e \"$MAESTRO_MERGE_NODE\""),
     "the merge must run via the embedded node program");
 });
+
+// ---------------------------------------------------------------------------
+// Front-door session prerequisites (design §3.7 / §6 WP-M3): the global SDK
+// install and a terminal multiplexer. The block is embedded in init-agent.sh
+// between BEGIN/END markers; we extract that exact block and run it under
+// bash with stub binaries, so the test pins what the script actually ships.
+// ---------------------------------------------------------------------------
+
+function extractGlobalSdkBlock() {
+  const m = scriptSrc.match(/# --- BEGIN maestro global-sdk check[^\n]*\n([\s\S]*?)# --- END maestro global-sdk check ---/);
+  assert.ok(m, "global-sdk check block (BEGIN/END markers) not found in init-agent.sh");
+  return m[1];
+}
+
+/**
+ * Run the extracted block with a stub `npm` (and optional `tmux`) on PATH.
+ * `npm ls -g` exits per `installed`; `npm view` prints `latest`; every call is
+ * appended to calls.log. Returns {status, stdout, calls}.
+ */
+function runGlobalSdkBlock({ installed, installedVersion = "1.0.0", latest = "1.0.0", tmux = false, screenBin, env = {} }) {
+  const dir = makeTmp();
+  try {
+    const bin = join(dir, "bin");
+    const log = join(dir, "calls.log");
+    mkdirSync(bin, { recursive: true });
+    writeFileSync(join(bin, "npm"), `#!/bin/bash
+echo "npm $*" >> "${log}"
+case "$1" in
+  ls) ${installed ? `echo "/usr/local/lib"; echo "└── @cohortapp/agent-sdk@${installedVersion}"; exit 0` : "exit 1"} ;;
+  view) echo "${latest}"; exit 0 ;;
+  install) exit 0 ;;
+esac
+exit 0
+`);
+    chmodSync(join(bin, "npm"), 0o755);
+    if (tmux) { writeFileSync(join(bin, "tmux"), "#!/bin/bash\necho 'tmux 3.4'\n"); chmodSync(join(bin, "tmux"), 0o755); }
+    const prog = `log(){ echo "[init] $1"; }; ok(){ echo "  ok $1"; }; warn(){ echo "  warn $1"; }; fail(){ echo "  FAIL $1"; exit 1; }\n${extractGlobalSdkBlock()}`;
+    writeFileSync(join(dir, "block.sh"), prog);
+    const r = spawnSync("/bin/bash", [join(dir, "block.sh")], {
+      encoding: "utf8",
+      env: { PATH: `${bin}:${env.MAESTRO_TEST_EXTRA_PATH ? `${env.MAESTRO_TEST_EXTRA_PATH}:` : ""}/usr/bin:/bin`, HOME: dir, MAESTRO_SCREEN_BIN: screenBin || join(dir, "no-such-screen"), ...env },
+    });
+    const calls = existsSync(log) ? readFileSync(log, "utf8") : "";
+    return { status: r.status, stdout: r.stdout + r.stderr, calls };
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+}
+
+test("global SDK present and current: verified, nothing installed", () => {
+  const r = runGlobalSdkBlock({ installed: true, installedVersion: "2.0.0", latest: "2.0.0", tmux: true });
+  assert.equal(r.status, 0, r.stdout);
+  assert.match(r.calls, /^npm ls -g @cohortapp\/agent-sdk/m, `must verify with npm ls -g; calls:\n${r.calls}`);
+  assert.ok(!/npm install -g/.test(r.calls), `must not install; calls:\n${r.calls}`);
+  assert.match(r.stdout, /Global SDK.*2\.0\.0/);
+});
+
+test("global SDK missing: installs @latest", () => {
+  const r = runGlobalSdkBlock({ installed: false, tmux: true });
+  assert.equal(r.status, 0, r.stdout);
+  assert.match(r.calls, /^npm install -g @cohortapp\/agent-sdk@latest/m, `expected a global install; calls:\n${r.calls}`);
+});
+
+test("global SDK outdated: upgrades to @latest", () => {
+  const r = runGlobalSdkBlock({ installed: true, installedVersion: "1.0.0", latest: "2.0.0", tmux: true });
+  assert.equal(r.status, 0, r.stdout);
+  assert.match(r.calls, /^npm install -g @cohortapp\/agent-sdk@latest/m, `expected an upgrade; calls:\n${r.calls}`);
+});
+
+test("MAESTRO_SKIP_GLOBAL_INSTALL=1 verifies but never installs or upgrades", () => {
+  for (const scenario of [{ installed: false }, { installed: true, installedVersion: "1.0.0", latest: "2.0.0" }]) {
+    const r = runGlobalSdkBlock({ ...scenario, tmux: true, env: { MAESTRO_SKIP_GLOBAL_INSTALL: "1" } });
+    assert.equal(r.status, 0, r.stdout);
+    assert.match(r.calls, /^npm ls -g @cohortapp\/agent-sdk/m, "still verifies");
+    assert.ok(!/npm install/.test(r.calls), `must not install under the skip flag; calls:\n${r.calls}`);
+    assert.match(r.stdout, /MAESTRO_SKIP_GLOBAL_INSTALL/, "must say why it skipped");
+  }
+});
+
+test("multiplexer: tmux preferred, /usr/bin/screen accepted, neither → warning naming brew install tmux", () => {
+  const withTmux = runGlobalSdkBlock({ installed: true, tmux: true });
+  assert.match(withTmux.stdout, /tmux/);
+  const dir = makeTmp();
+  try {
+    const screen = join(dir, "screen");
+    writeFileSync(screen, "#!/bin/bash\necho 'Screen version 4.00.03'\n"); chmodSync(screen, 0o755);
+    const withScreen = runGlobalSdkBlock({ installed: true, tmux: false, screenBin: screen });
+    assert.equal(withScreen.status, 0, withScreen.stdout);
+    assert.match(withScreen.stdout, /screen/i);
+  } finally { rmSync(dir, { recursive: true, force: true }); }
+  const neither = runGlobalSdkBlock({ installed: true, tmux: false });
+  assert.equal(neither.status, 0, "a missing multiplexer is a warning, not a fatal (screen ships with macOS)");
+  assert.match(neither.stdout, /brew install tmux/);
+});
+
+// ---------------------------------------------------------------------------
+// Review fixes (2026-09-08): the global-sdk block also verifies PATH and never
+// blocks on the registry; Step 5 never unload/loads a live session or daemon.
+// ---------------------------------------------------------------------------
+
+test("global SDK block: `npm view` carries a fetch timeout so an offline init-agent does not hang for minutes", () => {
+  const r = runGlobalSdkBlock({ installed: true, installedVersion: "2.0.0", latest: "2.0.0", tmux: true });
+  assert.match(r.calls, /^npm view @cohortapp\/agent-sdk version.*--fetch-timeout=\d+/m, `calls:\n${r.calls}`);
+});
+
+test("global SDK block: verifies that maestro and cohort-mcp resolve on PATH (spec §3.7(6))", () => {
+  const missing = runGlobalSdkBlock({ installed: true, installedVersion: "2.0.0", latest: "2.0.0", tmux: true });
+  assert.equal(missing.status, 0, missing.stdout);
+  assert.match(missing.stdout, /warn.*maestro.*not on PATH|warn.*not on PATH.*maestro/i, `must warn when maestro is missing from PATH:\n${missing.stdout}`);
+  assert.match(missing.stdout, /cohort-mcp/, "must name cohort-mcp too");
+  // Present on PATH → ok lines naming both.
+  const dir = makeTmp();
+  try {
+    const extra = join(dir, "gbin");
+    mkdirSync(extra, { recursive: true });
+    for (const b of ["maestro", "cohort-mcp"]) { writeFileSync(join(extra, b), "#!/bin/bash\nexit 0\n"); chmodSync(join(extra, b), 0o755); }
+    const present = runGlobalSdkBlock({ installed: true, installedVersion: "2.0.0", latest: "2.0.0", tmux: true, env: { MAESTRO_TEST_EXTRA_PATH: extra } });
+    assert.equal(present.status, 0, present.stdout);
+    assert.match(present.stdout, /ok.*maestro on PATH/i, present.stdout);
+    assert.match(present.stdout, /ok.*cohort-mcp on PATH/i, present.stdout);
+    assert.ok(!/not on PATH/.test(present.stdout));
+  } finally { rmSync(dir, { recursive: true, force: true }); }
+});
+
+function extractLaunchdBlock() {
+  const m = scriptSrc.match(/# --- BEGIN maestro launchd install[^\n]*\n([\s\S]*?)# --- END maestro launchd install ---/);
+  assert.ok(m, "launchd install block (BEGIN/END markers) not found in init-agent.sh");
+  return m[1];
+}
+
+/**
+ * Run Step 5 with a stub launchctl whose `list <label>` exits 0 for labels in
+ * `loaded`. Generated plists live in scripts/local-triggers/plists/ of a
+ * fixture agent dir. Returns {status, stdout, calls, home}.
+ */
+function runLaunchdBlock({ plists, loaded = [], supervisor = true, migrate = false }) {
+  const dir = makeTmp();
+  const agent = join(dir, "agent");
+  const home = join(dir, "home");
+  const bin = join(dir, "bin");
+  const log = join(dir, "calls.log");
+  mkdirSync(join(agent, "scripts", "local-triggers", "plists"), { recursive: true });
+  mkdirSync(join(agent, "scripts", "session"), { recursive: true });
+  mkdirSync(join(agent, "scripts", "poller-launchd"), { recursive: true });
+  mkdirSync(join(home, "Library", "LaunchAgents"), { recursive: true });
+  mkdirSync(bin, { recursive: true });
+  for (const label of plists) writeFileSync(join(agent, "scripts", "local-triggers", "plists", `${label}.plist`), `<plist>${label}</plist>\n`);
+  if (supervisor) writeFileSync(join(agent, "scripts", "session", "supervisor.sh"), "#!/bin/bash\n");
+  if (migrate) { writeFileSync(join(agent, "scripts", "poller-launchd", "migrate.sh"), `#!/bin/bash\necho "migrate $*" >> "${log}"\n`); chmodSync(join(agent, "scripts", "poller-launchd", "migrate.sh"), 0o755); }
+  writeFileSync(join(bin, "launchctl"), `#!/bin/bash
+echo "launchctl $*" >> "${log}"
+if [ "$1" = "list" ] && [ -n "$2" ]; then case " ${loaded.join(" ")} " in *" $2 "*) exit 0 ;; *) exit 1 ;; esac; fi
+exit 0
+`);
+  chmodSync(join(bin, "launchctl"), 0o755);
+  const prog = `set -u
+log(){ echo "[init] $1"; }; ok(){ echo "  ok $1"; }; warn(){ echo "  warn $1"; }
+AGENT_DIR="${agent}"
+LAUNCH_AGENTS_DIR="$HOME/Library/LaunchAgents"
+PLIST_DIR="$AGENT_DIR/scripts/local-triggers/plists"
+${extractLaunchdBlock()}`;
+  writeFileSync(join(dir, "block.sh"), prog);
+  const r = spawnSync("/bin/bash", [join(dir, "block.sh")], { encoding: "utf8", env: { PATH: `${bin}:/usr/bin:/bin`, HOME: home } });
+  const calls = existsSync(log) ? readFileSync(log, "utf8") : "";
+  const installed = readdirSync(join(home, "Library", "LaunchAgents"));
+  rmSync(dir, { recursive: true, force: true });
+  return { status: r.status, stdout: r.stdout + r.stderr, calls, installed };
+}
+
+test("Step 5: a LOADED session or daemon job is rewritten but never unloaded/loaded on a re-run (WP-M6 'never bootout')", () => {
+  const r = runLaunchdBlock({
+    plists: ["ai.maestro.ivy-session", "ai.maestro.ivy-daemon", "ai.maestro.ivy-daily-brief"],
+    loaded: ["ai.maestro.ivy-session", "ai.maestro.ivy-daemon", "ai.maestro.ivy-daily-brief"],
+  });
+  assert.equal(r.status, 0, r.stdout);
+  assert.ok(!/launchctl (unload|bootout)[^\n]*-session/.test(r.calls), `must not unload the session job; calls:\n${r.calls}`);
+  assert.ok(!/launchctl load[^\n]*-session/.test(r.calls), `must not re-load a loaded session job; calls:\n${r.calls}`);
+  assert.ok(!/launchctl (unload|bootout|load)[^\n]*-daemon/.test(r.calls), `must not unload/load a loaded daemon; calls:\n${r.calls}`);
+  // The trigger job keeps today's unload + load (its script may have changed).
+  assert.match(r.calls, /launchctl unload[^\n]*daily-brief/);
+  assert.match(r.calls, /launchctl load[^\n]*daily-brief/);
+  // Files are still refreshed for all three.
+  assert.deepEqual(r.installed.sort(), ["ai.maestro.ivy-daemon.plist", "ai.maestro.ivy-daily-brief.plist", "ai.maestro.ivy-session.plist"]);
+  assert.match(r.stdout, /kept running/i);
+});
+
+test("Step 5: a NOT-loaded session/daemon job is installed and loaded (first run)", () => {
+  const r = runLaunchdBlock({ plists: ["ai.maestro.ivy-session", "ai.maestro.ivy-daemon"], loaded: [] });
+  assert.equal(r.status, 0, r.stdout);
+  assert.match(r.calls, /launchctl load[^\n]*ai\.maestro\.ivy-session\.plist/);
+  assert.match(r.calls, /launchctl load[^\n]*ai\.maestro\.ivy-daemon\.plist/);
+  assert.ok(!/launchctl unload/.test(r.calls), "nothing to unload on a first run");
+});
+
+test("Step 5: the session plist is skipped when scripts/session/supervisor.sh is absent (launchd would retry every 30 s forever)", () => {
+  const r = runLaunchdBlock({ plists: ["ai.maestro.ivy-session", "ai.maestro.ivy-daemon"], loaded: [], supervisor: false });
+  assert.equal(r.status, 0, r.stdout);
+  assert.ok(!/-session/.test(r.calls), `must not load a session plist with no supervisor; calls:\n${r.calls}`);
+  assert.ok(!r.installed.includes("ai.maestro.ivy-session.plist"));
+  assert.match(r.stdout, /supervisor\.sh/);
+  assert.match(r.calls, /launchctl load[^\n]*-daemon/);
+});
+
+test("Step 5: runs the poller-plist migration (audit F6 follow-through) when it ships", () => {
+  const r = runLaunchdBlock({ plists: ["ai.maestro.ivy-daemon"], migrate: true });
+  assert.equal(r.status, 0, r.stdout);
+  assert.match(r.calls, /^migrate/m, `calls:\n${r.calls}`);
+  const without = runLaunchdBlock({ plists: ["ai.maestro.ivy-daemon"], migrate: false });
+  assert.equal(without.status, 0, "an absent migrate.sh is not an error");
+});

package/scripts/watchdog/memory-watchdog.sh

@@ -16,7 +16,10 @@
 #            auto-expiring ceiling = liveCount-2 that the resource governor
 #            reads to admit fewer sessions. NO kills.
 #   HARD     (sys 80–90% / claude ≥75%) → SIGTERM the youngest/biggest
-#            subagents, sparing the oldest "main" session (MIN_AGE_SECONDS).
+#            subagents, sparing the oldest "main" session (MIN_AGE_SECONDS)
+#            and — audit F16 — NEVER the seat's interactive main session
+#            (`--name <first>-main`) or its feed (scripts/session/feed.mjs),
+#            whatever their age or size. See is_protected_cmdline.
 #   CRITICAL (sys ≥90%, sustained 2 consecutive runs) → clean daemon RESTART
 #            via `launchctl kickstart -k` (the daemon re-reads state/queues +
 #            cooldowns + sweeps stale claims). NOT a halt. Only after 3 failed
@@ -156,6 +159,34 @@ count_claude_processes() {
 
 # --- Identification ----------------------------------------------------------
 
+# Audit F16. The oldest-process heuristic below is not enough: after a relaunch
+# the seat's interactive main session is the YOUNGEST claude process, and the
+# HARD tier killed it. The main session is identified by its command line, not
+# its age: `claude --name <first>-main …` (the supervisor launches it so) and
+# the feed running inside it (`node scripts/session/feed.mjs`). Pure: takes the
+# command line, exits 0 when the process must never be signalled.
+is_protected_cmdline() {
+  local cmdline="${1:-}"
+  [ -z "$cmdline" ] && return 1
+  # `--name <token>-main` as a WHOLE token (not -mainline, not -main-2).
+  if printf '%s\n' "$cmdline" | grep -Eq -- '(^|[[:space:]])--name[[:space:]]+[A-Za-z0-9_.-]+-main([[:space:]]|$)'; then
+    return 0
+  fi
+  case "$cmdline" in
+    *scripts/session/feed.mjs*) return 0 ;;
+  esac
+  return 1
+}
+
+# Full command line of a pid ("" when the process is gone). `-ww` = unlimited
+# width: without it macOS ps clips `command=` to the terminal width when
+# stdout is a tty (an operator's --check / --dry-run), and a long claude argv
+# can lose its `--name <first>-main` token — which would un-protect the main
+# session exactly when a human is watching.
+cmdline_of() {
+  /bin/ps -ww -o command= -p "$1" 2>/dev/null || true
+}
+
 identify_main_session() {
   # The oldest claude process is treated as the "main" session and spared by
   # HARD-tier kills. (longest-running heuristic)
@@ -201,6 +232,11 @@ kill_youngest_biggest_subagents() {
       log_event "info" "skip_young" "PID $pid age ${age}s < ${MIN_AGE_SECONDS}s minimum"
       continue
     fi
+    # Audit F16: the interactive main session and its feed are never candidates.
+    if is_protected_cmdline "$(cmdline_of "$pid")"; then
+      log_event "info" "skip_protected" "PID $pid is the main session / feed — never signalled"
+      continue
+    fi
     if [ "$killed" -ge "$target_count" ]; then
       break
     fi

package/scripts/watchdog/memory-watchdog.test.mjs

@@ -0,0 +1,64 @@
+/**
+ * memory-watchdog.test.mjs — audit F16: the HARD tier could SIGTERM the
+ * seat's long-lived interactive main session (it only spared the OLDEST
+ * claude process, and a freshly relaunched main session is not the oldest).
+ *
+ * The rule under test is a pure shell function, `is_protected_cmdline`,
+ * extracted from the script and run under bash: a command line carrying
+ * `--name <anything>-main` or `scripts/session/feed.mjs` is never a kill
+ * candidate. The kill loop is also checked textually for the call site, so
+ * the function cannot be defined and then not used.
+ */
+
+import { test } from "node:test";
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import { spawnSync } from "node:child_process";
+import { join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const SCRIPT = join(dirname(fileURLToPath(import.meta.url)), "memory-watchdog.sh");
+
+/** Extract `is_protected_cmdline` from the script and evaluate it on one command line. Exit 0 = protected. */
+function isProtected(cmdline) {
+  const src = readFileSync(SCRIPT, "utf8");
+  const m = src.match(/\nis_protected_cmdline\(\) \{[\s\S]*?\n\}\n/);
+  assert.ok(m, "memory-watchdog.sh defines is_protected_cmdline()");
+  const r = spawnSync("/bin/bash", ["-c", `${m[0]}\nis_protected_cmdline "$1"`, "_", cmdline], { encoding: "utf8" });
+  return r.status === 0;
+}
+
+test("the main session (`--name <first>-main`) is protected, whatever the first name", () => {
+  assert.equal(isProtected("claude --name alex-main --resume 1234 --dangerously-skip-permissions"), true);
+  assert.equal(isProtected("/opt/homebrew/bin/claude --dangerously-skip-permissions --name marc-main"), true);
+  assert.equal(isProtected("node /Users/x/.npm-global/lib/node_modules/@anthropic-ai/claude-code/cli.js --name olivia-main"), true);
+});
+
+test("the session feed (scripts/session/feed.mjs) is protected", () => {
+  assert.equal(isProtected("node /Users/alex/alex-ai/scripts/session/feed.mjs"), true);
+  assert.equal(isProtected("/usr/local/bin/node scripts/session/feed.mjs --agent-root /x"), true);
+});
+
+test("sub-sessions, peers and print spawns are NOT protected", () => {
+  assert.equal(isProtected("claude --print --output-format json --dangerously-skip-permissions prompt"), false);
+  assert.equal(isProtected("claude --name alex-research --dangerously-skip-permissions"), false);
+  assert.equal(isProtected("claude --name alex-mainline"), false, "-main must be a whole token");
+  assert.equal(isProtected("claude --name alex-main-2"), false);
+  assert.equal(isProtected("node scripts/daemon/maestro-daemon.mjs"), false);
+  assert.equal(isProtected(""), false);
+});
+
+test("the HARD-tier kill loop consults is_protected_cmdline before SIGTERM and logs the skip", () => {
+  const src = readFileSync(SCRIPT, "utf8");
+  const loop = src.slice(src.indexOf("kill_youngest_biggest_subagents() {"), src.indexOf('done <<< "$(get_claude_processes)"'));
+  assert.match(loop, /is_protected_cmdline/, "the kill loop calls the guard");
+  assert.match(loop, /skip_protected/, "a protected skip is logged");
+  assert.ok(loop.indexOf("is_protected_cmdline") < loop.indexOf('kill -TERM "$pid"'), "the guard runs before the signal");
+});
+
+test("cmdline_of reads the FULL command line (ps -ww) so a long argv is never cut before --name <first>-main on a narrow tty", () => {
+  const src = readFileSync(SCRIPT, "utf8");
+  const m = src.match(/\ncmdline_of\(\) \{[\s\S]*?\n\}\n/);
+  assert.ok(m, "memory-watchdog.sh defines cmdline_of()");
+  assert.match(m[0], /\/bin\/ps -ww /, "ps must be given -ww (unlimited width) — macOS truncates `-o command=` to the terminal width otherwise");
+});

package/scripts/setup/boot-claude-session.sh

@@ -1,94 +0,0 @@
-#!/bin/bash
-# =============================================================================
-# boot-claude-session.sh — Launch interactive Claude Code session on boot
-# =============================================================================
-#
-# Opens Terminal.app with a Claude Code interactive session in the agent's
-# working directory. Called via launchd at login.
-#
-# This is separate from the maestro daemon (which runs headless as a Node.js
-# process for polling/dispatching). This script provides a visible, interactive
-# Claude Code session that the operator can observe and interact with.
-#
-# Usage:
-#   ./scripts/setup/boot-claude-session.sh <agent-dir>
-#
-# =============================================================================
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-MAESTRO_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
-
-# Agent directory required as first argument (e.g. ~/<firstname>-ai).
-AGENT_DIR="${1:?Agent directory required as first argument (e.g. ~/<firstname>-ai)}"
-if [ ! -d "$AGENT_DIR" ]; then
-  echo "ERROR: Agent directory does not exist: $AGENT_DIR" >&2
-  exit 1
-fi
-
-AGENT_NAME=$(basename "$AGENT_DIR")
-# Resolve the agent's display name from config/agent.json (SOT), falling
-# back to the directory basename. Used for the Terminal window banner.
-AGENT_DISPLAY="$AGENT_NAME"
-if [ -f "$AGENT_DIR/config/agent.json" ]; then
-  if command -v jq >/dev/null 2>&1; then
-    fn=$(jq -r '.fullName // empty' "$AGENT_DIR/config/agent.json")
-    [ -n "$fn" ] && AGENT_DISPLAY="$fn"
-  fi
-fi
-LOG_FILE="$MAESTRO_DIR/logs/watchdog/$(date +%Y-%m-%d)-boot-session.log"
-mkdir -p "$(dirname "$LOG_FILE")"
-
-log() {
-  echo "[$(date -u +"%Y-%m-%dT%H:%M:%SZ")] $1" | tee -a "$LOG_FILE"
-}
-
-# Wait for the system to settle after login (network, services, etc.)
-log "Waiting 15s for system to settle..."
-sleep 15
-
-# Check for emergency stop
-if [ -f "$AGENT_DIR/.emergency-stop" ]; then
-  log "Emergency stop active — not starting Claude session"
-  exit 0
-fi
-
-if [ -f "$MAESTRO_DIR/.emergency-stop" ]; then
-  log "Emergency stop active in maestro — not starting Claude session"
-  exit 0
-fi
-
-# Check if claude CLI is available
-if ! command -v claude &>/dev/null; then
-  # Try common paths
-  CLAUDE_PATH=""
-  for p in "$HOME/.local/bin/claude" "/opt/homebrew/bin/claude" "/usr/local/bin/claude"; do
-    if [ -x "$p" ]; then
-      CLAUDE_PATH="$p"
-      break
-    fi
-  done
-
-  if [ -z "$CLAUDE_PATH" ]; then
-    log "ERROR: claude CLI not found"
-    exit 1
-  fi
-else
-  CLAUDE_PATH=$(which claude)
-fi
-
-log "Starting Claude Code session in $AGENT_DIR (claude: $CLAUDE_PATH)"
-
-# Open Terminal.app with Claude Code running in the agent directory
-osascript <<APPLESCRIPT
-tell application "Terminal"
-    activate
-    -- Open a new window with claude running in the agent directory
-    do script "cd '$AGENT_DIR' && clear && echo '╔══════════════════════════════════════════════════════════╗' && echo '║  $AGENT_DISPLAY — Boot Session ($(date +%Y-%m-%d))' && echo '╠══════════════════════════════════════════════════════════╣' && echo '║  Agent dir: $AGENT_DIR' && echo '║  Claude:    $CLAUDE_PATH' && echo '╚══════════════════════════════════════════════════════════╝' && echo '' && '$CLAUDE_PATH'"
-    -- Set the window title
-    set custom title of front window to "$AGENT_NAME — Claude Code"
-end tell
-APPLESCRIPT
-
-log "Terminal window opened with Claude Code session"