@indigoai-us/hq-cli 5.345.50 → 5.345.52

package/dist/hq-cloud-sync-runner/package.json

@@ -1 +1 @@
-{"name":"hq-cli-daemon-sync-runner","type":"module","version":"6.18.50","bundleSha256":"cddd12bcd4c78ea32b54644772aae073c139b83f4c6cf44ea15141670ee3360f","formatVersion":1}
+{"name":"hq-cli-daemon-sync-runner","type":"module","version":"6.18.54","bundleSha256":"3a2ccf7955d7a5be1ab8e9a54e810d55ec7041e1eda534b84eba75e2199ee2f6","formatVersion":1}

package/dist/lib/bot/daemon.d.ts

@@ -64,7 +64,7 @@ export interface BotDaemonDeps {
     platform?: BotDaemonPlatform;
     launchctl?: LaunchctlExec;
     uid?: number;
-    fsImpl?: Pick<typeof fs, "existsSync" | "writeFileSync" | "mkdirSync" | "unlinkSync">;
+    fsImpl?: Pick<typeof fs, "existsSync" | "readFileSync" | "writeFileSync" | "mkdirSync" | "unlinkSync"> & Partial<Pick<typeof fs, "chmodSync" | "renameSync">>;
     /** Blocking sleep, injectable for tests. */
     sleepMs?: (ms: number) => void;
     /**

package/dist/lib/bot/daemon.js

@@ -15,7 +15,7 @@ import * as path from "node:path";
 import { spawn } from "node:child_process";
 import { resolveHqBinary, resolveNodeBinary, preferStableHqBinary } from "../mesh/live/daemon/install.js";
 import { botLogPath, launchdLabel } from "./paths.js";
-import { reloadLaunchd } from "../service-manager/launchd.js";
+import { discoverLaunchdIdentity, installLaunchdPlist, launchdProgramArguments, launchdPlistProgramArguments as parsePlistArguments, parseLaunchdCommand, reloadLaunchd } from "../service-manager/launchd.js";
 import { nodeBinaryProblem, preferStableNodeBinary } from "../node-binary.js";
 export function detectBotPlatform(platform = process.platform) {
     if (platform === "darwin")
@@ -66,6 +66,12 @@ function escapeXml(value) {
         .replace(/"/g, """);
 }
 export function renderBotLaunchdPlist(p) {
+    const identity = discoverLaunchdIdentity(p.home);
+    const args = launchdProgramArguments({
+        nodeBinary: p.nodeBinary,
+        hqBinary: p.hqBinary,
+        launchdLauncherBinary: identity.launcherBinary,
+    }, ["bot", "run", p.name]);
     const envRows = [
         ["HOME", p.home],
         ["PATH", p.pathEntries.join(":")],
@@ -80,13 +86,9 @@ export function renderBotLaunchdPlist(p) {
 <dict>
   <key>Label</key>
   <string>${escapeXml(p.label)}</string>
-  <key>ProgramArguments</key>
+${identity.associatedBundleIdentifier ? `  <key>AssociatedBundleIdentifiers</key>\n  <array>\n    <string>${escapeXml(identity.associatedBundleIdentifier)}</string>\n  </array>\n` : ""}  <key>ProgramArguments</key>
   <array>
-    <string>${escapeXml(p.nodeBinary)}</string>
-    <string>${escapeXml(p.hqBinary)}</string>
-    <string>bot</string>
-    <string>run</string>
-    <string>${escapeXml(p.name)}</string>
+${args.map((arg) => `    <string>${escapeXml(arg)}</string>`).join("\n")}
   </array>
   <key>WorkingDirectory</key>
   <string>${escapeXml(p.hqRoot ?? p.botDir)}</string>
@@ -190,16 +192,13 @@ function launchdLoaded(p, deps) {
     return deps.launchctl(["print", `${launchdDomain(deps.uid)}/${p.label}`]).ok;
 }
 export function launchdPlistProgramArguments(plist) {
-    const block = plist.match(/<key>ProgramArguments<\/key>\s*<array>([\s\S]*?)<\/array>/);
-    if (!block)
-        return [];
-    return [...block[1].matchAll(/<string>([^<]*)<\/string>/g)].map((m) => m[1]);
+    return parsePlistArguments(plist);
 }
 /** The hq script path baked into an installed unit, or null if none. */
 export function installedDaemonHqBinary(p, io = fs) {
     if (io.existsSync(p.plistPath)) {
         const args = launchdPlistProgramArguments(io.readFileSync(p.plistPath, "utf8"));
-        return args[1] ?? null;
+        return parseLaunchdCommand(args)?.hq ?? null;
     }
     if (io.existsSync(p.systemdUnitPath)) {
         const unit = io.readFileSync(p.systemdUnitPath, "utf8");
@@ -212,7 +211,7 @@ export function installedDaemonHqBinary(p, io = fs) {
 export function installedDaemonNodeBinary(p, io = fs) {
     if (io.existsSync(p.plistPath)) {
         const args = launchdPlistProgramArguments(io.readFileSync(p.plistPath, "utf8"));
-        return args[0] ?? null;
+        return parseLaunchdCommand(args)?.node ?? null;
     }
     if (io.existsSync(p.systemdUnitPath)) {
         const unit = io.readFileSync(p.systemdUnitPath, "utf8");
@@ -383,19 +382,27 @@ export function installBotDaemon(p, deps = {}) {
     io.mkdirSync(path.dirname(p.logPath), { recursive: true, mode: 0o700 });
     if (platform === "darwin") {
         io.mkdirSync(path.dirname(p.plistPath), { recursive: true });
-        // Replace rather than overwrite, so re-adopting a bot over the stale plist
-        // a wiped ~/.hq left behind lands a fresh file at 0600 (writeFileSync
-        // keeps the mode an existing file already has).
-        if (io.existsSync(p.plistPath))
-            io.unlinkSync(p.plistPath);
-        io.writeFileSync(p.plistPath, renderBotLaunchdPlist(p), { mode: 0o600 });
-        let loaded = false;
-        if (deps.launchctl) {
-            // bootout first so a re-install picks up a changed plist.
-            const r = rebootstrapLaunchd(p, deps);
-            if (!r.ok) {
-                const detail = `launchctl bootstrap failed after ${r.bootstrapAttempts} attempts: ${(r.error ?? "").slice(0, 200)}`;
-                if (r.loaded) {
+        const reloadState = { result: null };
+        const written = installLaunchdPlist(p.plistPath, p.label, renderBotLaunchdPlist(p), {
+            files: {
+                existsSync: io.existsSync,
+                readFileSync: (file) => io.readFileSync(file, "utf8"),
+                writeFileSync: io.writeFileSync,
+                ...(io.chmodSync ? { chmodSync: io.chmodSync } : {}),
+                ...(io.renameSync ? { renameSync: io.renameSync } : {}),
+                unlinkSync: io.unlinkSync,
+            },
+            activate: Boolean(deps.launchctl),
+            isLoaded: () => launchdLoaded(p, deps),
+            ...(deps.launchctl ? { reload: () => { reloadState.result = rebootstrapLaunchd(p, deps); return reloadState.result; } } : {}),
+        });
+        let loaded = written.loaded;
+        if (deps.launchctl && reloadState.result) {
+            const r = reloadState.result;
+            loaded = r.loaded;
+            if (!r?.ok) {
+                const detail = `launchctl bootstrap failed after ${r?.bootstrapAttempts ?? 0} attempts: ${(r?.error ?? "").slice(0, 200)}`;
+                if (r?.loaded) {
                     // The previous definition survived the bootout; keep it running.
                     deps.launchctl(["kickstart", "-k", `${launchdDomain(deps.uid)}/${p.label}`]);
                 }
@@ -403,14 +410,13 @@ export function installBotDaemon(p, deps = {}) {
                     platform,
                     action: "install",
                     installed: true,
-                    loaded: r.loaded,
+                    loaded: r?.loaded ?? false,
                     dest: p.plistPath,
-                    message: r.loaded
+                    message: r?.loaded
                         ? `Wrote ${p.plistPath} but ${detail}. The previous definition of ${p.label} is still loaded and was restarted; the rewritten plist is not active yet.`
                         : `Wrote ${p.plistPath} but ${detail}. ${p.label} is NOT loaded. Load it with: launchctl bootstrap ${launchdDomain(deps.uid)} ${p.plistPath}`,
                 };
             }
-            loaded = true;
         }
         return {
             platform,

package/dist/lib/daemon/install.js

@@ -17,7 +17,7 @@
  */
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { activateLaunchd, deactivateLaunchd, launchdPlistPath, renderLaunchdPlist, } from "../service-manager/launchd.js";
+import { activateLaunchd, deactivateLaunchd, defaultRunCommand, installLaunchdPlist, launchdIsLoaded, launchdPlistPath, renderLaunchdPlist, } from "../service-manager/launchd.js";
 import { activateSystemd, deactivateSystemd, renderSystemdUserUnit, systemdUnitPath, } from "../service-manager/systemd.js";
 import { escapeXml, shellQuote } from "../service-manager/types.js";
 import { readPidLock } from "../mesh/live/daemon/pid-lock.js";
@@ -251,12 +251,43 @@ export function installDaemonUnit(host, options, deps) {
     fs.mkdirSync(path.dirname(plan.unitPath), { recursive: true });
     if (plan.kind !== "systemd-system")
         fs.mkdirSync(path.join(host.daemonDir, "logs"), { recursive: true });
-    if (plan.kind === "schtasks")
+    if (plan.kind === "launchd") {
+        let plist;
+        try {
+            plist = installLaunchdPlist(plan.unitPath, DAEMON_LAUNCHD_LABEL, plan.rendered, {
+                run: deps.run ?? defaultRunCommand,
+                uid: host.uid,
+                sleep: deps.sleep,
+                isLoaded: () => launchdIsLoaded(DAEMON_LAUNCHD_LABEL, deps.run ?? defaultRunCommand, host.uid),
+                files: {
+                    existsSync: fs.existsSync,
+                    readFileSync: (file) => fs.readFileSync(file, "utf8"),
+                    writeFileSync: fs.writeFileSync,
+                    chmodSync: fs.chmodSync,
+                    renameSync: fs.renameSync,
+                    unlinkSync: fs.unlinkSync,
+                },
+            });
+        }
+        catch (err) {
+            return {
+                kind: plan.kind,
+                unitPath: plan.unitPath,
+                installed: fs.existsSync(plan.unitPath),
+                running: launchdIsLoaded(DAEMON_LAUNCHD_LABEL, deps.run ?? defaultRunCommand, host.uid),
+                error: err instanceof Error ? err.message : String(err),
+            };
+        }
+        if (!plist.loaded)
+            return { kind: plan.kind, unitPath: plan.unitPath, installed: true, running: false };
+    }
+    else if (plan.kind === "schtasks")
         fs.writeFileSync(plan.unitPath, encodeWindowsTaskXml(plan.rendered));
     else
         fs.writeFileSync(plan.unitPath, plan.rendered, { mode: plan.kind === "systemd-system" ? 0o644 : 0o600 });
     try {
-        activate(plan, host, deps.run, deps.sleep);
+        if (plan.kind !== "launchd")
+            activate(plan, host, deps.run, deps.sleep);
         return { kind: plan.kind, unitPath: plan.unitPath, installed: true, running: true };
     }
     catch (err) {

package/dist/lib/doctor/checks/bots.js

@@ -10,6 +10,7 @@ import { botsRoot, botDir, launchdLabel } from "../../bot/paths.js";
 import { readBotConfig } from "../../bot/config.js";
 import { isPidAlive, readBotStatus } from "../../bot/status.js";
 import { nodeBinaryProblem } from "../../node-binary.js";
+import { launchdPlistProgramArguments, parseLaunchdCommand } from "../../service-manager/launchd.js";
 export const BOTS_FAMILY_ID = "bots";
 export const BOTS_FAMILY_TITLE = "Local bots";
 const DEFAULT_DEPS = {
@@ -35,14 +36,8 @@ export function checkBots(_context, deps = DEFAULT_DEPS) {
         ];
     }
 }
-function launchdPlistArgs(plist) {
-    const block = plist.match(/<key>ProgramArguments<\/key>\s*<array>([\s\S]*?)<\/array>/);
-    if (!block)
-        return [];
-    return [...block[1].matchAll(/<string>([^<]*)<\/string>/g)].map((m) => m[1]);
-}
 function launchdPlistHqBinary(plist) {
-    return launchdPlistArgs(plist)[1] ?? null;
+    return parseLaunchdCommand(launchdPlistProgramArguments(plist))?.hq ?? null;
 }
 function runChecks(deps) {
     const home = deps.home();
@@ -122,7 +117,7 @@ function runChecks(deps) {
             try {
                 const text = fs.readFileSync(plistPath, "utf8");
                 hqPath = launchdPlistHqBinary(text);
-                nodePath = launchdPlistArgs(text)[0] ?? null;
+                nodePath = parseLaunchdCommand(launchdPlistProgramArguments(text))?.node ?? null;
             }
             catch {
                 hqPath = null;