@indigoai-us/hq-cli 5.306.0 → 5.308.0

package/dist/commands/core-resolve-company-native.js

@@ -0,0 +1,408 @@
+/** Native port of resolve-company.sh. This module stays on the fast import path. */
+import { spawn } from "node:child_process";
+import * as fs from "node:fs";
+import * as path from "node:path";
+export const RESOLVE_COMPANY_ASSET = "core/scripts/resolve-company.sh";
+export const RESOLVE_COMPANY_HELP = [
+    "hq-core: public",
+    "resolve-company.sh — resolve the active company for skills and routing.",
+    "",
+    "Resolution order (first hit wins): explicit manifest slug in the prompt,",
+    "session company_slug, enabled device default, then none. Prompt matching is",
+    "whole-token only; free text never guesses a company.",
+    "",
+    "Output: {\"company\":\"<slug>\",\"source\":\"prompt|session|device_default|none\"}",
+    "Always exits 0 and never writes state.",
+    "",
+    "set -uo pipefail",
+    "",
+    "ROOT=\"\"",
+].join("\n") + "\n";
+const EMPTY_ENV = {};
+const keepSlug = (slug) => slug !== "" && slug !== "_template" && slug !== "companies" && slug !== "unaffiliated_repos";
+function errorCode(error) {
+    return error && typeof error === "object" && "code" in error && typeof error.code === "string"
+        ? error.code
+        : undefined;
+}
+function readFile(filePath, fileSystem) {
+    try {
+        return fileSystem.readFileSync(filePath, "utf8");
+    }
+    catch (error) {
+        const code = errorCode(error);
+        if (code === "ENOENT" || code === "ENOTDIR" || code === "EACCES" || code === "ELOOP")
+            return undefined;
+        throw error;
+    }
+}
+function readManifest(filePath, fileSystem) {
+    try {
+        return fileSystem.readFileSync(filePath, "utf8");
+    }
+    catch (error) {
+        const code = errorCode(error);
+        if (code === "EACCES") {
+            return {
+                code: 0,
+                stdout: Buffer.from('{"company":"","source":"none"}\n'),
+                stderr: Buffer.from("awk: fatal: cannot open file `" + filePath + "' for reading: Permission denied\n"),
+            };
+        }
+        if (code === "ENOENT" || code === "ENOTDIR" || code === "ELOOP")
+            return output("", "none");
+        throw error;
+    }
+}
+function isFile(filePath, fileSystem) {
+    try {
+        return fileSystem.statSync(filePath).isFile();
+    }
+    catch (error) {
+        const code = errorCode(error);
+        if (code === "ENOENT" || code === "ENOTDIR" || code === "EACCES" || code === "ELOOP")
+            return false;
+        throw error;
+    }
+}
+function parseManifestSlugs(text) {
+    const slugs = new Set();
+    let wrapped = false;
+    for (const rawLine of text.split("\n")) {
+        const line = rawLine.endsWith("\r") ? rawLine.slice(0, -1) : rawLine;
+        if (/^companies:[ \t]*$/.test(line)) {
+            wrapped = true;
+            continue;
+        }
+        if (wrapped && /^[^ \t][^:]*:[ \t]*$/.test(line))
+            wrapped = false;
+        if (wrapped) {
+            const match = line.match(/^ {2}([A-Za-z][A-Za-z0-9_-]*):/);
+            if (match && keepSlug(match[1]))
+                slugs.add(match[1]);
+            continue;
+        }
+        const match = line.match(/^([A-Za-z][A-Za-z0-9_-]*):/);
+        if (match && keepSlug(match[1]))
+            slugs.add(match[1]);
+    }
+    return [...slugs];
+}
+function promptSlug(prompt, slugs) {
+    if (!prompt)
+        return "";
+    const asciiLower = (value) => value.replace(/[A-Z]/g, (letter) => String.fromCharCode(letter.charCodeAt(0) + 32));
+    const normalized = asciiLower(prompt).replace(/[^a-z0-9_-]/g, " ");
+    const positions = new Map();
+    normalized.split(/[ \t]+/).forEach((token, index) => {
+        if (token && !positions.has(token))
+            positions.set(token, index + 1);
+    });
+    const matches = new Map();
+    for (const slug of slugs) {
+        const key = asciiLower(slug);
+        if (!positions.has(key))
+            continue;
+        matches.set(key, [...(matches.get(key) ?? []), slug]);
+    }
+    let bestSlug = "";
+    let bestLength = 0;
+    let bestPosition = 0;
+    for (const [key, candidates] of matches) {
+        if (candidates.length !== 1)
+            continue;
+        const slug = candidates[0];
+        const length = slug.length;
+        const position = positions.get(key);
+        if (length > bestLength || (length === bestLength && position < bestPosition)) {
+            bestSlug = slug;
+            bestLength = length;
+            bestPosition = position;
+        }
+    }
+    return bestSlug;
+}
+function validSessionId(value) {
+    return value !== "" && value !== "." && value !== ".." && /^[A-Za-z0-9._-]+$/.test(value);
+}
+function sessionId(root, env, fileSystem) {
+    for (const name of ["HQ_SESSION_ID", "CLAUDE_CODE_SESSION_ID", "CLAUDE_SESSION_ID", "CODEX_SESSION_ID", "CODEX_THREAD_ID", "GROK_SESSION_ID"]) {
+        const value = (env[name] ?? "").replace(/[ \t\n\v\f\r]/g, "");
+        if (validSessionId(value))
+            return value;
+    }
+    const current = readFile(path.join(root, "workspace/sessions/.current"), fileSystem)?.replace(/[ \t\n\v\f\r]/g, "") ?? "";
+    return validSessionId(current) ? current : "";
+}
+function sessionCompany(root, env, fileSystem) {
+    const helper = path.join(root, "core/scripts/hq-session.sh");
+    try {
+        fileSystem.accessSync(helper, fs.constants.X_OK);
+    }
+    catch (error) {
+        const code = errorCode(error);
+        if (code === "ENOENT" || code === "ENOTDIR" || code === "EACCES" || code === "ELOOP")
+            return "";
+        throw error;
+    }
+    // A directory may be executable according to access(2), but `bash directory`
+    // fails without output, just as hq-session.sh does here.
+    if (!isFile(helper, fileSystem))
+        return "";
+    const id = sessionId(root, env, fileSystem);
+    if (!id)
+        return "";
+    const meta = readFile(path.join(root, "workspace/sessions", id, "meta.yaml"), fileSystem);
+    if (meta === undefined)
+        return "";
+    let value = "";
+    for (const line of meta.split("\n")) {
+        const firstField = line.replace(/^[ \t]+/, "").split(/[ \t]+/, 1)[0];
+        if (firstField !== "company_slug:")
+            continue;
+        value = line.replace(/^[^:]+:[ \t]*/, "").replace(/^"|"$/g, "");
+        break;
+    }
+    // The shell's command substitution strips trailing newlines, then tr removes
+    // all remaining whitespace and double quotes from the helper's output.
+    return value.replace(/[ \t\n\v\f\r"]/g, "");
+}
+function fleetIdentityPresent(rootPrefix, env, fileSystem) {
+    if (env.HQ_AGENT_WORKDIR || env.HQ_AGENT_COMPANY_DIR || env.HQ_AGENT_IDENTITY_FILE)
+        return true;
+    const paths = [
+        "/etc/hq-agent/identity.json",
+        "/etc/hq-agent/machine-creds.json",
+        rootPrefix ? `${rootPrefix.replace(/\/$/, "")}/var/lib/hq-agent/identity.json` : "/var/lib/hq-agent/identity.json",
+        "/var/lib/hq-agent/machine-creds.json",
+    ];
+    return paths.some((filePath) => isFile(filePath, fileSystem));
+}
+function parseJson(text) {
+    try {
+        return JSON.parse(text);
+    }
+    catch {
+        return undefined;
+    }
+}
+function record(value) {
+    return value !== null && typeof value === "object" && !Array.isArray(value)
+        ? value
+        : undefined;
+}
+function normalizeShellValue(value) {
+    return value.replace(/[ \t\n\v\f\r"]/g, "");
+}
+function defaultSlugFromJson(text, knownSlugs) {
+    const root = record(parseJson(text));
+    if (!root)
+        return "";
+    const candidate = root.defaultCompany;
+    const preference = candidate === null || candidate === undefined || candidate === false
+        ? root
+        : record(candidate);
+    if (!preference)
+        return "";
+    if (preference.enabled !== true || (preference.source ?? "") === "disabled" || (preference.needsChoice ?? false) !== false)
+        return "";
+    if (typeof preference.slug !== "string")
+        return "";
+    const slug = normalizeShellValue(preference.slug);
+    return knownSlugs.has(slug) ? slug : "";
+}
+function validPreflight(text, slug, session, operation) {
+    const value = record(parseJson(text));
+    return Boolean(value && value.contractVersion === 1 && value.sessionId === session &&
+        value.clientOperationId === operation &&
+        typeof value.kind === "string" && ["queued", "needs_project", "needs_task", "bound"].includes(value.kind) &&
+        typeof value.classification === "string" && ["needs_project", "needs_task", "bound"].includes(value.classification) &&
+        typeof value.delivery === "string" && ["queued", "acked"].includes(value.delivery) && value.lifecycle === "open" &&
+        value.companySlug === slug &&
+        typeof value.companyUid === "string" && value.companyUid.length > 0);
+}
+function commandOnPath(name, env) {
+    const pathValue = env.PATH ?? "";
+    for (const directory of pathValue.split(path.delimiter)) {
+        const candidate = path.join(directory || ".", name);
+        try {
+            fs.accessSync(candidate, fs.constants.X_OK);
+            return true;
+        }
+        catch {
+            // `command -v` simply advances to the next PATH entry.
+        }
+    }
+    return false;
+}
+function runHq(args, env, timeoutMs, cwd) {
+    return new Promise((resolve) => {
+        let settled = false;
+        let stdout = "";
+        let child;
+        let timeoutKill;
+        let timedOut = false;
+        const signalGroup = (signal) => {
+            if (!child?.pid)
+                return;
+            try {
+                process.kill(-child.pid, signal);
+            }
+            catch (error) {
+                if (errorCode(error) !== "ESRCH")
+                    finish({ code: 1, stdout });
+            }
+        };
+        const finish = (result) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            if (timeoutKill)
+                clearTimeout(timeoutKill);
+            resolve(result);
+        };
+        const timer = setTimeout(() => {
+            timedOut = true;
+            if (child?.pid) {
+                signalGroup("SIGTERM");
+                // The shell wrapper returns shortly after its 2 second deadline. Do
+                // not wait for inherited stdio handles after killing the process group.
+                timeoutKill = setTimeout(() => {
+                    signalGroup("SIGKILL");
+                    finish({ code: 124, stdout });
+                }, 250);
+            }
+            else {
+                finish({ code: 124, stdout });
+            }
+        }, timeoutMs);
+        try {
+            child = spawn("hq", args, { cwd, detached: true, stdio: ["ignore", "pipe", "ignore"], env });
+        }
+        catch {
+            finish({ code: 127, stdout });
+            return;
+        }
+        child.stdout?.setEncoding("utf8");
+        child.stdout?.on("data", (chunk) => { stdout += chunk; });
+        child.once("error", () => finish({ code: 127, stdout }));
+        child.once("exit", (code, signal) => {
+            signalGroup("SIGTERM");
+            finish({ code: timedOut ? 124 : typeof code === "number" ? code : signal ? 128 : 1, stdout });
+        });
+    });
+}
+function output(company, source) {
+    return { code: 0, stdout: Buffer.from(`{"company":"${company}","source":"${source}"}\n`), stderr: Buffer.alloc(0) };
+}
+function parseArgs(args) {
+    let root = "";
+    let prompt = "";
+    let havePrompt = false;
+    for (let index = 0; index < args.length;) {
+        const arg = args[index];
+        if (arg === "--root") {
+            root = args[index + 1] ?? "";
+            index += Math.min(2, args.length - index);
+        }
+        else if (arg === "--prompt") {
+            prompt = args[index + 1] ?? "";
+            havePrompt = true;
+            index += Math.min(2, args.length - index);
+        }
+        else if (arg === "--help" || arg === "-h") {
+            return { root, prompt, havePrompt, help: true };
+        }
+        else {
+            index += 1;
+        }
+    }
+    return { root, prompt, havePrompt, help: false };
+}
+async function readStdin() {
+    const chunks = [];
+    for await (const chunk of process.stdin)
+        chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+    return Buffer.concat(chunks).toString("utf8");
+}
+export async function resolveCompany(args, dependencies) {
+    const env = dependencies.env ?? process.env;
+    const fileSystem = dependencies.fs ?? fs;
+    const parsed = parseArgs(args);
+    if (parsed.help)
+        return { code: 0, stdout: Buffer.from(RESOLVE_COMPANY_HELP), stderr: Buffer.alloc(0) };
+    let prompt = parsed.prompt;
+    if (!parsed.havePrompt && dependencies.stdinIsTty !== true) {
+        prompt = dependencies.stdin ?? await readStdin();
+    }
+    const root = parsed.root || dependencies.hqRoot || env.HQ_ROOT || env.CLAUDE_PROJECT_DIR || dependencies.cwd;
+    const manifest = path.join(root, "companies/manifest.yaml");
+    if (!isFile(manifest, fileSystem))
+        return output("", "none");
+    const manifestResult = readManifest(manifest, fileSystem);
+    if (typeof manifestResult !== "string")
+        return manifestResult;
+    const manifestText = manifestResult;
+    const slugs = parseManifestSlugs(manifestText);
+    if (slugs.length === 0)
+        return output("", "none");
+    const knownSlugs = new Set(slugs);
+    const promptMatch = promptSlug(prompt, slugs);
+    if (promptMatch)
+        return output(promptMatch, "prompt");
+    const sessionMatch = sessionCompany(root, env, fileSystem);
+    if (sessionMatch && knownSlugs.has(sessionMatch))
+        return output(sessionMatch, "session");
+    if (fleetIdentityPresent(env.HQ_AGENT_ROOT_PREFIX ?? "", env, fileSystem))
+        return output("", "none");
+    // jq is intentionally no longer needed. The native route is always hosted by
+    // Node; the old shell route required `node`, `hq`, and `jq` on PATH.
+    if (!commandOnPath("hq", env))
+        return output("", "none");
+    const hqEnv = { ...EMPTY_ENV, ...env };
+    if (dependencies.hqRoot) {
+        hqEnv.HQ_ROOT = dependencies.hqRoot;
+        hqEnv.CLAUDE_PROJECT_DIR = dependencies.hqRoot;
+    }
+    const invoke = dependencies.spawnHq ?? runHq;
+    const defaultResponse = await invoke(["mesh", "context", "default", "get", "--json"], hqEnv, 2_000, root);
+    const defaultSlug = defaultSlugFromJson(defaultResponse.stdout, knownSlugs);
+    if (!defaultSlug)
+        return output("", "none");
+    const pid = dependencies.pid ?? process.pid;
+    const random = dependencies.random ?? Math.random;
+    const session = `resolve-default-${pid}-${Math.floor(random() * 32768)}`;
+    const operation = `resolve-default-op-${pid}-${Math.floor(random() * 32768)}`;
+    const observation = JSON.stringify({
+        contractVersion: 1,
+        clientOperationId: operation,
+        identity: { sessionId: session, harness: "hq-core", adapterVersion: "1" },
+        cwd: root,
+        hqRoot: root,
+    }).replaceAll("\u007f", "\\u007f");
+    const preflight = await invoke([
+        "mesh", "context", "reconcile", "--observation-json", observation, "--machine", "--offline",
+    ], hqEnv, 2_000, root);
+    if (preflight.code === 0 && validPreflight(preflight.stdout, defaultSlug, session, operation)) {
+        return output(defaultSlug, "device_default");
+    }
+    return output("", "none");
+}
+export async function runResolveCompanyFast(args, stdin, cwd, hqRoot, _commandName, _hqRootArg, stdinReader = readStdin) {
+    const parsed = parseArgs(args);
+    const actualStdin = parsed.havePrompt || process.stdin.isTTY === true
+        ? stdin
+        : stdin || await stdinReader();
+    const result = await resolveCompany(args, {
+        cwd,
+        hqRoot,
+        stdin: actualStdin,
+        stdinIsTty: process.stdin.isTTY === true,
+    });
+    process.stdout.write(result.stdout);
+    if (result.stderr.length)
+        process.stderr.write(result.stderr);
+    return result.code;
+}
+//# sourceMappingURL=core-resolve-company-native.js.map

package/dist/commands/core.js

@@ -37,7 +37,12 @@ import { registerCoreOntologyCommand } from "./core-ontology.js";
 import { registerCoreKnowledgePrefsCommand } from "./core-knowledge-prefs.js";
 import { registerCorePolicyCommand } from "./core-policy.js";
 import { registerCoreJobsNativeCommand } from "./core-job-native.js";
+import { registerCoreResolveCompanyNativeCommand } from "./core-resolve-company-command.js";
 import { registerCoreCheckpointGateSettingCommand } from "./core-checkpoint-gate-setting.js";
+import { registerCoreAuditLogNative } from "./core-audit-log-native.js";
+import { registerCoreGitPackExtensionCheckNative } from "./core-git-pack-extension-check-native.js";
+import { registerCorePinNative } from "./core-pin-native.js";
+import { registerCoreRefreshVaultAccessNative } from "./core-refresh-vault-access-native.js";
 import { resolveLiveRoot } from "../utils/hq-roots.js";
 import { interpreterFor, runBundledScript } from "../utils/run-bundled-script.js";
 import { CompanyIndexUserError, renderIndexTarget } from "../lib/index-render/index.js";
@@ -214,6 +219,7 @@ export const SCAFFOLD_COMMANDS = [
  * direct `hq core` command.
  */
 export const SCAFFOLD_ONLY_ASSETS = [
+    { asset: "core/scripts/resolve-company.sh", root: "live", summary: "Rollback companion for native resolve-company" },
     { asset: "core/scripts/jobs-schedule-parse.sh", root: "live", summary: "Rollback companion for native jobs schedule-parse" },
     { asset: "core/scripts/jobs-validate.sh", root: "live", summary: "Rollback companion for native jobs validate" },
     { asset: "core/scripts/outpost-jobs-reconcile.sh", root: "live", summary: "Rollback companion for native jobs reconcile" },
@@ -271,6 +277,13 @@ export const SCAFFOLD_ONLY_ASSETS = [
     { asset: "core/scripts/handoff-post.sh", root: "live", summary: "Rollback shell for native handoff post" },
     { asset: "core/scripts/handoff-open-steps.sh", root: "live", summary: "Rollback shell for native handoff open-steps" },
     { asset: "core/scripts/qmd-reindex-bg.sh", root: "live", summary: "Rollback handoff reindex forwarder" },
+    // Wave 5 native utility rollback companions, sourced verbatim from staging
+    // because these assets were not present in the hq-cli bundle at launch.
+    { asset: "core/scripts/audit-log.sh", root: "live", summary: "Rollback shell for native audit-log" },
+    { asset: "core/scripts/git-pack-extension-check.sh", root: "cwd", summary: "Rollback shell for native git-pack-extension-check" },
+    { asset: "core/scripts/hq-pin.sh", root: "live", summary: "Rollback shell for native pin" },
+    { asset: "core/scripts/refresh-vault-access.sh", root: "cwd", summary: "Rollback shell for native refresh-vault-access" },
+    { asset: "core/scripts/lib/portable.sh", root: "live", summary: "Shared portable helpers sourced by the audit-log rollback shell" },
     ...NATIVE_UTILITY_COMMANDS.map(({ asset, root, summary }) => ({
         asset,
         root,
@@ -354,6 +367,11 @@ export function registerCoreCommands(program) {
     registerCoreKnowledgePrefsCommand(core);
     registerCorePolicyCommand(core);
     registerCoreJobsNativeCommand(core);
+    registerCoreResolveCompanyNativeCommand(core);
+    registerCoreAuditLogNative(core);
+    registerCoreGitPackExtensionCheckNative(core);
+    registerCorePinNative(core);
+    registerCoreRefreshVaultAccessNative(core);
     // Wave 2 handoff/worktree commands retain their byte-identical shell assets
     // as a default-off rollback path for one release. Keep the gate helper small
     // so sibling Wave 2 work can reuse it without editing this command table.

package/dist/commands/dm.js

@@ -407,7 +407,12 @@ async function runConnectionAction(action, identifier) {
         const token = await ensureCognitoToken();
         // Resolve the pairKey from the caller's pending requests when possible so
         // accept/decline/block work against a friendly email or personUid.
-        const requests = await fetchRequests(token).catch(() => []);
+        const requests = await fetchRequests(token).catch((err) => {
+            console.error("hq dm: pending connection request lookup failed", {
+                errorName: err instanceof Error ? err.name : typeof err,
+            });
+            return [];
+        });
         const matched = matchRequest(requests, identifier);
         const body = buildConnectionActionBody(identifier, matched);
         const res = await vaultApiFetch({

package/dist/commands/lanes.js

@@ -184,8 +184,12 @@ async function defaultDispatchOutpostExec(input) {
         throw new LanesError("outpost_dispatch_failed", `Outpost exec failed: ${dispatchErrorMessage(err)}`, { outpost_id: input.outpostId, message: dispatchErrorMessage(err) });
     }
 }
+// Pickup payloads are small; 30 seconds leaves room for normal network variance.
+const OUTPOST_PICKUP_PAYLOAD_TIMEOUT_MS = 30_000;
 async function defaultFetchText(url) {
-    const res = await fetch(url);
+    const res = await fetch(url, {
+        signal: AbortSignal.timeout(OUTPOST_PICKUP_PAYLOAD_TIMEOUT_MS),
+    });
     if (!res.ok) {
         throw new LanesError("outpost_payload_invalid", `Failed to download pickup payload: HTTP ${res.status}`, { status: res.status });
     }
@@ -1006,6 +1010,8 @@ const OUTPOST_HIRE_SUMMARY_TIMEOUT_SECONDS = 20;
 const OUTPOST_HIRE_SUMMARY_WAIT_MS = 15_000;
 const OUTPOST_SINGLE_LANE_WAIT_ENV = "HQ_LANES_OUTPOST_SINGLE_LANE_WAIT_MS";
 const OUTPOST_SINGLE_LANE_WAIT_MAX_MS = 600_000;
+const LEGACY_PICKUP_SETTLEMENT_MARGIN_MS = 60_000;
+const LEGACY_PICKUP_SETTLEMENT_MIN_AGE_MS = OUTPOST_SINGLE_LANE_WAIT_MAX_MS + LEGACY_PICKUP_SETTLEMENT_MARGIN_MS;
 function outpostSingleLaneWaitMs(env) {
     const raw = env[OUTPOST_SINGLE_LANE_WAIT_ENV]?.trim() || String(PICKUP_WAIT_MS);
     const value = /^\d+$/.test(raw) ? Number(raw) : Number.NaN;
@@ -1363,6 +1369,25 @@ async function refreshRemoteLaneMirrors(ctx, hqRoot, records, parentLaneIds, opt
                 !ownerIsHostedByOutpost ||
                 (owner.company?.uid ?? null) !== (mirror.company?.uid ?? null) ||
                 (owner.company?.slug ?? null) !== (mirror.company?.slug ?? null)) {
+                if (matches.length === 0 && isLegacyFailedDispatchWithoutPickupEvidence(mirror, nowMs)) {
+                    const settled = retryUpdateLane(hqRoot, mirror.lane_id, "reconcile", (current) => {
+                        if (!isLegacyFailedDispatchWithoutPickupEvidence(current, nowMs) ||
+                            current.host.id !== outpostId) {
+                            return current;
+                        }
+                        return {
+                            ...current,
+                            terminal_details: {
+                                ...(current.terminal_details ?? {}),
+                                pickup_persisted: false,
+                            },
+                        };
+                    });
+                    if (isUndispatchedOutpostMirror(settled)) {
+                        result.updated.set(mirror.lane_id, settled);
+                        continue;
+                    }
+                }
                 if (matches.length === 0)
                     result.missingOnOwner.set(mirror.lane_id, mirror);
                 const detail = matches.length === 0
@@ -2530,6 +2555,23 @@ export function isUndispatchedOutpostMirror(lane) {
         lane.terminal_details?.pickup_persisted === false &&
         lane.last_host_report_at == null;
 }
+function isLegacyFailedDispatchWithoutPickupEvidence(lane, nowMs) {
+    const terminalDetails = lane.terminal_details;
+    const updatedAtMs = Date.parse(lane.updated_at);
+    const completedFailure = (terminalDetails?.status === "Failed" ||
+        terminalDetails?.status === "Cancelled" ||
+        terminalDetails?.status === "TimedOut") &&
+        typeof terminalDetails.exit_code === "number" &&
+        Number.isSafeInteger(terminalDetails.exit_code);
+    return lane.host.kind === "outpost" &&
+        isTerminalLaneState(lane.state) &&
+        lane.terminal_reason === DISPATCH_TERMINAL_REASON &&
+        lane.last_host_report_at == null &&
+        lane.terminal_details?.pickup_persisted === undefined &&
+        completedFailure &&
+        Number.isFinite(updatedAtMs) &&
+        nowMs - updatedAtMs > LEGACY_PICKUP_SETTLEMENT_MIN_AGE_MS;
+}
 function parsePickupTerminalReason(value) {
     if (PICKUP_TERMINAL_REASONS.includes(value)) {
         return value;

package/dist/fast-scaffold.js

@@ -144,6 +144,18 @@ export const FAST_SCAFFOLD_SCRIPTS = [
         shellCwd: "caller",
         shellHqRoot: name === "reconcile" ? "reconcile-default" : "none",
     })),
+    {
+        name: "resolve-company",
+        kind: "native",
+        modulePath: "./commands/core-resolve-company-native.js",
+        exportName: "runResolveCompanyFast",
+        flagKey: "hq-core-native-fast-route",
+        familyFlagKey: "core-native-utilities",
+        asset: "core/scripts/resolve-company.sh",
+        root: "live",
+        shellCwd: "live",
+        shellHqRoot: "live",
+    },
     ...["resolve", "pickup", "repo", "secrets", "transfer"].map((name) => ({
         name: `delegate ${name}`,
         kind: "native",

package/dist/lib/agent-kit/fallback.d.ts

@@ -9,10 +9,7 @@
  */
 import type { ServiceHostPaths, ServiceSetResult } from "../service-manager/index.js";
 import type { AgentKitPaths } from "./paths.js";
-export declare const KIT_PID_NAME = "kit.pid";
-export declare const KIT_FALLBACK_LOG_NAME = "kit.log";
 export declare function kitPidPath(paths: Pick<AgentKitPaths, "agentDir">): string;
-export declare function kitFallbackLogPath(paths: Pick<AgentKitPaths, "logsDir">): string;
 /** True when an activation error means the service manager itself is unusable. */
 export declare function isServiceManagerUnavailable(error: string | undefined): boolean;
 /**
@@ -46,10 +43,6 @@ export interface DetachedSpawn {
         unref(): void;
     };
 }
-export declare function fallbackCommand(host: ServiceHostPaths): {
-    cmd: string;
-    args: string[];
-};
 /** crontab line that restarts the fallback supervisor after a reboot. */
 export declare function rebootCrontabLine(paths: Pick<AgentKitPaths, "agentDir" | "logsDir">, host: ServiceHostPaths): string;
 export declare function startFallback(paths: AgentKitPaths, host: ServiceHostPaths, deps?: {

package/dist/lib/agent-kit/fallback.js

@@ -12,12 +12,12 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import { kitServiceEnv } from "./services.js";
 import { writePrivateFile } from "./private-file.js";
-export const KIT_PID_NAME = "kit.pid";
-export const KIT_FALLBACK_LOG_NAME = "kit.log";
+const KIT_PID_NAME = "kit.pid";
+const KIT_FALLBACK_LOG_NAME = "kit.log";
 export function kitPidPath(paths) {
     return path.join(paths.agentDir, KIT_PID_NAME);
 }
-export function kitFallbackLogPath(paths) {
+function kitFallbackLogPath(paths) {
     return path.join(paths.logsDir, KIT_FALLBACK_LOG_NAME);
 }
 const UNAVAILABLE_PATTERNS = [
@@ -93,7 +93,7 @@ export function stopFallback(paths, kill = defaultKill) {
     fs.rmSync(kitPidPath(paths), { force: true });
     return { pid, killed };
 }
-export function fallbackCommand(host) {
+function fallbackCommand(host) {
     return { cmd: host.nodeBinary, args: [host.hqBinary, "agent", "kit", "run", "all"] };
 }
 /** crontab line that restarts the fallback supervisor after a reboot. */

package/dist/lib/agent-kit/inbox-state.d.ts

@@ -9,8 +9,6 @@
  * always drain exactly what it has not handled yet and never reply twice.
  */
 import type { AgentKitPaths } from "./paths.js";
-export declare const DONE_IDS_NAME = "done-ids.json";
-export declare const MAX_DONE_IDS = 5000;
 export interface MirroredInboxEntry {
     id: string;
     mirroredAt?: string;

package/dist/lib/agent-kit/inbox-state.js

@@ -11,8 +11,8 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { writePrivateFile } from "./private-file.js";
-export const DONE_IDS_NAME = "done-ids.json";
-export const MAX_DONE_IDS = 5000;
+const DONE_IDS_NAME = "done-ids.json";
+const MAX_DONE_IDS = 5000;
 const INBOX_JSONL = "inbox.jsonl";
 export function readDoneIds(paths) {
     try {

package/dist/lib/agent-kit/kit-config.d.ts

@@ -5,10 +5,6 @@
  * contract-shaped credential file and nothing else.
  */
 import { type AgentKitPaths, type KitComponent } from "./paths.js";
-export declare const DEFAULT_SYNC_INTERVAL_MS: number;
-export declare const DEFAULT_INBOX_POLL_MS = 15000;
-export declare const DEFAULT_HEARTBEAT_INTERVAL_MS = 60000;
-export declare const DEFAULT_MESH_REFRESH_MS: number;
 export interface KitConfig {
     /** Local HQ tree the company vault syncs into (companies/<slug>/ …). */
     hqRoot: string;
@@ -53,7 +49,6 @@ export interface KitConfig {
  * unhealthy, so reporting it either way would be a lie.
  */
 export declare function enabledKitComponents(config: Pick<KitConfig, "syncFiles">): readonly KitComponent[];
-export declare function defaultHqRoot(paths: Pick<AgentKitPaths, "agentDir">): string;
 export declare function defaultKitConfig(paths: Pick<AgentKitPaths, "agentDir">, cliVersion: string, now?: () => Date): KitConfig;
 export declare function writeKitConfig(paths: Pick<AgentKitPaths, "kitConfigPath">, config: KitConfig): void;
 /** Read kit.json, falling back to defaults for any missing/invalid field. */