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

package/changelog.json

@@ -1,6 +1,12 @@
 {
   "_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": [

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

@@ -77,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.
@@ -89,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`);
@@ -224,6 +227,32 @@ function currentUserUid() {
 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"),
+        mkdirp: (dir) => fs.mkdirSync(dir, { recursive: true }),
+        homeDir,
+    };
+    const entryPath = resolveDaemonBootEntryPath(homeDir);
+    /* v8 ignore next -- covered via mock in daemon-cli-defaults.test.ts; v8 on CI attributes the real fs.existsSync branch to the non-mock load @preserve */
+    if (!fs.existsSync(entryPath)) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "daemon",
+            event: "daemon.entry_path_missing",
+            message: "entryPath does not exist on disk — plist may point to a stale location. Run 'ouro daemon install' from the correct location.",
+            meta: { entryPath },
+        });
+    }
+    return (0, launchd_1.writeLaunchAgentPlist)(writeDeps, {
+        nodePath: process.execPath,
+        entryPath,
+        socketPath,
+        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" }); });
@@ -235,6 +264,16 @@ function isDaemonLaunchAgentLoaded(deps) {
         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;
@@ -267,69 +306,60 @@ async function waitForBootstrappedDaemonSocket(socketPath, deps = {}) {
         meta: { socketPath },
     });
 }
-async function defaultEnsureDaemonBootPersistence(socketPath) {
+async function startDaemonProcessViaLaunchd(socketPath) {
     if (process.platform !== "darwin") {
-        return;
-    }
-    const homeDir = os.homedir();
-    const writeDeps = {
-        writeFile: (filePath, content) => fs.writeFileSync(filePath, content, "utf-8"),
-        mkdirp: (dir) => fs.mkdirSync(dir, { recursive: true }),
-        homeDir,
-    };
-    const entryPath = resolveDaemonBootEntryPath(homeDir);
-    /* v8 ignore next -- covered via mock in daemon-cli-defaults.test.ts; v8 on CI attributes the real fs.existsSync branch to the non-mock load @preserve */
-    if (!fs.existsSync(entryPath)) {
-        (0, runtime_1.emitNervesEvent)({
-            level: "warn",
-            component: "daemon",
-            event: "daemon.entry_path_missing",
-            message: "entryPath does not exist on disk — plist may point to a stale location. Run 'ouro daemon install' from the correct location.",
-            meta: { entryPath },
-        });
+        return null;
     }
-    const logDir = (0, identity_1.getAgentDaemonLogsDir)();
-    const plistPath = (0, launchd_1.writeLaunchAgentPlist)(writeDeps, {
-        nodePath: process.execPath,
-        entryPath,
-        socketPath,
-        logDir,
-        envPath: process.env.PATH,
-    });
+    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;
-    }
+    const domain = launchAgentDomain(userUid);
     try {
         (0, runtime_1.emitNervesEvent)({
             component: "daemon",
             event: "daemon.launchd_bootstrap_start",
-            message: "bootstrapping daemon launch agent for current login session",
+            message: "starting 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" });
+        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 bootstrapped for current login session",
+            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 bootstrap daemon launch agent for current login session",
+            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() {

package/package.json

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