@indigoai-us/hq-cli 5.162.0 → 5.163.0

package/dist/commands/bot.js

@@ -39,8 +39,10 @@ import { DEFAULT_COGNITO, ensureCognitoToken, resolveDefaultHqRoot, } from "../u
 import { peekHqApiKey } from "../utils/resolve-vault-credential.js";
 import { getCompanyUid, resolveCallerPersonUid } from "../utils/vault-api.js";
 import { resolveHqBinary } from "../lib/mesh/live/daemon/install.js";
+import { askDaemonToStart, askDaemonToStop, daemonOwnsProcess, daemonSupervises, daemonWillSupervise, handOffInstallHere, } from "../lib/daemon/handoff.js";
+import { daemonPaths } from "../lib/daemon/paths.js";
 import { runtimeDisplayName } from "../lib/bot/runtime-sign-in.js";
-import { BotApi, BotApiError, BOT_RESTORE_DEFAULTS, buildBotLocalConfig, describeBotLocalConfig, orphanBotRunMessage, parseBotLocalConfig, removeOrphanBotDaemon, botDaemonStatus, botDir, botCredsPath, botLogPath, botsRoot, botTokenStateDir, botWorkerRelDir, buildBotDaemonPaths, createBotLogger, deleteBotCreds, installBotDaemon, repairBotDaemonIfStale, introDmText, isBotMemoryMode, botLocalMemoryDir, botMemoryMode, resolveBotMemoryDir, validateBotIntro, validateBotKickoff, validateBotEffort, validateBotModel, effectiveBotEffort, BOT_EFFORT_LEVELS, DEFAULT_BOT_EFFORT, BOT_MEMORY_MODES, BOT_KINDS, isBotKind, effectiveBotKind, effectiveBotCompanies, normalizeBotCompanies, SETUP_BOT_WORKER_ID, isBotRuntimeId, localNameForRemoteBot, remoteBotRunnability, isPidAlive, listBotWorkerOptions, patchBotConfig, readBotConfig, readBotCredsIdentity, readBotStatus, resolveBotWorker, runBot, runtimeFor, scaffoldBotMemory, scaffoldBotWorker, startBotDaemon, stopBotDaemon, uninstallBotDaemon, validateBotName, writeBotConfig, writeBotCreds, BOT_RUNTIMES, BOT_INTRO_MAX_CHARS, BOT_KICKOFF_MAX_CHARS, } from "../lib/bot/index.js";
+import { BotApi, BotApiError, BOT_RESTORE_DEFAULTS, buildBotLocalConfig, describeBotLocalConfig, orphanBotRunMessage, parseBotLocalConfig, removeOrphanBotDaemon, botDaemonStatus, botDir, botCredsPath, botLogPath, botsRoot, botTokenStateDir, botWorkerRelDir, buildBotDaemonPaths, createBotLogger, deleteBotCreds, installBotDaemon, repairBotDaemonIfStale, introDmText, isBotMemoryMode, botLocalMemoryDir, botMemoryMode, resolveBotMemoryDir, validateBotIntro, validateBotKickoff, validateBotEffort, validateBotModel, effectiveBotEffort, BOT_EFFORT_LEVELS, DEFAULT_BOT_EFFORT, BOT_MEMORY_MODES, BOT_KINDS, isBotKind, effectiveBotKind, effectiveBotCompanies, normalizeBotCompanies, SETUP_BOT_WORKER_ID, isBotRuntimeId, localNameForRemoteBot, remoteBotRunnability, isPidAlive, listBotWorkerOptions, patchBotConfig, readBotConfig, readBotCredsIdentity, readBotStatus, resolveBotWorker, runBot, runtimeFor, scaffoldBotMemory, scaffoldBotWorker, startBotDaemon, stopBotDaemon, uninstallBotDaemon, validateBotName, writeBotConfig, writeBotCreds, BOT_RUNTIMES, BOT_INTRO_MAX_CHARS, BOT_KICKOFF_MAX_CHARS, detectBotPlatform, } from "../lib/bot/index.js";
 function collectRepeated(value, previous) {
     return [...previous, value];
 }
@@ -74,6 +76,13 @@ export const RESERVED_SETUP_BOT_NAME = "setup";
 function daemonDeps() {
     return process.platform === "darwin" ? { launchctl: defaultLaunchctl } : {};
 }
+/** Install the bot's LaunchAgent, unless `hq daemon` runs local bots on this machine. */
+function installBotAgent(p) {
+    const handedOff = handOffInstallHere(["bots"]);
+    if (handedOff)
+        return { platform: detectBotPlatform(), action: "install", installed: true, loaded: true, message: handedOff };
+    return installBotDaemon(p, daemonDeps());
+}
 export function listBotNames(root) {
     if (!fs.existsSync(root))
         return [];
@@ -252,8 +261,22 @@ async function startBot(name, dir, config, output, extra = {}) {
         patchBotConfig(dir, { enabled: true });
     const paths = buildBotDaemonPaths({ name, botDir: dir, hqRoot: config.hqRoot });
     const d = botDaemonStatus(paths, daemonDeps());
+    const hqDaemon = daemonPaths();
     let how;
-    if (d.installed && process.platform === "darwin") {
+    // A bot created since the daemon last read its plan is the daemon's too,
+    // unless its own LaunchAgent runs it.
+    if (daemonSupervises(hqDaemon, `bots:${name}`) || (!d.installed && daemonWillSupervise(hqDaemon, `bots:${name}`))) {
+        // `hq daemon` runs this bot; starting a copy here would run it twice.
+        const before = readBotStatus(dir);
+        if (before && isPidAlive(before.pid) && before.state === "running") {
+            how = `already running under hq daemon (pid ${before.pid})`;
+        }
+        else {
+            askDaemonToStart(hqDaemon, `bots:${name}`);
+            how = "started by hq daemon";
+        }
+    }
+    else if (d.installed && process.platform === "darwin") {
         repairBotDaemonIfStale(paths, daemonDeps());
         const r = startBotDaemon(paths, daemonDeps());
         how = r.message;
@@ -298,6 +321,33 @@ async function stopBot(name, dir, config, output) {
     if (hasPromotionHold(dir))
         throw new Error("This bot is held for cloud promotion. Continue its promotion before changing local settings or lifecycle.");
     const paths = buildBotDaemonPaths({ name, botDir: dir, hqRoot: config.hqRoot });
+    const hqDaemon = daemonPaths();
+    const before = readBotStatus(dir);
+    const wasRunning = !!before && isPidAlive(before.pid);
+    const supervised = daemonSupervises(hqDaemon, `bots:${name}`);
+    // Keep the daemon's copy down either way, so it does not start one as soon as this bot is gone.
+    if (supervised)
+        askDaemonToStop(hqDaemon, `bots:${name}`);
+    // A bot started before the daemon is not the daemon's child; stop it directly below.
+    if (supervised && (!wasRunning || daemonOwnsProcess(hqDaemon, `bots:${name}`, before.pid))) {
+        // The daemon stops it (escalating to SIGKILL itself) and keeps it down; a
+        // kill from here would look like a crash and be restarted.
+        const gone = await waitFor(() => {
+            const s = readBotStatus(dir);
+            return !s || !isPidAlive(s.pid);
+        }, 20_000);
+        if (output === "silent")
+            return;
+        if (output === "json") {
+            console.log(JSON.stringify({ ok: gone, name, signalled: wasRunning, stopped: gone, how: "stopped by hq daemon" }, null, 2));
+            return;
+        }
+        if (gone)
+            console.log(chalk.green(`${name} stopped`) + chalk.dim(" (by hq daemon)"));
+        else
+            console.log(chalk.yellow(`${name} did not stop within 20s`) + chalk.dim(` (logs: hq daemon logs bots:${name})`));
+        return;
+    }
     if (process.platform === "darwin")
         stopBotDaemon(paths, daemonDeps());
     const signalled = stopProcess(dir);
@@ -540,7 +590,7 @@ export async function runBotCreate(nameArg, opts) {
     };
     let daemonMessage = null;
     if (opts.daemon !== false && process.platform === "darwin") {
-        const r = installBotDaemon(buildBotDaemonPaths({ name, botDir: dir, hqRoot }), daemonDeps());
+        const r = installBotAgent(buildBotDaemonPaths({ name, botDir: dir, hqRoot }));
         daemonMessage = r.message;
     }
     if (!opts.json) {
@@ -1304,7 +1354,7 @@ async function adoptRemoteBot(input) {
     createBotLogger(dir)("info", `adopted ${name} (${bot.agentUid}) on ${localMachineId()} kind=${config.kind}${local ? "" : " (no saved settings; defaults)"} runtime=${config.runtime}`);
     let daemonMessage = null;
     if (input.daemon && process.platform === "darwin") {
-        daemonMessage = installBotDaemon(buildBotDaemonPaths({ name, botDir: dir, hqRoot: input.hqRoot }), daemonDeps()).message;
+        daemonMessage = installBotAgent(buildBotDaemonPaths({ name, botDir: dir, hqRoot: input.hqRoot })).message;
     }
     return {
         config,
@@ -1407,7 +1457,7 @@ async function repairLocalBot(name, api, bot, daemon) {
     });
     createBotLogger(dir)("info", `re-issued machine credentials for ${name} (${bot.agentUid}) on ${localMachineId()}`);
     if (daemon && process.platform === "darwin") {
-        installBotDaemon(buildBotDaemonPaths({ name, botDir: dir, hqRoot: config.hqRoot }), daemonDeps());
+        installBotAgent(buildBotDaemonPaths({ name, botDir: dir, hqRoot: config.hqRoot }));
     }
     return "new credentials, startup agent reinstalled";
 }
@@ -1694,7 +1744,7 @@ export function registerBotCommand(program) {
         .option("--json", "Print machine-readable JSON")
         .action((name, opts) => wrap(async () => {
         const b = requireBot(name);
-        const r = installBotDaemon(buildBotDaemonPaths({ name: b.name, botDir: b.dir, hqRoot: b.config.hqRoot }), daemonDeps());
+        const r = installBotAgent(buildBotDaemonPaths({ name: b.name, botDir: b.dir, hqRoot: b.config.hqRoot }));
         console.log(opts.json ? JSON.stringify({ ok: r.installed, ...r }, null, 2) : r.message);
     })());
     daemon

package/dist/commands/daemon.d.ts

@@ -0,0 +1,53 @@
+/**
+ * `hq daemon` — one supervisor for every HQ background service on a machine.
+ *
+ *   hq daemon                     status (same as `hq daemon status`)
+ *   hq daemon install             detect the machine type, install the one OS unit
+ *   hq daemon run                 what the OS unit runs; starts the default services
+ *   hq daemon status [--json]
+ *   hq daemon logs [unit] [--follow] [--lines N]
+ *   hq daemon restart [unit] | trigger <unit>
+ *   hq daemon enable|disable <service...>   per-machine overrides
+ *   hq daemon migrate             list the older units it would take over (read-only)
+ *   hq daemon uninstall [--purge]
+ *
+ * Hidden from `hq --help` while it rolls out.
+ */
+import type { Command } from "commander";
+import { type LegacyUnit } from "../lib/daemon/legacy.js";
+import type { RunCommand } from "../lib/service-manager/launchd.js";
+export interface DaemonCommandDeps {
+    env: NodeJS.ProcessEnv;
+    home: string;
+    platform: NodeJS.Platform;
+    out: (line: string) => void;
+    err: (line: string) => void;
+    run: RunCommand;
+    nodeBinary: string;
+    hqBinary: string;
+    uid: number;
+    isRoot: boolean;
+    fileExists: (p: string) => boolean;
+    readFile: (p: string) => string;
+    legacyUnits: () => LegacyUnit[];
+    resolveHqRoot: (flag: string | undefined) => string | undefined;
+    /** Home folder of the login user a box's system unit runs as. */
+    userHome: (user: string) => string;
+    /** The pid is a live `hq daemon run`. */
+    daemonAlive: (pid: number) => boolean;
+    windowsUser?: string;
+    windowsHeadlessLauncher?: string;
+    systemUnitDir?: string;
+}
+/**
+ * The HQ folder install records: --hq-root, else the CLI's shared resolution
+ * (HQ_ROOT, the tree around the current folder, the folder the installer or
+ * menubar recorded, the well-known locations). Undefined when none resolves.
+ */
+export declare function resolveDaemonHqRoot(flag: string | undefined, where: {
+    env: NodeJS.ProcessEnv;
+    cwd: string;
+    home: string;
+}): string | undefined;
+export declare function registerDaemonCommand(program: Command, over?: Partial<DaemonCommandDeps>): Command;
+//# sourceMappingURL=daemon.d.ts.map