@indigoai-us/hq-cli 5.296.0 → 5.298.0

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## [Unreleased]
 
+## [5.298.0] — 2026-09-30
+- [feedback_d4a080e9-de79-4290-81c3-06ba26990a38] Preserve raw substring matches while normalizing company path searches.
+- `hq agents` now prints the Slack app settings link and the console paste link whenever an agent is waiting on its Slack app-level token, and follows the pending actions and paste URL the server returns.
+- When an app install is already running, `hq integrations connect` tells you to wait instead of showing a generic conflict error.
+- Validate policy trigger expressions when loading worker policies (feedback_3982db47-ceb8-4148-8ee0-4dd533f5138b).
+
+## [5.297.0] — 2026-09-30
+- When enabled by hq-flags, show the quarantined work-context outbox count and latest reason in hq doctor and mesh daemon status.
+- `hq daemon` now exits after shutdown when handles remain open, and its mesh service waits when another live mesh daemon owns the process lock.
+
 ## [5.296.0] — 2026-09-30
 - Upgrade varlock to 1.21.1. `hq run` skips Varlock cache setup and reports malformed env files promptly without sending them to Sentry.
 - Record bounded actor and trigger history for lane worker starts and expose it through `hq lanes show --json`. Preserve history through conflict merges and envelope repair, and record answered-question callers for immediate and queued resumes.

package/dist/commands/agents.js

@@ -549,13 +549,59 @@ function currentDeviceSignInAction(status) {
         code,
     };
 }
+const SLACK_APP_TOKEN_INSTRUCTION = "Create an app-level token with the connections:write scope, then paste it into HQ. HQ verifies the token and resumes setup; if Slack asks you to install the app, follow the install link shown there.";
+function consolePasteUrl(companyKey, agentUid) {
+    const base = process.env.HQ_CONSOLE_URL?.trim().replace(/\/+$/, "") || "https://hq.computer";
+    return `${base}/companies/${encodeURIComponent(companyKey)}/agents?setup=${encodeURIComponent(agentUid)}`;
+}
+function slackAppIdFromSetupState(status) {
+    const steps = recordValue(status.setupState)?.steps;
+    if (!Array.isArray(steps))
+        return null;
+    for (const step of steps) {
+        const item = recordValue(step);
+        if (item?.name !== "channels" || item.status === "done")
+            continue;
+        const match = /https:\/\/api\.slack\.com\/apps\/(A[A-Z0-9]+)/.exec(JSON.stringify(item));
+        if (match)
+            return match[1];
+    }
+    return null;
+}
+function serverPendingActions(status) {
+    if (!Array.isArray(status.pendingActions))
+        return [];
+    const actions = [];
+    for (const raw of status.pendingActions) {
+        const item = recordValue(raw);
+        const type = nonEmptyString(item?.type);
+        const title = nonEmptyString(item?.title);
+        if (!item || !type || !title)
+            continue;
+        const url = safeActionUrl(item.url) ?? undefined;
+        const pasteUrl = safeActionUrl(item.pasteUrl) ?? undefined;
+        const rawCode = nonEmptyString(item.code);
+        actions.push({
+            type,
+            title,
+            summary: title.charAt(0).toLowerCase() + title.slice(1),
+            instruction: nonEmptyString(item.instruction) ?? "Open this page and follow the instructions.",
+            ...(url ? { url, urlLabel: type === "slack-app-token" ? "Get token" : "Open" } : {}),
+            ...(pasteUrl ? { pasteUrl } : {}),
+            ...(rawCode && /^[A-Z0-9]{4,8}-[A-Z0-9]{4,8}$/i.test(rawCode) ? { code: rawCode } : {}),
+        });
+    }
+    return actions;
+}
 function pendingSlackAction(status, companySlug) {
     const agent = recordValue(status.agent);
     const configuredSlack = recordValue(recordValue(agent?.channels)?.slack);
-    const appId = nonEmptyString(configuredSlack?.appId);
+    const stepAppId = slackAppIdFromSetupState(status);
+    const appId = nonEmptyString(configuredSlack?.appId) ?? stepAppId;
     const agentUid = nonEmptyString(agent?.uid);
     const companyUid = nonEmptyString(agent?.companyUid);
-    const tokenPage = safeActionUrl(configuredSlack?.appTokenPendingUrl);
+    const tokenPage = safeActionUrl(configuredSlack?.appTokenPendingUrl) ??
+        (stepAppId ? `https://api.slack.com/apps/${stepAppId}/general` : null);
     if (tokenPage &&
         appId && /^A[A-Z0-9]+$/.test(appId) &&
         new URL(tokenPage).hostname === "api.slack.com" &&
@@ -568,10 +614,10 @@ function pendingSlackAction(status, companySlug) {
             type: "slack-app-token",
             title: `Finish ${nonEmptyString(agent?.name) ?? "the agent"}'s Slack connection`,
             summary: "connect it to Slack",
-            instruction: "Create an app-level token with the connections:write scope, then paste it into HQ. HQ verifies the token and resumes setup; if Slack asks you to install the app, follow the install link shown there.",
+            instruction: SLACK_APP_TOKEN_INSTRUCTION,
             url: `https://api.slack.com/apps/${appId}/general`,
             urlLabel: "Get token",
-            pasteUrl: `https://hq.computer/companies/${encodeURIComponent(companyUrlKey)}/agents?setup=${encodeURIComponent(agentUid)}`,
+            pasteUrl: consolePasteUrl(companyUrlKey, agentUid),
         };
     }
     const diagnostics = recordValue(agent?.channelDiagnostics);
@@ -587,6 +633,11 @@ function pendingSlackAction(status, companySlug) {
             instruction: "Open this page, create the app-level token, then provide it in the agent's Slack setup.",
             url,
             urlLabel: "Open",
+            ...(agentUid && AGENT_UID_PATTERN.test(agentUid) && companyUid && /^cmp_[A-Za-z0-9_-]+$/.test(companyUid)
+                ? {
+                    pasteUrl: consolePasteUrl(companySlug && /^[a-z0-9][a-z0-9-]*$/.test(companySlug) ? companySlug : companyUid, agentUid),
+                }
+                : {}),
         };
     }
     if (slack?.inboundCapability !== "pending-install")
@@ -606,6 +657,9 @@ function pendingSlackAction(status, companySlug) {
  * changing the renderers or command control flow.
  */
 function pendingOperatorActions(status, companySlug) {
+    const fromServer = serverPendingActions(status);
+    if (fromServer.length > 0)
+        return fromServer;
     return [
         currentDeviceSignInAction(status),
         pendingSlackAction(status, companySlug),
@@ -616,7 +670,7 @@ async function consoleCompanySlug(token, status, companyRef) {
         return companyRef;
     const agent = recordValue(status.agent);
     const slack = recordValue(recordValue(agent?.channels)?.slack);
-    if (!slack?.appTokenPendingUrl)
+    if (!slack?.appTokenPendingUrl && !slackAppIdFromSetupState(status))
         return undefined;
     const companyUid = nonEmptyString(agent?.companyUid);
     if (!companyUid)

package/dist/commands/files-browse.d.ts

@@ -502,6 +502,8 @@ export declare function resolveBrowseSession(): Promise<{
  * and registers `share`/`unshare`/`acl`; this function appends the two
  * new browse-vs-sync subcommands so they share the `--company` switch.
  */
-export declare function registerFilesBrowseCommands(filesCmd: Command): void;
+export declare function registerFilesBrowseCommands(filesCmd: Command, deps?: {
+    personalS3Factory?: S3ClientFactory;
+}): void;
 export {};
 //# sourceMappingURL=files-browse.d.ts.map

package/dist/commands/files-browse.js

@@ -192,6 +192,18 @@ export function formatBrowseTable(rows) {
         lines.push(renderRow(row));
     return lines.join("\n");
 }
+function formatSearchResults(rows, query) {
+    if (rows.length === 0) {
+        return `No files found for search ${JSON.stringify(query)}.`;
+    }
+    return formatBrowseTable(rows);
+}
+function normalizeCompanySearchPath(value) {
+    return value
+        .split("/")
+        .map((segment) => (segment === "company" ? "companies" : segment))
+        .join("/");
+}
 /** Guard: the personal path needs an S3 factory. */
 function requirePersonalS3Factory(f) {
     if (!f) {
@@ -530,7 +542,17 @@ export async function runSearch(input) {
         region: input.region,
     });
     const q = input.query.toLowerCase();
-    return rows.filter((r) => r.key.toLowerCase().includes(q));
+    // Only a leading `company/<slug>...` path form is an alias for the
+    // `companies/` anchor. A bare `company` stays a plain substring, since every
+    // company-mode key starts with `companies/<slug>/`.
+    const normalizedQuery = /^company\/[^/]+/.test(q)
+        ? normalizeCompanySearchPath(q)
+        : q;
+    return rows.filter((r) => {
+        const key = r.key.toLowerCase();
+        return (key.includes(q) ||
+            normalizeCompanySearchPath(key).includes(normalizedQuery));
+    });
 }
 /** Per-machine pin set path: `<hqRoot>/.hq/pins.json`. */
 export function pinFilePath(hqRoot) {
@@ -927,7 +949,8 @@ export async function resolveBrowseSession() {
  * and registers `share`/`unshare`/`acl`; this function appends the two
  * new browse-vs-sync subcommands so they share the `--company` switch.
  */
-export function registerFilesBrowseCommands(filesCmd) {
+export function registerFilesBrowseCommands(filesCmd, deps = {}) {
+    const personalS3Factory = deps.personalS3Factory ?? defaultS3Factory;
     filesCmd
         .command("browse [path]")
         .description("List vault objects under [path] without syncing them locally. Private-folder rows (foo/) are labelled and do not imply child access; their children are creator-only. Uses the browse-vend path (role-bypass allowed). Pass --personal to browse the caller's personal vault; otherwise [path] must start with companies/<slug>/.")
@@ -961,7 +984,7 @@ export function registerFilesBrowseCommands(filesCmd) {
                     personalMode: true,
                     personalUid,
                     vaultClient: cognito,
-                    s3Factory: defaultS3Factory,
+                    s3Factory: personalS3Factory,
                     region: DEFAULT_COGNITO.region,
                 });
                 console.log(formatBrowseTable(result.rows));
@@ -1053,7 +1076,7 @@ export function registerFilesBrowseCommands(filesCmd) {
                     personalMode: true,
                     personalUid,
                     vaultClient: cognito,
-                    s3Factory: defaultS3Factory,
+                    s3Factory: personalS3Factory,
                     region: DEFAULT_COGNITO.region,
                 });
                 if (result.destination.kind === "file") {
@@ -1170,10 +1193,10 @@ export function registerFilesBrowseCommands(filesCmd) {
                     personalMode: true,
                     personalUid,
                     vaultClient: cognito,
-                    s3Factory: defaultS3Factory,
+                    s3Factory: personalS3Factory,
                     region: DEFAULT_COGNITO.region,
                 });
-                console.log(formatBrowseTable(rows));
+                console.log(formatSearchResults(rows, query));
                 return;
             }
             if (!company) {
@@ -1187,7 +1210,7 @@ export function registerFilesBrowseCommands(filesCmd) {
                 companyClient: makeCompanyPresignFactory(accessToken, company),
                 region: DEFAULT_COGNITO.region,
             });
-            console.log(formatBrowseTable(rows));
+            console.log(formatSearchResults(rows, query));
         }
         catch (err) {
             const message = err instanceof Error ? err.message : String(err);

package/dist/commands/integrations-api.js

@@ -8,7 +8,7 @@
  * is optional and read defensively.
  */
 import { vaultApiFetch } from "../utils/vault-api.js";
-import { raiseForResponse, } from "./integrations-core.js";
+import { IntegrationsCliError, raiseForResponse, } from "./integrations-core.js";
 export async function listCatalog(token, companyUid, opts = {}) {
     const query = {
         companyUid,
@@ -59,8 +59,19 @@ export async function installIntegration(token, companyUid, input) {
         method: "POST",
         body: { companyUid, ...input },
     });
-    if (!res.ok)
-        await raiseForResponse(res, "Failed to connect the app");
+    if (!res.ok) {
+        try {
+            await raiseForResponse(res, "Failed to connect the app");
+        }
+        catch (error) {
+            if (error instanceof IntegrationsCliError &&
+                error.status === 409 &&
+                error.code === "INTEGRATION_FACTORY_INSTALL_IN_PROGRESS") {
+                throw new IntegrationsCliError("An install for this app is already running. Wait for it to finish before trying again.", { expected: true, status: 409, code: error.code });
+            }
+            throw error;
+        }
+    }
     return (await res.json());
 }
 export async function uninstallIntegration(token, companyUid, installationId) {

package/dist/commands/mesh.js

@@ -2129,7 +2129,9 @@ async function runDaemonInstall(opts) {
     // `hq daemon` runs mesh on this machine: installing a second unit would run it twice.
     // An explicit --hq-root is verified the same way as below and saved for the daemon.
     const explicitRoot = opts.hqRoot ? resolveInstallHqRoot({ explicit: opts.hqRoot }).root : undefined;
-    const handedOff = opts.systemUser ? null : handOffInstallHere(["mesh"], process.env, { hqRoot: explicitRoot });
+    const handedOff = opts.systemUser
+        ? null
+        : handOffInstallHere(["mesh"], process.env, { hqRoot: explicitRoot, ifStale: opts.ifStale });
     if (handedOff) {
         console.log(opts.json ? JSON.stringify({ ok: true, action: "hq-daemon", reinstalled: false, message: handedOff }) : handedOff);
         return;

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

@@ -47,6 +47,8 @@ export interface WorkerPromptSource {
     contextPaths: string[];
     /** companies/<co>/policies/*.md, hqRoot-relative. */
     policyPaths: string[];
+    /** Invalid policy files excluded from policyPaths, with a safe diagnostic. */
+    policyDiagnostics?: string[];
 }
 export interface PromptSources {
     workerYaml?: string;

package/dist/lib/bot/prompt.js

@@ -20,6 +20,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import * as yaml from "js-yaml";
 import { packageRoot } from "../../utils/hq-roots.js";
+import { policyLoadDiagnostic } from "../policy-validator.js";
 export const MEMORY_FILE_BUDGET_BYTES = 64 * 1024;
 export const MEMORY_TOTAL_BUDGET_BYTES = 192 * 1024;
 export const CONTEXT_FILE_BUDGET_BYTES = 32 * 1024;
@@ -117,7 +118,7 @@ function resolveSkillFile(hqRoot, workerDir, name, doc, io) {
     return undefined;
 }
 function readWorkerSource(hqRoot, workerDir, workerYaml, io, companyOverride) {
-    const out = { skills: [], contextFiles: [], contextPaths: [], policyPaths: [] };
+    const out = { skills: [], contextFiles: [], contextPaths: [], policyPaths: [], policyDiagnostics: [] };
     let doc = {};
     if (workerYaml) {
         try {
@@ -197,9 +198,28 @@ function readWorkerSource(hqRoot, workerDir, workerYaml, io, companyOverride) {
             catch {
                 names = [];
             }
-            out.policyPaths = names
-                .filter((n) => n.endsWith(".md") && !n.startsWith(".") && !n.includes(".conflict-"))
-                .map((n) => path.join(policiesRel, n));
+            for (const name of names) {
+                if (!name.endsWith(".md") || name.startsWith(".") || name.includes(".conflict-"))
+                    continue;
+                const relative = path.join(policiesRel, name);
+                const absolute = insideHqRoot(hqRoot, relative);
+                if (!absolute)
+                    continue;
+                let content;
+                try {
+                    content = io.readFileSync(absolute);
+                }
+                catch {
+                    out.policyPaths.push(relative);
+                    continue;
+                }
+                const diagnostic = policyLoadDiagnostic(content, absolute);
+                if (diagnostic) {
+                    out.policyDiagnostics.push(`${relative}: ${diagnostic.split("\n", 1)[0]}`);
+                    continue;
+                }
+                out.policyPaths.push(relative);
+            }
         }
     }
     return out;
@@ -331,6 +351,11 @@ export function buildSystemPrompt(input) {
                 `Hard rules for \`${company}\`. Read the relevant ones before acting; they override anything else in this prompt.\n\n` +
                 worker.policyPaths.map((p) => `- ${p}`).join("\n"));
         }
+        if (worker.policyDiagnostics && worker.policyDiagnostics.length > 0) {
+            parts.push(`## Policy load diagnostics\n\n` +
+                `These company policy files were not loaded because their frontmatter is invalid. Correct each file before relying on its rules.\n\n` +
+                worker.policyDiagnostics.map((diagnostic) => `- ${diagnostic}`).join("\n"));
+        }
         if (worker.contextFiles.length > 0 || worker.contextPaths.length > 0) {
             const blocks = worker.contextFiles.map((c) => `### ${c.path}\n\n${c.body.trim()}`);
             const more = worker.contextPaths.length > 0

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

@@ -51,5 +51,6 @@ export declare function handOffInstall(opts: {
 /** handOffInstall for this machine and user, for the older install commands. */
 export declare function handOffInstallHere(services: readonly ServiceName[], env?: NodeJS.ProcessEnv, opts?: {
     hqRoot?: string;
+    ifStale?: boolean;
 }): string | null;
 //# sourceMappingURL=handoff.d.ts.map

package/dist/lib/daemon/handoff.js

@@ -17,6 +17,15 @@ import { daemonPaths } from "./paths.js";
 import { writeControlRequest } from "./requests.js";
 /** Statuses where the daemon itself owns the unit's process. */
 const OWNED = new Set(["running", "backoff", "exited", "idle", "stopped"]);
+const RECENT_HOSTED_DAEMON_MS = 5 * 60_000;
+/** The updater's postinstall may run in the short gap before the desktop app relaunches its daemon. */
+function recentlyHostedDaemon(paths) {
+    if (!fs.existsSync(paths.statePath))
+        return false;
+    const state = JSON.parse(fs.readFileSync(paths.statePath, "utf8"));
+    const age = Date.now() - (state.updatedAt ?? 0);
+    return state.host === "desktop" && age >= 0 && age <= RECENT_HOSTED_DAEMON_MS;
+}
 /** The live daemon's state, or null when no daemon is running. */
 function liveState(paths, alive) {
     if (runningDaemonPid(paths.lockPath, alive) === null)
@@ -124,14 +133,21 @@ export function handOffInstall(opts) {
 export function handOffInstallHere(services, env = process.env, opts = {}) {
     const home = os.homedir();
     const paths = daemonPaths(home, env);
+    const config = readDaemonConfig(paths.configPath);
+    if (opts.ifStale && services.every((service) => config.disable.includes(service))) {
+        return `hq daemon has ${services.join(", ")} disabled, so the older service will not be installed.`;
+    }
     const installed = daemonUnitInstalled({
         platform: process.platform,
         home,
         windowsTaskExists: (task) => spawnSync("schtasks.exe", ["/Query", "/TN", task], { encoding: "utf8", windowsHide: true }).status === 0,
     }) || hostedDaemonRunning(paths);
-    if (!installed)
+    if (!installed) {
+        if (opts.ifStale && services.includes("mesh") && recentlyHostedDaemon(paths)) {
+            return `hq daemon recently hosted mesh on this machine, so the older mesh service will not be installed during its restart.`;
+        }
         return null;
-    const config = readDaemonConfig(paths.configPath);
+    }
     const machineType = detectMachineType(undefined, {
         platform: process.platform,
         env,

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

@@ -32,4 +32,11 @@ export declare function findLegacyUnits(deps: LegacyProbeDeps): LegacyUnit[];
  * own checks, because `hq daemon migrate` will never take them over.
  */
 export declare function legacyOwnerLookup(units: readonly LegacyUnit[]): (unitId: string) => string | null;
+/** A daemon-managed macOS mesh service takes over the old LaunchAgent on startup. */
+export declare function legacyMeshUnitsToRetire(units: readonly LegacyUnit[], opts: {
+    platform: NodeJS.Platform;
+    managed: boolean;
+    hosted: boolean;
+    meshEnabled: boolean;
+}): LegacyUnit[];
 //# sourceMappingURL=legacy.d.ts.map

package/dist/lib/daemon/legacy.js

@@ -122,4 +122,10 @@ export function legacyOwnerLookup(units) {
         return hit ? describeLegacyUnit(hit) : null;
     };
 }
+/** A daemon-managed macOS mesh service takes over the old LaunchAgent on startup. */
+export function legacyMeshUnitsToRetire(units, opts) {
+    if (opts.platform !== "darwin" || (!opts.managed && !opts.hosted) || !opts.meshEnabled)
+        return [];
+    return units.filter((unit) => unit.service === "mesh" && unit.kind === "launchd" && unit.migratable);
+}
 //# sourceMappingURL=legacy.js.map

package/dist/lib/daemon/lock.js

@@ -43,7 +43,7 @@ export function processCommandLine(pid, deps = defaultCommandLineDeps()) {
             "-Command",
             `(Get-CimInstance Win32_Process -Filter "ProcessId=${Math.trunc(pid)}").CommandLine`,
         ])
-        : deps.run("ps", ["-o", "command=", "-p", String(pid)]);
+        : deps.run("ps", ["-ww", "-o", "args=", "-p", String(pid)]);
     if (r.status !== 0)
         return null;
     const line = r.stdout.trim();

package/dist/lib/daemon/run.js

@@ -19,9 +19,12 @@ import { botsRoot } from "../bot/paths.js";
 import { CLAUDE_RUNNER_SCRIPT, CODEX_RUNNER_SCRIPT, enabledServices, planUnits } from "./catalog.js";
 import { effectiveSyncOwner, readDaemonConfig } from "./config.js";
 import { SUPERVISOR_HANDOFF_FLAG, readDaemonFlag } from "./flag.js";
-import { findLegacyUnits, legacyOwnerLookup } from "./legacy.js";
+import { findLegacyUnits, legacyMeshUnitsToRetire, legacyOwnerLookup } from "./legacy.js";
 import { readLegacySyncEnv } from "./legacy-sync-env.js";
-import { acquireDaemonLock, releaseDaemonLock } from "./lock.js";
+import { acquireDaemonLock, isProcessAlive, processCommandLine, releaseDaemonLock } from "./lock.js";
+import { adoptLegacyUnits } from "./migrate.js";
+import { daemonDir as meshDaemonDir, daemonPidPath as meshDaemonPidPath } from "../mesh/live/daemon/paths.js";
+import { readPidLock } from "../mesh/live/daemon/pid-lock.js";
 import { daemonRootRefusal } from "./install.js";
 import { detectMachineType } from "./machine-type.js";
 import { appendPrivate, daemonPaths, ensurePrivateDir, openPrivateAppend } from "./paths.js";
@@ -332,6 +335,54 @@ export async function runDaemon(opts) {
         }
         return legacyCache.units;
     };
+    const legacyMesh = legacyMeshUnitsToRetire(legacyUnits(), {
+        platform,
+        managed: opts.managed === true,
+        hosted: opts.host !== undefined,
+        meshEnabled: enabledServices(machineType, initial).includes("mesh"),
+    });
+    if (legacyMesh.length > 0) {
+        try {
+            const uid = process.getuid?.() ?? 0;
+            const result = adoptLegacyUnits(legacyMesh, {
+                run: (command, args) => {
+                    const r = spawnSync(command, args, { encoding: "utf8", windowsHide: true, timeout: 15_000 });
+                    return { status: r.status, stdout: r.stdout ?? "", stderr: r.stderr ?? "" };
+                },
+                uid,
+                isRoot: uid === 0,
+                adoptedDir: path.join(paths.root, "adopted"),
+                recordPath: path.join(paths.root, "adopted.json"),
+                systemAdoptedDir: "/var/lib/hq/daemon/adopted",
+                systemRecordPath: "/var/lib/hq/daemon/adopted.json",
+                systemUnitDir: "/etc/systemd/system",
+            });
+            for (const unit of result.adopted)
+                log("info", `retired legacy ${unit.unitId} unit ${unit.name}; hq daemon now owns mesh`);
+            for (const failure of result.failed)
+                log("warn", `could not retire legacy ${failure.unit.unitId} unit ${failure.unit.name}: ${failure.error}`);
+        }
+        catch (err) {
+            log("error", `could not retire legacy mesh units: ${err.message}`);
+        }
+        legacyCache = null;
+    }
+    const meshOwnerReason = () => {
+        const lockPath = meshDaemonPidPath(meshDaemonDir(undefined, home, env));
+        const owner = readPidLock(lockPath);
+        if (!owner || owner.pid === process.pid || !isProcessAlive(owner.pid))
+            return undefined;
+        const command = processCommandLine(owner.pid, {
+            platform,
+            run: (file, args) => {
+                const r = spawnSync(file, args, { encoding: "utf8", windowsHide: true, timeout: 15_000 });
+                return { status: r.status, stdout: r.stdout ?? "", stderr: r.stderr ?? "" };
+            },
+        });
+        if (command && !/\bmesh\s+daemon\s+run\b/.test(command))
+            return undefined;
+        return `mesh daemon already running (pid ${owner.pid}); waiting for it to exit`;
+    };
     let warnedMissingPin = null;
     const daemonSyncRunnerPids = new Set();
     const plan = () => {
@@ -554,6 +605,7 @@ export async function runDaemon(opts) {
                 return undefined;
             }
         },
+        meshOwnerReason,
         cliVersion: CLI_VERSION,
         adopt,
     });
@@ -603,6 +655,9 @@ export async function runDaemon(opts) {
                     log("info", "all services stopped");
                 releaseDaemonLock(paths.lockPath);
                 resolve(exitCode);
+                // Pipes, sockets and unrelated timers can outlive a clean shutdown.
+                // Keep restart and signal exits bounded just like the handoff path.
+                setTimeout(() => process.exit(exitCode), 5_000).unref();
             });
         };
         /** Exit for a restart but leave the services running for the next daemon to adopt. */

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

@@ -107,6 +107,8 @@ export interface SupervisorDeps {
     requestPollMs?: number;
     /** Read hq-cloud's lease status after it exits with the lease-conflict code. */
     syncOwnerBlockReason?: () => string | undefined;
+    /** A separate mesh daemon currently owns its pid lock after our mesh child exits. */
+    meshOwnerReason?: () => string | undefined;
     /** The running CLI's version; part of the key of units that run `hq` commands. */
     cliVersion?: string;
     /** Services to take over from the previous daemon instead of starting them. */

package/dist/lib/daemon/supervisor.js

@@ -27,6 +27,7 @@ export const BACKOFF_BASE_MS = 1_000;
 export const BACKOFF_MAX_MS = 60_000;
 export const HEALTHY_RUN_MS = 60_000;
 export const STOP_ESCALATION_MS = 10_000;
+const MESH_OWNER_RECHECK_MS = 15_000;
 /** After a handoff, how long a replaced unit must stay up before the next one is replaced. */
 export const HANDOFF_STAGGER_MS = 15_000;
 /** How long a draining unit may take to finish its work before it gets SIGTERM. */
@@ -294,6 +295,31 @@ export function createSupervisor(deps) {
                 emit();
                 return;
             }
+            const meshOwnerReason = slot.plan.service === "mesh" ? deps.meshOwnerReason?.() : undefined;
+            if (meshOwnerReason) {
+                const waitForOwner = (reason) => {
+                    slot.state.status = "waiting";
+                    slot.state.reason = reason;
+                    slot.state.nextRunAt = now() + MESH_OWNER_RECHECK_MS;
+                    deps.log("warn", `${reason}; retrying mesh ownership check in ${MESH_OWNER_RECHECK_MS}ms`);
+                    slot.timer = setT(() => {
+                        slot.timer = undefined;
+                        const current = deps.meshOwnerReason?.();
+                        if (current)
+                            waitForOwner(current);
+                        else {
+                            slot.attempts = 0;
+                            delete slot.state.reason;
+                            delete slot.state.nextRunAt;
+                            startLong(slot);
+                        }
+                        emit();
+                    }, MESH_OWNER_RECHECK_MS);
+                };
+                waitForOwner(meshOwnerReason);
+                emit();
+                return;
+            }
             deps.log("warn", `${slot.plan.id} exited (code=${code ?? "null"} signal=${signal ?? "none"})`);
             if (ranFor >= HEALTHY_RUN_MS)
                 slot.attempts = 0;

package/dist/lib/doctor/checks/work-context.js

@@ -8,6 +8,7 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { readDeviceConfig, } from "../../work-context/config.js";
 import { outboxStats, listOutboxOperations } from "../../work-context/outbox.js";
+import { outboxQuarantineStatusEnabled } from "../../work-context/outbox-quarantine-status-flag.js";
 import { workContextRoot, workContextSessionsDir } from "../../work-context/paths.js";
 import { countJsonlLines, deadLetterNonEmpty, } from "../../mesh/live/spool.js";
 import { workMeshDeadLetterPath, workMeshHeldPath, workMeshRoot, workMeshSpoolPath, } from "../../mesh/live/paths.js";
@@ -87,11 +88,14 @@ function runChecks(deps) {
         target: path.join(root, "outbox"),
         message: `Outbox queued depth=${stats.depth} (acked=${stats.acked}).`,
     });
+    const showQuarantineReason = stats.quarantined > 0 && outboxQuarantineStatusEnabled();
     results.push({
         status: stats.quarantined > 0 ? "WARN" : "PASS",
         checkId: "work-context.outbox-quarantined",
         target: path.join(root, "outbox"),
-        message: `Outbox quarantined count=${stats.quarantined}.`,
+        message: `Outbox quarantined count=${stats.quarantined}${showQuarantineReason
+            ? ` (last reason=${stats.lastQuarantineReason ?? "unknown"})`
+            : ""}.`,
     });
     // Default-company mode + migration capability (US-017B)
     try {

package/dist/lib/lanes/profile.js

@@ -10,6 +10,7 @@ import { createHash } from "node:crypto";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { parseUserYaml } from "../../utils/user-yaml-error.js";
+import { policyLoadDiagnostic } from "../policy-validator.js";
 import { WorkerResolutionError } from "./errors.js";
 import { PROVIDER_EFFORT_LEVELS } from "./effort.js";
 import { LANE_PROVIDERS, isLaneProvider, } from "./types.js";
@@ -261,6 +262,10 @@ function validatePolicyFrontmatter(id, profileDir, relative) {
         frontmatter.on.some((value) => typeof value !== "string" || value.trim().length === 0)) {
         throw new WorkerResolutionError("worker_policy_invalid", `Worker policy ${filePath} frontmatter must include a non-empty on string array`, { worker: id, file: filePath, field: "on" });
     }
+    const diagnostic = policyLoadDiagnostic(content, filePath);
+    if (diagnostic) {
+        throw new WorkerResolutionError("worker_policy_invalid", `Worker policy ${filePath} failed policy validation: ${diagnostic.split("\n", 1)[0]}`, { worker: id, file: filePath, field: "frontmatter", diagnostic });
+    }
 }
 function readSettings(id, dir) {
     const filePath = path.join(dir, PROFILE_SETTINGS);

package/dist/lib/mesh/live/daemon/doctor.d.ts

@@ -25,6 +25,8 @@ export interface DaemonDoctorReport {
     /** Events in any local queue still marked no-company / NEEDS_COMPANY / NONE. */
     unattributedEvents: UnattributedEventCounts;
     outboxDepth: number;
+    outboxQuarantined?: number;
+    outboxLastQuarantineReason?: string;
     lastFlushAt?: string;
     lastFlushResult?: DaemonStateFile["lastFlushResult"];
     unhealthy: boolean;

package/dist/lib/mesh/live/daemon/doctor.js

@@ -9,6 +9,7 @@ import { describeCognitoTokenSource, formatCognitoSubject, loadMachineCachedToke
 import { listOutboxOperations, outboxStats, } from "../../../work-context/outbox.js";
 import { readSessionState } from "../../../work-context/state.js";
 import { workContextRoot } from "../../../work-context/paths.js";
+import { outboxQuarantineStatusEnabled } from "../../../work-context/outbox-quarantine-status-flag.js";
 import { formatDroppedPresenceCompany } from "./credentials.js";
 import { countJsonlLines, countUnattributedEvents, } from "../spool.js";
 import { workMeshDeadLetterPath, workMeshHeldPath, workMeshRoot, workMeshSpoolPath, } from "../paths.js";
@@ -258,6 +259,12 @@ export function collectDaemonDoctor(deps = {}) {
         deadLetterCount,
         unattributedEvents,
         outboxDepth: outbox.depth,
+        ...(outbox.quarantined > 0 && outboxQuarantineStatusEnabled()
+            ? {
+                outboxQuarantined: outbox.quarantined,
+                outboxLastQuarantineReason: outbox.lastQuarantineReason ?? undefined,
+            }
+            : {}),
         lastFlushAt: state?.lastFlushAt,
         lastFlushResult: state?.lastFlushResult,
         unhealthy: unhealthyReasons.length > 0,
@@ -302,6 +309,9 @@ export function formatDaemonDoctor(report) {
         // receive-only (direct) mode.
         lines.push(`spool depth: ${report.spoolDepth}`, `held: ${report.heldCount}${report.heldCount > 0 ? " (needs_company; not sent as NONE)" : ""}`, `held with no local evidence: ${report.heldWithNoLocalEvidence}`, `outbox depth: ${report.outboxDepth}`);
     }
+    if (report.outboxQuarantined !== undefined) {
+        lines.push(`outbox quarantined: ${report.outboxQuarantined} (last reason=${report.outboxLastQuarantineReason ?? "unknown"})`);
+    }
     if (report.emitMode !== "legacy" && report.heldCount > 0) {
         lines.push(`held: ${report.heldCount} (needs_company; not sent as NONE)`);
     }

package/dist/lib/policy-validator.d.ts

@@ -1,2 +1,7 @@
+/**
+ * Load-time validation: reject policy files that cannot participate in the
+ * trigger system. Authoring-only hard-policy constraints remain in the hook.
+ */
+export declare function policyLoadDiagnostic(content: string, filePath: string): string | undefined;
 export declare function policyValidatorDiagnostic(content: string, filePath: string, env: NodeJS.ProcessEnv): string | undefined;
 //# sourceMappingURL=policy-validator.d.ts.map

package/dist/lib/policy-validator.js

@@ -80,13 +80,21 @@ function hasValidTriggerGrammar(expression) {
     skip();
     return valid && position === input.length;
 }
-export function policyValidatorDiagnostic(content, filePath, env) {
-    if (!isPolicyPath(filePath))
-        return undefined;
+const MISSING_TRIGGER_HELP = `Every policy under */policies/ must declare BOTH:
+  when: <expression>   # e.g.  always  |  git && push  |  deploy || share
+  on:   [<events>]     # any of PreToolUse, PostToolUse, UserPromptSubmit, AssistantIntent, SessionStart
+These drive just-in-time policy injection. See
+core/knowledge/public/hq-core/policies-spec.md ("Trigger Expressions").
+Add both fields to the frontmatter, then retry.
+${VALIDATION_NOTE}`;
+function inspectPolicyTriggerFrontmatter(content) {
     const normalized = normalizeValidatorText(content);
     const match = /^\s*---[ \t]*\n([\s\S]*?)\n---[ \t]*(\n|$)/.exec(normalized);
-    if (!match)
-        return `BLOCKED: policy file is missing required trigger frontmatter (missing: no-frontmatter).\n\nEvery policy under */policies/ must declare BOTH:\n  when: <expression>   # e.g.  always  |  git && push  |  deploy || share\n  on:   [<events>]     # any of PreToolUse, PostToolUse, UserPromptSubmit, AssistantIntent, SessionStart\nThese drive just-in-time policy injection. See\ncore/knowledge/public/hq-core/policies-spec.md ("Trigger Expressions").\nAdd both fields to the frontmatter, then retry.\n${VALIDATION_NOTE}`;
+    if (!match) {
+        return {
+            diagnostic: `BLOCKED: policy file is missing required trigger frontmatter (missing: no-frontmatter).\n\n${MISSING_TRIGGER_HELP}`,
+        };
+    }
     const frontmatter = match[1];
     const whenLines = [...frontmatter.matchAll(/^[ \t]*when:[ \t]*(.*)$/gm)].map((entry) => entry[1] ?? '');
     const hasWhen = whenLines.some((line) => /\S/.test(line));
@@ -96,8 +104,46 @@ export function policyValidatorDiagnostic(content, filePath, env) {
         missing.push('when');
     if (!onMatch)
         missing.push('on');
-    if (missing.length > 0)
-        return `BLOCKED: policy file is missing required trigger frontmatter (missing: ${missing.join(',')}).\n\nEvery policy under */policies/ must declare BOTH:\n  when: <expression>   # e.g.  always  |  git && push  |  deploy || share\n  on:   [<events>]     # any of PreToolUse, PostToolUse, UserPromptSubmit, AssistantIntent, SessionStart\nThese drive just-in-time policy injection. See\ncore/knowledge/public/hq-core/policies-spec.md ("Trigger Expressions").\nAdd both fields to the frontmatter, then retry.\n${VALIDATION_NOTE}`;
+    if (missing.length > 0) {
+        return {
+            diagnostic: `BLOCKED: policy file is missing required trigger frontmatter (missing: ${missing.join(',')}).\n\n${MISSING_TRIGGER_HELP}`,
+            whenLines,
+        };
+    }
+    return { parsed: { normalized, match, frontmatter, whenLines }, whenLines };
+}
+function malformedTriggerDiagnostic(whenLines) {
+    let malformedWhen;
+    for (const when of whenLines) {
+        if (!hasValidTriggerGrammar(when))
+            malformedWhen = when;
+    }
+    if (malformedWhen === undefined)
+        return undefined;
+    const when = malformedWhen;
+    return `BLOCKED: policy file has a malformed when: trigger expression:\n\n  when: ${when}\n\nThe canonical trigger evaluator rejected it. A space is NOT an AND, and quoted\nphrases are NOT tokens. Use explicit boolean operators instead:\n  "pull request"  -> (pull && request)\n  "force-push"    -> force-push\n\nUse only identifiers joined by the documented boolean grammar:\n  when: <identifier>                 # e.g.  always  |  git  |  /deep-plan\n  when: <expr> && <expr>             # AND\n  when: <expr> || <expr>             # OR\n  when: ! <expr>                     # NOT\n  when: ( <expr> )                   # grouping\nIdentifiers may contain letters, digits, _, ., /, and internal -. Quotes,\nYAML block scalars, adjacent identifiers without an operator, and other\npunctuation are not valid. See core/knowledge/public/hq-core/policies-spec.md\n("Trigger Expressions"). Fix the expression, then retry.\n${VALIDATION_NOTE}`;
+}
+/**
+ * Load-time validation: reject policy files that cannot participate in the
+ * trigger system. Authoring-only hard-policy constraints remain in the hook.
+ */
+export function policyLoadDiagnostic(content, filePath) {
+    if (!isPolicyPath(filePath))
+        return undefined;
+    // Partial frontmatter (for example `when:` without `on:`) still has its
+    // `when:` grammar checked, so a malformed expression is never loaded.
+    const { whenLines } = inspectPolicyTriggerFrontmatter(content);
+    if (!whenLines)
+        return undefined;
+    return malformedTriggerDiagnostic(whenLines);
+}
+export function policyValidatorDiagnostic(content, filePath, env) {
+    if (!isPolicyPath(filePath))
+        return undefined;
+    const inspected = inspectPolicyTriggerFrontmatter(content);
+    if (inspected.diagnostic)
+        return inspected.diagnostic;
+    const { normalized, match, frontmatter, whenLines } = inspected.parsed;
     const enforcement = /^[ \t]*enforcement:[ \t]*["']?([A-Za-z]+)["']?/m.exec(frontmatter)?.[1]?.toLowerCase();
     if (enforcement === 'hard') {
         const tautological = whenLines.some((line) => !/[&!]/.test(line.toLowerCase()) && /(^|[^A-Za-z0-9_./-])always([^A-Za-z0-9_./-]|$)/i.test(line));
@@ -105,7 +151,21 @@ export function policyValidatorDiagnostic(content, filePath, env) {
         const reactive = ['PreToolUse', 'PostToolUse', 'UserPromptSubmit', 'AssistantIntent'].filter((event) => onLine.includes(event));
         if (tautological && reactive.length > 0) {
             const events = reactive.join(', ');
-            return `BLOCKED: an enforcement: hard policy pairs an unconditional \`when:\` with a\nreactive event (${events}).\n\n\`when: always\` is TRUE for every command, prompt, and message. On a reactive\nevent the injector ranks that as an event-specific match, so it takes the\nsession cap slot of a policy that genuinely matched the thing you are doing —\nthe loose trigger crowds out the precise one.\n\nPick one:\n  when: always          + on: [SessionStart]        # ambient governance rule\n  when: <real signal>   + on: [PreToolUse, ...]     # e.g. deploy || publish\n\nName the word(s) that actually appear when the rule is relevant. See\ncore/knowledge/public/hq-core/policies-spec.md ("Trigger Expressions").\n${VALIDATION_NOTE}`;
+            return `BLOCKED: an enforcement: hard policy pairs an unconditional \`when:\` with a
+reactive event (${events}).
+
+\`when: always\` is TRUE for every command, prompt, and message. On a reactive
+event the injector ranks that as an event-specific match, so it takes the
+session cap slot of a policy that genuinely matched the thing you are doing —
+the loose trigger crowds out the precise one.
+
+Pick one:
+  when: always          + on: [SessionStart]        # ambient governance rule
+  when: <real signal>   + on: [PreToolUse, ...]     # e.g. deploy || publish
+
+Name the word(s) that actually appear when the rule is relevant. See
+core/knowledge/public/hq-core/policies-spec.md ("Trigger Expressions").
+${VALIDATION_NOTE}`;
         }
         const after = normalized.slice(match.index + match[0].length);
         const binding = [];
@@ -122,15 +182,6 @@ export function policyValidatorDiagnostic(content, filePath, env) {
             return `BLOCKED: enforcement: hard policy body is ${byteCount} bytes; the limit is ${rawMax}.\n\nA hard policy is injected VERBATIM into the session, so its length is a\nrecurring context cost for every session it fires in. Keep the binding rule\ntight and move the reasoning out of the injected span: everything from the\nfirst \`## Rationale\` / \`## Background\` / \`## Change history\` /\n\`## Examples\` / \`## References\` heading onward is NOT counted and NOT\ninjected, so long-form context belongs there.\n\nIf the rule genuinely needs more than that, either split it into separate\npolicies with distinct triggers, or raise HQ_POLICY_HARD_RULE_MAX_BYTES in\n.claude/settings.local.json "env".\n${VALIDATION_NOTE}`;
         }
     }
-    let malformedWhen;
-    for (const when of whenLines) {
-        if (!hasValidTriggerGrammar(when))
-            malformedWhen = when;
-    }
-    if (malformedWhen !== undefined) {
-        const when = malformedWhen;
-        return `BLOCKED: policy file has a malformed when: trigger expression:\n\n  when: ${when}\n\nThe canonical trigger evaluator rejected it. A space is NOT an AND, and quoted\nphrases are NOT tokens. Use explicit boolean operators instead:\n  "pull request"  -> (pull && request)\n  "force-push"    -> force-push\n\nUse only identifiers joined by the documented boolean grammar:\n  when: <identifier>                 # e.g.  always  |  git  |  /deep-plan\n  when: <expr> && <expr>             # AND\n  when: <expr> || <expr>             # OR\n  when: ! <expr>                     # NOT\n  when: ( <expr> )                   # grouping\nIdentifiers may contain letters, digits, _, ., /, and internal -. Quotes,\nYAML block scalars, adjacent identifiers without an operator, and other\npunctuation are not valid. See core/knowledge/public/hq-core/policies-spec.md\n("Trigger Expressions"). Fix the expression, then retry.\n${VALIDATION_NOTE}`;
-    }
-    return undefined;
+    return malformedTriggerDiagnostic(whenLines);
 }
 //# sourceMappingURL=policy-validator.js.map

package/dist/lib/work-context/outbox-quarantine-status-flag.d.ts

@@ -0,0 +1,4 @@
+export declare const OUTBOX_QUARANTINE_STATUS_FLAG = "agents.work-context-outbox-quarantine-status";
+export declare const OUTBOX_QUARANTINE_STATUS_FALLBACK = false;
+export declare function outboxQuarantineStatusEnabled(): boolean;
+//# sourceMappingURL=outbox-quarantine-status-flag.d.ts.map

package/dist/lib/work-context/outbox-quarantine-status-flag.js

@@ -0,0 +1,7 @@
+import { resolveProcessFlagGate } from "../flag-registry.js";
+export const OUTBOX_QUARANTINE_STATUS_FLAG = "agents.work-context-outbox-quarantine-status";
+export const OUTBOX_QUARANTINE_STATUS_FALLBACK = false;
+export function outboxQuarantineStatusEnabled() {
+    return resolveProcessFlagGate(OUTBOX_QUARANTINE_STATUS_FLAG, { fallback: OUTBOX_QUARANTINE_STATUS_FALLBACK }, () => OUTBOX_QUARANTINE_STATUS_FALLBACK);
+}
+//# sourceMappingURL=outbox-quarantine-status-flag.js.map

package/dist/lib/work-context/outbox.d.ts

@@ -118,6 +118,7 @@ export interface OutboxStats {
     quarantined: number;
     queued: number;
     acked: number;
+    lastQuarantineReason: string | null;
 }
 export declare function outboxStats(root: string): OutboxStats;
 export type DeliverFn = (op: OutboxOperation) => Promise<{

package/dist/lib/work-context/outbox.js

@@ -458,11 +458,17 @@ export function listOutboxOperations(root, deps = {}) {
 }
 export function outboxStats(root) {
     const ops = listOutboxOperations(root);
+    const quarantinedOps = ops.filter((o) => o.delivery === "quarantined");
+    const latestQuarantine = quarantinedOps.reduce((latest, op) => !latest || op.updatedAt > latest.updatedAt ||
+        (op.updatedAt === latest.updatedAt && op.operationId > latest.operationId)
+        ? op
+        : latest, null);
     return {
         depth: ops.filter((o) => o.delivery === "queued").length,
-        quarantined: ops.filter((o) => o.delivery === "quarantined").length,
+        quarantined: quarantinedOps.length,
         queued: ops.filter((o) => o.delivery === "queued").length,
         acked: ops.filter((o) => o.delivery === "acked").length,
+        lastQuarantineReason: latestQuarantine?.lastErrorCode ?? null,
     };
 }
 function isOutboxDue(op, nowIso) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigoai-us/hq-cli",
-  "version": "5.296.0",
+  "version": "5.298.0",
   "description": "HQ by Indigo management CLI — modules and cloud sync",
   "main": "dist/index.js",
   "bin": {