@ouro.bot/cli 0.1.0-alpha.551 → 0.1.0-alpha.553

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.553",
+      "changes": [
+        "Daemon startup on macOS now starts through launchd before opening the daemon socket when the LaunchAgent is available, preventing `ouro up` from leaving both a manual daemon and a launchd daemon alive after current-session bootstrap."
+      ]
+    },
+    {
+      "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": [

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;
@@ -75,7 +77,10 @@ const cli_parse_1 = require("./cli-parse");
 const provider_discovery_1 = require("./provider-discovery");
 const provider_credentials_1 = require("../provider-credentials");
 // ── Default implementations ──
-function defaultStartDaemonProcess(socketPath) {
+async function defaultStartDaemonProcess(socketPath) {
+    const launchdStarted = await startDaemonProcessViaLaunchd(socketPath);
+    if (launchdStarted)
+        return launchdStarted;
     const entry = path.join((0, identity_1.getRepoRoot)(), "dist", "heart", "daemon", "daemon-entry.js");
     // Redirect stdio to /dev/null via file descriptors — using 'ignore' causes EPIPE
     // when the daemon's logging system writes to stderr after the parent exits.
@@ -87,7 +92,7 @@ function defaultStartDaemonProcess(socketPath) {
     });
     child.unref();
     // Don't close fds — the child process needs them. They'll be cleaned up when the parent exits.
-    return Promise.resolve({ pid: child.pid ?? null });
+    return { pid: child.pid ?? null };
 }
 function defaultWriteStdout(text) {
     process.stdout.write(text.endsWith("\n") ? text : `${text}\n`);
@@ -216,10 +221,13 @@ function defaultFallbackPendingMessage(command) {
     });
     return pendingPath;
 }
-function defaultEnsureDaemonBootPersistence(socketPath) {
-    if (process.platform !== "darwin") {
-        return;
-    }
+function currentUserUid() {
+    return process.getuid?.() ?? 0;
+}
+function launchAgentDomain(userUid = currentUserUid()) {
+    return `gui/${userUid}`;
+}
+function writeDaemonBootPlist(socketPath) {
     const homeDir = os.homedir();
     const writeDeps = {
         writeFile: (filePath, content) => fs.writeFileSync(filePath, content, "utf-8"),
@@ -237,20 +245,123 @@ function defaultEnsureDaemonBootPersistence(socketPath) {
             meta: { entryPath },
         });
     }
-    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, {
+    return (0, launchd_1.writeLaunchAgentPlist)(writeDeps, {
         nodePath: process.execPath,
         entryPath,
         socketPath,
-        logDir,
+        logDir: (0, identity_1.getAgentDaemonLogsDir)(),
         envPath: process.env.PATH,
     });
 }
+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;
+    }
+}
+function readDaemonLaunchAgentPid() {
+    try {
+        const output = (0, child_process_1.execSync)(`launchctl print ${launchAgentDomain()}/${launchd_1.DAEMON_PLIST_LABEL}`, { encoding: "utf-8" });
+        const match = output.match(/^\s*pid = (\d+)/m);
+        return match ? Number(match[1]) : null;
+    }
+    catch {
+        return null;
+    }
+}
+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 startDaemonProcessViaLaunchd(socketPath) {
+    if (process.platform !== "darwin") {
+        return null;
+    }
+    const plistPath = writeDaemonBootPlist(socketPath);
+    const userUid = currentUserUid();
+    const domain = launchAgentDomain(userUid);
+    try {
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.launchd_bootstrap_start",
+            message: "starting daemon launch agent for current login session",
+            meta: { plistPath, label: launchd_1.DAEMON_PLIST_LABEL },
+        });
+        if (isDaemonLaunchAgentLoaded({ exec: (cmd) => { (0, child_process_1.execSync)(cmd, { stdio: "ignore" }); }, userUid })) {
+            (0, child_process_1.execSync)(`launchctl kickstart -k ${domain}/${launchd_1.DAEMON_PLIST_LABEL}`, { stdio: "ignore" });
+        }
+        else {
+            (0, child_process_1.execSync)(`launchctl bootstrap ${domain} "${plistPath}"`, { stdio: "ignore" });
+        }
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.launchd_bootstrap_end",
+            message: "daemon launch agent started for current login session",
+            meta: { plistPath, label: launchd_1.DAEMON_PLIST_LABEL },
+        });
+        await waitForBootstrappedDaemonSocket(socketPath);
+        return { pid: readDaemonLaunchAgentPid() };
+    }
+    catch (error) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "daemon",
+            event: "daemon.launchd_bootstrap_error",
+            message: "failed to start daemon launch agent for current login session",
+            meta: { plistPath, label: launchd_1.DAEMON_PLIST_LABEL, error: error instanceof Error ? error.message : String(error) },
+        });
+        return null;
+    }
+}
+async function defaultEnsureDaemonBootPersistence(socketPath) {
+    if (process.platform !== "darwin") {
+        return;
+    }
+    const plistPath = writeDaemonBootPlist(socketPath);
+    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;
+    }
+}
 function defaultPrepareDaemonRuntimeReplacement() {
     if (process.platform !== "darwin") {
         return;

package/package.json

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