@ouro.bot/cli 0.1.0-alpha.550 → 0.1.0-alpha.552

package/changelog.json

@@ -1,6 +1,18 @@
 {
   "_note": "This changelog is maintained as part of the PR/version-bump workflow. Agent-curated, not auto-generated. Agents read this file directly via read_file to understand what changed between versions.",
   "versions": [
+    {
+      "version": "0.1.0-alpha.552",
+      "changes": [
+        "`ouro up` now bootstraps the daemon LaunchAgent into the current login session when it is not already loaded, waits for the launchd-owned daemon socket to settle, and keeps the launchd adoption non-fatal if macOS refuses the bootstrap."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.551",
+      "changes": [
+        "`ouro up` now waits for SIGTERMed orphan daemon processes to settle before opening the replacement Unix socket, preventing the previous daemon from unlinking the new daemon's command socket during orphan cleanup."
+      ]
+    },
     {
       "version": "0.1.0-alpha.550",
       "changes": [

package/dist/heart/daemon/cli-defaults.js

@@ -41,6 +41,8 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultStartDaemonProcess = defaultStartDaemonProcess;
 exports.readFirstBundleMetaVersion = readFirstBundleMetaVersion;
+exports.isDaemonLaunchAgentLoaded = isDaemonLaunchAgentLoaded;
+exports.waitForBootstrappedDaemonSocket = waitForBootstrappedDaemonSocket;
 exports.defaultListDiscoveredAgents = defaultListDiscoveredAgents;
 exports.defaultRunSerpentGuide = defaultRunSerpentGuide;
 exports.createDefaultOuroCliDeps = createDefaultOuroCliDeps;
@@ -216,7 +218,56 @@ function defaultFallbackPendingMessage(command) {
     });
     return pendingPath;
 }
-function defaultEnsureDaemonBootPersistence(socketPath) {
+function currentUserUid() {
+    return process.getuid?.() ?? 0;
+}
+function launchAgentDomain(userUid = currentUserUid()) {
+    return `gui/${userUid}`;
+}
+function isDaemonLaunchAgentLoaded(deps) {
+    const userUid = deps?.userUid ?? currentUserUid();
+    const exec = deps?.exec ?? ((cmd) => { (0, child_process_1.execSync)(cmd, { stdio: "ignore" }); });
+    try {
+        exec(`launchctl print ${launchAgentDomain(userUid)}/${launchd_1.DAEMON_PLIST_LABEL}`);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+async function waitForBootstrappedDaemonSocket(socketPath, deps = {}) {
+    const checkSocketAlive = deps.checkSocketAlive ?? socket_client_1.checkDaemonSocketAlive;
+    const now = deps.now ?? Date.now;
+    const sleep = deps.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+    const timeoutMs = deps.timeoutMs ?? 30_000;
+    const initialSettleMs = deps.initialSettleMs ?? 1_000;
+    const pollIntervalMs = deps.pollIntervalMs ?? 250;
+    const requiredConsecutiveAliveChecks = deps.requiredConsecutiveAliveChecks ?? 2;
+    const deadline = now() + timeoutMs;
+    const firstTrustworthyCheckAt = now() + initialSettleMs;
+    let consecutiveAliveChecks = 0;
+    while (now() < deadline) {
+        await sleep(pollIntervalMs);
+        if (now() < firstTrustworthyCheckAt)
+            continue;
+        if (await checkSocketAlive(socketPath)) {
+            consecutiveAliveChecks += 1;
+            if (consecutiveAliveChecks >= requiredConsecutiveAliveChecks)
+                return;
+        }
+        else {
+            consecutiveAliveChecks = 0;
+        }
+    }
+    (0, runtime_1.emitNervesEvent)({
+        level: "warn",
+        component: "daemon",
+        event: "daemon.launchd_bootstrap_socket_wait_timeout",
+        message: "launchd bootstrap finished but daemon socket did not settle before timeout",
+        meta: { socketPath },
+    });
+}
+async function defaultEnsureDaemonBootPersistence(socketPath) {
     if (process.platform !== "darwin") {
         return;
     }
@@ -238,18 +289,48 @@ function defaultEnsureDaemonBootPersistence(socketPath) {
         });
     }
     const logDir = (0, identity_1.getAgentDaemonLogsDir)();
-    // Write plist only — do NOT launchctl bootstrap.
-    // The daemon is already running (started by ouro up). Bootstrapping would
-    // start a SECOND daemon via launchd's RunAtLoad, causing a race where
-    // killOrphanProcesses kills the first daemon and both end up dead.
-    // The plist on disk is sufficient: launchd picks it up on login.
-    (0, launchd_1.writeLaunchAgentPlist)(writeDeps, {
+    const plistPath = (0, launchd_1.writeLaunchAgentPlist)(writeDeps, {
         nodePath: process.execPath,
         entryPath,
         socketPath,
         logDir,
         envPath: process.env.PATH,
     });
+    const userUid = currentUserUid();
+    if (isDaemonLaunchAgentLoaded({ exec: (cmd) => { (0, child_process_1.execSync)(cmd, { stdio: "ignore" }); }, userUid })) {
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.launchd_bootstrap_skipped_loaded",
+            message: "daemon launch agent already loaded",
+            meta: { plistPath, label: launchd_1.DAEMON_PLIST_LABEL },
+        });
+        return;
+    }
+    try {
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.launchd_bootstrap_start",
+            message: "bootstrapping daemon launch agent for current login session",
+            meta: { plistPath, label: launchd_1.DAEMON_PLIST_LABEL },
+        });
+        (0, child_process_1.execSync)(`launchctl bootstrap ${launchAgentDomain(userUid)} "${plistPath}"`, { stdio: "ignore" });
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.launchd_bootstrap_end",
+            message: "daemon launch agent bootstrapped for current login session",
+            meta: { plistPath, label: launchd_1.DAEMON_PLIST_LABEL },
+        });
+        await waitForBootstrappedDaemonSocket(socketPath);
+    }
+    catch (error) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "daemon",
+            event: "daemon.launchd_bootstrap_error",
+            message: "failed to bootstrap daemon launch agent for current login session",
+            meta: { plistPath, label: launchd_1.DAEMON_PLIST_LABEL, error: error instanceof Error ? error.message : String(error) },
+        });
+    }
 }
 function defaultPrepareDaemonRuntimeReplacement() {
     if (process.platform !== "darwin") {

package/dist/heart/daemon/daemon.js

@@ -37,6 +37,7 @@ exports.OuroDaemon = void 0;
 exports.parseOrphanPidsFromPs = parseOrphanPidsFromPs;
 exports.filterPidfilePidsToActualOrphans = filterPidfilePidsToActualOrphans;
 exports.mergeUniqueOrphanPids = mergeUniqueOrphanPids;
+exports.waitForOrphanProcessesToSettle = waitForOrphanProcessesToSettle;
 exports.killOrphanProcesses = killOrphanProcesses;
 exports.writePidfile = writePidfile;
 exports.handleAgentSenseTurn = handleAgentSenseTurn;
@@ -176,6 +177,40 @@ function mergeUniqueOrphanPids(...sources) {
     }
     return merged;
 }
+const ORPHAN_CLEANUP_SETTLE_TIMEOUT_MS = 5_000;
+const ORPHAN_CLEANUP_SETTLE_POLL_INTERVAL_MS = 50;
+/* v8 ignore start -- process liveness probe; pure wait behavior covered via injected deps @preserve */
+function defaultIsPidAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch (error) {
+        return error.code === "EPERM";
+    }
+}
+/* v8 ignore stop */
+/* v8 ignore start -- real timer wiring; wait behavior covered via injected sleep @preserve */
+async function defaultSettleSleep(ms) {
+    await new Promise((resolve) => setTimeout(resolve, ms));
+}
+/* v8 ignore stop */
+async function waitForOrphanProcessesToSettle(pids, deps = {}) {
+    if (pids.length === 0)
+        return [];
+    const isPidAlive = deps.isPidAlive ?? defaultIsPidAlive;
+    const now = deps.now ?? Date.now;
+    const sleep = deps.sleep ?? defaultSettleSleep;
+    const timeoutMs = deps.timeoutMs ?? ORPHAN_CLEANUP_SETTLE_TIMEOUT_MS;
+    const pollIntervalMs = deps.pollIntervalMs ?? ORPHAN_CLEANUP_SETTLE_POLL_INTERVAL_MS;
+    const deadline = now() + timeoutMs;
+    let survivors = pids.filter(isPidAlive);
+    while (survivors.length > 0 && now() < deadline) {
+        await sleep(pollIntervalMs);
+        survivors = pids.filter(isPidAlive);
+    }
+    return survivors;
+}
 /* v8 ignore start -- shells out to ps; covered by filterPidfilePidsToActualOrphans unit tests via injected runner @preserve */
 function runPsCheck(pids) {
     try {
@@ -217,7 +252,7 @@ function killOrphanProcesses(socketPath = socket_client_1.DEFAULT_DAEMON_SOCKET_
             message: "blocked orphan cleanup for non-production daemon socket",
             meta: { socketPath, pidfilePath: PIDFILE_PATH },
         });
-        return;
+        return [];
     }
     if (isVitestProcess()) {
         (0, runtime_1.emitNervesEvent)({
@@ -227,7 +262,7 @@ function killOrphanProcesses(socketPath = socket_client_1.DEFAULT_DAEMON_SOCKET_
             message: "blocked killOrphanProcesses from touching real pidfile under vitest",
             meta: { pidfilePath: PIDFILE_PATH },
         });
-        return;
+        return [];
     }
     try {
         let pidfileOrphans = [];
@@ -269,6 +304,7 @@ function killOrphanProcesses(socketPath = socket_client_1.DEFAULT_DAEMON_SOCKET_
                 meta: { pids: pidsToKill },
             });
         }
+        return pidsToKill;
     }
     catch (error) {
         (0, runtime_1.emitNervesEvent)({
@@ -278,6 +314,7 @@ function killOrphanProcesses(socketPath = socket_client_1.DEFAULT_DAEMON_SOCKET_
             message: "failed to clean up orphaned ouro processes",
             meta: { error: error instanceof Error ? error.message : String(error) },
         });
+        return [];
     }
 }
 /**
@@ -594,7 +631,8 @@ class OuroDaemon {
         // MCP connections are lazily initialized per-agent during senseTurn
         // (daemon manages multiple agents; agent identity must be set before loading MCP config)
         /* v8 ignore start -- orphan cleanup + pidfile: calls process management functions @preserve */
-        killOrphanProcesses(this.socketPath);
+        const killedOrphanPids = killOrphanProcesses(this.socketPath);
+        await waitForOrphanProcessesToSettle(killedOrphanPids);
         /* v8 ignore stop */
         await this.openCommandSocket();
         this.triggerAutoStartAgents();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.550",
+  "version": "0.1.0-alpha.552",
   "main": "dist/heart/daemon/ouro-entry.js",
   "bin": {
     "cli": "dist/heart/daemon/ouro-bot-entry.js",