@indigoai-us/hq-cli 5.345.190 → 5.345.193

package/dist/commands/bot.js

@@ -1,4 +1,7 @@
 import { withLocalJobs } from "../lib/bot/local-jobs.js";
+import { runSignals } from "../lib/signals/engine.js";
+import { BOT_SIGNALS_ENGINE_JOB_FLAG, signalsEngineForJob } from "../lib/bot/signals-engine-flag.js";
+import { resolveProcessFlagGate } from "../lib/flag-registry.js";
 import { currentHotSignalSyncCompany, readActiveCompanySlug, registerHotSignalSyncOnStart, runHotSignalSyncJob } from "../lib/bot/jobs/hot-signal-sync.js";
 import { createClaudeSignalsPass } from "../lib/hot-channels/signals-pass.js";
 import { machineTimeZone } from "../lib/bot/job-run.js";
@@ -10,7 +13,7 @@ import { hasPromotionHold, promotionHoldSummary } from "../lib/bot/promotion-hol
 /**
  * `hq bot` — personal local bots (local-bots US-003/US-004/US-005).
  *
- *   hq bot create <name> [--kind personal|company] [--company slug]... [--runtime claude|codex|grok] [--model m] [--effort level] [--worker id] [--intro text] [--kickoff prompt] [--memory synced|local] [--no-daemon]
+ *   hq bot create <name> [--kind personal|company] [--company slug]... [--runtime claude|codex|grok] [--model m] [--worker id] [--intro text] [--kickoff prompt] [--memory synced|local] [--no-daemon]
  *   hq bot companies <name> [--add slug]... [--remove slug]...   (a company bot's memberships)
  *   hq bot workers [--json]              (company + core workers a bot can be created from)
  *   hq bot list [--remote] [--json]
@@ -39,6 +42,12 @@ import { createVaultObjectDownloader } from "../lib/agent-kit/attachment-downloa
 import { addBotToCompanies, describeCompanyFailures, removeBotFromCompanies } from "./bot-companies.js";
 import { registerBotContinuityCommand } from "./bot-continuity.js";
 import { registerBotJobsCommand } from "./bot-jobs.js";
+import { ensureFleetHotSignalSync, fleetCronOps, migrateLegacyJobsToFleet } from "../lib/bot/fleet-cron.js";
+import { resolvePackSetupPrompt } from "../lib/bot/pack-setup.js";
+import { detectCodingToolActivity } from "../lib/bot/coding-tool-activity.js";
+import { setupToolOfferPendingSection, setupToolOfferText, setupWelcomeOpening } from "../lib/bot/setup-tool-offer.js";
+import { patchSetupIntroState, readSetupIntroState, readSetupProgressIntro } from "../lib/bot/setup-explain.js";
+import { resolveHqBinary, resolveNodeBinary } from "../lib/mesh/live/daemon/install.js";
 import chalk from "chalk";
 import { execFileSync, spawn } from "node:child_process";
 import * as fs from "node:fs";
@@ -48,7 +57,6 @@ import * as readline from "node:readline";
 import { DEFAULT_COGNITO, ensureCognitoToken, resolveDefaultHqRoot, } from "../utils/cognito-session.js";
 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, daemonHoldReason, daemonSupervises, daemonWillSupervise, handOffInstallHere, } from "../lib/daemon/handoff.js";
 import { daemonPaths } from "../lib/daemon/paths.js";
 import { launchdLabel } from "../lib/bot/paths.js";
@@ -57,7 +65,7 @@ import { runtimeDisplayName, signInCommand } from "../lib/bot/runtime-sign-in.js
 import { classifyRuntimeFailure, runtimeFailureReason } from "../lib/bot/runtime-failure.js";
 import { PROBE_DEFAULT_TIMEOUT_MS, probeBotRuntime } from "../lib/bot/probe.js";
 import { BOT_LOGIN_RUNTIMES, botAuthEnv, botRuntimeAuth, capacityAccountHome, describeBotAuth, formatBotAuth, isBotLoginRuntime, restoreBotSessions, setAsideBotSessions, signInBotRuntime, signOutBotRuntime, withRuntimeAuth, } from "../lib/bot/runtime-auth.js";
-import { BotApi, BotApiError, BOT_RESTORE_DEFAULTS, buildBotLocalConfig, describeBotLocalConfig, orphanBotRunMessage, parseBotLocalConfig, removeOrphanBotDaemon, botDaemonStatus, botDir, botCredsPath, botLogPath, botsRoot, botTokenStateDir, botWorkerRelDir, buildBotDaemonPaths, createBotLogger, deleteBotCreds, installBotDaemon, repairBotDaemonIfStale, healBotDaemonNodeFromJob, introDmText, isBotMemoryMode, botLocalMemoryDir, botMemoryMode, resolveBotMemoryDir, validateBotIntro, validateBotDisplayName, 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, runtimeCrashSinceStart, resolveBotWorker, runBot, runtimeFor, scaffoldBotMemory, scaffoldBotWorker, startBotDaemon, stopBotDaemon, uninstallBotDaemon, validateBotName, writeBotConfig, writeBotCreds, BOT_RUNTIMES, BOT_INTRO_MAX_CHARS, BOT_DISPLAY_NAME_MAX_CHARS, BOT_KICKOFF_MAX_CHARS, detectBotPlatform, withBotLock, localBotRole, remoteBotRole, remoteBotDisplayName, personFacingName, writeCloudDisplayName, setupSlugFor, ASSISTANT_ROLE, HQ_FLEET_RUNTIME_ENGINE_ID, authenticateFleetLocalBot, bootstrapFleetLocalBot, buildSystemPrompt, controlFleetLocalBot, ensureFleetPython, fleetLocalGatewayPid, fleetLocalProfileNeedsAdoption, fleetProviderForRuntime, importFleetLocalMachineCredential, fleetProviderNeedsSignIn, fleetDefaultCompanies, fleetOwnerCompanies, fleetRuntimeIsDefault, refreshFleetLocalInstructions, fleetLocalPromotionRuntime, installPinnedFleetLocalDistribution, readPromptSources, removeFleetLocalBot, } 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, healBotDaemonNodeFromJob, introDmText, isBotMemoryMode, botLocalMemoryDir, botMemoryMode, resolveBotMemoryDir, validateBotIntro, validateBotDisplayName, 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, runtimeCrashSinceStart, resolveBotWorker, runBot, runtimeFor, scaffoldBotMemory, scaffoldBotWorker, startBotDaemon, stopBotDaemon, uninstallBotDaemon, validateBotName, writeBotConfig, writeBotCreds, BOT_RUNTIMES, BOT_INTRO_MAX_CHARS, BOT_DISPLAY_NAME_MAX_CHARS, BOT_KICKOFF_MAX_CHARS, detectBotPlatform, withBotLock, localBotRole, remoteBotRole, remoteBotDisplayName, personFacingName, writeCloudDisplayName, setupSlugFor, ASSISTANT_ROLE, HQ_FLEET_RUNTIME_ENGINE_ID, HQ_FLEET_LOCAL_RELEASE, authenticateFleetLocalBot, bootstrapFleetLocalBot, buildSystemPrompt, controlFleetLocalBot, ensureFleetPython, fleetLocalGatewayPid, fleetLocalProfileNeedsAdoption, fleetLocalServiceInstalled, fleetProviderForRuntime, importFleetLocalMachineCredential, fleetProviderNeedsSignIn, fleetOwnerCompanies, refreshFleetLocalInstructions, fleetLocalPromotionRuntime, installPinnedFleetLocalDistribution, installTargetFleetLocalDistribution, resolveFleetLocalPointerTarget, resolveFleetLocalTargetRelease, fleetLocalProfileDir, fleetProfileOwnerCompanies, fleetLocalChannels, readFleetLocalGatewayState, readPromptSources, removeFleetLocalBot, } from "../lib/bot/index.js";
 function collectRepeated(value, previous) {
     return [...previous, value];
 }
@@ -128,7 +136,15 @@ function isFleetRuntimeBot(config) {
  * runtime's own way of labelling senders.
  */
 function fleetBotSystemPrompt(name, config, overrides = {}) {
-    return buildSystemPrompt({
+    let packSetup;
+    try {
+        packSetup = resolvePackSetupPrompt({ hqRoot: config.hqRoot, workerDir: config.workerDir, workerSource: config.workerSource });
+    }
+    catch {
+        packSetup = null;
+    }
+    const prompt = buildSystemPrompt({
+        packSetup,
         botName: name,
         ...(config.displayName ? { displayName: config.displayName } : {}),
         agentUid: config.agentUid,
@@ -148,10 +164,139 @@ function fleetBotSystemPrompt(name, config, overrides = {}) {
             companySlug: config.companySlug,
         }),
     });
+    const offer = pendingFleetSetupToolOffer(name, config);
+    return offer ? `${prompt.trimEnd()}\n\n${offer}` : prompt;
+}
+function isFleetSetupBot(name, config) {
+    return name === RESERVED_SETUP_BOT_NAME && effectiveBotKind(config) === "personal" && config.workerId === SETUP_BOT_WORKER_ID;
+}
+function pendingFleetSetupToolOffer(name, config) {
+    const kickoff = (config.kickoff ?? "").trim();
+    if (!kickoff || !isFleetSetupBot(name, config))
+        return null;
+    try {
+        const state = readSetupIntroState(botDir(name));
+        if (!state.kickoffDeferred || !state.toolOffer)
+            return null;
+        if (readSetupProgressIntro(resolveBotMemoryDir(config)) !== null)
+            return null;
+        return setupToolOfferPendingSection(state.toolOffer.tool, kickoff);
+    }
+    catch {
+        return null;
+    }
+}
+function fleetSetupToolOffer(dir, config) {
+    try {
+        if (readSetupIntroState(dir).toolOffer)
+            return null;
+        if (readSetupProgressIntro(resolveBotMemoryDir(config)) !== null)
+            return null;
+        const tool = detectCodingToolActivity({ now: new Date(), extraHqRoots: [config.hqRoot] }).pick;
+        if (!tool)
+            return null;
+        patchSetupIntroState(dir, { toolOffer: { tool, offeredAt: new Date().toISOString() }, kickoffDeferred: true });
+        createBotLogger(dir)("info", `offered to continue setup in the ${tool} app; the kickoff waits for the answer`);
+        return tool;
+    }
+    catch (err) {
+        createBotLogger(dir)("warn", `coding tool check failed (${err instanceof Error ? err.message : String(err)}); running the kickoff`);
+        return null;
+    }
+}
+/** The daily Fleet signals job is gated by the same default-off flag as the in-process engine job. */
+function fleetSignalsJobEnabled() {
+    try {
+        return resolveProcessFlagGate(BOT_SIGNALS_ENGINE_JOB_FLAG, { fallback: false }, () => false);
+    }
+    catch {
+        return false;
+    }
+}
+function syncFleetRuntimeJobs(name, dir, config) {
+    const log = createBotLogger(dir);
+    let ops;
+    try {
+        ops = fleetCronOps(config.agentUid);
+    }
+    catch (err) {
+        log("warn", `could not reach ${name}'s HQ Fleet Runtime schedule: ${err instanceof Error ? err.message : String(err)}`);
+        return;
+    }
+    try {
+        const migrated = migrateLegacyJobsToFleet(dir, config, ops);
+        if (migrated) {
+            const movedCount = migrated.imported;
+            const moved = `moved ${movedCount} scheduled job${movedCount === 1 ? "" : "s"} into the HQ Fleet Runtime${migrated.alreadyPresent ? ` (${migrated.alreadyPresent} already there)` : ""}`;
+            if (migrated.skipped.length === 0) {
+                log("info", `${moved}; the old list is kept at ${migrated.renamedTo}`);
+            }
+            else {
+                const message = `${moved}, but could not move ${migrated.skipped.length} scheduled job(s) (${migrated.skipped.join(", ")}): the HQ Fleet Runtime cannot run their schedule. They are still in ${path.join(dir, "jobs.json")}, which was not renamed, and they will not run until you add them again with hq bot jobs --add using a schedule the runtime supports.`;
+                log("warn", message);
+                console.warn(`Warning: ${name}: ${message}`);
+            }
+        }
+    }
+    catch (err) {
+        log("warn", `could not move ${name}'s scheduled jobs into the HQ Fleet Runtime: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    try {
+        let otherBotDirs = [];
+        try {
+            otherBotDirs = listBotNames(botsRoot()).map((n) => botDir(n));
+        }
+        catch {
+            otherBotDirs = [];
+        }
+        const result = ensureFleetHotSignalSync({
+            dir,
+            config,
+            ops,
+            profileDir: fleetLocalProfileDir(config.agentUid),
+            activeCompany: readActiveCompanySlug(config.hqRoot) ?? null,
+            ownerCompanies: fleetProfileOwnerCompanies(config.agentUid),
+            otherBotDirs,
+            nodeBinary: resolveNodeBinary(),
+            hqBinary: resolveHqBinary(),
+            signalsJobEnabled: fleetSignalsJobEnabled(),
+        });
+        for (const id of result.removed)
+            log("info", `removed the hot-signal-sync job ${id}: this bot no longer syncs that company`);
+        for (const entry of result.companies) {
+            if (entry.created)
+                log("info", `registered the daily hot-signal-sync job for ${entry.company} at 06:30 in the HQ Fleet Runtime`);
+            if (entry.heldBy)
+                log("info", `not adding a hot-signal-sync job for ${entry.company}: the bot in ${entry.heldBy} already runs it`);
+        }
+    }
+    catch (err) {
+        log("warn", `could not set up ${name}'s hot-signal-sync job: ${err instanceof Error ? err.message : String(err)}`);
+    }
+}
+function refuseHeldFleetBot(dir) {
+    if (hasPromotionHold(dir))
+        throw new Error("This bot is held for cloud promotion. Continue its promotion before changing local settings or lifecycle.");
 }
 function fleetAuthCommand(name, config) {
     return `hq bot auth ${name} --provider ${config.runtime === "grok" ? "grok" : config.runtime === "codex" ? "chatgpt" : "claude"}`;
 }
+/** How long a just-(re)started HQ Fleet gateway gets to write its pid before it counts as not started. */
+function fleetStartWaitMs() {
+    const raw = Number(process.env.HQ_BOT_FLEET_START_WAIT_MS);
+    return Number.isFinite(raw) && raw >= 0 ? raw : 15_000;
+}
+async function fleetGatewayComesUp(agentUid, waitMs, stepMs = 500) {
+    const deadline = Date.now() + waitMs;
+    for (;;) {
+        const pid = fleetLocalGatewayPid(agentUid);
+        if (pid !== null && isPidAlive(pid))
+            return true;
+        if (Date.now() >= deadline)
+            return false;
+        await new Promise((r) => setTimeout(r, stepMs));
+    }
+}
 function runFleetRuntimeControl(name, config, action, json) {
     if ((action === "install" || action === "start" || action === "restart") && config.fleetAuthPending === true) {
         const authCommand = fleetAuthCommand(name, config);
@@ -163,6 +308,7 @@ function runFleetRuntimeControl(name, config, action, json) {
     }
     if (action === "install" || action === "start" || action === "restart") {
         refreshFleetLocalInstructions(config.agentUid, fleetBotSystemPrompt(name, config));
+        syncFleetRuntimeJobs(name, botDir(name), config);
     }
     const installService = action === "install" || (config.fleetServiceInstallPending === true && (action === "start" || action === "restart"));
     const result = controlFleetLocalBot(config.agentUid, installService ? "install" : action);
@@ -236,6 +382,7 @@ function rowFor(name, opts = {}) {
         agentUid: config.agentUid,
         ownerUid: config.ownerUid,
         runtime: config.runtime,
+        ...(fleet ? { engine: HQ_FLEET_RUNTIME_ENGINE_ID } : {}),
         model: config.model,
         effort: effectiveBotEffort(config),
         effortIsDefault: !config.effort,
@@ -436,6 +583,7 @@ async function startFleetRuntimeBot(name, dir, config, output, extra) {
     }
     const adopted = await adoptFleetRuntimeProfile(name, dir, config);
     refreshFleetLocalInstructions(config.agentUid, fleetBotSystemPrompt(name, config));
+    syncFleetRuntimeJobs(name, dir, config);
     const before = readBotStatus(dir);
     const alreadyRunning = !!before && before.state === "running" && isPidAlive(before.pid);
     const installService = adopted || config.fleetServiceInstallPending === true;
@@ -460,10 +608,28 @@ async function startFleetRuntimeBot(name, dir, config, output, extra) {
         console.log(chalk.yellow(`${name} did not report running within 45s`) + chalk.dim(`  logs: ~/.hq-fleet/profiles/${config.agentUid}/logs`));
     return { running, how };
 }
-async function adoptFleetRuntimeProfile(name, dir, config) {
-    if (!fleetLocalProfileNeedsAdoption(config.agentUid))
+async function adoptFleetRuntimeProfile(name, dir, config, opts = {}) {
+    const target = opts.pointerOnly ? await resolveFleetLocalPointerTarget() : await resolveFleetLocalTargetRelease();
+    if (!target)
+        return false;
+    if (!fleetLocalProfileNeedsAdoption(config.agentUid, { release: target.release }))
         return false;
-    const installation = await installPinnedFleetLocalDistribution();
+    let installation;
+    try {
+        installation = await installTargetFleetLocalDistribution({ target });
+    }
+    catch (err) {
+        if (target.source !== "pointer")
+            throw err;
+        if (opts.pointerOnly) {
+            createBotLogger(dir)("warn", `could not install HQ Fleet Local ${target.release.version} (${err instanceof Error ? err.message : String(err)}); the bot stays on its current release`);
+            return false;
+        }
+        createBotLogger(dir)("warn", `could not install HQ Fleet Local ${target.release.version} (${err instanceof Error ? err.message : String(err)}); staying on ${HQ_FLEET_LOCAL_RELEASE.version}`);
+        if (!fleetLocalProfileNeedsAdoption(config.agentUid, { release: HQ_FLEET_LOCAL_RELEASE }))
+            return false;
+        installation = await installPinnedFleetLocalDistribution();
+    }
     const python = await ensureFleetPython();
     const companyScope = effectiveBotKind(config) === "company"
         ? effectiveBotCompanies(config)
@@ -477,6 +643,7 @@ async function adoptFleetRuntimeProfile(name, dir, config) {
         systemPrompt: fleetBotSystemPrompt(name, config),
         provider: fleetProviderForRuntime(config.runtime, config.model),
         ownerCompanies: companyScope,
+        ...(config.autoApprove === true ? { autoApprove: true } : {}),
     }, { python, start: false });
     patchBotConfig(dir, { engine: installation.engine });
     const credentials = botCredsPath(dir);
@@ -637,28 +804,6 @@ export function resolveCreateKind(opts, worker) {
     }
     return { kind, companies };
 }
-async function promptFleetProvider() {
-    if (process.stdin.isTTY !== true || process.stderr.isTTY !== true) {
-        throw Object.assign(new Error("--provider is required with --hq-fleet-runtime in a non-interactive command (claude, codex, or grok)."), { expected: true });
-    }
-    const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
-    try {
-        const answer = await new Promise((resolve) => {
-            rl.question("Provider: 1) Codex  2) Claude  3) Grok [1]: ", resolve);
-        });
-        const selected = answer.trim().toLowerCase();
-        if (selected === "" || selected === "1" || selected === "codex")
-            return "codex";
-        if (selected === "2" || selected === "claude")
-            return "claude";
-        if (selected === "3" || selected === "grok")
-            return "grok";
-        throw Object.assign(new Error("Provider must be claude, codex, or grok."), { expected: true });
-    }
-    finally {
-        rl.close();
-    }
-}
 /**
  * `hq bot create`. Runs under the bot's lock, so a create racing an adopt,
  * restore, rm or set of the same bot waits for it instead of tripping over
@@ -789,12 +934,8 @@ async function finishExistingSetupBot(name, dir, config, displayName, opts) {
         console.log(chalk.yellow(`${name} did not report running within 15s`) + chalk.dim(`  logs: hq bot logs ${name}`));
 }
 async function runBotCreateLocked(name, opts) {
-    const requestedFleetRuntime = opts.hqFleetRuntime === true;
-    if (requestedFleetRuntime && opts.legacyRuntime) {
-        throw Object.assign(new Error("Pick one of --hq-fleet-runtime and --legacy-runtime."), { expected: true });
-    }
-    if (requestedFleetRuntime && (opts.effort || opts.lean)) {
-        throw Object.assign(new Error("--hq-fleet-runtime sets its own thinking level. Do not combine it with --effort or --lean."), { expected: true });
+    if (opts.legacyRuntime) {
+        throw Object.assign(new Error("--legacy-runtime is no longer supported: new bots run on the HQ Fleet Runtime. Drop --legacy-runtime."), { expected: true });
     }
     if (opts.provider && !isBotRuntimeId(opts.provider)) {
         throw Object.assign(new Error(`--provider must be one of ${BOT_RUNTIMES.join(", ")}`), { expected: true });
@@ -802,8 +943,7 @@ async function runBotCreateLocked(name, opts) {
     if (opts.provider && opts.runtime && opts.provider !== opts.runtime) {
         throw Object.assign(new Error("--provider and --runtime must name the same provider when both are used."), { expected: true });
     }
-    const selectedProvider = opts.provider ?? opts.runtime ?? (requestedFleetRuntime ? await promptFleetProvider() : undefined);
-    const runtime = selectedProvider ?? "claude";
+    const runtime = opts.provider ?? opts.runtime ?? "claude";
     if (!isBotRuntimeId(runtime)) {
         throw Object.assign(new Error(`--runtime must be one of ${BOT_RUNTIMES.join(", ")}`), { expected: true });
     }
@@ -815,7 +955,6 @@ async function runBotCreateLocked(name, opts) {
     const displayName = opts.displayName !== undefined ? validateBotDisplayName(opts.displayName) : undefined;
     const kickoff = opts.kickoff !== undefined ? validateBotKickoff(opts.kickoff) : undefined;
     const model = opts.model !== undefined ? validateBotModel(opts.model) : undefined;
-    const effort = opts.effort !== undefined ? validateBotEffort(runtime, opts.effort) : undefined;
     const dir = botDir(name);
     const existingBeforeRoot = readBotConfig(dir);
     // Only HQ's setup assistant is idempotent; any other bot keeps failing fast.
@@ -838,24 +977,11 @@ async function runBotCreateLocked(name, opts) {
     // cost an identity).
     const worker = opts.worker?.trim() ? resolveBotWorker(hqRoot, opts.worker) : null;
     const { kind, companies } = resolveCreateKind(opts, worker);
-    if (requestedFleetRuntime && kind === "company" && companies.length !== 1) {
+    if (kind === "company" && companies.length !== 1) {
         throw Object.assign(new Error("An HQ Fleet company bot must belong to exactly one company."), {
             expected: true,
         });
     }
-    // Companies with the fleet-default flag get their personal bots on
-    // the HQ Fleet Runtime; --legacy-runtime keeps the model-CLI runner.
-    const fleetCandidate = requestedFleetRuntime ||
-        (!opts.legacyRuntime && kind === "personal" && !opts.effort && !opts.lean);
-    // Owner turns on the bot may use only these companies: the owner's own,
-    // and only where the company turned the flag on.
-    const flaggedCompanies = fleetCandidate && kind === "personal" ? await fleetDefaultCompanies(hqRoot) : [];
-    const useFleetRuntime = requestedFleetRuntime || (fleetCandidate && fleetRuntimeIsDefault(flaggedCompanies));
-    const ownerCompanies = useFleetRuntime
-        ? kind === "personal"
-            ? await fleetOwnerCompanies()
-            : companies
-        : [];
     const isSetupBot = name === RESERVED_SETUP_BOT_NAME && kind === "personal" && worker?.id === SETUP_BOT_WORKER_ID;
     if (name === RESERVED_SETUP_BOT_NAME && kind === "personal" && !isSetupBot) {
         throw Object.assign(new Error(`The name ${RESERVED_SETUP_BOT_NAME} is reserved for HQ's assistant; create it with --worker ${RESERVED_SETUP_BOT_NAME}.`), { expected: true });
@@ -870,12 +996,8 @@ async function runBotCreateLocked(name, opts) {
             expected: true,
         });
     }
-    const fleetInstallation = useFleetRuntime
-        ? await installPinnedFleetLocalDistribution()
-        : null;
-    const fleetPython = fleetInstallation ? await ensureFleetPython() : null;
-    const fleetProvider = fleetInstallation ? fleetProviderForRuntime(runtime, model) : null;
-    const fleetAuthPending = fleetProvider !== null && fleetProviderNeedsSignIn(fleetProvider);
+    const fleetProvider = fleetProviderForRuntime(runtime, model);
+    const fleetAuthPending = fleetProviderNeedsSignIn(fleetProvider);
     const token = await ownerToken();
     const owner = await resolveCallerPersonUid(token, undefined, { command: "hq bot create" });
     if (!owner)
@@ -968,6 +1090,9 @@ async function runBotCreateLocked(name, opts) {
     // of sending another create that the entity store will reject.
     if (isSetupBot && (await adoptOwnedSetupBot(true)))
         return;
+    const fleetInstallation = await installTargetFleetLocalDistribution();
+    const fleetPython = await ensureFleetPython();
+    const ownerCompanies = kind === "personal" ? await fleetOwnerCompanies() : companies;
     // A company bot's companies are resolved first (a typo must not cost an
     // identity) and sent with the create: the server makes the bot a member of
     // each and refuses the whole create if the owner cannot add agents there.
@@ -985,12 +1110,11 @@ async function runBotCreateLocked(name, opts) {
     // instead of creating a new one. The machine secret never travels.
     const localConfig = buildBotLocalConfig({
         runtime,
-        ...(fleetInstallation ? { engine: fleetInstallation.engine } : {}),
+        engine: fleetInstallation.engine,
         kind,
         ...(kind === "company" ? { companies } : {}),
         ...(model ? { model } : {}),
-        ...(effort ? { effort } : {}),
-        ...(opts.autoApprove === false ? { autoApprove: false } : {}),
+        ...(opts.autoApprove === true ? { autoApprove: true } : {}),
         ...(worker
             ? { workerSource: "worker", workerId: worker.id, ...(worker.company ? { companySlug: worker.company } : {}) }
             : { workerSource: "scaffold" }),
@@ -1052,13 +1176,12 @@ async function runBotCreateLocked(name, opts) {
         agentUid,
         ownerUid: created.agent.ownerUid ?? owner,
         runtime,
-        ...(fleetInstallation ? { engine: fleetInstallation.engine } : {}),
+        engine: fleetInstallation.engine,
         kind,
         // A company bot's list is filled in below, with the invites that went through.
         ...(kind === "company" ? { companies: [] } : {}),
         ...(model ? { model } : {}),
-        ...(effort ? { effort } : {}),
-        ...(opts.autoApprove === false ? { autoApprove: false } : {}),
+        ...(opts.autoApprove === true ? { autoApprove: true } : {}),
         hqRoot,
         ...(worker
             ? {
@@ -1080,7 +1203,6 @@ async function runBotCreateLocked(name, opts) {
         ...(displayName ? { displayName } : {}),
         ...(intro ? { intro } : {}),
         ...(kickoff ? { kickoff } : {}),
-        ...(opts.lean && runtime === "claude" ? { lean: true } : {}),
         createdAt: new Date().toISOString(),
         enabled: !fleetAuthPending,
         ...(fleetAuthPending ? { fleetAuthPending: true } : {}),
@@ -1110,28 +1232,28 @@ async function runBotCreateLocked(name, opts) {
     const scaffoldOpts = { memoryDir: config.memoryDir };
     const scaffold = worker
         ? scaffoldBotMemory(hqRoot, name, undefined, scaffoldOpts)
-        : scaffoldBotWorker(hqRoot, name, agentUid, fleetInstallation ? HQ_FLEET_RUNTIME_ENGINE_ID : runtime, undefined, scaffoldOpts);
-    if (fleetInstallation)
-        fs.rmSync(path.join(dir, "status.json"), { force: true });
-    const fleetBootstrap = fleetInstallation && fleetPython
-        ? await bootstrapFleetLocalBot({
-            agentUid,
-            ownerUid: config.ownerUid,
-            hqRoot,
-            botDir: dir,
-            installation: fleetInstallation,
-            machineCredentials: botCredsPath(dir),
-            systemPrompt: fleetBotSystemPrompt(name, config, { kind, companies }),
-            provider: fleetProvider,
-            ownerCompanies,
-            firstStart: {
-                intro: introDmText(name, runtime, intro, { kind, companies }),
-                ...(kickoff ? { kickoff } : {}),
-            },
-        }, { start: opts.start !== false && !fleetAuthPending, python: fleetPython })
-        : null;
-    const fleetProfile = fleetBootstrap?.profile ?? null;
-    const runtimeLabel = fleetInstallation ? HQ_FLEET_RUNTIME_ENGINE_ID : runtime;
+        : scaffoldBotWorker(hqRoot, name, agentUid, HQ_FLEET_RUNTIME_ENGINE_ID, undefined, scaffoldOpts);
+    fs.rmSync(path.join(dir, "status.json"), { force: true });
+    const introText = introDmText(name, runtime, intro, { kind, companies });
+    const toolOffer = isSetupBot && kickoff ? fleetSetupToolOffer(dir, config) : null;
+    const fleetBootstrap = await bootstrapFleetLocalBot({
+        agentUid,
+        ownerUid: config.ownerUid,
+        hqRoot,
+        botDir: dir,
+        installation: fleetInstallation,
+        machineCredentials: botCredsPath(dir),
+        systemPrompt: fleetBotSystemPrompt(name, config, { kind, companies }),
+        provider: fleetProvider,
+        ownerCompanies,
+        ...(opts.autoApprove === true ? { autoApprove: true } : {}),
+        firstStart: toolOffer
+            ? { intro: setupToolOfferText(toolOffer, setupWelcomeOpening(intro)) }
+            : { intro: introText, ...(kickoff ? { kickoff } : {}) },
+    }, { start: opts.start !== false && !fleetAuthPending, python: fleetPython });
+    syncFleetRuntimeJobs(name, dir, config);
+    const fleetProfile = fleetBootstrap.profile;
+    const runtimeLabel = HQ_FLEET_RUNTIME_ENGINE_ID;
     createBotLogger(dir)("info", `created ${name} (${agentUid}) kind=${kind}${companies.length ? ` companies=${companies.join(",")}` : ""} runtime=${runtimeLabel}${worker ? ` worker=${worker.id} company=${worker.company ?? "-"}` : ""} memory=${memoryMode}`);
     const created_ = {
         outcome: "created",
@@ -1142,7 +1264,7 @@ async function runBotCreateLocked(name, opts) {
         kind,
         companies,
         runtime: runtimeLabel,
-        engine: fleetInstallation?.engine ?? null,
+        engine: fleetInstallation.engine,
         profile: fleetProfile,
         dir,
         worker: worker ? path.join(hqRoot, worker.path) : scaffold.dir,
@@ -1154,14 +1276,11 @@ async function runBotCreateLocked(name, opts) {
         intro: intro ?? null,
         kickoff: kickoff ?? null,
         model: model ?? null,
-        effort: fleetInstallation ? null : effort ?? DEFAULT_BOT_EFFORT,
-        ...(fleetProvider ? { provider: fleetProvider.id, needsSignIn: fleetAuthPending, ...(fleetAuthPending ? { authCommand: fleetAuthCommand(name, config) } : {}) } : {}),
+        effort: null,
+        provider: fleetProvider.id,
+        needsSignIn: fleetAuthPending,
+        ...(fleetAuthPending ? { authCommand: fleetAuthCommand(name, config) } : {}),
     };
-    let daemonMessage = null;
-    if (!fleetInstallation && opts.daemon !== false && process.platform === "darwin") {
-        const r = installBotAgent(buildBotDaemonPaths({ name, botDir: dir, hqRoot }));
-        daemonMessage = r.message;
-    }
     if (!opts.json) {
         console.log(chalk.green(`Created bot ${chalk.bold(name)}`) + chalk.dim(` (${agentUid}, ${runtimeLabel})`));
         console.log(chalk.dim(`  kind:   ${describeKind(kind, companies)}`));
@@ -1171,38 +1290,24 @@ async function runBotCreateLocked(name, opts) {
             console.log(chalk.dim(`  worker: ${scaffold.dir}`));
         console.log(chalk.dim(`  memory: ${scaffold.memoryDir} (${memoryMode})`));
         console.log(chalk.dim(`  state:  ${dir}`));
-        if (fleetProfile)
-            console.log(chalk.dim(`  profile: ${fleetProfile}`));
-        if (fleetProvider && fleetProviderNeedsSignIn(fleetProvider)) {
+        console.log(chalk.dim(`  profile: ${fleetProfile}`));
+        if (fleetAuthPending) {
             console.log(chalk.yellow(`  sign it in before it can answer: hq bot auth ${name} --provider ${runtime === "grok" ? "grok" : "chatgpt"}`));
         }
-        if (daemonMessage)
-            console.log(chalk.dim(`  ${daemonMessage}`));
-    }
-    if (fleetInstallation) {
-        if (opts.json) {
-            console.log(JSON.stringify({ ok: true, name, ...created_, daemon: null, running: fleetBootstrap?.running ?? false }, null, 2));
-        }
-        return;
-    }
-    if (opts.start !== false) {
-        if (daemonMessage && /loaded\)/.test(daemonMessage)) {
-            // RunAtLoad already started it.
-            const running = await waitFor(() => readBotStatus(dir)?.state === "running", 20_000);
-            if (opts.json) {
-                console.log(JSON.stringify({ ok: true, name, ...created_, daemon: daemonMessage, running }, null, 2));
-            }
-            else if (running)
-                console.log(chalk.green(`${name} is online — it will DM you an introduction shortly.`));
-            else
-                console.log(chalk.yellow(`${name} has not reported running yet; check hq bot logs ${name}`));
-            return;
-        }
-        await startBot(name, dir, config, opts.json ? "json" : "text", { ...(isSetupBot ? { ok: true } : {}), ...created_, daemon: daemonMessage });
-        return;
     }
     if (opts.json) {
-        console.log(JSON.stringify({ ok: true, name, ...created_, daemon: daemonMessage, running: false }, null, 2));
+        const status = readBotStatus(dir);
+        console.log(JSON.stringify({
+            ok: true,
+            name,
+            ...created_,
+            daemon: null,
+            running: fleetBootstrap.running,
+            how: fleetBootstrap.running ? "started by the HQ Fleet Runtime" : null,
+            state: status?.state ?? "unknown",
+            pid: status?.pid ?? null,
+            lastError: status?.lastError ?? null,
+        }, null, 2));
     }
 }
 // ── companies ────────────────────────────────────────────────────────────────
@@ -1326,12 +1431,20 @@ async function runBotResident(nameArg) {
     // A bot with no company (the personal bot first-run setup creates) syncs the
     // HQ's active company. Only one local bot registers the job per company, and
     // the first sync starts in the background right after the job is created.
-    const runHotSignalSync = (input) => runHotSignalSyncJob({
+    // US-006: a fired job runs the signals engine (garden -> adapters ->
+    // extract -> garden -> upload) and replies in the storyboarded format.
+    const runHotSignalSync = (input) => 
+    // The engine is gated default-off (cli.bot-signals-engine-job); with the
+    // flag off the job runs the hot-channel sync alone, as before US-006.
+    signalsEngineForJob(runSignals).then((signals) => runHotSignalSyncJob({
         ...input,
+        hqRoot: config.hqRoot,
+        timeZone: input.timeZone ?? machineTimeZone(),
+        ...(signals ? { signals } : {}),
         sync: (syncInput) => runCompanyHotChannelSync({ hqRoot: config.hqRoot, ...syncInput }),
         // A new pass per run: the login preflight and the 20-document cap are per run.
         signalsPass: createClaudeSignalsPass({ hqRoot: config.hqRoot, company: input.company }),
-    });
+    }));
     let otherBotDirs = [];
     try {
         otherBotDirs = listBotNames(botsRoot()).map((n) => botDir(n));
@@ -1355,7 +1468,7 @@ async function runBotResident(nameArg) {
         api,
         runtime: runtimeFor(config.runtime),
         ownerContext: () => owner.get(),
-        hotSignalSync: ({ company, catchUp, now, sendAlert }) => runHotSignalSync({ company, catchUp, now, sendAlert }),
+        hotSignalSync: (input) => runHotSignalSync(input),
         // US-005: decision picks in the owner DM, with the bot's own machine token
         // (never the owner's login).
         decisions: new DecisionsClient(token),
@@ -1427,8 +1540,9 @@ async function runBotStatus(nameArg, opts) {
     await decorateOnline([row]);
     const status = readBotStatus(dir);
     const creds = readBotCredsIdentity(dir);
+    const channels = fleet ? fleetLocalChannels(readFleetLocalGatewayState(config.agentUid), row.processAlive) : null;
     if (opts.json) {
-        console.log(JSON.stringify({ ...row, ...(fleet ? { engine: config.engine } : {}), credsPresent: fleet || !!creds, login: describeBotAuth(dir, config), status }, null, 2));
+        console.log(JSON.stringify({ ...row, ...(fleet ? { engine: config.engine, channels } : {}), credsPresent: fleet || !!creds, login: describeBotAuth(dir, config), status }, null, 2));
         return;
     }
     console.log(`${chalk.bold(name)}  ${row.agentUid}`);
@@ -1452,7 +1566,14 @@ async function runBotStatus(nameArg, opts) {
         console.log(`  inbox:      last poll ${status.lastInboxPollAt}`);
     }
     console.log(`  answering:  ${row.busy ? chalk.green(`yes${row.busySince ? `, since ${row.busySince}` : ""}`) : chalk.gray("no")}`);
-    console.log(`  launchd:    ${row.daemonInstalled ? (row.daemonLoaded ? "installed, loaded" : "installed, not loaded") : "not installed"}`);
+    if (fleet) {
+        console.log(`  service:    ${fleetLocalServiceInstalled(config.agentUid) ? "installed (HQ Fleet gateway, starts at login)" : row.serviceInstallPending ? "not installed yet; installs on hq bot start" : "not installed"}`);
+        if (channels)
+            console.log(`  channels:   Slack ${channels.slack.replace(/_/g, " ")}, Telegram ${channels.telegram.replace(/_/g, " ")}`);
+    }
+    else {
+        console.log(`  launchd:    ${row.daemonInstalled ? (row.daemonLoaded ? "installed, loaded" : "installed, not loaded") : "not installed"}`);
+    }
     if (row.daemonNodeMissing) {
         console.log(`  ${chalk.red(`node missing: ${row.daemonNodeMissing}`)} — launchd cannot start ${name}; fix with: hq bot start ${name}`);
     }
@@ -2105,10 +2226,38 @@ export async function runBotIntro(nameArg) {
 export function botExists(name) {
     return readBotConfig(botDir(name)) !== null;
 }
+export async function updateFleetRuntimeBot(nameArg, opts = {}) {
+    const name = validateBotName(nameArg);
+    return withBotLock(name, async () => {
+        const b = requireBot(name);
+        if (!isFleetRuntimeBot(b.config) || hasPromotionHold(b.dir))
+            return "unchanged";
+        const adopted = await adoptFleetRuntimeProfile(b.name, b.dir, b.config, { pointerOnly: true });
+        if (!adopted && b.config.fleetRestartPending !== true)
+            return "unchanged";
+        const config = readBotConfig(b.dir) ?? b.config;
+        if (adopted) {
+            refreshFleetLocalInstructions(config.agentUid, fleetBotSystemPrompt(b.name, config));
+            syncFleetRuntimeJobs(b.name, b.dir, config);
+        }
+        if (opts.busy?.()) {
+            patchBotConfig(b.dir, { fleetRestartPending: true });
+            return "waiting";
+        }
+        const result = controlFleetLocalBot(config.agentUid, "install");
+        if (result.ok !== true) {
+            patchBotConfig(b.dir, { fleetRestartPending: true });
+            throw new Error(typeof result.summary === "string" && result.summary ? result.summary : "the HQ Fleet gateway did not restart");
+        }
+        patchBotConfig(b.dir, { fleetServiceInstallPending: false, fleetRestartPending: false, enabled: true });
+        return "updated";
+    }, { command: "hq daemon service fleet-bots-update" });
+}
 /** `hq bot restart <name>`: stop, then start (launchd when installed). */
 export async function runBotRestart(nameArg, opts = {}) {
     const b = requireBot(nameArg);
     if (isFleetRuntimeBot(b.config)) {
+        refuseHeldFleetBot(b.dir);
         const adopted = await adoptFleetRuntimeProfile(b.name, b.dir, b.config);
         runFleetRuntimeControl(b.name, b.config, adopted ? "install" : "restart", opts.json === true || opts.output === "json");
         return;
@@ -2150,8 +2299,7 @@ async function runBotAuth(nameArg, opts) {
         model: result.model,
         ...(b.config.fleetAuthPending === true ? { fleetAuthPending: false, fleetServiceInstallPending: !result.restarted, enabled: result.restarted } : {}),
     });
-    const pid = fleetLocalGatewayPid(b.config.agentUid);
-    const running = pid !== null && isPidAlive(pid);
+    const running = await fleetGatewayComesUp(b.config.agentUid, result.restarted ? fleetStartWaitMs() : 0);
     if (opts.json) {
         console.log(JSON.stringify({ ok: true, name: b.name, runtime: HQ_FLEET_RUNTIME_ENGINE_ID, ...result, needsSignIn: false, running, serviceInstallPending: b.config.fleetAuthPending === true && !result.restarted }, null, 2));
         return;
@@ -2347,7 +2495,7 @@ export function configFromLocalConfig(input) {
         ...(kind === "company" ? { companies: local?.companies ?? [] } : {}),
         ...(model ? { model } : {}),
         ...(effort ? { effort } : {}),
-        ...(local?.autoApprove === false ? { autoApprove: false } : {}),
+        ...(local?.autoApprove === true ? { autoApprove: true } : {}),
         hqRoot: input.hqRoot,
         workerDir,
         ...(workerSource === "worker" && workerId ? { workerSource, workerId } : {}),
@@ -2446,6 +2594,7 @@ async function adoptRemoteBotLocked(input) {
             systemPrompt: fleetBotSystemPrompt(name, config),
             provider: fleetProviderForRuntime(config.runtime, config.model),
             ownerCompanies: await fleetOwnerCompanies(),
+            ...(config.autoApprove === true ? { autoApprove: true } : {}),
             ...(input.preserveFirstStart
                 ? {
                     firstStart: {
@@ -2762,20 +2911,18 @@ export function registerBotCommand(program) {
         .description("Provision a local bot identity, scaffold its worker folder, install its launchd agent, and start it")
         .option("--kind <kind>", `personal (acts as you, everywhere you are) or company (acts as itself, as a member of its companies). Default: personal, or company when created from a company worker`)
         .option("--company <slug>", "Company bots: a company the bot is a member of (repeat for several); the owner invites it on creation", collectRepeated, [])
-        .option("--runtime <runtime>", `Model CLI to run the bot with: ${BOT_RUNTIMES.join("|")}`)
-        .option("--provider <provider>", `HQ Fleet provider: ${BOT_RUNTIMES.join("|")} (interactive Fleet creation prompts when omitted)`)
-        .option("--hq-fleet-runtime", "Create this personal bot with the local HQ Fleet Runtime")
-        .option("--legacy-runtime", "Run this bot with the model CLI even where the HQ Fleet Runtime is the default")
-        .option("--model <model>", "Model override passed to the runtime CLI")
-        .option("--effort <level>", `Thinking level: claude ${BOT_EFFORT_LEVELS.claude.join("|")}; codex ${BOT_EFFORT_LEVELS.codex.join("|")}; grok ${BOT_EFFORT_LEVELS.grok.join("|")} (default ${DEFAULT_BOT_EFFORT})`)
-        .option("--no-auto-approve", "Keep the runtime's permission gates (default: everything pre-approved; a headless bot cannot answer prompts)")
+        .option("--runtime <runtime>", `Model provider the bot answers with: ${BOT_RUNTIMES.join("|")} (same as --provider; default claude)`)
+        .option("--provider <provider>", `HQ Fleet provider: ${BOT_RUNTIMES.join("|")} (default claude)`)
+        .option("--hq-fleet-runtime", "Accepted for compatibility; every new bot runs on the HQ Fleet Runtime")
+        .option("--legacy-runtime", "No longer supported; new bots always run on the HQ Fleet Runtime")
+        .option("--model <model>", "Model the bot answers with")
+        .option("--auto-approve", "Turn the runtime's command approval prompts off for every sender (default: prompts stay on; the owner's own turns are always allowed)")
         .option("--worker <workerId>", "Run an existing company or core worker (see hq bot workers): its instructions, skills, context, and company policies; a company worker binds the bot to that company on every turn")
         .option("--display-name <name>", `The human name people see for the bot in HQ (e.g. Maya; up to ${BOT_DISPLAY_NAME_MAX_CHARS} chars). The handle stays <name>`)
         .option("--intro <text>", `The hello the bot DMs you when it first comes online (verbatim, up to ${BOT_INTRO_MAX_CHARS} chars)`)
         .option("--kickoff <prompt>", `A first task the bot starts on by itself right after its hello: one model turn run as if you had sent it, answered in your DM, once (up to ${BOT_KICKOFF_MAX_CHARS} chars)`)
         .option("--memory <where>", "Where the bot keeps its memory: synced (personal/workers/<name>/memory in HQ) or local (~/.hq/bots/<name>/memory, this computer only)", "synced")
-        .option("--lean", "Claude bots: run each turn without this computer's plugins, MCP servers and HQ's session hooks (HQ's tool hooks still run), so replies take seconds")
-        .option("--no-daemon", "Do not install the launchd agent (macOS)")
+        .option("--no-daemon", "Accepted for compatibility; HQ Fleet bots run under their own background service")
         .option("--no-start", "Create without starting")
         .option("--json", "Print machine-readable JSON")
         .action((name, opts) => wrap(() => runBotCreate(name, opts))());
@@ -2822,6 +2969,7 @@ export function registerBotCommand(program) {
         .action((name, opts) => wrap(async () => {
         const b = requireBot(name);
         if (isFleetRuntimeBot(b.config)) {
+            refuseHeldFleetBot(b.dir);
             const adopted = await adoptFleetRuntimeProfile(b.name, b.dir, b.config);
             runFleetRuntimeControl(b.name, b.config, adopted ? "install" : "start", opts.json === true);
             return;
@@ -2835,6 +2983,7 @@ export function registerBotCommand(program) {
         .action((name, opts) => wrap(async () => {
         const b = requireBot(name);
         if (isFleetRuntimeBot(b.config)) {
+            refuseHeldFleetBot(b.dir);
             runFleetRuntimeControl(b.name, b.config, "stop", opts.json === true);
             return;
         }