@ouro.bot/cli 0.1.0-alpha.700 → 0.1.0-alpha.701

package/changelog.json

@@ -1,6 +1,13 @@
 {
   "_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.701",
+      "changes": [
+        "Retry daemon launchd bootstrap when stale labels make kickstart fail so runtime replacement does not fall back to an unlabelled daemon process.",
+        "Keep daemon restart persistence verifiable after native habit scheduler installs launchd jobs."
+      ]
+    },
     {
       "version": "0.1.0-alpha.700",
       "changes": [

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

@@ -277,6 +277,21 @@ function readDaemonLaunchAgentPid() {
         return null;
     }
 }
+function launchdExec(cmd) {
+    (0, child_process_1.execSync)(cmd, { stdio: "ignore" });
+}
+function bootstrapDaemonLaunchAgent(domain, plistPath) {
+    launchdExec(`launchctl bootstrap ${domain} "${plistPath}"`);
+}
+function kickstartDaemonLaunchAgent(domain) {
+    launchdExec(`launchctl kickstart -k ${domain}/${launchd_1.DAEMON_PLIST_LABEL}`);
+}
+function bootoutDaemonLaunchAgentLabel(userUid) {
+    (0, launchd_1.bootoutLaunchAgentByLabel)({
+        exec: launchdExec,
+        userUid,
+    });
+}
 async function waitForBootstrappedDaemonSocket(socketPath, deps = {}) {
     const checkSocketAlive = deps.checkSocketAlive ?? socket_client_1.checkDaemonSocketAlive;
     const now = deps.now ?? Date.now;
@@ -323,11 +338,41 @@ async function startDaemonProcessViaLaunchd(socketPath) {
             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" });
+        if (isDaemonLaunchAgentLoaded({ exec: launchdExec, userUid })) {
+            try {
+                kickstartDaemonLaunchAgent(domain);
+            }
+            catch (error) {
+                (0, runtime_1.emitNervesEvent)({
+                    level: "warn",
+                    component: "daemon",
+                    event: "daemon.launchd_kickstart_recovering",
+                    message: "daemon launch agent kickstart failed; clearing label and bootstrapping from plist",
+                    meta: { plistPath, label: launchd_1.DAEMON_PLIST_LABEL, error: error instanceof Error ? error.message : String(error) },
+                });
+                try {
+                    bootoutDaemonLaunchAgentLabel(userUid);
+                    bootstrapDaemonLaunchAgent(domain, plistPath);
+                }
+                catch (repairError) {
+                    (0, runtime_1.emitNervesEvent)({
+                        level: "warn",
+                        component: "daemon",
+                        event: "daemon.launchd_kickstart_recovery_error",
+                        message: "daemon launch agent kickstart recovery failed; preserving launchd ownership instead of falling back to detached spawn",
+                        meta: {
+                            plistPath,
+                            label: launchd_1.DAEMON_PLIST_LABEL,
+                            kickstartError: error instanceof Error ? error.message : String(error),
+                            recoveryError: repairError instanceof Error ? repairError.message : String(repairError),
+                        },
+                    });
+                    return { pid: readDaemonLaunchAgentPid() };
+                }
+            }
         }
         else {
-            (0, child_process_1.execSync)(`launchctl bootstrap ${domain} "${plistPath}"`, { stdio: "ignore" });
+            bootstrapDaemonLaunchAgent(domain, plistPath);
         }
         (0, runtime_1.emitNervesEvent)({
             component: "daemon",
@@ -355,7 +400,7 @@ async function defaultEnsureDaemonBootPersistence(socketPath) {
     }
     const plistPath = writeDaemonBootPlist(socketPath);
     const userUid = currentUserUid();
-    if (isDaemonLaunchAgentLoaded({ exec: (cmd) => { (0, child_process_1.execSync)(cmd, { stdio: "ignore" }); }, userUid })) {
+    if (isDaemonLaunchAgentLoaded({ exec: launchdExec, userUid })) {
         (0, runtime_1.emitNervesEvent)({
             component: "daemon",
             event: "daemon.launchd_bootstrap_skipped_loaded",
@@ -370,7 +415,7 @@ function defaultPrepareDaemonRuntimeReplacement() {
         return;
     }
     (0, launchd_1.bootoutLaunchAgentByLabel)({
-        exec: (cmd) => { (0, child_process_1.execSync)(cmd, { stdio: "ignore" }); },
+        exec: launchdExec,
         userUid: process.getuid?.() ?? 0,
     });
     // launchctl bootout may return before the old daemon's SIGTERM cleanup has

package/package.json

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