@openape/apes 1.29.0 → 1.30.0

package/dist/cli.js

@@ -381,7 +381,7 @@ async function loginWithPKCE(idp) {
   consola2.success(`Logged in as ${payload.email || payload.sub}`);
 }
 async function loginWithKey(idp, keyPath, agentEmail) {
-  const { readFileSync: readFileSync21 } = await import("fs");
+  const { readFileSync: readFileSync18 } = await import("fs");
   const { sign: sign3 } = await import("crypto");
   const { loadEd25519PrivateKey: loadEd25519PrivateKey2 } = await import("./ssh-key-YBNNG5K5.js");
   const challengeUrl = await getAgentChallengeEndpoint(idp);
@@ -395,7 +395,7 @@ async function loginWithKey(idp, keyPath, agentEmail) {
     throw new CliError(`Challenge failed: ${await challengeResp.text()}`);
   }
   const { challenge } = await challengeResp.json();
-  const keyContent = readFileSync21(keyPath, "utf-8");
+  const keyContent = readFileSync18(keyPath, "utf-8");
   const privateKey = loadEd25519PrivateKey2(keyContent);
   const signature = sign3(null, Buffer2.from(challenge), privateKey).toString("base64");
   const authenticateUrl = await getAgentAuthenticateEndpoint(idp);
@@ -1976,15 +1976,13 @@ var agentCommand = defineCommand21({
 import { defineCommand as defineCommand32 } from "citty";
 
 // src/commands/agents/allow.ts
-import { execFileSync as execFileSync10 } from "child_process";
+import { execFileSync as execFileSync6 } from "child_process";
 import { defineCommand as defineCommand22 } from "citty";
 import consola19 from "consola";
 
 // src/lib/agent-bootstrap.ts
 import { Buffer as Buffer3 } from "buffer";
-import { execFileSync as execFileSync2 } from "child_process";
 import { createPrivateKey, sign } from "crypto";
-import { rmSync } from "fs";
 import { exchangeWithDelegation } from "@openape/cli-auth";
 var AGENT_NAME_REGEX = /^[a-z][a-z0-9-]{0,23}$/;
 var SSH_ED25519_PREFIX = "ssh-ed25519 ";
@@ -2061,7 +2059,10 @@ async function issueAgentToken(input) {
   const challengeResp = await fetch(challengeUrl, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ agent_id: input.agentEmail })
+    // Canonical /api/auth/challenge expects `id` (M3). The legacy
+    // /api/agent/challenge field was `agent_id`; discovery now resolves
+    // the canonical endpoint, so the payload must use `id` to match.
+    body: JSON.stringify({ id: input.agentEmail })
   });
   if (!challengeResp.ok) {
     const text = await challengeResp.text().catch(() => "");
@@ -2073,7 +2074,8 @@ async function issueAgentToken(input) {
   const authResp = await fetch(authenticateUrl, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ agent_id: input.agentEmail, challenge, signature })
+    // Canonical /api/auth/authenticate expects `id` (same M3 rename).
+    body: JSON.stringify({ id: input.agentEmail, challenge, signature })
   });
   if (!authResp.ok) {
     const text = await authResp.text().catch(() => "");
@@ -2092,7 +2094,7 @@ ${content}
 ${SH_HEREDOC_DELIMITER}`;
 }
 function buildSpawnSetupScript(input) {
-  const { name, macOSUsername, homeDir, shellPath } = input;
+  const { name, homeDir, shellPath } = input;
   const privatePemForHeredoc = input.privateKeyPem.endsWith("\n") ? input.privateKeyPem : `${input.privateKeyPem}
 `;
   const claudeBlock = input.claudeSettingsJson && input.hookScriptSource ? `
@@ -2123,95 +2125,50 @@ done
   return `#!/bin/bash
 set -euo pipefail
 
-# escapes-spawned scripts inherit a minimal PATH that doesn't include
-# /usr/sbin \u2014 which is where chown / dscl / pwpolicy live. Force a
-# wide PATH so the privileged setup commands resolve without absolute
-# paths everywhere.
-export PATH="/usr/sbin:/usr/bin:/bin:/sbin:/opt/homebrew/bin:/usr/local/bin"
+# Wide PATH so useradd / getent / install / chown resolve regardless of
+# how the privileged wrapper trimmed the environment.
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 NAME=${shQuote(name)}
-MACOS_USER=${shQuote(macOSUsername)}
 HOME_DIR=${shQuote(homeDir)}
 SHELL_PATH=${shQuote(shellPath)}
 
-# Tombstone-reuse: \`apes agents destroy\` leaves the dscl user
-# record behind (opendirectoryd refuses \`dscl . -delete\` from
-# escapes' setuid-root context without admin auth, so we accept the
-# stranded record as a harmless tombstone \u2014 see
-# runPhaseGTeardownInProcess). When the operator re-spawns with the
-# same name, we recycle the tombstone instead of refusing: if the
-# previously-recorded home dir is gone from disk (matching the
-# Phase-G teardown's \`rm -rf\`), we reuse the existing UID +
-# overwrite the home. If the home is still on disk it's a real,
-# live agent \u2014 refuse.
-TOMBSTONE_REUSE=0
-if dscl . -read "/Users/$MACOS_USER" >/dev/null 2>&1; then
-  EXISTING_HOME=$(dscl . -read "/Users/$MACOS_USER" NFSHomeDirectory 2>/dev/null | awk '/NFSHomeDirectory:/ {print $2}')
-  if [ -n "$EXISTING_HOME" ] && [ -d "$EXISTING_HOME" ]; then
-    echo "User $MACOS_USER already exists with a live home at $EXISTING_HOME; refusing to overwrite." >&2
-    exit 1
-  fi
-  NEXT_UID=$(dscl . -read "/Users/$MACOS_USER" UniqueID 2>/dev/null | awk '/UniqueID:/ {print $2}')
-  if [ -z "$NEXT_UID" ]; then
-    echo "User $MACOS_USER exists but has no UniqueID; record is malformed, refusing to recycle." >&2
-    exit 1
-  fi
-  echo "Recycling tombstone dscl record for $MACOS_USER (uid=$NEXT_UID, prior home $EXISTING_HOME \u2014 gone)"
-  TOMBSTONE_REUSE=1
+# Agent homes live under /var/lib/openape/homes/ (the persisted
+# openape-homes volume) \u2014 out of /home/ where real operator accounts
+# live. useradd --create-home makes the leaf dir but not missing
+# parents; the volume mount provides the parent, but pre-create it
+# anyway so a bare-metal/non-volume run still works.
+mkdir -p /var/lib/openape/homes
+chmod 755 /var/lib/openape/homes
+
+# Create the agent's OS user if absent. spawn.ts already refused earlier
+# when the user existed, but guard here too so a re-run of the privileged
+# script is idempotent rather than erroring on a half-created account.
+if ! getent passwd "$NAME" >/dev/null 2>&1; then
+  useradd --create-home --home-dir "$HOME_DIR" --shell "$SHELL_PATH" --comment "OpenApe Agent $NAME" "$NAME"
 fi
 
-# Phase G: agent home dirs live under /var/openape/homes/, not
-# /Users/. Pre-create the parent and chmod it world-traversable
-# so per-agent dirs can be reached by their respective uids.
-mkdir -p /var/openape/homes
-chmod 755 /var/openape/homes
-
-if [ "$TOMBSTONE_REUSE" = "0" ]; then
-  # Pick the LOWEST free UID in the [200, 500) hidden service-account
-  # range. We must skip every occupied UID \u2014 agent users AND the many
-  # macOS system _* accounts \u2014 and reuse gaps. The old code took
-  # max(existing)+1, so a single agent landing on 499 wedged every
-  # future spawn ("No free UID") even with 100+ UIDs free. Now we scan
-  # for the first actually-unused UID.
-  OCCUPIED_UIDS=$(dscl . -list /Users UniqueID | awk '$2 >= 200 && $2 < 500 {print $2}' | sort -n -u)
-  NEXT_UID=""
-  candidate=200
-  while [ "$candidate" -lt 500 ]; do
-    if ! printf '%s
-' "$OCCUPIED_UIDS" | grep -qx "$candidate"; then
-      NEXT_UID=$candidate
-      break
-    fi
-    candidate=$((candidate + 1))
-  done
-  if [ -z "$NEXT_UID" ]; then
-    echo "No free UID in [200, 500) \u2014 refusing to clobber a real user." >&2
-    exit 1
-  fi
+# Resolve the uid for the final report line (getent is the canonical read).
+NEW_UID=$(getent passwd "$NAME" | cut -d: -f3)
 
-  dscl . -create "/Users/$MACOS_USER"
-fi
-
-# Idempotent attribute writes \u2014 \`dscl . -create\` on an existing
-# property overwrites in place, so the tombstone-reuse path lands
-# the same end-state as a fresh create.
-dscl . -create "/Users/$MACOS_USER" UserShell "$SHELL_PATH"
-dscl . -create "/Users/$MACOS_USER" RealName "OpenApe Agent $NAME"
-dscl . -create "/Users/$MACOS_USER" UniqueID "$NEXT_UID"
-dscl . -create "/Users/$MACOS_USER" PrimaryGroupID 20
-dscl . -create "/Users/$MACOS_USER" NFSHomeDirectory "$HOME_DIR"
-dscl . -create "/Users/$MACOS_USER" IsHidden 1
-
-mkdir -p "$HOME_DIR/.ssh" "$HOME_DIR/.config/apes"
+# Identity dirs \u2014 created owned by the agent so the file writes below land
+# with the right owner even before the final recursive chown.
+install -d -m 700 -o "$NAME" "$HOME_DIR/.ssh"
+install -d -m 700 -o "$NAME" "$HOME_DIR/.config"
+install -d -m 700 -o "$NAME" "$HOME_DIR/.config/apes"
+install -d -m 700 -o "$NAME" "$HOME_DIR/.config/openape"
 
 cat > "$HOME_DIR/.ssh/id_ed25519" ${shHeredoc(privatePemForHeredoc.trimEnd())}
-cat > "$HOME_DIR/.ssh/id_ed25519.pub" ${shHeredoc(`${input.publicKeySshLine}`)}
+cat > "$HOME_DIR/.ssh/id_ed25519.pub" ${shHeredoc(input.publicKeySshLine)}
 cat > "$HOME_DIR/.config/apes/auth.json" ${shHeredoc(input.authJson)}
-mkdir -p "$HOME_DIR/.config/openape"
 cat > "$HOME_DIR/.config/openape/agent-x25519.key" ${shHeredoc(input.x25519PrivateKey)}
 cat > "$HOME_DIR/.config/openape/agent-x25519.key.pub" ${shHeredoc(input.x25519PublicKey)}
-${claudeBlock}${claudeTokenBlock}${buildBridgeBlock(input.bridge)}${buildTroopBlock(input.troop)}
-chown -R "$MACOS_USER:staff" "$HOME_DIR"
+${claudeBlock}${claudeTokenBlock}
+# Per-agent task dir that \`apes agents sync\` writes to (XDG-style on
+# Linux; was ~/Library/... on macOS).
+mkdir -p "$HOME_DIR/.openape/agent/tasks"
+
+chown -R "$NAME:" "$HOME_DIR"
 chmod 700 "$HOME_DIR/.ssh"
 chmod 700 "$HOME_DIR/.config"
 chmod 700 "$HOME_DIR/.config/openape"
@@ -2221,142 +2178,10 @@ chmod 600 "$HOME_DIR/.config/apes/auth.json"
 chmod 600 "$HOME_DIR/.config/openape/agent-x25519.key"
 chmod 644 "$HOME_DIR/.config/openape/agent-x25519.key.pub"
 if [ -f "$HOME_DIR/.config/openape/claude-token.env" ]; then
-  chmod 700 "$HOME_DIR/.config/openape"
   chmod 600 "$HOME_DIR/.config/openape/claude-token.env"
 fi
 
-echo "OK $NAME (macOS user $MACOS_USER) uid=$NEXT_UID home=$HOME_DIR"
-${buildBridgeBootstrapBlock(input.bridge, name)}${buildTroopBootstrapBlock(input.troop, name)}`;
-}
-function buildBridgeBlock(bridge) {
-  if (!bridge) return "";
-  return `
-mkdir -p "$HOME_DIR/Library/Application Support/openape/bridge" "$HOME_DIR/Library/Logs"
-cat > "$HOME_DIR/Library/Application Support/openape/bridge/.env" ${shHeredoc(bridge.envFile)}
-chmod 600 "$HOME_DIR/Library/Application Support/openape/bridge/.env"
-`;
-}
-function buildBridgeBootstrapBlock(_bridge, _name) {
-  return "";
-}
-function buildTroopBlock(_troop) {
-  return `
-mkdir -p "$HOME_DIR/Library/Logs" "$HOME_DIR/.openape/agent/tasks"
-`;
-}
-function buildTroopBootstrapBlock(_troop, _name) {
-  return "";
-}
-function runPhaseGTeardownInProcess(input) {
-  const { name, homeDir } = input;
-  const macOSUser = input.macOSUsername ?? name;
-  let uid = null;
-  try {
-    const out = execFileSync2("/usr/bin/dscl", [".", "-read", `/Users/${macOSUser}`, "UniqueID"], { encoding: "utf8" });
-    const m = out.match(/UniqueID:\s*(\d+)/);
-    if (m) uid = m[1];
-  } catch {
-  }
-  if (uid) {
-    try {
-      execFileSync2("/bin/launchctl", ["bootout", `user/${uid}`], { stdio: "ignore" });
-    } catch {
-    }
-    try {
-      execFileSync2("/usr/bin/pkill", ["-9", "-u", uid], { stdio: "ignore" });
-    } catch {
-    }
-  }
-  const agentDir = `/var/openape/agents/${name}`;
-  try {
-    rmSync(agentDir, { recursive: true, force: true });
-  } catch {
-  }
-  if (homeDir && homeDir !== "/" && homeDir.startsWith("/var/openape/homes/")) {
-    try {
-      rmSync(homeDir, { recursive: true, force: true });
-    } catch {
-    }
-  }
-  console.log(`OK Phase-G teardown done for ${name} (dscl record /Users/${macOSUser} kept as tombstone)`);
-}
-function buildDestroyTeardownScript(input) {
-  const { name, homeDir, adminUser } = input;
-  return `#!/bin/bash
-# Best-effort teardown. set -u catches typos; we deliberately do NOT use -e
-# because pkill / launchctl are allowed to fail when the user has no live
-# sessions.
-set -u
-
-NAME=${shQuote(name)}
-HOME_DIR=${shQuote(homeDir)}
-ADMIN_USER=${shQuote(adminUser)}
-
-# Read the admin password from stdin (line 1). The caller pipes it in.
-# We never accept it as an argv element so it can't show up in process
-# listings or escapes' audit log.
-read -r ADMIN_PASSWORD
-if [ -z "$ADMIN_PASSWORD" ]; then
-  echo "ERROR: no admin password on stdin (expected one line)." >&2
-  exit 2
-fi
-
-UID_OF=$(dscl . -read "/Users/$NAME" UniqueID 2>/dev/null | awk '/UniqueID:/ {print $2}')
-
-if [ -n "$UID_OF" ]; then
-  launchctl bootout "user/$UID_OF" 2>/dev/null || true
-  pkill -9 -u "$UID_OF" 2>/dev/null || true
-fi
-
-# Per-agent system LaunchDaemon written by spawn (unless --no-bridge). Bootout +
-# delete must come BEFORE we delete the user, otherwise launchd keeps a
-# zombie reference. No-op if the plist isn't there.
-BRIDGE_LABEL="eco.hofmann.apes.bridge.$NAME"
-BRIDGE_PLIST="/Library/LaunchDaemons/$BRIDGE_LABEL.plist"
-if [ -f "$BRIDGE_PLIST" ]; then
-  launchctl bootout "system/$BRIDGE_LABEL" 2>/dev/null || true
-  rm -f "$BRIDGE_PLIST"
-fi
-
-if [ -d "$HOME_DIR" ] && [ "$HOME_DIR" != "/" ] && [ "$HOME_DIR" != "" ]; then
-  rm -rf "$HOME_DIR"
-fi
-
-# \`escapes\` is a plain setuid binary \u2014 opendirectoryd sees no audit/PAM
-# session attached (AUDIT_SESSION_ID=unset) and rejects DirectoryService
-# writes from this context: a bare \`sysadminctl -deleteUser\` or
-# \`dscl . -delete\` hangs ~5 minutes and exits with eUndefinedError -14987
-# at DSRecord.m:563. Passing explicit -adminUser/-adminPassword bypasses
-# opendirectoryd's implicit "is current session admin?" check and
-# authenticates against DirectoryService directly \u2014 the delete then
-# completes in ~1 second.
-if ! command -v sysadminctl >/dev/null 2>&1; then
-  echo "ERROR: sysadminctl not available; cannot delete user record." >&2
-  exit 1
-fi
-
-sysadminctl \\
-  -deleteUser "$NAME" \\
-  -adminUser "$ADMIN_USER" \\
-  -adminPassword "$ADMIN_PASSWORD"
-SYSAD_EC=$?
-unset ADMIN_PASSWORD
-
-if [ $SYSAD_EC -ne 0 ]; then
-  echo "ERROR: sysadminctl -deleteUser failed (exit=$SYSAD_EC)." >&2
-  echo "       Common causes: wrong admin password, admin user '$ADMIN_USER'" >&2
-  echo "       not in admin group, or target user '$NAME' is the last secure" >&2
-  echo "       token holder (run \\\`sysadminctl -secureTokenStatus $NAME\\\`)." >&2
-  exit 1
-fi
-
-# Verify the record is actually gone.
-if dscl . -read "/Users/$NAME" >/dev/null 2>&1; then
-  echo "ERROR: user record /Users/$NAME still exists after teardown" >&2
-  exit 1
-fi
-
-echo "OK destroyed $NAME"
+echo "OK $NAME (linux user) uid=$NEW_UID home=$HOME_DIR"
 `;
 }
 function shQuote(s) {
@@ -2401,81 +2226,11 @@ print(json.dumps(out))
 '
 `;
 
-// src/lib/macos-user.ts
-import { execFileSync as execFileSync3 } from "child_process";
-import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
-function isDarwin() {
-  return process.platform === "darwin";
-}
-var MACOS_USER_PREFIX = "openape-agent-";
-function macOSUsernameForAgent(agentName) {
-  return `${MACOS_USER_PREFIX}${agentName}`;
-}
-function lookupMacOSUserForAgent(agentName) {
-  return readMacOSUser(macOSUsernameForAgent(agentName)) ?? readMacOSUser(agentName);
-}
-function listOrphanedAgentRecords() {
-  if (!isDarwin()) return [];
-  let output;
-  try {
-    output = execFileSync3("dscl", [".", "-list", "/Users", "NFSHomeDirectory"], {
-      encoding: "utf-8",
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-  } catch {
-    return [];
-  }
-  const orphans = [];
-  for (const line of output.split("\n")) {
-    const parts = line.trim().split(/\s+/);
-    if (parts.length < 2) continue;
-    const name = parts[0];
-    const homeDir = parts.slice(1).join(" ");
-    const looksLikeAgent = name.startsWith(MACOS_USER_PREFIX) || homeDir.startsWith("/var/openape/homes/");
-    if (!looksLikeAgent) continue;
-    if (existsSync3(homeDir)) continue;
-    const record = readMacOSUser(name);
-    orphans.push({ name, uid: record?.uid ?? null, homeDir });
-  }
-  return orphans;
-}
-function readMacOSUser(name) {
-  let output;
-  try {
-    output = execFileSync3("dscl", [".", "-read", `/Users/${name}`], {
-      encoding: "utf-8",
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-  } catch {
-    return null;
-  }
-  const uidMatch = output.match(/UniqueID:\s*(\d+)/);
-  const shellMatch = output.match(/UserShell:\s*(\S.*)$/m);
-  const homeMatch = output.match(/NFSHomeDirectory:\s*(\S.*)$/m);
-  return {
-    name,
-    uid: uidMatch ? Number.parseInt(uidMatch[1], 10) : null,
-    shell: shellMatch ? shellMatch[1].trim() : null,
-    homeDir: homeMatch ? homeMatch[1].trim() : null
-  };
-}
-function listMacOSUserNames() {
-  let output;
-  try {
-    output = execFileSync3("dscl", [".", "-list", "/Users"], {
-      encoding: "utf-8",
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-  } catch {
-    return /* @__PURE__ */ new Set();
-  }
-  return new Set(
-    output.split("\n").map((line) => line.trim()).filter((line) => line.length > 0)
-  );
-}
+// src/lib/which.ts
+import { execFileSync as execFileSync2 } from "child_process";
 function whichBinary(name) {
   try {
-    const out = execFileSync3("which", [name], {
+    const out = execFileSync2("which", [name], {
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "ignore"]
     }).trim();
@@ -2484,193 +2239,34 @@ function whichBinary(name) {
     return null;
   }
 }
-function isShellRegistered(shellPath) {
-  if (!existsSync3("/etc/shells")) return false;
-  const content = readFileSync2("/etc/shells", "utf-8");
-  return content.split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("#")).includes(shellPath);
-}
 
 // src/lib/host-platform/index.ts
 import process2 from "process";
 
-// src/lib/macos-host.ts
-import { execFileSync as execFileSync4 } from "child_process";
-import { hostname as hostname3 } from "os";
-function getHostId() {
-  try {
-    const output = execFileSync4(
-      "/usr/sbin/ioreg",
-      ["-d2", "-c", "IOPlatformExpertDevice"],
-      { encoding: "utf8", timeout: 2e3 }
-    );
-    const match = output.match(/"IOPlatformUUID"\s*=\s*"([^"]+)"/);
-    return match ? match[1].trim().toLowerCase() : "";
-  } catch {
-    return "";
-  }
-}
-function getHostname() {
-  try {
-    return hostname3();
-  } catch {
-    return "";
-  }
-}
-
-// src/lib/host-platform/darwin-nest.ts
-import { execFileSync as execFileSync5 } from "child_process";
-import { existsSync as existsSync4, mkdirSync, readFileSync as readFileSync3, unlinkSync, writeFileSync } from "fs";
-import { userInfo } from "os";
-import { join as join2 } from "path";
-var PLIST_LABEL = "ai.openape.nest";
-function plistPath(userHome) {
-  return join2(userHome, "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
-}
-function xmlEscape(s) {
-  return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-}
-function buildNestPlist(spec) {
-  const logsDir = join2(spec.userHome, "Library", "Logs");
-  return `<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>Label</key>
-  <string>${xmlEscape(PLIST_LABEL)}</string>
-  <key>ProgramArguments</key>
-  <array>
-    <string>${xmlEscape(spec.nestBin)}</string>
-  </array>
-  <key>WorkingDirectory</key>
-  <string>${xmlEscape(spec.nestHome)}</string>
-  <key>RunAtLoad</key>
-  <true/>
-  <key>KeepAlive</key>
-  <true/>
-  <key>ThrottleInterval</key>
-  <integer>10</integer>
-  <key>EnvironmentVariables</key>
-  <dict>
-    <key>HOME</key><string>${xmlEscape(spec.nestHome)}</string>
-    <key>PATH</key><string>/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin</string>
-    <key>OPENAPE_NEST_PORT</key><string>${spec.port}</string>
-    <key>OPENAPE_APES_BIN</key><string>${xmlEscape(spec.apesBin)}</string>
-  </dict>
-  <key>StandardOutPath</key>
-  <string>${xmlEscape(logsDir)}/openape-nest.log</string>
-  <key>StandardErrorPath</key>
-  <string>${xmlEscape(logsDir)}/openape-nest.log</string>
-</dict>
-</plist>
-`;
-}
-async function installNestSupervisorOnDarwin(spec) {
-  const path2 = plistPath(spec.userHome);
-  mkdirSync(join2(spec.userHome, "Library", "LaunchAgents"), { recursive: true });
-  const desired = buildNestPlist(spec);
-  let existing = "";
-  try {
-    existing = readFileSync3(path2, "utf8");
-  } catch {
-  }
-  if (existing !== desired) {
-    writeFileSync(path2, desired, { mode: 420 });
-  }
-  const uid = userInfo().uid;
-  try {
-    execFileSync5("/bin/launchctl", ["bootout", `gui/${uid}/${PLIST_LABEL}`], { stdio: "ignore" });
-  } catch {
-  }
-  execFileSync5("/bin/launchctl", ["bootstrap", `gui/${uid}`, path2], { stdio: "inherit" });
-}
-async function uninstallNestSupervisorOnDarwin() {
-  const home = userInfo().homedir;
-  const uid = userInfo().uid;
-  const path2 = plistPath(home);
-  try {
-    execFileSync5("/bin/launchctl", ["bootout", `gui/${uid}/${PLIST_LABEL}`], { stdio: "ignore" });
-  } catch {
-  }
-  if (existsSync4(path2)) unlinkSync(path2);
-}
-
-// src/lib/host-platform/darwin-exec.ts
-import { execFileSync as execFileSync6, spawnSync } from "child_process";
-import { mkdtempSync, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "fs";
-import { tmpdir } from "os";
-import { join as join3 } from "path";
-function resolveApesBinary() {
-  return process.env.OPENAPE_APES_BIN || "apes";
-}
-async function runPrivilegedBashOnDarwin(script) {
-  const dir = mkdtempSync(join3(tmpdir(), "apes-privileged-"));
-  const scriptPath = join3(dir, "run.sh");
-  writeFileSync2(scriptPath, script, { mode: 448 });
-  try {
-    if (process.getuid?.() === 0) {
-      execFileSync6("bash", [scriptPath], { stdio: "inherit" });
-    } else {
-      execFileSync6(resolveApesBinary(), ["run", "--as", "root", "--wait", "--", "bash", scriptPath], { stdio: "inherit" });
-    }
-  } finally {
-    try {
-      rmSync2(dir, { recursive: true, force: true });
-    } catch {
-    }
-  }
-}
-async function runAsAgentUserOnDarwin(agentName, argv) {
-  const r = spawnSync(
-    resolveApesBinary(),
-    ["run", "--as", agentName, "--wait", "--", ...argv],
-    { encoding: "utf8" }
-  );
-  return {
-    stdout: r.stdout ?? "",
-    stderr: r.stderr ?? "",
-    exitCode: r.status ?? 1
-  };
-}
-
-// src/lib/host-platform/darwin.ts
-var darwinHostPlatform = {
-  getHostId,
-  getHostname,
-  agentUsername: macOSUsernameForAgent,
-  lookupAgentUser: (agentName) => lookupMacOSUserForAgent(agentName),
-  readAgentUser: (osName) => readMacOSUser(osName),
-  listAgentUserNames: listMacOSUserNames,
-  listOrphanAgentUsers: () => listOrphanedAgentRecords().map((r) => ({ name: r.name, uid: r.uid, homeDir: r.homeDir })),
-  installNestSupervisor: installNestSupervisorOnDarwin,
-  uninstallNestSupervisor: uninstallNestSupervisorOnDarwin,
-  runPrivilegedBash: runPrivilegedBashOnDarwin,
-  runAsAgentUser: runAsAgentUserOnDarwin
-};
-
 // src/lib/host-platform/linux-host.ts
-import { hostname as hostname4 } from "os";
-import { existsSync as existsSync5, readFileSync as readFileSync4 } from "fs";
+import { hostname as hostname3 } from "os";
+import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
 var FALLBACK_PATHS = ["/etc/machine-id", "/var/lib/dbus/machine-id"];
 function getLinuxHostId() {
   for (const path2 of FALLBACK_PATHS) {
-    if (!existsSync5(path2)) continue;
+    if (!existsSync3(path2)) continue;
     try {
-      const v = readFileSync4(path2, "utf-8").trim();
+      const v = readFileSync2(path2, "utf-8").trim();
       if (v) return v;
     } catch {
     }
   }
-  return hostname4();
+  return hostname3();
 }
 function getLinuxHostname() {
-  return hostname4();
+  return hostname3();
 }
 
 // src/lib/host-platform/linux-user.ts
-import { execFileSync as execFileSync7 } from "child_process";
+import { execFileSync as execFileSync3 } from "child_process";
 function getentPasswd(name) {
   try {
-    return execFileSync7("getent", ["passwd", name], {
+    return execFileSync3("getent", ["passwd", name], {
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "ignore"]
     }).trim() || null;
@@ -2698,7 +2294,7 @@ function readLinuxUser(name) {
 }
 function listLinuxUserNames() {
   try {
-    const out = execFileSync7("getent", ["passwd"], {
+    const out = execFileSync3("getent", ["passwd"], {
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "ignore"]
     });
@@ -2714,29 +2310,29 @@ function listLinuxUserNames() {
 }
 
 // src/lib/host-platform/linux-exec.ts
-import { execFileSync as execFileSync8, spawnSync as spawnSync2 } from "child_process";
-import { mkdtempSync as mkdtempSync2, rmSync as rmSync3, writeFileSync as writeFileSync3 } from "fs";
-import { tmpdir as tmpdir2 } from "os";
-import { join as join4 } from "path";
+import { execFileSync as execFileSync4, spawnSync } from "child_process";
+import { mkdtempSync, rmSync, writeFileSync } from "fs";
+import { tmpdir } from "os";
+import { join as join2 } from "path";
 async function runPrivilegedBashOnLinux(script) {
-  const dir = mkdtempSync2(join4(tmpdir2(), "apes-privileged-"));
-  const scriptPath = join4(dir, "run.sh");
-  writeFileSync3(scriptPath, script, { mode: 448 });
+  const dir = mkdtempSync(join2(tmpdir(), "apes-privileged-"));
+  const scriptPath = join2(dir, "run.sh");
+  writeFileSync(scriptPath, script, { mode: 448 });
   try {
     if (process.getuid?.() === 0) {
-      execFileSync8("bash", [scriptPath], { stdio: "inherit" });
+      execFileSync4("bash", [scriptPath], { stdio: "inherit" });
     } else {
-      execFileSync8("sudo", ["-n", "--", "bash", scriptPath], { stdio: "inherit" });
+      execFileSync4("sudo", ["-n", "--", "bash", scriptPath], { stdio: "inherit" });
     }
   } finally {
     try {
-      rmSync3(dir, { recursive: true, force: true });
+      rmSync(dir, { recursive: true, force: true });
     } catch {
     }
   }
 }
 async function runAsAgentUserOnLinux(agentName, argv) {
-  const r = spawnSync2("sudo", ["-n", "-H", "-u", agentName, "--", ...argv], { encoding: "utf8" });
+  const r = spawnSync("sudo", ["-n", "-H", "-u", agentName, "--", ...argv], { encoding: "utf8" });
   return {
     stdout: r.stdout ?? "",
     stderr: r.stderr ?? "",
@@ -2745,8 +2341,8 @@ async function runAsAgentUserOnLinux(agentName, argv) {
 }
 
 // src/lib/host-platform/linux-nest.ts
-import { execFileSync as execFileSync9 } from "child_process";
-import { existsSync as existsSync6, readFileSync as readFileSync5, unlinkSync as unlinkSync2, writeFileSync as writeFileSync4 } from "fs";
+import { execFileSync as execFileSync5 } from "child_process";
+import { existsSync as existsSync4, readFileSync as readFileSync3, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
 var UNIT_NAME = "openape-nest.service";
 var UNIT_PATH = `/etc/systemd/system/${UNIT_NAME}`;
 function buildNestUnit(spec) {
@@ -2776,23 +2372,23 @@ async function installNestSupervisorOnLinux(spec) {
   const desired = buildNestUnit(spec);
   let existing = "";
   try {
-    existing = readFileSync5(UNIT_PATH, "utf8");
+    existing = readFileSync3(UNIT_PATH, "utf8");
   } catch {
   }
   if (existing !== desired) {
-    writeFileSync4(UNIT_PATH, desired, { mode: 420 });
+    writeFileSync2(UNIT_PATH, desired, { mode: 420 });
   }
-  execFileSync9("systemctl", ["daemon-reload"], { stdio: "inherit" });
-  execFileSync9("systemctl", ["enable", "--now", UNIT_NAME], { stdio: "inherit" });
+  execFileSync5("systemctl", ["daemon-reload"], { stdio: "inherit" });
+  execFileSync5("systemctl", ["enable", "--now", UNIT_NAME], { stdio: "inherit" });
 }
 async function uninstallNestSupervisorOnLinux() {
   try {
-    execFileSync9("systemctl", ["disable", "--now", UNIT_NAME], { stdio: "inherit" });
+    execFileSync5("systemctl", ["disable", "--now", UNIT_NAME], { stdio: "inherit" });
   } catch {
   }
-  if (existsSync6(UNIT_PATH)) unlinkSync2(UNIT_PATH);
+  if (existsSync4(UNIT_PATH)) unlinkSync(UNIT_PATH);
   try {
-    execFileSync9("systemctl", ["daemon-reload"], { stdio: "inherit" });
+    execFileSync5("systemctl", ["daemon-reload"], { stdio: "inherit" });
   } catch {
   }
 }
@@ -2818,18 +2414,14 @@ var linuxHostPlatform = {
 };
 
 // src/lib/host-platform/index.ts
-function isDarwin2() {
-  return process2.platform === "darwin";
-}
 function isLinux() {
   return process2.platform === "linux";
 }
 var testOverride = null;
 function getHostPlatform() {
   if (testOverride) return testOverride;
-  if (isDarwin2()) return darwinHostPlatform;
   if (isLinux()) return linuxHostPlatform;
-  throw new Error(`unsupported host platform: ${process2.platform}`);
+  throw new Error(`unsupported host platform: ${process2.platform} \u2014 OpenApe nests are Linux-only`);
 }
 
 // src/commands/agents/allow.ts
@@ -2842,7 +2434,7 @@ var allowAgentCommand = defineCommand22({
     agent: {
       type: "positional",
       required: true,
-      description: "Agent name (the macOS short username spawn created)"
+      description: "Agent name (the Linux username spawn created)"
     },
     email: {
       type: "positional",
@@ -2859,11 +2451,8 @@ var allowAgentCommand = defineCommand22({
     if (!email.includes("@")) {
       throw new CliError(`Invalid email "${email}".`);
     }
-    if (!isDarwin2()) {
-      throw new CliError("`apes agents allow` is currently macOS-only.");
-    }
     if (!getHostPlatform().lookupAgentUser(agent)) {
-      throw new CliError(`No macOS user for agent "${agent}" \u2014 has it been spawned?`);
+      throw new CliError(`No OS user for agent "${agent}" \u2014 has it been spawned?`);
     }
     const apes = whichBinary("apes");
     if (!apes) throw new CliError("`apes` not found on PATH.");
@@ -2894,7 +2483,7 @@ PY
 chmod 600 "$F"
 `;
     consola19.start(`Adding ${email} to ${agent}'s allowlist\u2026`);
-    execFileSync10(apes, ["run", "--as", agent, "--wait", "--", "bash", "-c", script], { stdio: "inherit" });
+    execFileSync6(apes, ["run", "--as", agent, "--wait", "--", "bash", "-c", script], { stdio: "inherit" });
     consola19.success(`${agent} will auto-accept future contact requests from ${email} (within ~30s of next bridge connect).`);
   }
 });
@@ -2903,13 +2492,12 @@ function shQuote2(s) {
 }
 
 // src/commands/agents/cleanup-orphans.ts
-import { execFileSync as execFileSync11 } from "child_process";
 import { defineCommand as defineCommand23 } from "citty";
 import consola20 from "consola";
 var cleanupOrphansCommand = defineCommand23({
   meta: {
     name: "cleanup-orphans",
-    description: "Delete tombstoned macOS user records left behind by `apes agents destroy` (run with sudo)."
+    description: "Report agent-user tombstones. Linux userdel is atomic, so there are normally none."
   },
   args: {
     "dry-run": {
@@ -2921,81 +2509,37 @@ var cleanupOrphansCommand = defineCommand23({
       description: "Skip the interactive confirmation. Required when stdin is not a TTY."
     }
   },
-  async run({ args }) {
-    if (!isDarwin2()) {
-      throw new CliError(`\`apes agents cleanup-orphans\` is macOS-only. Detected platform: ${process.platform}.`);
-    }
+  async run() {
     const orphans = getHostPlatform().listOrphanAgentUsers();
     if (orphans.length === 0) {
-      consola20.success("No agent tombstones found \u2014 dscl is clean.");
+      consola20.success("No agent tombstones \u2014 userdel is clean on Linux.");
       return;
     }
-    consola20.info(`Found ${orphans.length} agent tombstone${orphans.length === 1 ? "" : "s"}:`);
+    consola20.warn(`Found ${orphans.length} unexpected agent tombstone${orphans.length === 1 ? "" : "s"}:`);
     for (const o of orphans) {
       console.log(`  \u2022 ${o.name}${o.uid !== null ? ` (uid=${o.uid})` : ""} \u2014 was ${o.homeDir}`);
     }
-    if (args["dry-run"]) {
-      consola20.info("Dry-run \u2014 no records deleted. Re-run without --dry-run to clean up.");
-      return;
-    }
-    if (process.geteuid?.() !== 0) {
-      throw new CliError(
-        "Must run as root so opendirectoryd accepts the sysadminctl-deleteUser calls. Re-run with `sudo apes agents cleanup-orphans` from a shell login (the sudo session inherits your admin audit-session, which opendirectoryd verifies)."
-      );
-    }
-    if (!args.force) {
-      if (!process.stdin.isTTY) {
-        throw new CliError(
-          "No TTY available for the interactive confirmation. Re-run with --force (this is the same flag CI / scripted callers use)."
-        );
-      }
-      const confirmed = await consola20.prompt(`Delete ${orphans.length} tombstone${orphans.length === 1 ? "" : "s"}?`, {
-        type: "confirm",
-        initial: false
-      });
-      if (typeof confirmed === "symbol" || !confirmed) {
-        consola20.info("Aborted \u2014 no records deleted.");
-        return;
-      }
-    }
-    let deleted = 0;
-    let failed = 0;
-    for (const o of orphans) {
-      try {
-        execFileSync11("/usr/sbin/sysadminctl", ["-deleteUser", o.name], {
-          stdio: ["ignore", "inherit", "inherit"]
-        });
-        consola20.success(`Deleted ${o.name}`);
-        deleted++;
-      } catch (err) {
-        consola20.warn(`Failed to delete ${o.name}: ${err instanceof Error ? err.message : String(err)}`);
-        failed++;
-      }
-    }
-    if (failed > 0) {
-      throw new CliError(`Cleanup finished with errors: ${deleted} deleted, ${failed} failed.`);
-    }
-    consola20.success(`Cleanup complete \u2014 ${deleted} tombstone${deleted === 1 ? "" : "s"} removed.`);
+    consola20.info("Remove each one manually with `userdel -r <name>`.");
   }
 });
 
 // src/commands/agents/code.ts
-import { existsSync as existsSync8, readFileSync as readFileSync7 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync5 } from "fs";
 import { homedir as homedir5 } from "os";
-import { join as join6 } from "path";
+import { join as join4 } from "path";
 import process3 from "process";
 import { defineCommand as defineCommand24 } from "citty";
 import { consola as consola21 } from "consola";
 import { taskTools, runApeShell, runCodingTask, buildIssueGet, detectForge, createLlmReviewer, createLlmRiskAssessor, resolveMergePolicy } from "@openape/agent-runtime";
 
 // src/lib/agent-secrets-runtime.ts
-import { existsSync as existsSync7, readdirSync, readFileSync as readFileSync6, watch } from "fs";
+import { existsSync as existsSync5, readdirSync, readFileSync as readFileSync4, watch } from "fs";
 import { homedir as homedir4 } from "os";
-import { join as join5 } from "path";
+import { join as join3 } from "path";
 import { openString } from "@openape/core";
-var CONFIG_DIR2 = join5(homedir4(), ".config", "openape");
-var SECRETS_DIR = join5(CONFIG_DIR2, "secrets.d");
-var X25519_KEY_PATH = join5(CONFIG_DIR2, "agent-x25519.key");
+var CONFIG_DIR2 = join3(homedir4(), ".config", "openape");
+var SECRETS_DIR = join3(CONFIG_DIR2, "secrets.d");
+var X25519_KEY_PATH = join3(CONFIG_DIR2, "agent-x25519.key");
 var X25519_PUBKEY_PATH = `${X25519_KEY_PATH}.pub`;
 function envNameFromFile(file) {
   if (!file.endsWith(".blob")) return null;
@@ -3003,13 +2547,13 @@ function envNameFromFile(file) {
   return /^[A-Z][A-Z0-9_]*$/.test(env) ? env : null;
 }
 function readAgentEncryptionKey(keyPath = X25519_KEY_PATH) {
-  if (!existsSync7(keyPath)) return null;
-  const k = readFileSync6(keyPath, "utf8").trim();
+  if (!existsSync5(keyPath)) return null;
+  const k = readFileSync4(keyPath, "utf8").trim();
   return k.length > 0 ? k : null;
 }
 function readAgentEncryptionPublicKey(pubPath = X25519_PUBKEY_PATH) {
-  if (!existsSync7(pubPath)) return null;
-  const k = readFileSync6(pubPath, "utf8").trim();
+  if (!existsSync5(pubPath)) return null;
+  const k = readFileSync4(pubPath, "utf8").trim();
   return k.length > 0 ? k : null;
 }
 function materializeSecrets(opts = {}) {
@@ -3020,12 +2564,12 @@ function materializeSecrets(opts = {}) {
   const applied = [];
   const failed = [];
   const key = readAgentEncryptionKey(opts.keyPath);
-  const files = key && existsSync7(dir) ? readdirSync(dir) : [];
+  const files = key && existsSync5(dir) ? readdirSync(dir) : [];
   for (const file of files) {
     const name = envNameFromFile(file);
     if (!name) continue;
     try {
-      const box = JSON.parse(readFileSync6(join5(dir, file), "utf8"));
+      const box = JSON.parse(readFileSync4(join3(dir, file), "utf8"));
       env[name] = openString(box, key);
       applied.push(name);
     } catch (e) {
@@ -3052,7 +2596,7 @@ function startSecretsWatcher(opts = {}) {
     appliedNames = new Set(r.applied);
   };
   run();
-  if (!existsSync7(dir)) return () => {
+  if (!existsSync5(dir)) return () => {
   };
   let timer = null;
   const watcher = watch(dir, () => {
@@ -3079,9 +2623,9 @@ var DEFAULT_PERSONA = [
 ].join(" ");
 function readLitellmConfig(model) {
   const env = {};
-  const envPath = join6(homedir5(), "litellm", ".env");
-  if (existsSync8(envPath)) {
-    for (const raw of readFileSync7(envPath, "utf8").split("\n")) {
+  const envPath = join4(homedir5(), "litellm", ".env");
+  if (existsSync6(envPath)) {
+    for (const raw of readFileSync5(envPath, "utf8").split("\n")) {
       const line = raw.trim();
       const m = /^([A-Z_][A-Z0-9_]*)=(.*)$/.exec(line);
       if (m) env[m[1]] = m[2].trim().replace(/^["']|["']$/g, "");
@@ -3097,11 +2641,11 @@ function readLitellmConfig(model) {
   return { apiBase, apiKey, model: model || process3.env.APE_CHAT_BRIDGE_MODEL || "claude-haiku-4-5" };
 }
 function readPersona(file) {
-  if (file && existsSync8(file)) return readFileSync7(file, "utf8");
-  const agentJson = join6(homedir5(), ".openape", "agent", "agent.json");
-  if (existsSync8(agentJson)) {
+  if (file && existsSync6(file)) return readFileSync5(file, "utf8");
+  const agentJson = join4(homedir5(), ".openape", "agent", "agent.json");
+  if (existsSync6(agentJson)) {
     try {
-      const p = JSON.parse(readFileSync7(agentJson, "utf8"));
+      const p = JSON.parse(readFileSync5(agentJson, "utf8"));
       if (p.systemPrompt?.trim()) return p.systemPrompt;
     } catch {
     }
@@ -3186,30 +2730,27 @@ ${result.reason}`);
 });
 
 // src/commands/agents/destroy.ts
-import { execFileSync as execFileSync12 } from "child_process";
-import { mkdtempSync as mkdtempSync3, rmSync as rmSync4, writeFileSync as writeFileSync6 } from "fs";
-import { tmpdir as tmpdir3, userInfo as userInfo2 } from "os";
-import { join as join8 } from "path";
 import { defineCommand as defineCommand25 } from "citty";
 import consola22 from "consola";
 
 // src/lib/nest-registry.ts
-import { existsSync as existsSync9, mkdirSync as mkdirSync2, readFileSync as readFileSync8, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync7, mkdirSync, readFileSync as readFileSync6, writeFileSync as writeFileSync3 } from "fs";
 import { homedir as homedir6 } from "os";
-import { join as join7 } from "path";
+import { join as join5 } from "path";
 function resolveRegistryPath() {
-  if (existsSync9("/var/openape/nest/agents.json")) return "/var/openape/nest/agents.json";
-  if (existsSync9("/var/openape/nest")) return "/var/openape/nest/agents.json";
-  return join7(homedir6(), ".openape", "nest", "agents.json");
+  if (process.env.OPENAPE_NEST_REGISTRY_PATH) return process.env.OPENAPE_NEST_REGISTRY_PATH;
+  if (existsSync7("/var/openape/nest/agents.json")) return "/var/openape/nest/agents.json";
+  if (existsSync7("/var/openape/nest")) return "/var/openape/nest/agents.json";
+  return join5(homedir6(), ".openape", "nest", "agents.json");
 }
 function emptyRegistry() {
   return { version: 1, agents: [] };
 }
 function readNestRegistry() {
   const path2 = resolveRegistryPath();
-  if (!existsSync9(path2)) return emptyRegistry();
+  if (!existsSync7(path2)) return emptyRegistry();
   try {
-    const parsed = JSON.parse(readFileSync8(path2, "utf8"));
+    const parsed = JSON.parse(readFileSync6(path2, "utf8"));
     if (parsed?.version !== 1 || !Array.isArray(parsed.agents)) return emptyRegistry();
     return parsed;
   } catch {
@@ -3220,10 +2761,10 @@ function writeNestRegistry(reg) {
   const path2 = resolveRegistryPath();
   const dir = path2.replace(/\/agents\.json$/, "");
   try {
-    mkdirSync2(dir, { recursive: true });
+    mkdirSync(dir, { recursive: true });
   } catch {
   }
-  writeFileSync5(path2, `${JSON.stringify(reg, null, 2)}
+  writeFileSync3(path2, `${JSON.stringify(reg, null, 2)}
 `, { mode: 432 });
 }
 function upsertNestAgent(entry) {
@@ -3242,65 +2783,11 @@ function removeNestAgent(name) {
   return true;
 }
 
-// src/lib/silent-password.ts
-function readPasswordSilent(prompt) {
-  if (!process.stdin.isTTY) {
-    return Promise.reject(new CliError(
-      "No TTY available for the silent password prompt. Set APES_ADMIN_PASSWORD in the environment instead."
-    ));
-  }
-  return new Promise((resolve4, reject) => {
-    process.stdout.write(prompt);
-    const wasRaw = process.stdin.isRaw ?? false;
-    process.stdin.setRawMode(true);
-    process.stdin.resume();
-    process.stdin.setEncoding("utf8");
-    let buf = "";
-    let cleanupFn;
-    const cleanup = () => cleanupFn?.();
-    const onData = (chunk) => {
-      for (const ch of chunk) {
-        const code = ch.charCodeAt(0);
-        if (ch === "\r" || ch === "\n") {
-          cleanup();
-          process.stdout.write("\n");
-          resolve4(buf);
-          return;
-        }
-        if (code === 3) {
-          cleanup();
-          process.stdout.write("\n");
-          reject(new CliError("Aborted by user (Ctrl-C)."));
-          return;
-        }
-        if (code === 4 && buf.length === 0) {
-          cleanup();
-          process.stdout.write("\n");
-          reject(new CliError("Aborted by user (Ctrl-D)."));
-          return;
-        }
-        if (code === 127 || code === 8) {
-          if (buf.length > 0) buf = buf.slice(0, -1);
-          continue;
-        }
-        if (code < 32) continue;
-        buf += ch;
-      }
-    };
-    cleanupFn = () => {
-      process.stdin.removeListener("data", onData);
-      process.stdin.setRawMode(wasRaw);
-      process.stdin.pause();
-    };
-    process.stdin.on("data", onData);
-  });
-}
-
 // src/commands/agents/destroy.ts
 var destroyAgentCommand = defineCommand25({
   meta: {
     name: "destroy",
-    description: "Tear down an agent: remove macOS user, hard-delete IdP agent, drop all SSH keys"
+    description: "Tear down an agent: remove the OS user, hard-delete IdP agent, drop all SSH keys"
   },
   args: {
     name: {
@@ -3319,10 +2806,6 @@ var destroyAgentCommand = defineCommand25({
     "keep-os-user": {
       type: "boolean",
       description: "Skip OS-side teardown. Useful for CI where the agent has no OS user."
-    },
-    "root-stage": {
-      type: "boolean",
-      description: "Internal \u2014 destroy.ts re-invokes itself via `apes run --as root --` with this flag set, then runs only the Phase-G teardown (rm home, launchctl bootout, kill processes). Skips IdP + auth + interactive prompts since those already ran in the outer pass."
     }
   },
   async run({ args }) {
@@ -3332,18 +2815,6 @@ var destroyAgentCommand = defineCommand25({
         `Invalid agent name "${name}". Must match /^[a-z][a-z0-9-]{0,23}$/.`
       );
     }
-    if (args["root-stage"]) {
-      if (process.geteuid?.() !== 0) {
-        throw new CliError("--root-stage was passed but this process is not running as root. Refusing to continue.");
-      }
-      const platform = getHostPlatform();
-      const resolved = platform.lookupAgentUser(name);
-      const macOSUsername = resolved?.name ?? platform.agentUsername(name);
-      const homeDir = resolved?.homeDir ?? `/var/openape/homes/${macOSUsername}`;
-      consola22.start(`Running teardown for ${name} (Phase-G, root-stage)\u2026`);
-      runPhaseGTeardownInProcess({ name, homeDir, macOSUsername });
-      return;
-    }
     const auth = loadAuth();
     if (!auth) {
       throw new CliError("Not authenticated. Run `apes login` first.");
@@ -3355,7 +2826,7 @@ var destroyAgentCommand = defineCommand25({
     const owned = await apiFetch("/api/my-agents", { idp });
     const idpAgent = owned.find((u) => u.name === name);
     const idpExists = idpAgent !== void 0;
-    const osUser = isDarwin2() ? getHostPlatform().lookupAgentUser(name) : null;
+    const osUser = getHostPlatform().lookupAgentUser(name);
     const osUserExists = !args["keep-os-user"] && osUser !== null;
     if (!idpExists && !osUserExists) {
       consola22.info(`Nothing to destroy: no IdP agent and no OS user for "${name}".`);
@@ -3364,8 +2835,8 @@ var destroyAgentCommand = defineCommand25({
     if (!args.force) {
       const consequences = [];
       if (osUserExists) {
-        const home = osUser?.homeDir ?? `/Users/${name}`;
-        consequences.push(`\u2022 Remove macOS user ${osUser?.name ?? name} and rm -rf ${home}`);
+        const home = osUser?.homeDir ?? `/home/${name}`;
+        consequences.push(`\u2022 Remove OS user ${osUser?.name ?? name} and rm -rf ${home}`);
       }
       if (idpExists) {
         consequences.push(args.soft ? `\u2022 Deactivate IdP agent ${idpAgent.email} (PATCH isActive=false)` : `\u2022 Hard-delete IdP agent ${idpAgent.email} and all its SSH keys`);
@@ -3395,69 +2866,17 @@ ${consequences.join("\n")}`);
       consola22.info("No IdP agent to remove (skipped).");
     }
     if (osUserExists) {
-      const macOSUsername = osUser?.name ?? getHostPlatform().agentUsername(name);
-      const fallbackHome = macOSUsername.startsWith("openape-agent-") ? `/var/openape/homes/${macOSUsername}` : `/Users/${macOSUsername}`;
-      const homeDir = osUser?.homeDir ?? fallbackHome;
-      const isPhaseG = homeDir.startsWith("/var/openape/homes/");
-      if (isPhaseG) {
-        if (process.geteuid?.() === 0) {
-          consola22.start("Running teardown (Phase G \u2014 already root, no grant needed)\u2026");
-          runPhaseGTeardownInProcess({ name, homeDir, macOSUsername });
-        } else {
-          consola22.start("Running teardown (Phase G \u2014 no admin password needed)\u2026");
-          execFileSync12("apes", [
-            "run",
-            "--as",
-            "root",
-            "--wait",
-            "--",
-            "apes",
-            "agents",
-            "destroy",
-            name,
-            "--force",
-            "--root-stage"
-          ], { stdio: "inherit" });
-        }
-        consola22.info(`dscl record /Users/${macOSUsername} kept as tombstone (hidden, no home). Run \`sudo apes agents cleanup-orphans\` to sweep accumulated tombstones.`);
-      } else {
-        const sudo = whichBinary("sudo");
-        if (!sudo) {
-          throw new CliError("`sudo` not found on PATH; required for OS teardown.");
-        }
-        const adminUser = userInfo2().username;
-        let adminPassword;
-        try {
-          adminPassword = await collectAdminPassword({ adminUser });
-        } catch (err) {
-          const headless = !process.stdin.isTTY && !process.env.APES_ADMIN_PASSWORD;
-          if (headless) {
-            consola22.warn(`Legacy OS teardown for ${name} requires a TTY or APES_ADMIN_PASSWORD; skipping. Run \`apes agents destroy ${name}\` from a shell later to fully clean up /Users/${name} + dscl record.`);
-            adminPassword = "";
-          } else {
-            throw err;
-          }
-        }
-        if (adminPassword) {
-          const scratch = mkdtempSync3(join8(tmpdir3(), `apes-destroy-${name}-`));
-          const scriptPath = join8(scratch, "teardown.sh");
-          try {
-            const script = buildDestroyTeardownScript({ name, homeDir, adminUser });
-            writeFileSync6(scriptPath, script, { mode: 448 });
-            consola22.start("Running teardown via sudo\u2026");
-            execFileSync12(sudo, ["-S", "--prompt=", "--", "bash", scriptPath], {
-              input: `${adminPassword}
-${adminPassword}
-`,
-              stdio: ["pipe", "inherit", "inherit"]
-            });
-          } finally {
-            rmSync4(scratch, { recursive: true, force: true });
-          }
-        }
-      }
-    } else if (!args["keep-os-user"] && isDarwin2()) {
-      consola22.info("No macOS user to remove (skipped).");
+      consola22.start(`Removing OS user ${name}\u2026`);
+      await getHostPlatform().runPrivilegedBash(
+        `#!/bin/bash
+set -euo pipefail
+if getent passwd ${JSON.stringify(name)} >/dev/null 2>&1; then
+  pkill -9 -u ${JSON.stringify(name)} 2>/dev/null || true
+  userdel -r ${JSON.stringify(name)}
+fi
+`
+      );
+      consola22.success(`Removed OS user ${name}.`);
     }
     try {
       removeNestAgent(name);
@@ -3467,15 +2886,6 @@ ${adminPassword}
     consola22.success(`Destroyed ${name}.`);
   }
 });
-async function collectAdminPassword(opts) {
-  const fromEnv = process.env.APES_ADMIN_PASSWORD;
-  if (fromEnv && fromEnv.length > 0) return fromEnv;
-  const pw = await readPasswordSilent(`Password for ${opts.adminUser}: `);
-  if (pw.length === 0) {
-    throw new CliExit(0);
-  }
-  return pw;
-}
 
 // src/commands/agents/list.ts
 import { defineCommand as defineCommand26 } from "citty";
@@ -3507,7 +2917,7 @@ var listAgentsCommand = defineCommand26({
     const all = await apiFetch("/api/my-agents", { idp });
     const filtered = args["include-inactive"] ? all : all.filter((u) => u.isActive !== false);
     const platform = getHostPlatform();
-    const osUsers = isDarwin2() ? platform.listAgentUserNames() : /* @__PURE__ */ new Set();
+    const osUsers = platform.listAgentUserNames();
     const osStateOf = (agentName) => {
       const u = platform.lookupAgentUser(agentName);
       if (u) return { osUser: true, home: u.homeDir };
@@ -3543,14 +2953,14 @@ var listAgentsCommand = defineCommand26({
     for (const r of rows) {
       const active = r.isActive ? "\u2713" : "\u2717";
       const os = r.osUser ? "\u2713" : "\u2717";
-      const homeCol = r.home ?? (isDarwin2() ? "(missing)" : "(non-darwin)");
+      const homeCol = r.home ?? "(missing)";
       console.log(`${r.name.padEnd(nameW)}  ${r.email.padEnd(emailW)}  ${active.padEnd(6)}  ${os.padEnd(7)}  ${homeCol}`);
     }
   }
 });
 
 // src/commands/agents/register.ts
-import { existsSync as existsSync10, readFileSync as readFileSync9 } from "fs";
+import { existsSync as existsSync8, readFileSync as readFileSync7 } from "fs";
 import { defineCommand as defineCommand27 } from "citty";
 import consola24 from "consola";
 var registerAgentCommand = defineCommand27({
@@ -3598,10 +3008,10 @@ var registerAgentCommand = defineCommand27({
       throw new CliError("Pass either --public-key or --public-key-file, not both.");
     }
     if (!publicKey && keyFile) {
-      if (!existsSync10(keyFile)) {
+      if (!existsSync8(keyFile)) {
         throw new CliError(`Public-key file not found: ${keyFile}`);
       }
-      publicKey = readFileSync9(keyFile, "utf-8").trim();
+      publicKey = readFileSync7(keyFile, "utf-8").trim();
     }
     if (!publicKey) {
       throw new CliError('Provide --public-key "<ssh-ed25519 line>" or --public-key-file <path>.');
@@ -3636,19 +3046,19 @@ var registerAgentCommand = defineCommand27({
 });
 
 // src/commands/agents/run.ts
-import { existsSync as existsSync11, readFileSync as readFileSync10 } from "fs";
+import { existsSync as existsSync9, readFileSync as readFileSync8 } from "fs";
 import { homedir as homedir7 } from "os";
-import { join as join9 } from "path";
+import { join as join6 } from "path";
 import { defineCommand as defineCommand28 } from "citty";
 import consola25 from "consola";
 import { taskTools as taskTools2, runLoop } from "@openape/agent-runtime";
-var AUTH_PATH = join9(homedir7(), ".config", "apes", "auth.json");
-var TASK_CACHE_DIR = join9(homedir7(), ".openape", "agent", "tasks");
+var AUTH_PATH = join6(homedir7(), ".config", "apes", "auth.json");
+var TASK_CACHE_DIR = join6(homedir7(), ".openape", "agent", "tasks");
 function readAuth() {
-  if (!existsSync11(AUTH_PATH)) {
+  if (!existsSync9(AUTH_PATH)) {
     throw new CliError(`No agent auth found at ${AUTH_PATH}. Run \`apes agents spawn <name>\` first.`);
   }
-  const parsed = JSON.parse(readFileSync10(AUTH_PATH, "utf8"));
+  const parsed = JSON.parse(readFileSync8(AUTH_PATH, "utf8"));
   if (!parsed.access_token) throw new CliError("auth.json missing access_token");
   return parsed;
 }
@@ -3684,26 +3094,26 @@ ${msg}`.slice(0, 9e3);
   }
 }
 function readTaskSpec(taskId) {
-  const path2 = join9(TASK_CACHE_DIR, `${taskId}.json`);
-  if (!existsSync11(path2)) {
+  const path2 = join6(TASK_CACHE_DIR, `${taskId}.json`);
+  if (!existsSync9(path2)) {
     throw new CliError(`No cached task spec at ${path2}. Run \`apes agents sync\` first to pull the task list from troop.`);
   }
-  return JSON.parse(readFileSync10(path2, "utf8"));
+  return JSON.parse(readFileSync8(path2, "utf8"));
 }
-var AGENT_CONFIG_PATH = join9(homedir7(), ".openape", "agent", "agent.json");
+var AGENT_CONFIG_PATH = join6(homedir7(), ".openape", "agent", "agent.json");
 function readAgentConfig() {
-  if (!existsSync11(AGENT_CONFIG_PATH)) return { systemPrompt: "" };
+  if (!existsSync9(AGENT_CONFIG_PATH)) return { systemPrompt: "" };
   try {
-    return JSON.parse(readFileSync10(AGENT_CONFIG_PATH, "utf8"));
+    return JSON.parse(readFileSync8(AGENT_CONFIG_PATH, "utf8"));
   } catch {
     return { systemPrompt: "" };
   }
 }
 function readLitellmConfig2(model) {
-  const envPath = join9(homedir7(), "litellm", ".env");
+  const envPath = join6(homedir7(), "litellm", ".env");
   const env = {};
-  if (existsSync11(envPath)) {
-    for (const line of readFileSync10(envPath, "utf8").split(/\r?\n/)) {
+  if (existsSync9(envPath)) {
+    for (const line of readFileSync8(envPath, "utf8").split(/\r?\n/)) {
       const m = line.match(/^([A-Z_]+)=(.*)$/);
       if (m) env[m[1]] = m[2].replace(/^["']|["']$/g, "");
     }
@@ -3809,18 +3219,18 @@ var runAgentCommand = defineCommand28({
 });
 
 // src/commands/agents/serve.ts
-import { existsSync as existsSync12, readFileSync as readFileSync11 } from "fs";
+import { existsSync as existsSync10, readFileSync as readFileSync9 } from "fs";
 import { homedir as homedir8 } from "os";
-import { join as join10 } from "path";
+import { join as join7 } from "path";
 import { createInterface } from "readline";
 import { defineCommand as defineCommand29 } from "citty";
 import { taskTools as taskTools3, runLoop as runLoop2, RpcSessionMap } from "@openape/agent-runtime";
-var AUTH_PATH2 = join10(homedir8(), ".config", "apes", "auth.json");
+var AUTH_PATH2 = join7(homedir8(), ".config", "apes", "auth.json");
 function readLitellmConfig3(model) {
-  const envPath = join10(homedir8(), "litellm", ".env");
+  const envPath = join7(homedir8(), "litellm", ".env");
   const env = {};
-  if (existsSync12(envPath)) {
-    for (const line of readFileSync11(envPath, "utf8").split(/\r?\n/)) {
+  if (existsSync10(envPath)) {
+    for (const line of readFileSync9(envPath, "utf8").split(/\r?\n/)) {
       const m = line.match(/^([A-Z_]+)=(.*)$/);
       if (m) env[m[1]] = m[2].replace(/^["']|["']$/g, "");
     }
@@ -3852,9 +3262,9 @@ var serveAgentCommand = defineCommand29({
     if (!args.rpc) {
       throw new CliError("apes agents serve currently only supports --rpc mode");
     }
-    if (existsSync12(AUTH_PATH2)) {
+    if (existsSync10(AUTH_PATH2)) {
       try {
-        JSON.parse(readFileSync11(AUTH_PATH2, "utf8"));
+        JSON.parse(readFileSync9(AUTH_PATH2, "utf8"));
       } catch {
       }
     }
@@ -3937,61 +3347,9 @@ async function handleInbound(msg, sessions) {
 import { defineCommand as defineCommand30 } from "citty";
 import consola26 from "consola";
 
-// src/lib/troop-bootstrap.ts
-var SYNC_LABEL_PREFIX = "openape.troop.sync";
-var SYNC_INTERVAL_SECONDS = 300;
-function syncPlistLabel(agentName) {
-  return `${SYNC_LABEL_PREFIX}.${agentName}`;
-}
-function escape(s) {
-  return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-}
-function buildSyncPlist(input) {
-  const pathDirs = (input.hostBinDirs && input.hostBinDirs.length > 0 ? input.hostBinDirs : ["/opt/homebrew/bin", "/usr/local/bin"]).join(":");
-  const pathLine = `    <key>PATH</key><string>${escape(pathDirs)}:/usr/bin:/bin</string>
-`;
-  const agentUserLine = `    <key>AGENT_USER</key><string>${escape(input.userName)}</string>
-`;
-  const envBlock = input.troopUrl ? `  <key>EnvironmentVariables</key>
-  <dict>
-    <key>HOME</key><string>${escape(input.homeDir)}</string>
-${pathLine}${agentUserLine}    <key>OPENAPE_TROOP_URL</key><string>${escape(input.troopUrl)}</string>
-  </dict>
-` : `  <key>EnvironmentVariables</key>
-  <dict>
-    <key>HOME</key><string>${escape(input.homeDir)}</string>
-${pathLine}${agentUserLine}  </dict>
-`;
-  return `<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>Label</key>
-  <string>${escape(syncPlistLabel(input.agentName))}</string>
-  <key>ProgramArguments</key>
-  <array>
-    <string>${escape(input.apesBin)}</string>
-    <string>agents</string>
-    <string>sync</string>
-  </array>
-  <key>WorkingDirectory</key>
-  <string>${escape(input.homeDir)}</string>
-${envBlock}  <key>StartInterval</key>
-  <integer>${SYNC_INTERVAL_SECONDS}</integer>
-  <key>RunAtLoad</key>
-  <true/>
-  <key>StandardOutPath</key>
-  <string>${escape(input.homeDir)}/Library/Logs/openape-troop-sync.log</string>
-  <key>StandardErrorPath</key>
-  <string>${escape(input.homeDir)}/Library/Logs/openape-troop-sync.log</string>
-</dict>
-</plist>
-`;
-}
-
 // src/lib/keygen.ts
 import { Buffer as Buffer4 } from "buffer";
-import { existsSync as existsSync13, mkdirSync as mkdirSync3, readFileSync as readFileSync12, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync11, mkdirSync as mkdirSync2, readFileSync as readFileSync10, writeFileSync as writeFileSync4 } from "fs";
 import { generateKeyPairSync } from "crypto";
 import { homedir as homedir9 } from "os";
 import { dirname, resolve as resolve2 } from "path";
@@ -4010,10 +3368,10 @@ function buildSshEd25519Line(rawPub) {
 }
 function readPublicKey(keyPath) {
   const pubPath = `${keyPath}.pub`;
-  if (existsSync13(pubPath)) {
-    return readFileSync12(pubPath, "utf-8").trim();
+  if (existsSync11(pubPath)) {
+    return readFileSync10(pubPath, "utf-8").trim();
   }
-  const keyContent = readFileSync12(keyPath, "utf-8");
+  const keyContent = readFileSync10(keyPath, "utf-8");
   const privateKey = loadEd25519PrivateKey(keyContent);
   const jwk = privateKey.export({ format: "jwk" });
   const pubBytes = Buffer4.from(jwk.x, "base64url");
@@ -4022,16 +3380,16 @@ function readPublicKey(keyPath) {
 function generateAndSaveKey(keyPath) {
   const resolved = resolveKeyPath(keyPath);
   const dir = dirname(resolved);
-  if (!existsSync13(dir)) {
-    mkdirSync3(dir, { recursive: true });
+  if (!existsSync11(dir)) {
+    mkdirSync2(dir, { recursive: true });
   }
   const { publicKey, privateKey } = generateKeyPairSync("ed25519");
   const privatePem = privateKey.export({ type: "pkcs8", format: "pem" });
-  writeFileSync7(resolved, privatePem, { mode: 384 });
+  writeFileSync4(resolved, privatePem, { mode: 384 });
   const jwk = publicKey.export({ format: "jwk" });
   const pubBytes = Buffer4.from(jwk.x, "base64url");
   const pubKeyStr = buildSshEd25519Line(pubBytes);
-  writeFileSync7(`${resolved}.pub`, `${pubKeyStr}
+  writeFileSync4(`${resolved}.pub`, `${pubKeyStr}
 `, { mode: 420 });
   return pubKeyStr;
 }
@@ -4049,145 +3407,8 @@ function generateKeyPairInMemory() {
   };
 }
 
-// src/lib/llm-bridge.ts
-import { execFileSync as execFileSync13 } from "child_process";
-import { existsSync as existsSync14, readFileSync as readFileSync13 } from "fs";
-import { homedir as homedir10 } from "os";
-import { dirname as dirname2, join as join11 } from "path";
-var PLIST_LABEL_PREFIX = "eco.hofmann.apes.bridge";
-function readLitellmEnv(envPath = join11(homedir10(), "litellm", ".env")) {
-  if (!existsSync14(envPath)) return null;
-  try {
-    const text = readFileSync13(envPath, "utf8");
-    const out = {};
-    for (const line of text.split("\n")) {
-      const trimmed = line.trim();
-      if (!trimmed || trimmed.startsWith("#")) continue;
-      const eq = trimmed.indexOf("=");
-      if (eq < 0) continue;
-      const key = trimmed.slice(0, eq).trim();
-      const value = trimmed.slice(eq + 1).trim();
-      if (key === "LITELLM_MASTER_KEY" || key === "LITELLM_API_KEY") out.apiKey = value;
-      if (key === "LITELLM_BASE_URL") out.baseUrl = value;
-      if (key === "APE_CHAT_BRIDGE_MODEL") out.model = value;
-    }
-    return out;
-  } catch {
-    return null;
-  }
-}
-function resolveBridgeConfig(opts) {
-  const env = readLitellmEnv(opts.envPath);
-  const apiKey = opts.cliKey ?? env?.apiKey;
-  const baseUrl = opts.cliBaseUrl ?? env?.baseUrl ?? "http://127.0.0.1:4000/v1";
-  const model = opts.cliModel ?? env?.model;
-  if (!apiKey) {
-    throw new Error(
-      "No LITELLM_API_KEY resolved. Pass --bridge-key sk-\u2026 or write LITELLM_MASTER_KEY into ~/litellm/.env first."
-    );
-  }
-  return { baseUrl, apiKey, model };
-}
-function captureHostBinDirs() {
-  const dirs = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const bin of ["node", "ape-agent", "apes"]) {
-    let resolved;
-    try {
-      resolved = execFileSync13("/usr/bin/which", [bin], { encoding: "utf8" }).trim();
-    } catch {
-      const installCmd = bin === "ape-agent" ? "npm i -g @openape/ape-agent" : bin === "apes" ? "npm i -g @openape/apes" : "install Node.js (e.g. brew install node)";
-      throw new Error(`'${bin}' not found on host PATH. ${installCmd} before spawning agents \u2014 the bridge runtime resolves these at spawn time and bakes the dir into the agent's launchd plist.`);
-    }
-    const dir = dirname2(resolved);
-    if (!seen.has(dir)) {
-      seen.add(dir);
-      dirs.push(dir);
-    }
-  }
-  return dirs;
-}
-function bridgePlistLabel(agentName) {
-  return `${PLIST_LABEL_PREFIX}.${agentName}`;
-}
-function bridgePlistPath(agentName) {
-  return `/Library/LaunchDaemons/${bridgePlistLabel(agentName)}.plist`;
-}
-function buildBridgeEnvFile(cfg) {
-  const modelLine = cfg.model ? `APE_CHAT_BRIDGE_MODEL=${cfg.model}
-` : "";
-  return `# Auto-generated by 'apes agents spawn'.
-# Read by the chat-bridge daemon at boot to talk to the local LLM proxy.
-LITELLM_BASE_URL=${cfg.baseUrl}
-LITELLM_API_KEY=${cfg.apiKey}
-${modelLine}`;
-}
-function buildBridgeStartScript(hostBinDirs) {
-  const pathLine = `export PATH="${hostBinDirs.join(":")}:/usr/bin:/bin"`;
-  return `#!/usr/bin/env bash
-# Auto-generated by 'apes agents spawn'.
-# Slim launcher \u2014 bridge stack lives on the host, no per-agent install.
-set -euo pipefail
-
-${pathLine}
-
-# Token refresh is in-process via @openape/cli-auth's challenge-response
-# path (auth.json.key_path -> ~/.ssh/id_ed25519). No "apes login" needed
-# at boot \u2014 keeping start.sh slim avoids the rate-limit dance the old
-# refresh hit when KeepAlive crash-restarted the daemon every 1h.
-
-set -a
-. "$HOME/Library/Application Support/openape/bridge/.env"
-set +a
-exec ape-agent
-`;
-}
-function buildBridgePlist(agentName, homeDir, ownerEmail, hostBinDirs) {
-  const startScript = `${homeDir}/Library/Application Support/openape/bridge/start.sh`;
-  const stdoutLog = `${homeDir}/Library/Logs/ape-agent.log`;
-  const stderrLog = `${homeDir}/Library/Logs/ape-agent.err.log`;
-  const pathValue = `${hostBinDirs.join(":")}:/usr/bin:/bin`;
-  return `<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>Label</key>
-    <string>${bridgePlistLabel(agentName)}</string>
-    <key>UserName</key>
-    <string>${agentName}</string>
-    <key>ProgramArguments</key>
-    <array>
-        <string>/bin/bash</string>
-        <string>${startScript}</string>
-    </array>
-    <key>WorkingDirectory</key>
-    <string>${homeDir}</string>
-    <key>RunAtLoad</key>
-    <true/>
-    <key>KeepAlive</key>
-    <true/>
-    <key>ThrottleInterval</key>
-    <integer>10</integer>
-    <key>StandardOutPath</key>
-    <string>${stdoutLog}</string>
-    <key>StandardErrorPath</key>
-    <string>${stderrLog}</string>
-    <key>EnvironmentVariables</key>
-    <dict>
-        <key>HOME</key>
-        <string>${homeDir}</string>
-        <key>PATH</key>
-        <string>${pathValue}</string>
-        <key>OPENAPE_OWNER_EMAIL</key>
-        <string>${ownerEmail}</string>
-    </dict>
-</dict>
-</plist>
-`;
-}
-
 // src/commands/agents/spawn.ts
-function readMacOSUidOrNull(name) {
+function readUidOrNull(name) {
   try {
     const u = getHostPlatform().readAgentUser(name);
     return u?.uid ?? null;
@@ -4198,17 +3419,17 @@ function readMacOSUidOrNull(name) {
 var spawnAgentCommand = defineCommand30({
   meta: {
     name: "spawn",
-    description: "Provision a local macOS agent end-to-end (OS user, keypair, IdP agent, Claude hook)"
+    description: "Provision a local Linux agent end-to-end (OS user, keypair, IdP agent, Claude hook)"
   },
   args: {
     name: {
       type: "positional",
-      description: "Agent name \u2014 also the macOS short username (lowercase, [a-z0-9-], must start with a letter)",
+      description: "Agent name \u2014 also the Linux username (lowercase, [a-z0-9-], must start with a letter)",
       required: true
     },
     shell: {
       type: "string",
-      description: "Login shell for the macOS user. Default: /bin/zsh. Pass $(which ape-shell) to opt into the grant-mediated REPL as login shell."
+      description: "Login shell for the Linux user. Default: /bin/bash. Pass $(which ape-shell) to opt into the grant-mediated REPL as login shell."
     },
     "no-claude-hook": {
       type: "boolean",
@@ -4246,11 +3467,6 @@ var spawnAgentCommand = defineCommand30({
         `Invalid agent name "${name}". Must match /^[a-z][a-z0-9-]{0,23}$/ \u2014 lowercase letters, digits and hyphens, 1\u201324 chars, must start with a letter.`
       );
     }
-    if (!isDarwin2()) {
-      throw new CliError(
-        `\`apes agents spawn\` is currently macOS-only. Detected platform: ${process.platform}. Linux support is a follow-up; for now, use \`apes agents register\` plus a manually provisioned user.`
-      );
-    }
     const auth = loadAuth();
     if (!auth) {
       throw new CliError("Not authenticated. Run `apes login` first.");
@@ -4259,137 +3475,91 @@ var spawnAgentCommand = defineCommand30({
     if (!idp) {
       throw new CliError("No IdP URL configured. Run `apes login` first.");
     }
-    const loginShell = (args.shell ?? "/bin/zsh").toString();
-    const apes = whichBinary("apes");
-    if (!apes) {
-      throw new CliError("`apes` not found on PATH. Install @openape/apes globally first.");
-    }
-    const escapes = whichBinary("escapes");
-    if (!escapes) {
-      throw new CliError(
-        "`escapes` not found on PATH. spawn delegates the privileged setup phase to escapes; install it before running spawn."
-      );
-    }
-    if (!isShellRegistered(loginShell)) {
-      throw new CliError(
-        `${loginShell} is not registered in /etc/shells. macOS refuses to set it as a login shell. Run:
-  echo ${loginShell} | sudo tee -a /etc/shells
-and try again.`
-      );
-    }
+    const loginShell = (args.shell ?? "/bin/bash").toString();
     const platform = getHostPlatform();
-    const macOSUsername = platform.agentUsername(name);
-    const existing = platform.readAgentUser(macOSUsername) ?? platform.readAgentUser(name);
+    const osUsername = platform.agentUsername(name);
+    const existing = platform.readAgentUser(osUsername);
     if (existing) {
-      throw new CliError(`macOS user "${existing.name}" already exists (uid=${existing.uid ?? "?"}). Refusing to overwrite.`);
+      throw new CliError(`OS user "${existing.name}" already exists (uid=${existing.uid ?? "?"}). Refusing to overwrite.`);
     }
-    const homeDir = `/var/openape/homes/${macOSUsername}`;
+    const homeDir = `/var/lib/openape/homes/${osUsername}`;
+    consola26.start(`Generating keypair for ${name}\u2026`);
+    const { privatePem, publicSshLine, x25519PrivateKey, x25519PublicKey } = generateKeyPairInMemory();
+    consola26.start(`Registering agent at ${idp}\u2026`);
+    const registration = await registerAgentAtIdp({ name, publicKey: publicSshLine, idp });
+    consola26.success(`Registered as ${registration.email}`);
+    consola26.start("Issuing agent access token\u2026");
+    const { token, expiresIn } = await issueAgentToken({
+      idp,
+      agentEmail: registration.email,
+      privateKeyPem: privatePem
+    });
+    const authJson = buildAgentAuthJson({
+      idp,
+      accessToken: token,
+      email: registration.email,
+      expiresAt: Math.floor(Date.now() / 1e3) + expiresIn,
+      keyPath: `${homeDir}/.ssh/id_ed25519`,
+      // The IdP resolves the owner transitively (when the caller
+      // is itself an agent — e.g. a Nest spawning a child — the
+      // human at the top of the chain becomes owner). Use the
+      // server-resolved owner, not the local caller's auth.email,
+      // otherwise the agent's auth.json will carry the Nest's
+      // email and troop will reject sync calls because the
+      // encoded owner-domain in the agent email doesn't match
+      // the auth.json's owner_email domain.
+      ownerEmail: registration.owner
+    });
+    const includeClaudeHook = !args["no-claude-hook"];
+    const claudeOauthToken = await resolveClaudeToken({
+      flag: typeof args["claude-token"] === "string" ? args["claude-token"] : void 0,
+      fromStdin: !!args["claude-token-stdin"]
+    });
+    const withBridge = !args["no-bridge"];
+    const script = buildSpawnSetupScript({
+      name,
+      homeDir,
+      shellPath: loginShell,
+      privateKeyPem: privatePem,
+      publicKeySshLine: publicSshLine,
+      x25519PrivateKey,
+      x25519PublicKey,
+      authJson,
+      claudeSettingsJson: includeClaudeHook ? CLAUDE_SETTINGS_JSON : null,
+      hookScriptSource: includeClaudeHook ? BASH_VIA_APE_SHELL_HOOK_SOURCE : null,
+      claudeOauthToken
+    });
+    consola26.start("Running privileged setup\u2026");
+    if (process.getuid?.() !== 0) {
+      consola26.info("You will be asked to approve the as=root grant in your DDISA inbox; this command blocks until you do.");
+    }
+    await platform.runPrivilegedBash(script);
     try {
-      consola26.start(`Generating keypair for ${name}\u2026`);
-      const { privatePem, publicSshLine, x25519PrivateKey, x25519PublicKey } = generateKeyPairInMemory();
-      consola26.start(`Registering agent at ${idp}\u2026`);
-      const registration = await registerAgentAtIdp({ name, publicKey: publicSshLine, idp });
-      consola26.success(`Registered as ${registration.email}`);
-      consola26.start("Issuing agent access token\u2026");
-      const { token, expiresIn } = await issueAgentToken({
-        idp,
-        agentEmail: registration.email,
-        privateKeyPem: privatePem
-      });
-      const authJson = buildAgentAuthJson({
-        idp,
-        accessToken: token,
-        email: registration.email,
-        expiresAt: Math.floor(Date.now() / 1e3) + expiresIn,
-        keyPath: `${homeDir}/.ssh/id_ed25519`,
-        // The IdP resolves the owner transitively (when the caller
-        // is itself an agent — e.g. a Nest spawning a child — the
-        // human at the top of the chain becomes owner). Use the
-        // server-resolved owner, not the local caller's auth.email,
-        // otherwise the agent's auth.json will carry the Nest's
-        // email and troop will reject sync calls because the
-        // encoded owner-domain in the agent email doesn't match
-        // the auth.json's owner_email domain.
-        ownerEmail: registration.owner
-      });
-      const includeClaudeHook = !args["no-claude-hook"];
-      const claudeOauthToken = await resolveClaudeToken({
-        flag: typeof args["claude-token"] === "string" ? args["claude-token"] : void 0,
-        fromStdin: !!args["claude-token-stdin"]
-      });
-      const withBridge = !args["no-bridge"];
-      const bridge = withBridge ? (() => {
-        const cfg = resolveBridgeConfig({
-          cliKey: typeof args["bridge-key"] === "string" ? args["bridge-key"] : void 0,
-          cliBaseUrl: typeof args["bridge-base-url"] === "string" ? args["bridge-base-url"] : void 0,
-          cliModel: typeof args["bridge-model"] === "string" ? args["bridge-model"] : void 0
-        });
-        const hostBinDirs = captureHostBinDirs();
-        return {
-          plistLabel: bridgePlistLabel(name),
-          plistPath: bridgePlistPath(name),
-          plistContent: buildBridgePlist(name, homeDir, auth.email, hostBinDirs),
-          startScript: buildBridgeStartScript(hostBinDirs),
-          envFile: buildBridgeEnvFile(cfg)
-        };
-      })() : null;
-      const troopPlistLabel = `openape.troop.sync.${name}`;
-      const troopPlistPath = `/Library/LaunchDaemons/${troopPlistLabel}.plist`;
-      const troopBinDirs = bridge ? captureHostBinDirs() : captureHostBinDirs();
-      const troop = {
-        plistLabel: troopPlistLabel,
-        plistPath: troopPlistPath,
-        plistContent: buildSyncPlist({ agentName: name, apesBin: apes, homeDir, userName: name, hostBinDirs: troopBinDirs })
-      };
-      const script = buildSpawnSetupScript({
+      const uid = readUidOrNull(osUsername) ?? -1;
+      upsertNestAgent({
         name,
-        macOSUsername,
-        homeDir,
-        shellPath: loginShell,
-        privateKeyPem: privatePem,
-        publicKeySshLine: publicSshLine,
-        x25519PrivateKey,
-        x25519PublicKey,
-        authJson,
-        claudeSettingsJson: includeClaudeHook ? CLAUDE_SETTINGS_JSON : null,
-        hookScriptSource: includeClaudeHook ? BASH_VIA_APE_SHELL_HOOK_SOURCE : null,
-        claudeOauthToken,
-        bridge,
-        troop
+        uid,
+        home: homeDir,
+        email: registration.email,
+        registeredAt: Math.floor(Date.now() / 1e3),
+        bridge: withBridge ? {
+          baseUrl: typeof args["bridge-base-url"] === "string" ? args["bridge-base-url"] : void 0,
+          apiKey: typeof args["bridge-key"] === "string" ? args["bridge-key"] : void 0,
+          model: typeof args["bridge-model"] === "string" ? args["bridge-model"] : void 0
+        } : void 0
       });
-      consola26.start("Running privileged setup\u2026");
-      if (process.getuid?.() !== 0) {
-        consola26.info("You will be asked to approve the as=root grant in your DDISA inbox; this command blocks until you do.");
-      }
-      await platform.runPrivilegedBash(script);
-      try {
-        const uid = readMacOSUidOrNull(macOSUsername) ?? readMacOSUidOrNull(name);
-        upsertNestAgent({
-          name,
-          uid: uid ?? -1,
-          home: homeDir,
-          email: registration.email,
-          registeredAt: Math.floor(Date.now() / 1e3),
-          bridge: withBridge ? {
-            baseUrl: typeof args["bridge-base-url"] === "string" ? args["bridge-base-url"] : void 0,
-            apiKey: typeof args["bridge-key"] === "string" ? args["bridge-key"] : void 0,
-            model: typeof args["bridge-model"] === "string" ? args["bridge-model"] : void 0
-          } : void 0
-        });
-      } catch (err) {
-        consola26.warn(`Could not write to nest registry: ${err instanceof Error ? err.message : String(err)}`);
-      }
-      consola26.success(`Agent ${name} spawned.`);
-      consola26.info(`\u{1F517} Troop: https://troop.openape.ai/agents/${name}`);
-      if (withBridge) {
-        consola26.info(`On first boot, the bridge will send you a contact request from ${registration.email}.`);
-        consola26.info("Open chat.openape.ai and accept it to start chatting with the agent.");
-      }
-      console.log("");
-      console.log("Run as the agent with:");
-      console.log(`  apes run --as ${name} -- claude --session-name ${name} --dangerously-skip-permissions`);
-    } finally {
+    } catch (err) {
+      consola26.warn(`Could not write to nest registry: ${err instanceof Error ? err.message : String(err)}`);
     }
+    consola26.success(`Agent ${name} spawned.`);
+    consola26.info(`\u{1F517} Troop: https://troop.openape.ai/agents/${name}`);
+    if (withBridge) {
+      consola26.info(`On first boot, the bridge will send you a contact request from ${registration.email}.`);
+      consola26.info("Open chat.openape.ai and accept it to start chatting with the agent.");
+    }
+    console.log("");
+    console.log("Run as the agent with:");
+    console.log(`  apes run --as ${name} -- claude --session-name ${name} --dangerously-skip-permissions`);
   }
 });
 async function resolveClaudeToken(opts) {
@@ -4416,20 +3586,20 @@ async function resolveClaudeToken(opts) {
 }
 
 // src/commands/agents/sync.ts
-import { chownSync, existsSync as existsSync15, mkdirSync as mkdirSync4, readdirSync as readdirSync2, readFileSync as readFileSync14, rmSync as rmSync5, statSync, writeFileSync as writeFileSync8 } from "fs";
-import { homedir as homedir11 } from "os";
-import { join as join12 } from "path";
+import { chownSync, existsSync as existsSync12, mkdirSync as mkdirSync3, readdirSync as readdirSync2, readFileSync as readFileSync11, rmSync as rmSync2, statSync, writeFileSync as writeFileSync5 } from "fs";
+import { homedir as homedir10 } from "os";
+import { join as join8 } from "path";
 import { defineCommand as defineCommand31 } from "citty";
 import consola27 from "consola";
-var AUTH_PATH3 = join12(homedir11(), ".config", "apes", "auth.json");
-var TASK_CACHE_DIR2 = join12(homedir11(), ".openape", "agent", "tasks");
+var AUTH_PATH3 = join8(homedir10(), ".config", "apes", "auth.json");
+var TASK_CACHE_DIR2 = join8(homedir10(), ".openape", "agent", "tasks");
 function readAuthJson() {
-  if (!existsSync15(AUTH_PATH3)) {
+  if (!existsSync12(AUTH_PATH3)) {
     throw new CliError(
       `No agent auth found at ${AUTH_PATH3}. Run \`apes agents spawn <name>\` to provision an agent first.`
     );
   }
-  const raw = readFileSync14(AUTH_PATH3, "utf8");
+  const raw = readFileSync11(AUTH_PATH3, "utf8");
   let parsed;
   try {
     parsed = JSON.parse(raw);
@@ -4496,7 +3666,7 @@ var syncAgentCommand = defineCommand31({
     let agentGid = null;
     if (process.geteuid?.() === 0) {
       try {
-        const homeStat = statSync(homedir11());
+        const homeStat = statSync(homedir10());
         agentUid = homeStat.uid;
         agentGid = homeStat.gid;
       } catch {
@@ -4510,46 +3680,46 @@ var syncAgentCommand = defineCommand31({
         }
       }
     }
-    const agentDir = join12(homedir11(), ".openape", "agent");
-    mkdirSync4(agentDir, { recursive: true });
-    chownToAgent(join12(homedir11(), ".openape"));
+    const agentDir = join8(homedir10(), ".openape", "agent");
+    mkdirSync3(agentDir, { recursive: true });
+    chownToAgent(join8(homedir10(), ".openape"));
     chownToAgent(agentDir);
-    const agentJsonPath = join12(agentDir, "agent.json");
-    writeFileSync8(
+    const agentJsonPath = join8(agentDir, "agent.json");
+    writeFileSync5(
       agentJsonPath,
       `${JSON.stringify({ systemPrompt, tools }, null, 2)}
 `,
       { mode: 384 }
     );
     chownToAgent(agentJsonPath);
-    mkdirSync4(TASK_CACHE_DIR2, { recursive: true });
+    mkdirSync3(TASK_CACHE_DIR2, { recursive: true });
     chownToAgent(TASK_CACHE_DIR2);
     for (const task of tasks) {
-      const path2 = join12(TASK_CACHE_DIR2, `${task.taskId}.json`);
-      writeFileSync8(path2, `${JSON.stringify(task, null, 2)}
+      const path2 = join8(TASK_CACHE_DIR2, `${task.taskId}.json`);
+      writeFileSync5(path2, `${JSON.stringify(task, null, 2)}
 `, { mode: 384 });
       chownToAgent(path2);
     }
-    const skillsDir = join12(agentDir, "skills");
-    mkdirSync4(skillsDir, { recursive: true });
+    const skillsDir = join8(agentDir, "skills");
+    mkdirSync3(skillsDir, { recursive: true });
     chownToAgent(skillsDir);
     const incomingNames = new Set(skills.map((s) => s.name));
     try {
       for (const entry of readdirSync2(skillsDir)) {
         if (incomingNames.has(entry)) continue;
         try {
-          rmSync5(join12(skillsDir, entry), { recursive: true, force: true });
+          rmSync2(join8(skillsDir, entry), { recursive: true, force: true });
         } catch {
         }
       }
     } catch {
     }
     for (const skill of skills) {
-      const skillDir = join12(skillsDir, skill.name);
-      mkdirSync4(skillDir, { recursive: true });
+      const skillDir = join8(skillsDir, skill.name);
+      mkdirSync3(skillDir, { recursive: true });
       chownToAgent(skillDir);
-      const skillPath = join12(skillDir, "SKILL.md");
-      writeFileSync8(skillPath, skill.body.endsWith("\n") ? skill.body : `${skill.body}
+      const skillPath = join8(skillDir, "SKILL.md");
+      writeFileSync5(skillPath, skill.body.endsWith("\n") ? skill.body : `${skill.body}
 `, { mode: 384 });
       chownToAgent(skillPath);
     }
@@ -4581,21 +3751,21 @@ var agentsCommand = defineCommand32({
 import { defineCommand as defineCommand40 } from "citty";
 
 // src/commands/nest/authorize.ts
-import { execFileSync as execFileSync14 } from "child_process";
-import { existsSync as existsSync17, readFileSync as readFileSync15 } from "fs";
-import { join as join14 } from "path";
+import { execFileSync as execFileSync7 } from "child_process";
+import { existsSync as existsSync14, readFileSync as readFileSync12 } from "fs";
+import { join as join10 } from "path";
 import { defineCommand as defineCommand34 } from "citty";
 import consola29 from "consola";
 
 // src/commands/nest/enroll.ts
-import { hostname as hostname5, homedir as homedir12 } from "os";
-import { existsSync as existsSync16, mkdirSync as mkdirSync5, writeFileSync as writeFileSync9, chmodSync } from "fs";
-import { join as join13 } from "path";
+import { hostname as hostname4, homedir as homedir11 } from "os";
+import { existsSync as existsSync13, mkdirSync as mkdirSync4, writeFileSync as writeFileSync6, chmodSync } from "fs";
+import { join as join9 } from "path";
 import { defineCommand as defineCommand33 } from "citty";
 import consola28 from "consola";
-var NEST_DATA_DIR = join13(homedir12(), ".openape", "nest");
+var NEST_DATA_DIR = join9(homedir11(), ".openape", "nest");
 function nestAgentName() {
-  const raw = hostname5().toLowerCase();
+  const raw = hostname4().toLowerCase();
   const head = raw.split(".")[0] ?? raw;
   const safe = head.replace(/[^a-z0-9-]/g, "-").replace(/-+/g, "-").replace(/^-+|-+$/g, "");
   const trimmed = safe.slice(0, 16);
@@ -4626,19 +3796,19 @@ var enrollNestCommand = defineCommand33({
       throw new CliError("Run `apes login <email>` first \u2014 nest enroll attaches the new identity to your owner account.");
     }
     const name = args.name || nestAgentName();
-    const authPath = join13(NEST_DATA_DIR, ".config", "apes", "auth.json");
-    if (existsSync16(authPath) && !args.force) {
+    const authPath = join9(NEST_DATA_DIR, ".config", "apes", "auth.json");
+    if (existsSync13(authPath) && !args.force) {
       throw new CliError(`Nest already enrolled at ${authPath}. Pass --force to re-enroll.`);
     }
-    const sshDir = join13(NEST_DATA_DIR, ".ssh");
-    const configDir = join13(NEST_DATA_DIR, ".config", "apes");
-    mkdirSync5(sshDir, { recursive: true });
-    mkdirSync5(configDir, { recursive: true });
+    const sshDir = join9(NEST_DATA_DIR, ".ssh");
+    const configDir = join9(NEST_DATA_DIR, ".config", "apes");
+    mkdirSync4(sshDir, { recursive: true });
+    mkdirSync4(configDir, { recursive: true });
     consola28.start(`Generating keypair for ${name}\u2026`);
     const { privatePem, publicSshLine } = generateKeyPairInMemory();
-    writeFileSync9(join13(sshDir, "id_ed25519"), `${privatePem.trimEnd()}
+    writeFileSync6(join9(sshDir, "id_ed25519"), `${privatePem.trimEnd()}
 `, { mode: 384 });
-    writeFileSync9(join13(sshDir, "id_ed25519.pub"), `${publicSshLine}
+    writeFileSync6(join9(sshDir, "id_ed25519.pub"), `${publicSshLine}
 `, { mode: 420 });
     chmodSync(sshDir, 448);
     consola28.start(`Registering nest at ${idp}\u2026`);
@@ -4655,10 +3825,10 @@ var enrollNestCommand = defineCommand33({
       accessToken: token,
       email: registration.email,
       expiresAt: Math.floor(Date.now() / 1e3) + expiresIn,
-      keyPath: join13(sshDir, "id_ed25519"),
+      keyPath: join9(sshDir, "id_ed25519"),
       ownerEmail: ownerAuth.email
     });
-    writeFileSync9(authPath, authJson, { mode: 384 });
+    writeFileSync6(authPath, authJson, { mode: 384 });
     chmodSync(configDir, 448);
     consola28.success(`Nest enrolled \u2014 auth.json at ${authPath}`);
     consola28.info("");
@@ -4727,11 +3897,11 @@ var authorizeNestCommand = defineCommand34({
     }
   },
   async run({ args }) {
-    const nestAuthPath = join14(NEST_DATA_DIR, ".config", "apes", "auth.json");
-    if (!existsSync17(nestAuthPath)) {
+    const nestAuthPath = join10(NEST_DATA_DIR, ".config", "apes", "auth.json");
+    if (!existsSync14(nestAuthPath)) {
       throw new CliError("Nest not enrolled. Run `apes nest enroll` first.");
     }
-    const nestAuth = JSON.parse(readFileSync15(nestAuthPath, "utf8"));
+    const nestAuth = JSON.parse(readFileSync12(nestAuthPath, "utf8"));
     if (!nestAuth.email) throw new CliError(`${nestAuthPath} has no email`);
     const allow = args.allow ?? DEFAULT_ALLOW_PATTERNS.join(",");
     consola29.info(`Configuring YOLO-policy on ${nestAuth.email} via \`apes yolo set\`\u2026`);
@@ -4748,7 +3918,7 @@ var authorizeNestCommand = defineCommand34({
       cmdArgs.push("--expires-in", args["expires-in"]);
     }
     try {
-      execFileSync14("apes", cmdArgs, { stdio: "inherit" });
+      execFileSync7("apes", cmdArgs, { stdio: "inherit" });
     } catch (err) {
       throw new CliError(err instanceof Error ? err.message : String(err));
     }
@@ -4758,7 +3928,7 @@ var authorizeNestCommand = defineCommand34({
 });
 
 // src/commands/nest/destroy.ts
-import { execFileSync as execFileSync15 } from "child_process";
+import { execFileSync as execFileSync8 } from "child_process";
 import { defineCommand as defineCommand35 } from "citty";
 import consola30 from "consola";
 var destroyNestCommand = defineCommand35({
@@ -4772,7 +3942,7 @@ var destroyNestCommand = defineCommand35({
   async run({ args }) {
     const name = String(args.name);
     try {
-      execFileSync15("apes", ["run", "--as", "root", "--wait", "--", "apes", "agents", "destroy", name, "--force"], { stdio: "inherit" });
+      execFileSync8("apes", ["run", "--as", "root", "--wait", "--", "apes", "agents", "destroy", name, "--force"], { stdio: "inherit" });
       consola30.success(`Nest will tear down ${name}'s pm2 process on its next reconcile (\u22642s).`);
     } catch (err) {
       const status = err.status ?? 1;
@@ -4782,9 +3952,9 @@ var destroyNestCommand = defineCommand35({
 });
 
 // src/commands/nest/install.ts
-import { existsSync as existsSync18, mkdirSync as mkdirSync6, readFileSync as readFileSync16, writeFileSync as writeFileSync10 } from "fs";
-import { homedir as homedir13 } from "os";
-import { dirname as dirname3, join as join15 } from "path";
+import { existsSync as existsSync15, mkdirSync as mkdirSync5, readFileSync as readFileSync13, writeFileSync as writeFileSync7 } from "fs";
+import { homedir as homedir12 } from "os";
+import { dirname as dirname2, join as join11 } from "path";
 import { defineCommand as defineCommand36 } from "citty";
 import consola31 from "consola";
 
@@ -4852,41 +4022,41 @@ resource_chain = ["agents:name={name}", "allowlist:email={peer_email}"]
 
 // src/commands/nest/install.ts
 function installAdapter2() {
-  const target = join15(homedir13(), ".openape", "shapes", "adapters", "apes-agents.toml");
-  mkdirSync6(dirname3(target), { recursive: true });
+  const target = join11(homedir12(), ".openape", "shapes", "adapters", "apes-agents.toml");
+  mkdirSync5(dirname2(target), { recursive: true });
   let existing = "";
   try {
-    existing = readFileSync16(target, "utf8");
+    existing = readFileSync13(target, "utf8");
   } catch {
   }
   if (existing === APES_AGENTS_ADAPTER_TOML) return false;
-  writeFileSync10(target, APES_AGENTS_ADAPTER_TOML, { mode: 420 });
+  writeFileSync7(target, APES_AGENTS_ADAPTER_TOML, { mode: 420 });
   consola31.success(`Wrote shapes adapter ${target}`);
   return true;
 }
 function writeBridgeModelDefault(model) {
-  for (const envDir of [join15(homedir13(), "litellm"), join15(NEST_DATA_DIR, "litellm")]) {
-    const envFile = join15(envDir, ".env");
-    mkdirSync6(envDir, { recursive: true });
+  for (const envDir of [join11(homedir12(), "litellm"), join11(NEST_DATA_DIR, "litellm")]) {
+    const envFile = join11(envDir, ".env");
+    mkdirSync5(envDir, { recursive: true });
     let lines = [];
-    if (existsSync18(envFile)) {
-      lines = readFileSync16(envFile, "utf8").split("\n").filter((l) => !l.startsWith("APE_CHAT_BRIDGE_MODEL="));
+    if (existsSync15(envFile)) {
+      lines = readFileSync13(envFile, "utf8").split("\n").filter((l) => !l.startsWith("APE_CHAT_BRIDGE_MODEL="));
     }
     lines.push(`APE_CHAT_BRIDGE_MODEL=${model}`);
     while (lines.length > 0 && lines.at(-1).trim() === "") lines.pop();
-    writeFileSync10(envFile, `${lines.join("\n")}
+    writeFileSync7(envFile, `${lines.join("\n")}
 `, { mode: 384 });
   }
 }
 function findBinary(name) {
   for (const dir of [
-    join15(homedir13(), ".bun", "bin"),
+    join11(homedir12(), ".bun", "bin"),
     "/opt/homebrew/bin",
     "/usr/local/bin",
     "/usr/bin"
   ]) {
-    const p = join15(dir, name);
-    if (existsSync18(p)) return p;
+    const p = join11(dir, name);
+    if (existsSync15(p)) return p;
   }
   throw new Error(`could not locate ${name} on PATH; install it first`);
 }
@@ -4906,7 +4076,7 @@ var installNestCommand = defineCommand36({
     }
   },
   async run({ args }) {
-    const homeDir = homedir13();
+    const homeDir = homedir12();
     const port = Number(args.port ?? 9091);
     if (!Number.isInteger(port) || port < 1024 || port > 65535) {
       throw new Error(`invalid port ${port}`);
@@ -4922,7 +4092,7 @@ var installNestCommand = defineCommand36({
       consola31.success(`Default bridge model set to ${args["bridge-model"]} (in ~/litellm/.env)`);
     }
     installAdapter2();
-    mkdirSync6(NEST_DATA_DIR, { recursive: true });
+    mkdirSync5(NEST_DATA_DIR, { recursive: true });
     await getHostPlatform().installNestSupervisor({
       nestBin,
       apesBin,
@@ -4971,7 +4141,7 @@ var listNestCommand = defineCommand37({
 });
 
 // src/commands/nest/spawn.ts
-import { execFileSync as execFileSync16 } from "child_process";
+import { execFileSync as execFileSync9 } from "child_process";
 import { defineCommand as defineCommand38 } from "citty";
 import consola33 from "consola";
 var spawnNestCommand = defineCommand38({
@@ -5004,7 +4174,7 @@ var spawnNestCommand = defineCommand38({
     if (typeof args["bridge-base-url"] === "string") apesArgs.push("--bridge-base-url", args["bridge-base-url"]);
     if (typeof args["bridge-model"] === "string") apesArgs.push("--bridge-model", args["bridge-model"]);
     try {
-      execFileSync16("apes", apesArgs, { stdio: "inherit" });
+      execFileSync9("apes", apesArgs, { stdio: "inherit" });
       consola33.success(`Nest will pick up ${name} on its next reconcile (\u22642s).`);
     } catch (err) {
       const status = err.status ?? 1;
@@ -5569,14 +4739,13 @@ var adapterCommand = defineCommand45({
 });
 
 // src/commands/run.ts
-import { execFileSync as execFileSync17 } from "child_process";
-import { hostname as hostname6 } from "os";
+import { execFileSync as execFileSync10 } from "child_process";
+import { hostname as hostname5 } from "os";
 import { basename } from "path";
 import { defineCommand as defineCommand46 } from "citty";
 import consola39 from "consola";
 function resolveRunAsTarget(runAs) {
   if (!runAs) return runAs;
-  if (!isDarwin2()) return runAs;
   if (!AGENT_NAME_REGEX.test(runAs)) return runAs;
   if (runAs.startsWith("openape-agent-")) return runAs;
   const platform = getHostPlatform();
@@ -5754,7 +4923,7 @@ async function runShellMode(command, args) {
   const adapterHandled = await tryAdapterModeFromShell(command, idp, args);
   if (adapterHandled) return;
   const grantsUrl = await getGrantsEndpoint(idp);
-  const targetHost = args.host || hostname6();
+  const targetHost = args.host || hostname5();
   try {
     const grants = await apiFetch(
       `${grantsUrl}?requester=${encodeURIComponent(auth.email)}&status=approved&limit=20`
@@ -5850,7 +5019,7 @@ async function tryAdapterModeFromShell(command, idp, args) {
     approveUrl: `${idp}/grant-approval?grant_id=${grant.id}`,
     command: resolved.detail?.display || parsed?.raw || "unknown",
     audience: resolved.adapter?.cli?.audience ?? "shapes",
-    host: args.host || hostname6()
+    host: args.host || hostname5()
   });
   if (shouldWaitForGrant(args)) {
     consola39.info(`Grant requested: ${grant.id}`);
@@ -5870,7 +5039,7 @@ function execShellCommand(command) {
     throw new CliError("No command to execute");
   try {
     const { APES_SHELL_WRAPPER: _wrapperMarker, ...inheritedEnv } = process.env;
-    execFileSync17(command[0], command.slice(1), {
+    execFileSync10(command[0], command.slice(1), {
       stdio: "inherit",
       env: inheritedEnv
     });
@@ -5971,7 +5140,7 @@ async function runAudienceMode(audience, action, args, commandArgv) {
   const idp = getIdpUrl(args.idp);
   const grantsUrl = await getGrantsEndpoint(idp);
   const command = commandArgv ?? action.split(" ");
-  const targetHost = args.host || hostname6();
+  const targetHost = args.host || hostname5();
   const runAs = resolveRunAsTarget(args.as ?? void 0);
   const reusableId = await findReusableAudienceGrant({
     grantsUrl,
@@ -6039,7 +5208,7 @@ function executeWithGrantToken(opts) {
     consola39.info(`Executing: ${command.join(" ")}`);
     try {
       const { APES_SHELL_WRAPPER: _wrapperMarker, ...inheritedEnv } = process.env;
-      execFileSync17(args["escapes-path"] || "escapes", ["--grant", token, "--", ...command], {
+      execFileSync10(args["escapes-path"] || "escapes", ["--grant", token, "--", ...command], {
         stdio: "inherit",
         env: inheritedEnv
       });
@@ -6075,9 +5244,9 @@ async function findReusableAudienceGrant(opts) {
 
 // src/commands/proxy.ts
 import { spawn as spawn2 } from "child_process";
-import { existsSync as existsSync20 } from "fs";
-import { homedir as homedir14 } from "os";
-import { join as join18 } from "path";
+import { existsSync as existsSync17 } from "fs";
+import { homedir as homedir13 } from "os";
+import { join as join14 } from "path";
 import { defineCommand as defineCommand47 } from "citty";
 import consola40 from "consola";
 
@@ -6113,10 +5282,10 @@ note = "VPC-internal hostname suffix"
 
 // src/proxy/local-proxy.ts
 import { spawn } from "child_process";
-import { mkdtempSync as mkdtempSync4, rmSync as rmSync6, writeFileSync as writeFileSync11 } from "fs";
+import { mkdtempSync as mkdtempSync2, rmSync as rmSync3, writeFileSync as writeFileSync8 } from "fs";
 import { createRequire } from "module";
-import { tmpdir as tmpdir4 } from "os";
-import { dirname as dirname4, join as join16, resolve as resolve3 } from "path";
+import { tmpdir as tmpdir2 } from "os";
+import { dirname as dirname3, join as join12, resolve as resolve3 } from "path";
 var require2 = createRequire(import.meta.url);
 function findProxyBin() {
   const pkgPath = require2.resolve("@openape/proxy/package.json");
@@ -6125,12 +5294,12 @@ function findProxyBin() {
   if (!binRel) {
     throw new Error("@openape/proxy is missing the openape-proxy bin entry");
   }
-  return resolve3(dirname4(pkgPath), binRel);
+  return resolve3(dirname3(pkgPath), binRel);
 }
 async function startEphemeralProxy(configToml) {
-  const tmpDir = mkdtempSync4(join16(tmpdir4(), "openape-proxy-"));
-  const configPath = join16(tmpDir, "config.toml");
-  writeFileSync11(configPath, configToml, { mode: 384 });
+  const tmpDir = mkdtempSync2(join12(tmpdir2(), "openape-proxy-"));
+  const configPath = join12(tmpDir, "config.toml");
+  writeFileSync8(configPath, configToml, { mode: 384 });
   const binPath = findProxyBin();
   const child = spawn(process.execPath, [binPath, "-c", configPath], {
     stdio: ["ignore", "pipe", "pipe"],
@@ -6138,7 +5307,7 @@ async function startEphemeralProxy(configToml) {
   });
   const cleanupTmp = () => {
     try {
-      rmSync6(tmpDir, { recursive: true, force: true });
+      rmSync3(tmpDir, { recursive: true, force: true });
     } catch {
     }
   };
@@ -6212,9 +5381,9 @@ function waitForListenLine(child) {
 }
 
 // src/proxy/trust-bundle.ts
-import { existsSync as existsSync19, mkdtempSync as mkdtempSync5, readFileSync as readFileSync17, rmdirSync, unlinkSync as unlinkSync3, writeFileSync as writeFileSync12 } from "fs";
-import { tmpdir as tmpdir5 } from "os";
-import { join as join17 } from "path";
+import { existsSync as existsSync16, mkdtempSync as mkdtempSync3, readFileSync as readFileSync14, rmdirSync, unlinkSync as unlinkSync2, writeFileSync as writeFileSync9 } from "fs";
+import { tmpdir as tmpdir3 } from "os";
+import { join as join13 } from "path";
 var CANDIDATES = [
   "/etc/ssl/cert.pem",
   // macOS
@@ -6227,25 +5396,25 @@ var CANDIDATES = [
 ];
 function detectSystemCaPath() {
   for (const p of CANDIDATES) {
-    if (existsSync19(p)) return p;
+    if (existsSync16(p)) return p;
   }
   throw new Error(
     `Could not locate a system CA bundle. Tried: ${CANDIDATES.join(", ")}. Set NODE_EXTRA_CA_CERTS yourself or pass --allow-no-system-ca.`
   );
 }
 function buildTrustBundle(opts) {
-  const dir = mkdtempSync5(join17(tmpdir5(), "openape-trust-"));
-  const path2 = join17(dir, "bundle.pem");
-  const sys = readFileSync17(opts.systemCaPath, "utf-8");
-  const local = readFileSync17(opts.localCaPath, "utf-8");
-  writeFileSync12(path2, `${sys.trimEnd()}
+  const dir = mkdtempSync3(join13(tmpdir3(), "openape-trust-"));
+  const path2 = join13(dir, "bundle.pem");
+  const sys = readFileSync14(opts.systemCaPath, "utf-8");
+  const local = readFileSync14(opts.localCaPath, "utf-8");
+  writeFileSync9(path2, `${sys.trimEnd()}
 ${local.trimEnd()}
 `, { mode: 384 });
   return {
     path: path2,
     cleanup: () => {
       try {
-        unlinkSync3(path2);
+        unlinkSync2(path2);
       } catch {
       }
       try {
@@ -6295,8 +5464,8 @@ var proxyCommand = defineCommand47({
     if (reuseHostPort) {
       proxyUrl = `http://${reuseHostPort}`;
       consola40.info(`[apes proxy] using long-running daemon at ${proxyUrl}`);
-      const localCaPath = join18(homedir14(), ".openape", "proxy", "ca.crt");
-      if (!existsSync20(localCaPath)) {
+      const localCaPath = join14(homedir13(), ".openape", "proxy", "ca.crt");
+      if (!existsSync17(localCaPath)) {
         throw new CliError(
           `OPENAPE_PROXY is set but no local CA found at ${localCaPath}. Start the daemon (sudo -u <agent> apes proxy --global < secrets.toml) first.`
         );
@@ -6638,16 +5807,16 @@ var mcpCommand = defineCommand52({
     if (transport !== "stdio" && transport !== "sse") {
       throw new Error('Transport must be "stdio" or "sse"');
     }
-    const { startMcpServer } = await import("./server-QN35XDYH.js");
+    const { startMcpServer } = await import("./server-X4HHOCKV.js");
     await startMcpServer(transport, port);
   }
 });
 
 // src/commands/init/index.ts
-import { existsSync as existsSync21, copyFileSync, writeFileSync as writeFileSync13 } from "fs";
+import { existsSync as existsSync18, copyFileSync, writeFileSync as writeFileSync10 } from "fs";
 import { randomBytes } from "crypto";
-import { execFileSync as execFileSync18 } from "child_process";
-import { join as join19 } from "path";
+import { execFileSync as execFileSync11 } from "child_process";
+import { join as join15 } from "path";
 import { defineCommand as defineCommand53 } from "citty";
 import consola43 from "consola";
 var DEFAULT_IDP_URL = "https://id.openape.at";
@@ -6656,13 +5825,13 @@ async function downloadTemplate(repo, targetDir) {
   await gigetDownload(`gh:${repo}`, { dir: targetDir, force: false });
 }
 function installDeps(dir) {
-  const hasLockFile = (name) => existsSync21(join19(dir, name));
+  const hasLockFile = (name) => existsSync18(join15(dir, name));
   if (hasLockFile("pnpm-lock.yaml")) {
-    execFileSync18("pnpm", ["install"], { cwd: dir, stdio: "inherit" });
+    execFileSync11("pnpm", ["install"], { cwd: dir, stdio: "inherit" });
   } else if (hasLockFile("bun.lockb")) {
-    execFileSync18("bun", ["install"], { cwd: dir, stdio: "inherit" });
+    execFileSync11("bun", ["install"], { cwd: dir, stdio: "inherit" });
   } else {
-    execFileSync18("npm", ["install"], { cwd: dir, stdio: "inherit" });
+    execFileSync11("npm", ["install"], { cwd: dir, stdio: "inherit" });
   }
 }
 async function promptChoice(message, choices) {
@@ -6721,7 +5890,7 @@ var initCommand = defineCommand53({
 });
 async function initSP(targetDir) {
   const dir = targetDir || "my-app";
-  if (existsSync21(join19(dir, "package.json"))) {
+  if (existsSync18(join15(dir, "package.json"))) {
     throw new CliError(`Directory "${dir}" already contains a project.`);
   }
   consola43.start("Scaffolding SP starter...");
@@ -6730,9 +5899,9 @@ async function initSP(targetDir) {
   consola43.start("Installing dependencies...");
   installDeps(dir);
   consola43.success("Dependencies installed");
-  const envExample = join19(dir, ".env.example");
-  const envFile = join19(dir, ".env");
-  if (existsSync21(envExample) && !existsSync21(envFile)) {
+  const envExample = join15(dir, ".env.example");
+  const envFile = join15(dir, ".env");
+  if (existsSync18(envExample) && !existsSync18(envFile)) {
     copyFileSync(envExample, envFile);
     consola43.success(`\`.env\` created (using Free IdP at ${DEFAULT_IDP_URL})`);
   }
@@ -6746,7 +5915,7 @@ async function initSP(targetDir) {
 }
 async function initIdP(targetDir) {
   const dir = targetDir || "my-idp";
-  if (existsSync21(join19(dir, "package.json"))) {
+  if (existsSync18(join15(dir, "package.json"))) {
     throw new CliError(`Directory "${dir}" already contains a project.`);
   }
   const domain = await promptText("Domain for the IdP", "localhost");
@@ -6778,7 +5947,7 @@ async function initIdP(targetDir) {
     `NUXT_OPENAPE_RP_ID=${domain}`,
     `NUXT_OPENAPE_RP_ORIGIN=${origin}`
   ].join("\n");
-  writeFileSync13(join19(dir, ".env"), `${envContent}
+  writeFileSync10(join15(dir, ".env"), `${envContent}
 `, { mode: 384 });
   consola43.success(".env created");
   console.log("");
@@ -6799,7 +5968,7 @@ async function initIdP(targetDir) {
 
 // src/commands/enroll.ts
 import { Buffer as Buffer5 } from "buffer";
-import { existsSync as existsSync22, readFileSync as readFileSync18 } from "fs";
+import { existsSync as existsSync19, readFileSync as readFileSync15 } from "fs";
 import { execFile as execFile2 } from "child_process";
 import { sign as sign2 } from "crypto";
 import { defineCommand as defineCommand54 } from "citty";
@@ -6815,7 +5984,7 @@ function openBrowser2(url) {
 }
 async function pollForEnrollment(idp, agentEmail, keyPath) {
   const resolvedKey = resolveKeyPath(keyPath);
-  const keyContent = readFileSync18(resolvedKey, "utf-8");
+  const keyContent = readFileSync15(resolvedKey, "utf-8");
   const privateKey = loadEd25519PrivateKey(keyContent);
   const challengeUrl = await getAgentChallengeEndpoint(idp);
   const authenticateUrl = await getAgentAuthenticateEndpoint(idp);
@@ -6883,7 +6052,7 @@ var enrollCommand = defineCommand54({
     }) || DEFAULT_KEY_PATH;
     const resolvedKey = resolveKeyPath(keyPath);
     let publicKey;
-    if (existsSync22(resolvedKey)) {
+    if (existsSync19(resolvedKey)) {
       publicKey = readPublicKey(resolvedKey);
       consola44.success(`Using existing key ${keyPath}`);
     } else {
@@ -6927,7 +6096,7 @@ var enrollCommand = defineCommand54({
 });
 
 // src/commands/register-user.ts
-import { existsSync as existsSync23, readFileSync as readFileSync19 } from "fs";
+import { existsSync as existsSync20, readFileSync as readFileSync16 } from "fs";
 import { defineCommand as defineCommand55 } from "citty";
 import consola45 from "consola";
 var registerUserCommand = defineCommand55({
@@ -6966,8 +6135,8 @@ var registerUserCommand = defineCommand55({
       throw new CliError("No IdP URL configured. Run `apes login` first.");
     }
     let publicKey = args.key;
-    if (existsSync23(args.key)) {
-      publicKey = readFileSync19(args.key, "utf-8").trim();
+    if (existsSync20(args.key)) {
+      publicKey = readFileSync16(args.key, "utf-8").trim();
     }
     if (!publicKey.startsWith("ssh-ed25519 ")) {
       throw new CliError("Public key must be in ssh-ed25519 format.");
@@ -7276,7 +6445,7 @@ async function bestEffortGrantCount(idp) {
   }
 }
 async function runHealth(args) {
-  const version = true ? "1.29.0" : "0.0.0";
+  const version = true ? "1.30.0" : "0.0.0";
   const auth = loadAuth();
   if (!auth) {
     throw new CliError("Not logged in. Run `apes login` first.", 1);
@@ -7469,26 +6638,26 @@ var workflowsCommand = defineCommand63({
 });
 
 // src/version-check.ts
-import { existsSync as existsSync24, mkdirSync as mkdirSync7, readFileSync as readFileSync20, writeFileSync as writeFileSync14 } from "fs";
-import { homedir as homedir15 } from "os";
-import { join as join20 } from "path";
+import { existsSync as existsSync21, mkdirSync as mkdirSync6, readFileSync as readFileSync17, writeFileSync as writeFileSync11 } from "fs";
+import { homedir as homedir14 } from "os";
+import { join as join16 } from "path";
 import consola51 from "consola";
 var PACKAGE_NAME = "@openape/apes";
 var CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
-var CACHE_FILE = join20(homedir15(), ".config", "apes", ".version-check.json");
+var CACHE_FILE = join16(homedir14(), ".config", "apes", ".version-check.json");
 function readCache() {
-  if (!existsSync24(CACHE_FILE)) return null;
+  if (!existsSync21(CACHE_FILE)) return null;
   try {
-    return JSON.parse(readFileSync20(CACHE_FILE, "utf-8"));
+    return JSON.parse(readFileSync17(CACHE_FILE, "utf-8"));
   } catch {
     return null;
   }
 }
 function writeCache(entry) {
   try {
-    const dir = join20(homedir15(), ".config", "apes");
-    if (!existsSync24(dir)) mkdirSync7(dir, { recursive: true, mode: 448 });
-    writeFileSync14(CACHE_FILE, JSON.stringify(entry), { mode: 384 });
+    const dir = join16(homedir14(), ".config", "apes");
+    if (!existsSync21(dir)) mkdirSync6(dir, { recursive: true, mode: 448 });
+    writeFileSync11(CACHE_FILE, JSON.stringify(entry), { mode: 384 });
   } catch {
   }
 }
@@ -7549,10 +6718,10 @@ if (shellRewrite) {
   if (shellRewrite.action === "rewrite") {
     process.argv = shellRewrite.argv;
   } else if (shellRewrite.action === "version") {
-    console.log(`ape-shell ${"1.29.0"} (OpenApe DDISA shell wrapper)`);
+    console.log(`ape-shell ${"1.30.0"} (OpenApe DDISA shell wrapper)`);
     process.exit(0);
   } else if (shellRewrite.action === "help") {
-    console.log(`ape-shell ${"1.29.0"} \u2014 OpenApe DDISA shell wrapper`);
+    console.log(`ape-shell ${"1.30.0"} \u2014 OpenApe DDISA shell wrapper`);
     console.log("");
     console.log("Usage:");
     console.log("  ape-shell                 Start interactive grant-mediated REPL");
@@ -7610,7 +6779,7 @@ var configCommand = defineCommand64({
 var main = defineCommand64({
   meta: {
     name: "apes",
-    version: "1.29.0",
+    version: "1.30.0",
     description: "Unified CLI for OpenApe"
   },
   subCommands: {
@@ -7668,7 +6837,7 @@ async function maybeRefreshAuth() {
   }
 }
 await maybeRefreshAuth();
-await maybeWarnStaleVersion("1.29.0").catch(() => {
+await maybeWarnStaleVersion("1.30.0").catch(() => {
 });
 runMain(main).catch((err) => {
   if (err instanceof CliExit) {