@indigoai-us/hq-cli 5.307.0 → 5.308.0

package/CHANGELOG.md

@@ -2,7 +2,8 @@
 
 ## [Unreleased]
 
-## [5.307.0] — 2026-10-01
+## [5.308.0] — 2026-10-01
+- Add native `hq core resolve-company` on the fast route behind the default-off `core-native-utilities` gate.
 
 - Stop immediately when hq-deploy repeats an app-list cursor while resolving apps.
 

package/assets/scaffold/core/scripts/resolve-company.sh

@@ -0,0 +1,199 @@
+#!/usr/bin/env bash
+# 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=""
+PROMPT=""
+HAVE_PROMPT=0
+
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --root) ROOT="${2:-}"; shift 2 || shift ;;
+    --prompt) PROMPT="${2:-}"; HAVE_PROMPT=1; shift 2 || shift ;;
+    --help|-h)
+      sed -n '2,14p' "${BASH_SOURCE[0]}" | sed 's/^# \{0,1\}//'
+      exit 0
+      ;;
+    *) shift ;;
+  esac
+done
+
+if [ "$HAVE_PROMPT" -eq 0 ] && [ ! -t 0 ]; then
+  PROMPT="$(cat 2>/dev/null || true)"
+fi
+: "${PROMPT:=}"
+
+emit() {
+  printf '{"company":"%s","source":"%s"}\n' "$1" "$2"
+  exit 0
+}
+
+if [ -z "$ROOT" ]; then
+  ROOT="${HQ_ROOT:-${CLAUDE_PROJECT_DIR:-$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && cd .. && pwd)}}"
+fi
+
+MANIFEST="$ROOT/companies/manifest.yaml"
+[ -f "$MANIFEST" ] || emit "" "none"
+
+SLUGS="$(
+  awk '
+    function keep(slug) {
+      return slug != "" && slug != "_template" && slug != "companies" && slug != "unaffiliated_repos"
+    }
+    /^companies:[[:space:]]*$/ { wrapped = 1; next }
+    wrapped && /^[^[:space:]][^:]*:[[:space:]]*$/ { wrapped = 0 }
+    wrapped && /^  [A-Za-z][A-Za-z0-9_-]*:/ {
+      line = $0; sub(/^[[:space:]]+/, "", line); sub(/:.*/, "", line)
+      if (keep(line)) print line
+      next
+    }
+    !wrapped && /^[A-Za-z][A-Za-z0-9_-]*:/ {
+      line = $0; sub(/:.*/, "", line)
+      if (keep(line)) print line
+    }
+  ' "$MANIFEST" | sort -u
+)"
+[ -n "$SLUGS" ] || emit "" "none"
+
+is_known_slug() {
+  printf '%s\n' "$SLUGS" | grep -Fxq "$1"
+}
+
+prompt_slug() {
+  local normalized="" match=""
+  [ -n "$PROMPT" ] || return 0
+  normalized="$(printf '%s' "$PROMPT" | tr '[:upper:]' '[:lower:]' | tr -c 'a-z0-9_-' ' ')"
+  match="$(
+    # Prompt normalization is case-insensitive, but company IDs are not.
+    # Keep a folded match only when exactly one registered ID has that key.
+    # If IDs differ only by case, do not guess which tenant the prompt means.
+    printf '%s\n' "$SLUGS" | awk -v line="$normalized" '
+      BEGIN {
+        n = split(line, tok, /[ \t]+/)
+        for (i = 1; i <= n; i++) if (tok[i] != "" && !(tok[i] in pos)) pos[tok[i]] = i
+        bestSlug = ""; bestLen = 0; bestPos = 0
+      }
+      {
+        slug = $0
+        key = tolower(slug)
+        if (key in pos) {
+          matches[key]++
+          candidate[key] = slug
+        }
+      }
+      END {
+        for (key in matches) {
+          if (matches[key] != 1) continue
+          slug = candidate[key]
+          len = length(slug); p = pos[key]
+          if (len > bestLen || (len == bestLen && p < bestPos)) {
+            bestSlug = slug; bestLen = len; bestPos = p
+          }
+        }
+        if (bestSlug != "") print bestSlug
+      }
+    '
+  )"
+  printf '%s' "$match"
+}
+
+MATCH="$(prompt_slug)"
+[ -n "$MATCH" ] && emit "$MATCH" "prompt"
+
+SESSION_CO=""
+if [ -x "$ROOT/core/scripts/hq-session.sh" ]; then
+  SESSION_CO="$(bash "$ROOT/core/scripts/hq-session.sh" get company_slug 2>/dev/null || true)"
+  SESSION_CO="$(printf '%s' "$SESSION_CO" | tr -d '[:space:]\"')"
+fi
+if [ -n "$SESSION_CO" ] && is_known_slug "$SESSION_CO"; then
+  emit "$SESSION_CO" "session"
+fi
+
+is_fleet_identity() {
+  [ -n "${HQ_AGENT_WORKDIR:-}" ] && return 0
+  [ -n "${HQ_AGENT_COMPANY_DIR:-}" ] && return 0
+  [ -n "${HQ_AGENT_IDENTITY_FILE:-}" ] && return 0
+  [ -f /etc/hq-agent/identity.json ] && return 0
+  [ -f /etc/hq-agent/machine-creds.json ] && return 0
+  agent_root="${HQ_AGENT_ROOT_PREFIX:-}"
+  if [ -n "$agent_root" ]; then
+    [ -f "${agent_root%/}/var/lib/hq-agent/identity.json" ] && return 0
+  else
+    [ -f /var/lib/hq-agent/identity.json ] && return 0
+  fi
+  [ -f /var/lib/hq-agent/machine-creds.json ] && return 0
+  return 1
+}
+
+run_with_timeout() {
+  command -v node >/dev/null 2>&1 || return 127
+  node -e '
+const { spawn } = require("child_process");
+const command = process.argv[1];
+if (!command) process.exit(127);
+const child = spawn(command, process.argv.slice(2), { detached: true, stdio: ["ignore", "pipe", "ignore"] });
+let finished = false;
+const finish = (status) => {
+  if (finished) return;
+  finished = true;
+  clearTimeout(timer);
+  try { process.kill(-child.pid, "SIGTERM"); } catch (_) {}
+  process.exit(status);
+};
+child.stdout.on("data", (chunk) => process.stdout.write(chunk));
+child.once("error", () => finish(127));
+child.once("exit", (code) => finish(typeof code === "number" ? code : 1));
+const timer = setTimeout(() => finish(124), 2000);
+' "$@"
+}
+
+if ! is_fleet_identity && command -v hq >/dev/null 2>&1 && command -v jq >/dev/null 2>&1; then
+  DEFAULT_JSON="$(run_with_timeout hq mesh context default get --json 2>/dev/null || true)"
+  DEFAULT_SLUG="$(printf '%s' "$DEFAULT_JSON" | jq -er '(.defaultCompany // .) as $default | if $default.enabled == true and ($default.source // "") != "disabled" and ($default.needsChoice // false) == false and ($default.slug | type == "string") then $default.slug else empty end' 2>/dev/null || true)"
+  DEFAULT_SLUG="$(printf '%s' "$DEFAULT_SLUG" | tr -d '[:space:]\"')"
+  if [ -n "$DEFAULT_SLUG" ] && is_known_slug "$DEFAULT_SLUG"; then
+    # A device default is only a local preference. Reconcile performs the
+    # token-backed active-membership check; never promote this fallback when
+    # that preflight is unavailable, times out, or returns a noncanonical row.
+    PREFLIGHT_SESSION_ID="resolve-default-$$-$RANDOM"
+    PREFLIGHT_OPERATION_ID="resolve-default-op-$$-$RANDOM"
+    PREFLIGHT_OBSERVATION="$(jq -cn \
+      --arg session_id "$PREFLIGHT_SESSION_ID" \
+      --arg operation_id "$PREFLIGHT_OPERATION_ID" \
+      --arg root "$ROOT" \
+      '{contractVersion:1,clientOperationId:$operation_id,identity:{sessionId:$session_id,harness:"hq-core",adapterVersion:"1"},cwd:$root,hqRoot:$root}')"
+    PREFLIGHT_STATUS=0
+    PREFLIGHT_RESULT="$(run_with_timeout hq mesh context reconcile --observation-json "$PREFLIGHT_OBSERVATION" --machine --offline 2>/dev/null)" || PREFLIGHT_STATUS=$?
+    VALIDATED_SLUG=""
+    if [ "$PREFLIGHT_STATUS" -eq 0 ]; then
+      VALIDATED_SLUG="$(printf '%s' "$PREFLIGHT_RESULT" | jq -er \
+        --arg slug "$DEFAULT_SLUG" \
+        --arg session_id "$PREFLIGHT_SESSION_ID" \
+        --arg operation_id "$PREFLIGHT_OPERATION_ID" '
+          if type == "object"
+            and .contractVersion == 1
+            and (.sessionId | type == "string") and .sessionId == $session_id
+            and (.clientOperationId | type == "string") and .clientOperationId == $operation_id
+            and (.kind == "queued" or .kind == "needs_project" or .kind == "needs_task" or .kind == "bound")
+            and (.classification == "needs_project" or .classification == "needs_task" or .classification == "bound")
+            and (.delivery == "queued" or .delivery == "acked")
+            and .lifecycle == "open"
+            and .companySlug == $slug
+            and (.companyUid | type == "string") and (.companyUid | length > 0)
+          then .companySlug else empty end
+        ' 2>/dev/null || true)"
+    fi
+    [ "$VALIDATED_SLUG" = "$DEFAULT_SLUG" ] && emit "$DEFAULT_SLUG" "device_default"
+  fi
+fi
+
+emit "" "none"

package/dist/command-catalog.generated.d.ts

@@ -5730,6 +5730,19 @@ export declare const COMMAND_CATALOG: readonly [{
             readonly options: readonly [];
             readonly subcommands: readonly [];
         }];
+    }, {
+        readonly name: "resolve-company";
+        readonly description: "Resolve the active company for skills and routing";
+        readonly aliases: readonly [];
+        readonly hidden: false;
+        readonly usage: "[args...]";
+        readonly arguments: readonly [{
+            readonly name: "args";
+            readonly required: false;
+            readonly variadic: true;
+        }];
+        readonly options: readonly [];
+        readonly subcommands: readonly [];
     }, {
         readonly name: "audit-log";
         readonly description: "Append, query, or summarize the HQ audit log";

package/dist/command-catalog.generated.js

@@ -7384,6 +7384,22 @@ export const COMMAND_CATALOG = [
                     }
                 ]
             },
+            {
+                "name": "resolve-company",
+                "description": "Resolve the active company for skills and routing",
+                "aliases": [],
+                "hidden": false,
+                "usage": "[args...]",
+                "arguments": [
+                    {
+                        "name": "args",
+                        "required": false,
+                        "variadic": true
+                    }
+                ],
+                "options": [],
+                "subcommands": []
+            },
             {
                 "name": "audit-log",
                 "description": "Append, query, or summarize the HQ audit log",

package/dist/commands/core-resolve-company-command.d.ts

@@ -0,0 +1,4 @@
+import type { Command } from "commander";
+/** Commander registration stays in the full graph; the native resolver is fast-path safe. */
+export declare function registerCoreResolveCompanyNativeCommand(core: Command): void;
+//# sourceMappingURL=core-resolve-company-command.d.ts.map

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

@@ -0,0 +1,42 @@
+import { resolveLiveRoot } from "../utils/hq-roots.js";
+import { runBundledScript } from "../utils/run-bundled-script.js";
+import { describeCoreCommand } from "./core-command-catalog.js";
+import { coreNativeUtilitiesEnabled } from "./core-native-utilities-flag.js";
+import { RESOLVE_COMPANY_ASSET, resolveCompany } from "./core-resolve-company-native.js";
+/** Commander registration stays in the full graph; the native resolver is fast-path safe. */
+export function registerCoreResolveCompanyNativeCommand(core) {
+    const command = core.command("resolve-company")
+        .description("Resolve the active company for skills and routing")
+        .allowUnknownOption()
+        .allowExcessArguments()
+        .helpOption(false)
+        .argument("[args...]")
+        .action(async (args = [], _options, cmd) => {
+        const operands = cmd.args.length > 0 ? cmd.args : args;
+        if (!await coreNativeUtilitiesEnabled()) {
+            const root = resolveLiveRoot({ hqRoot: core.opts().hqRoot });
+            const { code } = runBundledScript({
+                asset: RESOLVE_COMPANY_ASSET,
+                args: operands,
+                cwd: root,
+                hqRoot: root,
+            });
+            if (code !== 0)
+                process.exit(code);
+            return;
+        }
+        const root = resolveLiveRoot({ hqRoot: core.opts().hqRoot });
+        const result = await resolveCompany(operands, {
+            cwd: process.cwd(),
+            hqRoot: root,
+            stdinIsTty: process.stdin.isTTY === true,
+        });
+        process.stdout.write(result.stdout);
+        if (result.stderr.length)
+            process.stderr.write(result.stderr);
+        if (result.code !== 0)
+            process.exit(result.code);
+    });
+    describeCoreCommand(command, { execution: "native", asset: RESOLVE_COMPANY_ASSET, root: "live" });
+}
+//# sourceMappingURL=core-resolve-company-command.js.map

package/dist/commands/core-resolve-company-native.d.ts

@@ -0,0 +1,28 @@
+import * as fs from "node:fs";
+export declare const RESOLVE_COMPANY_ASSET = "core/scripts/resolve-company.sh";
+export declare const RESOLVE_COMPANY_HELP: string;
+export type ResolveCompanyResult = {
+    code: number;
+    stdout: Buffer;
+    stderr: Buffer;
+};
+type HqResult = {
+    code: number;
+    stdout: string;
+};
+type ResolveCompanyFs = Pick<typeof fs, "readFileSync" | "statSync" | "accessSync">;
+export type ResolveCompanyDependencies = {
+    cwd: string;
+    hqRoot?: string;
+    env?: NodeJS.ProcessEnv;
+    fs?: ResolveCompanyFs;
+    stdin?: string;
+    stdinIsTty?: boolean;
+    spawnHq?: (args: string[], env: NodeJS.ProcessEnv, timeoutMs: number, cwd?: string) => Promise<HqResult>;
+    pid?: number;
+    random?: () => number;
+};
+export declare function resolveCompany(args: readonly string[], dependencies: ResolveCompanyDependencies): Promise<ResolveCompanyResult>;
+export declare function runResolveCompanyFast(args: readonly string[], stdin: string, cwd: string, hqRoot: string | undefined, _commandName?: string, _hqRootArg?: string, stdinReader?: () => Promise<string>): Promise<number>;
+export {};
+//# sourceMappingURL=core-resolve-company-native.d.ts.map

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,6 +37,7 @@ 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";
@@ -218,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" },
@@ -365,6 +367,7 @@ export function registerCoreCommands(program) {
     registerCoreKnowledgePrefsCommand(core);
     registerCorePolicyCommand(core);
     registerCoreJobsNativeCommand(core);
+    registerCoreResolveCompanyNativeCommand(core);
     registerCoreAuditLogNative(core);
     registerCoreGitPackExtensionCheckNative(core);
     registerCorePinNative(core);

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/package.json

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