@coworker-jp/aidr 0.0.6 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coworker-jp/aidr",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "AIDR setup CLI - installs ai-scanner hooks for 19+ AI coding agents",
   "type": "module",
   "bin": {

package/src/sentinel.mjs

@@ -60,7 +60,7 @@ function buildLaunchdPlist(envFile) {
   <array>
     <string>/bin/sh</string>
     <string>-c</string>
-    <string>. ${envFile} &amp;&amp; exec ${SENTINEL_BIN}</string>
+    <string>set -a; . ${envFile}; set +a; exec ${SENTINEL_BIN}</string>
   </array>
   <key>RunAtLoad</key>
   <true/>
@@ -167,13 +167,15 @@ async function _installMacos(dryRun, noActivate) {
     console.error(`[sentinel] Written: ${SENTINEL_PLIST}`);
 
     if (!noActivate && process.env.AI_SCANNER_NO_SCHEDULED_ACTIVATE !== "1") {
-      // Unload existing (ignore errors) then load
-      spawnSync("launchctl", ["unload", SENTINEL_PLIST], { stdio: "ignore" });
-      const load = spawnSync("launchctl", ["load", "-w", SENTINEL_PLIST]);
-      if (load.status !== 0) {
-        console.warn("[sentinel] launchctl load failed — daemon may need manual start");
-      } else {
+      // Modern launchctl API (bootstrap/bootout). Mirrors scheduled.mjs so
+      // both daemons share one mental model. Idempotent: bootout-before-
+      // bootstrap absorbs prior loads regardless of which API installed them.
+      try { await execFileP("launchctl", ["bootout", "system", SENTINEL_PLIST]); } catch { /* not loaded */ }
+      try {
+        await execFileP("launchctl", ["bootstrap", "system", SENTINEL_PLIST]);
         console.error("[sentinel] Daemon loaded via launchctl");
+      } catch (e) {
+        console.warn("[sentinel] launchctl bootstrap failed — daemon may need manual start:", e.message);
       }
     }
   } else {
@@ -212,7 +214,8 @@ export async function uninstallSentinel({ dryRun = false } = {}) {
   if (process.platform === "darwin") {
     if (await exists(SENTINEL_PLIST)) {
       if (!dryRun) {
-        spawnSync("launchctl", ["unload", SENTINEL_PLIST], { stdio: "ignore" });
+        // Modern launchctl API; mirrors scheduled.mjs's uninstallScheduled.
+        try { await execFileP("launchctl", ["bootout", "system", SENTINEL_PLIST]); } catch { /* not loaded */ }
         await fs.unlink(SENTINEL_PLIST);
         console.error(`[sentinel] Removed: ${SENTINEL_PLIST}`);
       } else {