@indigoai-us/hq-cli 5.345.170 → 5.345.171

package/dist/commands/access.d.ts

@@ -16,7 +16,7 @@
 import { Command } from "commander";
 import { type CompanyBrowseClientFactory, type FilesBrowseVaultClient, type RunGetResult } from "./files-browse.js";
 import { type AclLock } from "./acl-lock.js";
-export type AccessOutcome = "never-existed" | "local" | "not-synced" | "no-access" | "ambiguous" | "pending-confirmation";
+export type AccessOutcome = "never-existed" | "local" | "not-synced" | "no-access" | "no-write-access" | "ambiguous" | "pending-confirmation";
 export interface AccessAclTree {
     prefix: string;
     direct: Array<{
@@ -151,6 +151,15 @@ export interface RunAccessResult {
      * grants (including a root `*` company-wide grant) do not apply.
      */
     lockedBy?: AclLock;
+    /**
+     * Set with outcome "no-write-access": the ACL row that blocks writes to a
+     * path that is on disk but not in the vault, so a push cannot upload it.
+     * Anchored as companies/<slug>/<prefix>; absent when only the effective
+     * permission is known.
+     */
+    writeBlockedBy?: string;
+    /** Effective permission on the path when outcome is "no-write-access". */
+    permission?: string | null;
 }
 export interface AccessAsResult {
     personUid: string;
@@ -164,6 +173,28 @@ export interface AccessAsResult {
 export declare function outcomeExitCode(outcome: AccessOutcome): 0 | 2 | 3 | 4;
 export declare function formatAccessOutcome(result: RunAccessResult): string;
 export declare function resolveGrantor(tree: AccessAclTree | null, members: AccessMember[]): AccessGrantor | null;
+/**
+ * ACL evidence for one key. `tree` is the full acl/tree response (which keeps
+ * the deny / no-record distinction and the ACL creator for grantor lookup).
+ * `resolved` is a non-null permission from the batch acl/resolve route.
+ */
+export type AclVerdict = {
+    kind: "tree";
+    tree: AccessAclTree | null;
+} | {
+    kind: "resolved";
+    permission: string;
+};
+/**
+ * Why the caller cannot write `relative`, or null when it can or the ACL says
+ * nothing (no record: membership-distributed access decides, which this
+ * command cannot see). The tree is fetched when the fast resolve path gave
+ * only a permission, so the blocking row can be named.
+ */
+export declare function writeBlocker(verdict: AclVerdict, relative: string, deps: Pick<AccessDeps, "fetchAclTree" | "companySlug">): Promise<{
+    permission: string | null;
+    blockedBy?: string;
+} | null>;
 export declare function runAccess(input: RunAccessInput): Promise<RunAccessResult>;
 export interface RunAccessBatchInput {
     targets: string[];

package/dist/commands/access.js

@@ -26,6 +26,7 @@ import { listActiveMembers } from "./members.js";
 import { aclLockedBy } from "./acl-lock.js";
 import { buildDmBody } from "./dm.js";
 import { defaultAudienceFor, recipientKindOf } from "../lib/notify-recipient.js";
+import { callerIsMachinePrincipal } from "../lib/caller-principal.js";
 import { peekIdToken } from "../utils/id-token.js";
 import { findRecentAccessRequest, formatTimeAgo, recordAccessRequest, } from "../utils/access-requests.js";
 import { recordAccessOutcome } from "../utils/access-outcomes.js";
@@ -34,8 +35,11 @@ export function outcomeExitCode(outcome) {
         return 0;
     if (outcome === "never-existed")
         return 2;
-    if (outcome === "no-access" || outcome === "pending-confirmation")
+    if (outcome === "no-access" ||
+        outcome === "no-write-access" ||
+        outcome === "pending-confirmation") {
         return 3;
+    }
     return 4;
 }
 export function formatAccessOutcome(result) {
@@ -57,6 +61,16 @@ export function formatAccessOutcome(result) {
             lines.push(`You do not have read access to this path.`);
             lines.push(result.path);
             break;
+        case "no-write-access":
+            lines.push(`The file is on this computer but not in the ${result.company} vault, and you cannot write to it, so a push cannot upload it.`);
+            lines.push(result.path);
+            if (result.writeBlockedBy) {
+                lines.push(`Write is blocked by the ACL on ${result.writeBlockedBy} (your permission: ${result.permission ?? "none"}). Ask its creator or a company admin for write access.`);
+            }
+            else {
+                lines.push(`Your permission on this path is ${result.permission ?? "none"}. Ask a company admin for write access.`);
+            }
+            break;
         case "pending-confirmation":
             lines.push(`Ask the grantor for read access to this path.`);
             lines.push(result.path);
@@ -243,6 +257,69 @@ function startEarly(promise) {
     promise.catch(() => undefined);
     return promise;
 }
+const WRITE_PERMISSIONS = new Set(["write", "admin", "owner"]);
+/**
+ * Why the caller cannot write `relative`, or null when it can or the ACL says
+ * nothing (no record: membership-distributed access decides, which this
+ * command cannot see). The tree is fetched when the fast resolve path gave
+ * only a permission, so the blocking row can be named.
+ */
+export async function writeBlocker(verdict, relative, deps) {
+    const resolvedPermission = verdict.kind === "resolved" ? verdict.permission : undefined;
+    if (resolvedPermission && WRITE_PERMISSIONS.has(resolvedPermission))
+        return null;
+    let tree = verdict.kind === "tree" ? verdict.tree : null;
+    if (verdict.kind === "resolved") {
+        try {
+            tree = await deps.fetchAclTree(relative);
+        }
+        catch {
+            tree = null;
+        }
+    }
+    const permission = resolvedPermission ?? tree?.effectivePermission ?? null;
+    if (permission && WRITE_PERMISSIONS.has(permission))
+        return null;
+    const covering = tree?.coveringAclPath;
+    if (typeof covering === "string" && covering !== "") {
+        return {
+            permission,
+            blockedBy: toBucketRelative(covering, deps.companySlug),
+        };
+    }
+    // A row on the path itself with a known non-write permission blocks it.
+    // With no permission reported, nothing proves the path is blocked.
+    if (permission && tree?.directRow) {
+        return { permission, blockedBy: toBucketRelative(tree.prefix, deps.companySlug) };
+    }
+    // No ACL row covers the path. A known non-write permission still blocks.
+    if (resolvedPermission)
+        return { permission };
+    return null;
+}
+/**
+ * Owners and admins write past ACL rows on the server (role bypass), which
+ * the ACL tree does not always show. Treat a lookup failure as no bypass only
+ * when the member list loads; if it cannot be read, assume a bypass so the
+ * command keeps its old "never-existed" answer instead of a wrong blocker.
+ */
+async function callerHasRoleBypass(deps) {
+    try {
+        const [members, requester] = await Promise.all([
+            deps.listMembers(),
+            resolveRequester(deps.requester),
+        ]);
+        const email = (requester.email ?? "").trim().toLowerCase();
+        // An unknown caller cannot be matched; keep the old answer.
+        if (email === "")
+            return true;
+        return members.some((m) => (m.personEmail ?? "").trim().toLowerCase() === email &&
+            (m.role === "owner" || m.role === "admin"));
+    }
+    catch {
+        return true;
+    }
+}
 function verdictDenied(verdict) {
     return verdict.kind === "tree" ? aclDenied(verdict.tree) : false;
 }
@@ -388,6 +465,31 @@ async function locateTarget(target, deps, ctx) {
                         },
                     };
                 }
+                // feedback_5baccb9e: a file that is on disk but absent from the vault
+                // is usually one a push could not upload. When the ACL blocks writes,
+                // say so instead of "never existed".
+                if (relative !== "" &&
+                    fs.existsSync(path.join(deps.hqRoot, "companies", slug, relative))) {
+                    steps.push("disk: present");
+                    const blocker = await writeBlocker(verdict, relative, deps);
+                    if (blocker && !(await callerHasRoleBypass(deps))) {
+                        steps.push(blocker.blockedBy
+                            ? `acl: write blocked by ${anchored(blocker.blockedBy)} (${blocker.permission ?? "none"})`
+                            : `acl: no write (${blocker.permission ?? "none"})`);
+                        return {
+                            kind: "terminal",
+                            outcome: "no-write-access",
+                            fields: {
+                                path: anchored(relative),
+                                company: slug,
+                                exists: false,
+                                steps,
+                                permission: blocker.permission,
+                                ...(blocker.blockedBy ? { writeBlockedBy: anchored(blocker.blockedBy) } : {}),
+                            },
+                        };
+                    }
+                }
                 return {
                     kind: "terminal",
                     outcome: "never-existed",
@@ -857,6 +959,11 @@ function jsonPayload(result) {
         payload.alreadyAskedAt = result.alreadyAskedAt;
     if (result.lockedBy)
         payload.lockedBy = result.lockedBy;
+    if (result.outcome === "no-write-access") {
+        payload.permission = result.permission ?? null;
+        if (result.writeBlockedBy)
+            payload.writeBlockedBy = result.writeBlockedBy;
+    }
     return payload;
 }
 function emit(input, result, log) {
@@ -933,7 +1040,9 @@ export function registerAccessCommand(program) {
 Exit codes:
   0  local or not-synced (file exists and you can read it)
   2  never-existed (the path was never created)
-  3  no-access (the file exists but you cannot read it)
+  3  no-access (the file exists but you cannot read it), or
+     no-write-access (the file is on disk, not in the vault, and you cannot
+     write to it, so a push cannot upload it)
   4  ambiguous (several keys matched; pick one)
 
 With several paths, each gets its own result block and the exit code is the
@@ -1161,7 +1270,7 @@ async function buildLiveAccessDeps(slug, hqRoot) {
                 prompt: msg.prompt,
                 details: msg.details,
                 now: Date.now(),
-                audience: defaultAudienceFor(recipientKindOf(msg.recipient)),
+                audience: defaultAudienceFor(recipientKindOf(msg.recipient), callerIsMachinePrincipal()),
             });
             const res = await vaultApiFetch({
                 token,

package/dist/commands/agent-kit.d.ts

@@ -75,7 +75,7 @@ export interface KitRuntime {
     paths: AgentKitPaths;
     creds: ExternalMachineCreds;
     config: KitConfig;
-    getToken: () => Promise<string>;
+    getToken: (signal?: AbortSignal) => Promise<string>;
     log: KitLogger;
     credsSource?: HeartbeatCredsSource;
 }

package/dist/commands/agent-kit.js

@@ -153,7 +153,7 @@ export function buildKitRuntime(service) {
     process.env.HQ_REQUIRE_MACHINE_IDENTITY = "1";
     process.env.HQ_VAULT_API_URL = creds.apiBaseUrl;
     const log = createKitLogger(paths, service, { echo: process.stdout.isTTY === true });
-    const getToken = () => ensureCognitoToken({ tokenSource: "machine", interactive: false });
+    const getToken = (signal) => ensureCognitoToken({ tokenSource: "machine", interactive: false, ...(signal ? { signal } : {}) });
     return { paths, creds, config, getToken, log, credsSource };
 }
 export async function runKitService(service, rt) {
@@ -177,6 +177,7 @@ export async function runKitService(service, rt) {
                 },
                 apiBaseUrl: rt.creds.apiBaseUrl,
                 intervalMs: rt.config.heartbeatIntervalMs,
+                requestTimeoutMs: rt.config.requestTimeoutMs,
                 getToken: rt.getToken,
                 log: rt.log,
                 components: enabledKitComponents(rt.config),
@@ -192,6 +193,7 @@ export async function runKitService(service, rt) {
                     agentUid: rt.creds.entityUid,
                     apiBaseUrl: rt.creds.apiBaseUrl,
                     pollMs: rt.config.inboxPollMs,
+                    requestTimeoutMs: rt.config.requestTimeoutMs,
                     ack: rt.config.inboxAck,
                     getToken: rt.getToken,
                     log: rt.log,

package/dist/commands/agents.js

@@ -43,6 +43,7 @@ import { launchSessionManagerPlugin, SessionManagerPluginLaunchError, TerminalSe
 import { peekIdToken } from "../utils/id-token.js";
 import { canOfferTeamUpgrade, formatUpgradeRefusal, isPlanGateError, offerUpgradeLink, } from "../utils/plan-gate-error.js";
 import { AGENT_UID_PATTERN, defaultAudienceFor, isAgentUid } from "../lib/notify-recipient.js";
+import { callerIsMachinePrincipal } from "../lib/caller-principal.js";
 import { AGENT_MODEL_PROVIDERS, modelSelectionErrorMessage, readAgentModelCatalog, validateAgentModelSelection, } from "../lib/agents/model-catalog.js";
 import { fetchCompanyPricingPlan, isUsageOnly, usageOnlyBoxSentence, usageOnlyCardRequiredLines, } from "../lib/billing/usage-only.js";
 import { BUNDLED_USAGE_CARD, fetchUsageCard, } from "../lib/billing/usage-card.js";
@@ -1139,7 +1140,7 @@ export async function sendAgentDm(token, agentUid, message) {
         token,
         path: "/v1/notify/dm",
         method: "POST",
-        body: { toPersonUid: agentUid, body: message, audience: defaultAudienceFor("agent") },
+        body: { toPersonUid: agentUid, body: message, audience: defaultAudienceFor("agent", callerIsMachinePrincipal()) },
     });
 }
 /** Read the two-way DM conversation with an agent (most recent `limit`). */

package/dist/commands/bot.d.ts

@@ -109,6 +109,7 @@ export declare function resolveCreateKind(opts: {
 };
 export interface BotCreateOptions {
     runtime?: string;
+    hqFleetRuntime?: boolean;
     model?: string;
     effort?: string;
     autoApprove?: boolean;
@@ -343,6 +344,8 @@ export interface RemoteBotRow {
     displayName: string | null;
     /** "assistant" for HQ's setup assistant, else null. */
     role: BotRole;
+    /** The owner's person uid exactly as GET /v1/agents/mine sends it; null when the server omits it. */
+    ownerUid: string | null;
 }
 export declare function registerBotCommand(program: Command): void;
 //# sourceMappingURL=bot.d.ts.map

package/dist/commands/bot.js

@@ -52,7 +52,7 @@ import { isAncestorProcess } from "../lib/bot/self-process.js";
 import { runtimeDisplayName } 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 { 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, 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, } 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, 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, controlFleetLocalBot, fleetLocalPromotionRuntime, installPinnedFleetLocalDistribution, removeFleetLocalBot, } from "../lib/bot/index.js";
 function collectRepeated(value, previous) {
     return [...previous, value];
 }
@@ -114,6 +114,18 @@ function requireBot(name) {
     }
     return { name: valid, dir, config };
 }
+function isFleetRuntimeBot(config) {
+    return config.engine?.id === HQ_FLEET_RUNTIME_ENGINE_ID;
+}
+function runFleetRuntimeControl(name, config, action, json) {
+    const result = controlFleetLocalBot(config.agentUid, action);
+    if (json) {
+        console.log(JSON.stringify({ name, runtime: HQ_FLEET_RUNTIME_ENGINE_ID, ...result }, null, 2));
+        return;
+    }
+    const summary = typeof result.summary === "string" ? result.summary : `${action} completed`;
+    console.log(chalk.green(`${name}: ${summary}`));
+}
 /** Bot-identity token supplier: per-bot creds + per-bot token cache dir. */
 export function botTokenSupplier(dir) {
     process.env.HQ_MACHINE_CREDS_FILE = botCredsPath(dir);
@@ -605,6 +617,10 @@ 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 useFleetRuntime = opts.hqFleetRuntime === true;
+    if (useFleetRuntime && (opts.runtime || opts.model || opts.effort || opts.lean)) {
+        throw Object.assign(new Error("--hq-fleet-runtime selects the local HQ runtime. Do not combine it with --runtime, --model, --effort, or --lean."), { expected: true });
+    }
     const runtime = opts.runtime ?? "claude";
     if (!isBotRuntimeId(runtime)) {
         throw Object.assign(new Error(`--runtime must be one of ${BOT_RUNTIMES.join(", ")}`), { expected: true });
@@ -640,6 +656,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 (useFleetRuntime && kind !== "personal") {
+        throw Object.assign(new Error("--hq-fleet-runtime creates a personal bot. Drop --kind company and --company."), {
+            expected: true,
+        });
+    }
     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 });
@@ -654,6 +675,9 @@ async function runBotCreateLocked(name, opts) {
             expected: true,
         });
     }
+    const fleetInstallation = useFleetRuntime
+        ? await installPinnedFleetLocalDistribution()
+        : null;
     const token = await ownerToken();
     const owner = await resolveCallerPersonUid(token, undefined, { command: "hq bot create" });
     if (!owner)
@@ -763,6 +787,7 @@ async function runBotCreateLocked(name, opts) {
     // instead of creating a new one. The machine secret never travels.
     const localConfig = buildBotLocalConfig({
         runtime,
+        ...(fleetInstallation ? { engine: fleetInstallation.engine } : {}),
         kind,
         ...(kind === "company" ? { companies } : {}),
         ...(model ? { model } : {}),
@@ -829,6 +854,7 @@ async function runBotCreateLocked(name, opts) {
         agentUid,
         ownerUid: created.agent.ownerUid ?? owner,
         runtime,
+        ...(fleetInstallation ? { engine: fleetInstallation.engine } : {}),
         kind,
         // A company bot's list is filled in below, with the invites that went through.
         ...(kind === "company" ? { companies: [] } : {}),
@@ -885,8 +911,20 @@ async function runBotCreateLocked(name, opts) {
     const scaffoldOpts = { memoryDir: config.memoryDir };
     const scaffold = worker
         ? scaffoldBotMemory(hqRoot, name, undefined, scaffoldOpts)
-        : scaffoldBotWorker(hqRoot, name, agentUid, runtime, undefined, scaffoldOpts);
-    createBotLogger(dir)("info", `created ${name} (${agentUid}) kind=${kind}${companies.length ? ` companies=${companies.join(",")}` : ""} runtime=${runtime}${worker ? ` worker=${worker.id} company=${worker.company ?? "-"}` : ""} memory=${memoryMode}`);
+        : scaffoldBotWorker(hqRoot, name, agentUid, fleetInstallation ? HQ_FLEET_RUNTIME_ENGINE_ID : runtime, undefined, scaffoldOpts);
+    const fleetBootstrap = fleetInstallation
+        ? bootstrapFleetLocalBot({
+            agentUid,
+            ownerUid: config.ownerUid,
+            hqRoot,
+            botDir: dir,
+            installation: fleetInstallation,
+            machineCredentials: botCredsPath(dir),
+        }, { start: opts.start !== false })
+        : null;
+    const fleetProfile = fleetBootstrap?.profile ?? null;
+    const runtimeLabel = fleetInstallation ? HQ_FLEET_RUNTIME_ENGINE_ID : runtime;
+    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",
         role: localBotRole(config),
@@ -895,7 +933,9 @@ async function runBotCreateLocked(name, opts) {
         agentUid,
         kind,
         companies,
-        runtime,
+        runtime: runtimeLabel,
+        engine: fleetInstallation?.engine ?? null,
+        profile: fleetProfile,
         dir,
         worker: worker ? path.join(hqRoot, worker.path) : scaffold.dir,
         workerId: worker?.id ?? null,
@@ -906,15 +946,15 @@ async function runBotCreateLocked(name, opts) {
         intro: intro ?? null,
         kickoff: kickoff ?? null,
         model: model ?? null,
-        effort: effort ?? DEFAULT_BOT_EFFORT,
+        effort: fleetInstallation ? null : effort ?? DEFAULT_BOT_EFFORT,
     };
     let daemonMessage = null;
-    if (opts.daemon !== false && process.platform === "darwin") {
+    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}, ${runtime})`));
+        console.log(chalk.green(`Created bot ${chalk.bold(name)}`) + chalk.dim(` (${agentUid}, ${runtimeLabel})`));
         console.log(chalk.dim(`  kind:   ${describeKind(kind, companies)}`));
         if (worker)
             console.log(chalk.dim(`  worker: ${worker.id}${worker.company ? ` (${worker.company})` : ""} — ${path.join(hqRoot, worker.path)}`));
@@ -922,9 +962,17 @@ 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 (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.
@@ -1127,7 +1175,11 @@ async function runBotList(opts) {
     }
 }
 async function runBotStatus(nameArg, opts) {
-    const { name, dir } = requireBot(nameArg);
+    const { name, dir, config } = requireBot(nameArg);
+    if (isFleetRuntimeBot(config)) {
+        runFleetRuntimeControl(name, config, "status", opts.json === true);
+        return;
+    }
     const row = rowFor(name);
     await decorateOnline([row]);
     const status = readBotStatus(dir);
@@ -1326,6 +1378,15 @@ async function runBotRmOrphan(name, opts) {
     else
         console.log(chalk.dim(`  HQ may still have a bot named "${name}". Remove that too with: hq bot rm ${name} --remote`));
 }
+function stopFleetRuntimeBotQuietly(agentUid) {
+    try {
+        controlFleetLocalBot(agentUid, "stop");
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 async function runBotRm(nameArg, opts) {
     const validated = validateBotName(nameArg);
     // Under the bot's lock: an rm racing a create, adopt or restore of the same
@@ -1348,9 +1409,13 @@ async function runBotRmLocked(validated, opts) {
             return;
         }
     }
-    await stopBot(name, dir, config, "silent").catch(() => { });
-    const paths = buildBotDaemonPaths({ name, botDir: dir, hqRoot: config.hqRoot });
-    const daemon = uninstallBotDaemon(paths, daemonDeps());
+    if (isFleetRuntimeBot(config))
+        stopFleetRuntimeBotQuietly(config.agentUid);
+    else
+        await stopBot(name, dir, config, "silent").catch(() => { });
+    const daemon = isFleetRuntimeBot(config)
+        ? { message: "managed by HQ Fleet Runtime" }
+        : uninstallBotDaemon(buildBotDaemonPaths({ name, botDir: dir, hqRoot: config.hqRoot }), daemonDeps());
     const token = await ownerToken();
     const api = new BotApi({ token: async () => token });
     let identity;
@@ -1380,8 +1445,11 @@ async function runBotRmLocked(validated, opts) {
     // re-created under the same name. Everything else keeps the folder, so the
     // same command can pick the job back up.
     const localStateRemoved = terminal || incomplete.retryable === false;
-    if (localStateRemoved)
+    if (localStateRemoved) {
+        if (isFleetRuntimeBot(config))
+            removeFleetLocalBot(config.agentUid);
         fs.rmSync(dir, { recursive: true, force: true });
+    }
     const message = incomplete
         ? `HQ removed what it could of "${name}", but ${incomplete.detail}.` +
             (incomplete.retryable
@@ -1572,6 +1640,10 @@ export function botExists(name) {
 /** `hq bot restart <name>`: stop, then start (launchd when installed). */
 export async function runBotRestart(nameArg, opts = {}) {
     const b = requireBot(nameArg);
+    if (isFleetRuntimeBot(b.config)) {
+        runFleetRuntimeControl(b.name, b.config, "restart", opts.json === true || opts.output === "json");
+        return;
+    }
     const running = readBotStatus(b.dir);
     if (running && isPidAlive(running.pid) && selfStopProbe(running.pid)) {
         // The stop half would end this turn (and this command) before the
@@ -1581,6 +1653,30 @@ export async function runBotRestart(nameArg, opts = {}) {
     await stopBot(b.name, b.dir, b.config, "silent");
     await startBot(b.name, b.dir, b.config, opts.output ?? (opts.json ? "json" : "text"));
 }
+async function runBotAuth(nameArg, opts) {
+    const b = requireBot(nameArg);
+    if (!isFleetRuntimeBot(b.config)) {
+        throw Object.assign(new Error(`hq bot auth is for bots created with --hq-fleet-runtime. ${b.name} uses ${b.config.runtime}.`), { expected: true });
+    }
+    const apiKey = opts.apiKey ? fs.readFileSync(0, "utf8").trim() : undefined;
+    if (opts.apiKey && !apiKey) {
+        throw Object.assign(new Error("No API key was received on stdin."), { expected: true });
+    }
+    const result = authenticateFleetLocalBot({
+        agentUid: b.config.agentUid,
+        provider: opts.provider,
+        ...(opts.model ? { model: opts.model } : {}),
+        ...(apiKey ? { apiKey } : {}),
+        ...(opts.baseUrl ? { baseUrl: opts.baseUrl } : {}),
+        ...(opts.transport ? { transport: opts.transport } : {}),
+        openBrowser: opts.browser !== false,
+    });
+    if (opts.json) {
+        console.log(JSON.stringify({ ok: true, name: b.name, runtime: HQ_FLEET_RUNTIME_ENGINE_ID, ...result }, null, 2));
+        return;
+    }
+    console.log(chalk.green(`${b.name} is signed in to ${result.provider} and running ${result.model}.`));
+}
 // ── adopt / restore (bring a bot you own back to this computer) ──────────────
 /**
  * Which computer a re-issue is for. Never a secret and never an identifier the
@@ -2090,6 +2186,7 @@ async function runBotListRemote(opts) {
             reason: runnable.reason,
             displayName: remoteBotDisplayName(bot, name),
             role: remoteBotRole(bot),
+            ownerUid: bot.ownerUid ?? null,
         };
     });
     if (opts.json) {
@@ -2124,7 +2221,13 @@ export function registerBotCommand(program) {
         const { dir, config } = requireBot(name);
         const token = await ownerToken(false);
         const api = new BotApi({ token: async () => token });
-        const result = await promoteLocalBot({ dir, config, companyUid: opts.company, api });
+        const result = await promoteLocalBot({
+            dir,
+            config,
+            companyUid: opts.company,
+            api,
+            ...(isFleetRuntimeBot(config) ? { runtime: fleetLocalPromotionRuntime(config.agentUid) } : {}),
+        });
         const details = result.pending ? await api.promotionDetails(config.agentUid, opts.company) : null;
         if (opts.json)
             console.log(JSON.stringify({ ...result, pairing: details?.pairing ?? null, ...(details?.failure ? { failure: details.failure } : {}) }));
@@ -2140,7 +2243,8 @@ 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("|")}`, "claude")
+        .option("--runtime <runtime>", `Model CLI to run the bot with: ${BOT_RUNTIMES.join("|")}`)
+        .option("--hq-fleet-runtime", "Create this personal bot with the local HQ Fleet Runtime")
         .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)")
@@ -2196,6 +2300,10 @@ export function registerBotCommand(program) {
         .option("--json", "Print machine-readable JSON")
         .action((name, opts) => wrap(async () => {
         const b = requireBot(name);
+        if (isFleetRuntimeBot(b.config)) {
+            runFleetRuntimeControl(b.name, b.config, "start", opts.json === true);
+            return;
+        }
         await startBot(b.name, b.dir, b.config, opts.json ? "json" : "text");
     })());
     bot
@@ -2204,6 +2312,10 @@ export function registerBotCommand(program) {
         .option("--json", "Print machine-readable JSON")
         .action((name, opts) => wrap(async () => {
         const b = requireBot(name);
+        if (isFleetRuntimeBot(b.config)) {
+            runFleetRuntimeControl(b.name, b.config, "stop", opts.json === true);
+            return;
+        }
         await stopBot(b.name, b.dir, b.config, opts.json ? "json" : "text");
     })());
     bot
@@ -2216,6 +2328,17 @@ export function registerBotCommand(program) {
         .description("Show the bot's process, heartbeat, launchd, and credential state")
         .option("--json", "Print machine-readable JSON")
         .action((name, opts) => wrap(() => runBotStatus(name, opts))());
+    bot
+        .command("auth <name>")
+        .description("Sign a runtime-backed personal bot in to ChatGPT, Grok, Claude, or another supported provider")
+        .requiredOption("--provider <provider>", "Provider: chatgpt, grok, claude, or a runtime provider id")
+        .option("--model <model>", "Model id; required for providers without a built-in personal-bot default")
+        .option("--api-key", "Read an API key from stdin instead of starting device authorization")
+        .option("--base-url <url>", "Provider API base URL; required for custom runtime providers")
+        .option("--transport <transport>", "Provider transport: chat_completions, anthropic_messages, or codex_responses")
+        .option("--no-browser", "Do not open a browser during device authorization")
+        .option("--json", "Print machine-readable JSON")
+        .action((name, opts) => wrap(() => runBotAuth(name, opts))());
     bot
         .command("logs <name>")
         .description("Show the bot's log")