@indigoai-us/hq-cli 5.109.7 → 5.109.10

package/CHANGELOG.md

@@ -2,6 +2,45 @@
 
 ## [Unreleased]
 
+## [5.109.10] — 2026-09-12
+
+### Fixed
+
+- A global reinstall that tears the install tree out mid-startup now recovers
+  even when the module that vanished is a RELATIVE sibling (for example
+  `@babel/runtime`'s `./typeof.js`, reached through the mqtt → worker-timers
+  chain). The torn-install classifier reduced a relative CJS specifier to the
+  package name `.`, producing a readiness probe that could never turn true — so
+  an affected command burned the entire 90-second settle budget, never re-ran on
+  the settled tree, and reported an error instead of recovering. Relative
+  specifiers are now re-resolved the way Node's CJS resolver does — from the
+  importer's directory, trying the file, its `.js`/`.json`/`.node` forms, and the
+  directory forms — so the command waits only as long as the reinstall actually
+  takes and then re-execs once on the healed tree. A genuinely missing sibling
+  still surfaces exactly one error naming the resolved path (Sentry HQ-CLI-1R).
+
+## [5.109.8] — 2026-09-11
+
+### Fixed
+
+- A background reinstall no longer turns into a crash report (HQ-CLI-1M,
+  HQ-CLI-1N). When another program reinstalls hq globally while a command is
+  running — the box's own update timer, the desktop app, or a second `hq` — it
+  renames hq's files aside and rewrites them file by file over a few seconds, and
+  a command already running can try to load a file that vanished in that window.
+  hq already knew to treat that as "your install was mid-update, not an hq bug"
+  and print a re-run/reinstall note instead of a crash, but it could only do so
+  while it could still find its own install directory on disk — which, in this
+  exact situation, it usually could not, because that directory is what just got
+  renamed away. That one blind spot silenced the recovery for two different crash
+  shapes: the ESM-loader `ENOENT` seen in production (HQ-CLI-1M) and a lazy
+  CommonJS `require('./sibling')` from a bundled dependency that resolves after
+  the tear (HQ-CLI-1N). hq now locates its own directory without reading the
+  disk, so the mid-update case is recognized for both: a registration-time tear
+  waits for the install to settle and re-runs once, and a tear anywhere else
+  prints the reinstall note. A genuine packaging fault in hq's own shipped files
+  (a miss under the install's own `dist/` or `assets/`) is still reported.
+
 ## [5.109.7] — 2026-09-10
 
 ### Fixed

package/dist/commands/agents.d.ts

@@ -37,6 +37,28 @@ export declare const VALID_PROVIDERS: Set<string>;
 export declare const VALID_AUTH_MODES: Set<string>;
 /** Customer-facing agent size keys served by hq-pro's authoritative catalog. */
 export declare const VALID_AGENT_SIZE_KEYS: Set<string>;
+/**
+ * `hq agents create` exits with this distinct status when payment is required.
+ * Scripts can distinguish the expected upgrade state from an ordinary command
+ * failure without parsing human output.
+ */
+export declare const AGENT_CREATE_PAYMENT_REQUIRED_EXIT_CODE = 3;
+export type AgentCreatePlanLimit = Readonly<{
+    requiredPlan: "agents-500";
+    amountMinor: number;
+    currency: string;
+    checkoutUrl?: string;
+}>;
+/**
+ * Decode only the priced response defined by the agent-create contract. A
+ * lookalike 403 must stay an ordinary API error rather than opening a browser
+ * or guessing at a price.
+ */
+export declare function agentCreatePlanLimitFromPayload(status: number, body: unknown): AgentCreatePlanLimit | null;
+/** Print a server-priced plan block without minting or rewriting its URL. */
+export declare function surfaceAgentCreatePlanLimit(planLimit: AgentCreatePlanLimit, opts?: {
+    json?: boolean;
+}): Promise<void>;
 /**
  * Resolve a closed-set option value, or exit(1) with a message naming the
  * offending input and the legal set.
@@ -82,7 +104,9 @@ export declare class AgentsHttpError extends Error {
     code?: string;
     /** hq-pro's billing envelope on a `402 billing_required` provision block. */
     billing?: BillingErrorPayload;
-    constructor(status: number, message: string, code?: string, billing?: BillingErrorPayload);
+    /** Strictly decoded priced `403 AGENT_PLAN_LIMIT` create response. */
+    agentCreatePlanLimit?: AgentCreatePlanLimit;
+    constructor(status: number, message: string, code?: string, billing?: BillingErrorPayload, agentCreatePlanLimit?: AgentCreatePlanLimit);
 }
 /** Roster row from `GET /v1/agents` — a superset is returned; we keep what we render. */
 export interface CompanyAgentView {
@@ -194,7 +218,7 @@ export declare function formatAgentCreateSize(option: AgentCreateSizeOption): st
 /** Ask a TTY user to choose one of hq-pro's currently selectable quotes. */
 export declare function promptForAgentCreateSize(view: AgentCreateOptionsView): Promise<QuotedAgentCreateSizeOption>;
 /** Confirm creation using the server quote, preserving $0 as a real answer. */
-export declare function confirmAgentCreateQuoteOrExit(option: QuotedAgentCreateSizeOption, yes?: boolean): void;
+export declare function confirmAgentCreateQuoteOrExit(option: QuotedAgentCreateSizeOption, yes?: boolean, quiet?: boolean): void;
 export declare function provisionAgent(token: string, input: ProvisionAgentInput): Promise<{
     uid?: string;
     slug?: string;

package/dist/commands/agents.js

@@ -25,6 +25,7 @@
  * the caller's single active membership (same as `members.ts`).
  */
 import chalk from "chalk";
+import open from "open";
 import { randomUUID } from "node:crypto";
 import * as readline from "node:readline";
 import { resolveVaultCredential } from "../utils/resolve-vault-credential.js";
@@ -50,6 +51,96 @@ export const VALID_PROVIDERS = new Set(["codex", "grok", "claude", "agents-v2"])
 export const VALID_AUTH_MODES = new Set(["subscription", "apiKey"]);
 /** Customer-facing agent size keys served by hq-pro's authoritative catalog. */
 export const VALID_AGENT_SIZE_KEYS = new Set(["basic", "power", "dev"]);
+/**
+ * `hq agents create` exits with this distinct status when payment is required.
+ * Scripts can distinguish the expected upgrade state from an ordinary command
+ * failure without parsing human output.
+ */
+export const AGENT_CREATE_PAYMENT_REQUIRED_EXIT_CODE = 3;
+function isCheckoutUrl(value) {
+    if (typeof value !== "string" || !value.trim())
+        return false;
+    try {
+        const url = new URL(value);
+        return url.protocol === "https:" && !url.username && !url.password;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Decode only the priced response defined by the agent-create contract. A
+ * lookalike 403 must stay an ordinary API error rather than opening a browser
+ * or guessing at a price.
+ */
+export function agentCreatePlanLimitFromPayload(status, body) {
+    if (status !== 403 || !body || typeof body !== "object")
+        return null;
+    const payload = body;
+    if (payload.code !== "AGENT_PLAN_LIMIT" ||
+        payload.reasonCode !== "plan_limit" ||
+        payload.requiredPlan !== "agents-500" ||
+        typeof payload.amountMinor !== "number" ||
+        !Number.isSafeInteger(payload.amountMinor) ||
+        payload.amountMinor < 0 ||
+        typeof payload.currency !== "string" ||
+        !/^[A-Za-z]{3}$/.test(payload.currency)) {
+        return null;
+    }
+    if (payload.checkoutUrl !== undefined && !isCheckoutUrl(payload.checkoutUrl)) {
+        return null;
+    }
+    return {
+        requiredPlan: "agents-500",
+        amountMinor: payload.amountMinor,
+        currency: payload.currency.toUpperCase(),
+        ...(typeof payload.checkoutUrl === "string"
+            ? { checkoutUrl: payload.checkoutUrl }
+            : {}),
+    };
+}
+function formatServerPrice(amountMinor, currency) {
+    return new Intl.NumberFormat("en-US", {
+        style: "currency",
+        currency,
+    }).format(amountMinor / 100);
+}
+function canOfferAgentCheckout(json) {
+    return json !== true &&
+        process.stdin.isTTY === true &&
+        process.stdout.isTTY === true &&
+        !process.env.CI;
+}
+async function offerAgentCheckout(url) {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    try {
+        const answer = await new Promise((resolve) => rl.question("Open the payment page now? [y/N] ", resolve));
+        if (!/^y(?:es)?$/i.test(answer.trim()))
+            return;
+    }
+    finally {
+        rl.close();
+    }
+    try {
+        await open(url);
+    }
+    catch {
+        console.error("Could not open the payment page automatically. Use the URL above.");
+    }
+}
+/** Print a server-priced plan block without minting or rewriting its URL. */
+export async function surfaceAgentCreatePlanLimit(planLimit, opts = {}) {
+    const price = `${formatServerPrice(planLimit.amountMinor, planLimit.currency)}/month`;
+    console.error(`Payment required: your plan does not include agents. Upgrade to ${planLimit.requiredPlan} costs ${price}.`);
+    if (!planLimit.checkoutUrl) {
+        console.error("Ask a company owner to upgrade before creating an agent.");
+        return;
+    }
+    // Deliberately plain and on its own line so terminals make this clickable.
+    console.log(planLimit.checkoutUrl);
+    if (canOfferAgentCheckout(opts.json))
+        await offerAgentCheckout(planLimit.checkoutUrl);
+}
 /**
  * Resolve a closed-set option value, or exit(1) with a message naming the
  * offending input and the legal set.
@@ -112,12 +203,15 @@ export class AgentsHttpError extends Error {
     code;
     /** hq-pro's billing envelope on a `402 billing_required` provision block. */
     billing;
-    constructor(status, message, code, billing) {
+    /** Strictly decoded priced `403 AGENT_PLAN_LIMIT` create response. */
+    agentCreatePlanLimit;
+    constructor(status, message, code, billing, agentCreatePlanLimit) {
         super(message);
         this.name = "AgentsHttpError";
         this.status = status;
         this.code = code;
         this.billing = billing;
+        this.agentCreatePlanLimit = agentCreatePlanLimit;
     }
 }
 /**
@@ -134,7 +228,7 @@ export async function agentsRequest(opts) {
         // decline copy ("Your card was declined…") while `error` is the generic
         // "payment required" — error-first would feed surfaceBillingBlocked the
         // generic string and lose the decline reason (mirrors outpostRequest).
-        body.message ?? body.error ?? res.statusText, body.code, parseBillingPayload(body));
+        body.message ?? body.error ?? res.statusText, body.code, parseBillingPayload(body), agentCreatePlanLimitFromPayload(res.status, body) ?? undefined);
     }
     return (await res.json());
 }
@@ -242,7 +336,7 @@ export async function promptForAgentCreateSize(view) {
     }
 }
 /** Confirm creation using the server quote, preserving $0 as a real answer. */
-export function confirmAgentCreateQuoteOrExit(option, yes) {
+export function confirmAgentCreateQuoteOrExit(option, yes, quiet = false) {
     if (option.notBilled || option.netMonthlyCents === 0) {
         const message = `${option.productName} is ${formatUsd(0)}/month for this company — ` +
             "there is no per-agent charge.";
@@ -250,14 +344,26 @@ export function confirmAgentCreateQuoteOrExit(option, yes) {
             console.error(chalk.yellow(`${message}\nRe-run with --yes to confirm agent provisioning.`));
             process.exit(1);
         }
-        console.log(chalk.dim(`${message} Provisioning…`));
+        if (!quiet) {
+            console.log(chalk.dim(`${message} Provisioning…`));
+        }
         return;
     }
-    confirmChargeOrExit({
-        resource: "agent",
-        unitCents: option.netMonthlyCents,
-        yes,
-    });
+    if (!quiet) {
+        confirmChargeOrExit({
+            resource: "agent",
+            unitCents: option.netMonthlyCents,
+            yes,
+        });
+        return;
+    }
+    if (!yes) {
+        confirmChargeOrExit({
+            resource: "agent",
+            unitCents: option.netMonthlyCents,
+            yes,
+        });
+    }
 }
 export async function provisionAgent(token, input) {
     return agentsRequest({
@@ -764,7 +870,7 @@ export function registerAgentsCommand(program) {
     });
     agents
         .command("provision <name>")
-        .alias("new")
+        .aliases(["new", "create"])
         .description("Provision a new cloud agent (company-specific monthly price shown before creation)")
         .option("--company <slug>", "Company slug (resolves to companyUid)")
         .option("--slug <slug>", "Agent slug (defaults to a slug of <name>)")
@@ -775,6 +881,7 @@ export function registerAgentsCommand(program) {
         .option("--description <text>", "Short description / bio")
         .option("--size <size>", "Agent box size: basic | power | dev (omitted keeps the current default)")
         .option("--yes", "Confirm the quoted monthly cost and provision the agent")
+        .option("--json", "Emit machine-readable output and never open a browser")
         .action(async function (name, opts) {
         try {
             // Both of these previously fell back to their default on an
@@ -818,12 +925,12 @@ export function registerAgentsCommand(program) {
                 : shouldChooseInteractively
                     ? await promptForAgentCreateSize(createOptions)
                     : requireDefaultAgentCreateSize(createOptions);
-            if (!shouldChooseInteractively) {
+            if (!shouldChooseInteractively && !opts.json) {
                 console.log(chalk.dim(formatAgentCreateSize(quotedSize)));
             }
             // Every path confirms hq-pro's company-specific quote. Omission still
             // leaves the POST size implicit, preserving the server-side default.
-            confirmAgentCreateQuoteOrExit(quotedSize, opts.yes);
+            confirmAgentCreateQuoteOrExit(quotedSize, opts.yes, opts.json);
             const slug = opts.slug ?? slugifyAgentName(name);
             try {
                 const result = await provisionAgent(token, {
@@ -849,10 +956,28 @@ export function registerAgentsCommand(program) {
                     surface: CLI_AGENT_CREATE_SURFACE,
                 });
                 const uid = typeof result.uid === "string" ? result.uid : slug;
-                console.log(chalk.green(`Provisioning started for agent "${name}".`));
-                console.log(chalk.dim(`Track setup: hq agents status ${uid} --company <slug>`));
+                if (opts.json) {
+                    console.log(JSON.stringify(result));
+                }
+                else {
+                    console.log(chalk.green(`Provisioning started for agent "${name}".`));
+                    console.log(chalk.dim(`Track setup: hq agents status ${uid} --company <slug>`));
+                }
             }
             catch (err) {
+                if (err instanceof AgentsHttpError &&
+                    err.status === 403 &&
+                    err.code === "AGENT_PLAN_LIMIT") {
+                    if (!err.agentCreatePlanLimit) {
+                        throw new Error("HQ Pro returned an unrecognized agent payment-required response.");
+                    }
+                    await surfaceAgentCreatePlanLimit(err.agentCreatePlanLimit, opts);
+                    // Keep the payment-required status through normal CLI teardown.
+                    // Unlike process.exit(), this is testable and cannot be caught by
+                    // this action's outer error boundary as a generic failure.
+                    process.exitCode = AGENT_CREATE_PAYMENT_REQUIRED_EXIT_CODE;
+                    return;
+                }
                 // No card on file → surface the shareable payment link instead of an
                 // opaque 402, then exit non-zero so scripts can react.
                 if (err instanceof AgentsHttpError &&

package/dist/lib/workers-registry/index.js

@@ -124,6 +124,32 @@ function registryText(now, entries) {
 function withoutTimestamp(content) {
     return content.split('\n').filter((line) => !line.startsWith('generated_at:')).join('\n');
 }
+/**
+ * Worker roots hold two kinds of `worker.yaml` that must never reach the
+ * registry.
+ *
+ * The `_template` company and any `_overrides` directory are scaffolding —
+ * copies kept so a new tenant or a pack override can be stamped out from them.
+ *
+ * A checkout nested under a tenant's `repos/` is a source repository that tenant
+ * happens to keep inside HQ, and when that repository is HQ itself, its own
+ * `core/workers` and template trees are full of worker.yaml files. Indexing them
+ * treats product source as deployed workers: they claim ids real workers already
+ * own, and because duplicates resolve by path order — a tenant path sorts before
+ * both `core` and `personal` — the checkout wins. The operator's actual worker
+ * then silently vanishes from the registry every skill reads.
+ */
+function isExcludedWorkerPath(relativeFile) {
+    const normalized = relativeFile.replaceAll('\\', '/');
+    const [root, tenant, nested] = normalized.split('/');
+    if (root !== 'companies')
+        return /(?:^|\/)_overrides(?:\/|$)/.test(normalized);
+    if (tenant === '_template')
+        return true;
+    if (nested === 'repos')
+        return true;
+    return /(?:^|\/)_overrides(?:\/|$)/.test(normalized);
+}
 /**
  * Generate core/workers/registry.yaml from worker.yaml files. Invalid workers
  * are quarantined but do not prevent all valid workers from being registered.
@@ -138,7 +164,7 @@ export function generateWorkersRegistry(hqRoot, options = {}) {
         ...workerYamlFiles(hqRoot, 'personal/workers'),
     ].sort();
     for (const relativeFile of files) {
-        if (relativeFile.startsWith('companies/_template/') || /(?:^|[/\\])_overrides(?:[/\\]|$)/.test(relativeFile))
+        if (isExcludedWorkerPath(relativeFile))
             continue;
         const fields = readWorkerFields(path.join(hqRoot, relativeFile));
         const missing = ['id', 'type', 'description'].filter((key) => !fields[key]);

package/dist/startup-registration.d.ts

@@ -48,6 +48,8 @@ export interface RegisterRecoveryDeps {
     resolveInstall?: () => {
         packageRoot: string | null;
     };
+    /** Filesystem-free fallback root for the torn window (defaults to stringDerivedPackageRoot). */
+    deriveInstallRoot?: () => string | null;
     lockPath?: () => string;
     waitForSettled?: (args: WaitForInstallTreeSettledArgs) => Promise<WaitForInstallTreeSettledResult>;
     /** node flags to forward to the re-exec child (defaults to process.execArgv). */

package/dist/startup-registration.js

@@ -18,6 +18,7 @@
  */
 import { spawnSync } from "node:child_process";
 import { resolveRunningInstall } from "./utils/version-gate.js";
+import { stringDerivedPackageRoot } from "./utils/hq-roots.js";
 import { updateLockPath } from "./utils/update-lock.js";
 import { classifyModuleNotFound, InstallTreeTornError, waitForInstallTreeSettled, } from "./utils/install-tree-torn.js";
 /**
@@ -122,13 +123,23 @@ export async function registerCommandsWithRecovery(args) {
         return { reexecStatus: child.status ?? 1 };
     }
 }
-/** Resolve the running install's package dir, tolerating any resolver failure. */
+/**
+ * Resolve the running install's package dir for the settle wait's manifest-health
+ * and retired-sibling guards. The on-disk resolver returns null in exactly the
+ * window this recovery targets — the package directory has been renamed aside, so
+ * it cannot be found by reading disk — which would leave readiness keyed on the
+ * single missing file alone and let a premature re-exec run against a still-
+ * incomplete tree. Fall back to the filesystem-free derived root so those guards
+ * stay active while npm is mid-extraction. Tolerates any resolver failure.
+ */
 function resolvePackageRoot(deps) {
+    let root;
     try {
-        return (deps.resolveInstall ?? resolveRunningInstall)().packageRoot;
+        root = (deps.resolveInstall ?? resolveRunningInstall)().packageRoot;
     }
     catch {
-        return null;
+        root = null;
     }
+    return root ?? (deps.deriveInstallRoot ?? stringDerivedPackageRoot)();
 }
 //# sourceMappingURL=startup-registration.js.map

package/dist/utils/hq-roots.d.ts

@@ -61,6 +61,31 @@ export declare function createPackageRootResolver(options: PackageRootResolverOp
 export declare function packageRoot(): string;
 /** Reset the memoized package root. Tests only. */
 export declare function __resetPackageRootCache(): void;
+/**
+ * Derive this package's installed root from the running module's OWN path using
+ * STRING operations only — no `readFileSync`, `realpathSync`, or `existsSync`.
+ *
+ * {@link packageRoot} must read `<dir>/package.json` and `realpathSync` the
+ * module directory to answer, so it THROWS in exactly the situation that most
+ * needs an answer: a concurrent global install has renamed the installed
+ * package directory aside (`.hq-cli-<rand>`) and is re-extracting it file by
+ * file, so both the manifest walk and the dist-owner fallback fail on a
+ * directory that is momentarily gone. This walks the compiled module's
+ * ancestors as strings and returns the DEEPEST one whose trailing segments are
+ * `node_modules/@indigoai-us/hq-cli`, which stays correct while that directory
+ * does not exist on disk.
+ *
+ * It is a FALLBACK only — {@link packageRoot} validates the manifest name and
+ * is authoritative whenever it succeeds. Returns null for a dev checkout or any
+ * layout without that segment triple, so a caller that falls back to it can
+ * only ever degrade to today's behaviour (no resolution), never widen it.
+ *
+ * The deepest match is deliberate: a nested `node_modules/@indigoai-us/hq-cli`
+ * inside another package resolves to ITSELF (the copy the module belongs to),
+ * never an outer decoy. Case is folded only for a Windows-shaped path, matching
+ * the POSIX case-sensitivity the rest of this module assumes.
+ */
+export declare function stringDerivedPackageRoot(moduleFilePath?: string): string | null;
 export type LiveRootOptions = {
     /** Explicit `--hq-root` value. Highest precedence. */
     hqRoot?: string;

package/dist/utils/hq-roots.js

@@ -191,6 +191,73 @@ export function __resetPackageRootCache() {
         modulePath: currentModulePath,
     });
 }
+/**
+ * The trailing path segments that mark an installed copy of this package:
+ * `node_modules` followed by the package name's own segments (for
+ * `@indigoai-us/hq-cli`, that is `node_modules/@indigoai-us/hq-cli`).
+ */
+const INSTALLED_ROOT_SEGMENTS = ["node_modules", ...CLI_PACKAGE_NAME.split("/")];
+/** A Windows-shaped absolute path (drive letter or UNC), regardless of host OS. */
+function looksWin32Path(p) {
+    return /^[a-zA-Z]:[\\/]/.test(p) || /^\\\\/.test(p);
+}
+/**
+ * Derive this package's installed root from the running module's OWN path using
+ * STRING operations only — no `readFileSync`, `realpathSync`, or `existsSync`.
+ *
+ * {@link packageRoot} must read `<dir>/package.json` and `realpathSync` the
+ * module directory to answer, so it THROWS in exactly the situation that most
+ * needs an answer: a concurrent global install has renamed the installed
+ * package directory aside (`.hq-cli-<rand>`) and is re-extracting it file by
+ * file, so both the manifest walk and the dist-owner fallback fail on a
+ * directory that is momentarily gone. This walks the compiled module's
+ * ancestors as strings and returns the DEEPEST one whose trailing segments are
+ * `node_modules/@indigoai-us/hq-cli`, which stays correct while that directory
+ * does not exist on disk.
+ *
+ * It is a FALLBACK only — {@link packageRoot} validates the manifest name and
+ * is authoritative whenever it succeeds. Returns null for a dev checkout or any
+ * layout without that segment triple, so a caller that falls back to it can
+ * only ever degrade to today's behaviour (no resolution), never widen it.
+ *
+ * The deepest match is deliberate: a nested `node_modules/@indigoai-us/hq-cli`
+ * inside another package resolves to ITSELF (the copy the module belongs to),
+ * never an outer decoy. Case is folded only for a Windows-shaped path, matching
+ * the POSIX case-sensitivity the rest of this module assumes.
+ */
+export function stringDerivedPackageRoot(moduleFilePath = currentModulePath) {
+    if (typeof moduleFilePath !== "string" || moduleFilePath.length === 0) {
+        return null;
+    }
+    const wanted = INSTALLED_ROOT_SEGMENTS;
+    const caseInsensitive = looksWin32Path(moduleFilePath);
+    const sameSegment = (a, b) => caseInsensitive ? a.toLowerCase() === b.toLowerCase() : a === b;
+    // Tokenise into segments with each one's end offset in the ORIGINAL string,
+    // so the returned root keeps the source path's leading root and separators
+    // verbatim (a leading `/`, or a `C:\` drive) rather than a rejoined guess.
+    const segments = [];
+    const segmentPattern = /[^\\/]+/g;
+    let match;
+    while ((match = segmentPattern.exec(moduleFilePath)) !== null) {
+        segments.push({ text: match[0], end: match.index + match[0].length });
+    }
+    if (segments.length < wanted.length)
+        return null;
+    // Scan from the deepest segment upward; the first (deepest) leaf whose
+    // preceding segments complete the triple wins.
+    for (let leaf = segments.length - 1; leaf >= wanted.length - 1; leaf--) {
+        let matched = true;
+        for (let k = 0; k < wanted.length; k++) {
+            if (!sameSegment(segments[leaf - (wanted.length - 1) + k].text, wanted[k])) {
+                matched = false;
+                break;
+            }
+        }
+        if (matched)
+            return moduleFilePath.slice(0, segments[leaf].end);
+    }
+    return null;
+}
 /**
  * Resolve the user's live HQ installation.
  *

package/dist/utils/incomplete-install-error.d.ts

@@ -10,6 +10,8 @@ import * as fs from "fs";
 export declare const INCOMPLETE_INSTALL_REMEDY: string;
 /** A resolver for the running install's root; returns null instead of throwing. */
 export type PackageRootResolver = () => string | null;
+/** Which strategy produced the running install's root, recorded in diagnostics. */
+export type PackageRootResolverSource = "manifest-walk" | "string-derivation" | "unresolved" | "injected";
 /**
  * If `err` is an in-process incomplete-install module-load failure — either the
  * CJS relative-sibling shape (HQ-CLI-1N) or the ESM vanished-file shape
@@ -24,9 +26,21 @@ export type PackageRootResolver = () => string | null;
 export declare function incompleteInstallMessage(err: unknown, resolvePackageRoot?: PackageRootResolver, fileSystem?: Pick<typeof fs, "readFileSync">): string | null;
 /** Bounded, scrubber-safe diagnostics for an unattributable esm-loader ENOENT (HQ-CLI-1M). */
 export type IncompleteInstallEsmDiagnostics = {
+    /** The resolved install root, or the literal `<unresolved>` when none was found. */
     packageRoot: string;
-    packageJsonExists: boolean;
-    nodeModulesExists: boolean;
+    /** True only when a root was actually resolved (by any strategy). */
+    packageRootResolved: boolean;
+    /** Which resolver answered — so an unresolved root is never read as resolved-but-missing. */
+    resolver: PackageRootResolverSource;
+    /**
+     * Whether `<root>/package.json` and `<root>/node_modules` exist on disk.
+     * Present ONLY when a root was resolved: reported for an unresolved root,
+     * a bare `false` is indistinguishable from "resolved but the file is missing"
+     * — the ambiguity that made the delivered HQ-CLI-1M evidence weaker than
+     * intended (the two booleans were uninitialised defaults).
+     */
+    packageJsonExists?: boolean;
+    nodeModulesExists?: boolean;
     esmLoaderFrame: boolean;
     code: string;
 };
@@ -42,21 +56,44 @@ export type IncompleteInstallBareDiagnostics = {
     requiringPackage: string;
     requirerDeclaresMissing: false;
 };
+/** The four lexical scopes a NOT-suppressed CJS relative requirer can fall into. */
+export type RelativeRequirerScope = "dist" | "assets" | "outside-root" | "unresolved-root";
 /**
- * Both enriched shapes as a single OPEN record — every field optional so a
- * consumer can forward either shape to Sentry without narrowing (the boundary
- * and beforeSend only pass the block through). Every value CONSTRUCTED here is
- * exactly one of the two strict shapes above; the looseness is only at the read
+ * Bounded, scrubber-safe diagnostics for a NOT-suppressed CJS RELATIVE-specifier
+ * miss (HQ-CLI-1N): the CJS relative-sibling shape that reached the capture path
+ * WITHOUT being suppressed — its requirer sits under the install's own `dist/` or
+ * `assets/`, outside the running install entirely, or the install root could not
+ * be resolved. Records only a bounded, four-value LEXICAL scope of the requirer
+ * against the root — never the requirer path and never the specifier — so
+ * grouping cardinality cannot inflate. `code` is always `MODULE_NOT_FOUND`.
+ */
+export type IncompleteInstallRelativeDiagnostics = {
+    code: string;
+    relativeSpecifier: true;
+    packageRoot: string;
+    packageRootResolved: boolean;
+    resolver: PackageRootResolverSource;
+    requirerScope: RelativeRequirerScope;
+};
+/**
+ * The enriched shapes as a single OPEN record — every field optional so a
+ * consumer can forward any shape to Sentry without narrowing (the boundary and
+ * beforeSend only pass the block through). Every value CONSTRUCTED here is
+ * exactly one of the strict shapes above; the looseness is only at the read
  * boundary.
  */
-export type IncompleteInstallDiagnostics = Partial<IncompleteInstallEsmDiagnostics & IncompleteInstallBareDiagnostics>;
+export type IncompleteInstallDiagnostics = Partial<IncompleteInstallEsmDiagnostics & IncompleteInstallBareDiagnostics & IncompleteInstallRelativeDiagnostics>;
 /**
  * When an incomplete-install failure reaches the capture path WITHOUT being
  * suppressed, return a bounded `contexts.incomplete_install` block so the next
  * occurrence carries the evidence this one lacked; otherwise return undefined
- * (bare capture). Two enriched shapes:
+ * (bare capture). Three enriched shapes:
  *   - a third-party BARE-specifier miss the requirer did not declare (HQ-CLI-1Q)
  *     → { missingPackage, requiringPackage, requirerDeclaresMissing:false };
+ *   - a CJS RELATIVE-specifier miss whose requirer sits under the install's own
+ *     dist/ or assets/, outside the install, or under an unresolved root
+ *     (HQ-CLI-1N) → { code, relativeSpecifier:true, packageRoot,
+ *     packageRootResolved, resolver, requirerScope };
  *   - an esm-loader ENOENT whose path did not survive delivery (HQ-CLI-1M) — the
  *     shape the delivered payload arrived in, where neither the exception value
  *     nor node_system_error carried a `path` → { packageRoot, packageJsonExists,

package/dist/utils/incomplete-install-error.js

@@ -63,7 +63,7 @@
 //      `fs.readFileSync` ENOENT written by hq's own code stays captured.
 import * as fs from "fs";
 import * as path from "path";
-import { packageRoot } from "./hq-roots.js";
+import { packageRoot, stringDerivedPackageRoot } from "./hq-roots.js";
 import { packageNameOf } from "./install-tree-torn.js";
 import { boundedDiagnosticValue } from "./package-root-diagnostics.js";
 /**
@@ -85,8 +85,16 @@ export const INCOMPLETE_INSTALL_REMEDY = "hq couldn't load part of its own insta
     "`pnpm add -g @indigoai-us/hq-cli`).";
 /** A relative module specifier — `./x`, `../x`, `.\x`, `..\x`. */
 const RELATIVE_SPECIFIER = /^\.\.?[\\/]/;
-/** A Node ESM loader frame — proves the ENOENT came from the module loader, not hq's own fs call. */
-const ESM_LOADER_FRAME = /node:internal[\\/]modules[\\/]esm[\\/]/;
+/**
+ * The Node ESM loader's SOURCE-READ frame — `getSourceSync`/`defaultLoad` in
+ * `node:internal/modules/esm/load`. Requiring the `esm/load` module frame (not
+ * merely any frame under `modules/esm/`) proves the loader was READING the
+ * module's source. An ordinary `fs.openSync`/`readFileSync` ENOENT that merely
+ * ESCAPES a module's EVALUATION runs under `esm/module_job`, never `esm/load`,
+ * so it stays captured rather than suppressed. `load\b` excludes the sibling
+ * `esm/loader` module.
+ */
+const ESM_LOADER_FRAME = /node:internal[\\/]modules[\\/]esm[\\/]load\b/;
 const ROOT_DIAGNOSTIC_BYTES = 256;
 const CODE_DIAGNOSTIC_BYTES = 32;
 // Package names live inside hq-cli's own dependency graph, so their universe is
@@ -95,19 +103,42 @@ const PACKAGE_NAME_DIAGNOSTIC_BYTES = 128;
 /** The `<something>/node_modules/<something>` directory-boundary marker. */
 const NODE_MODULES_SEGMENT = "/node_modules/";
 /**
- * packageRoot() walks up from the compiled module and THROWS
- * PackageRootResolutionError when it cannot resolve. This classifier runs inside
- * beforeSend on EVERY event, so it must never throw — a resolution failure
- * returns null and the error stays captured.
+ * Resolve the running install's root, trying the authoritative on-disk manifest
+ * walk first and falling back to the filesystem-free string derivation ONLY when
+ * it throws — the torn-tree case, where a concurrent global install has renamed
+ * the package directory aside so packageRoot() cannot read a manifest. Never
+ * throws; reports which strategy answered so a captured event is attributable.
+ *
+ * packageRoot() itself is deliberately NOT widened: resolveBundledAsset() and
+ * isWithinPackage() require a root that exists on disk, and handing them a
+ * string-derived phantom directory would break them. The fallback lives here,
+ * where the only consumer is classification (a lexical prefix test) that needs
+ * no live filesystem.
  */
-function safePackageRoot() {
+function resolvePackageRootWithSource() {
     try {
-        return packageRoot();
+        return { root: packageRoot(), source: "manifest-walk" };
     }
     catch {
-        return null;
+        const derived = stringDerivedPackageRoot();
+        return derived
+            ? { root: derived, source: "string-derivation" }
+            : { root: null, source: "unresolved" };
     }
 }
+/**
+ * packageRoot() walks up from the compiled module and THROWS
+ * PackageRootResolutionError when it cannot resolve. This classifier runs inside
+ * beforeSend on EVERY event, so it must never throw — a resolution failure
+ * returns null and the error stays captured. When the on-disk walk fails because
+ * a concurrent install renamed the package directory aside, the filesystem-free
+ * string derivation still supplies the root: that is the HQ-CLI-1M repair —
+ * the running install's root must be known even while its directory is
+ * momentarily gone.
+ */
+function safePackageRoot() {
+    return resolvePackageRootWithSource().root;
+}
 /** Call a (possibly injected) resolver without letting it throw. */
 function resolveRootSafely(resolve) {
     try {
@@ -137,16 +168,25 @@ function normalizeForCompare(p) {
     return looksWin32(p) ? folded.toLowerCase() : folded;
 }
 /**
- * True when `candidate` lives under `<root>/node_modules/`. Anchored at a true
- * directory boundary (`<root>` + sep + `node_modules` + sep) so a sibling such
- * as `<root>-old/node_modules/...` can never match.
+ * True when `candidate` lives directly under `<root>/<subdir>/`. Anchored at a
+ * true directory boundary (`<root>` + sep + `<subdir>` + sep) so a sibling such
+ * as `<root>-old/<subdir>/...` can never match. `<subdir>` carries no separator,
+ * so this stays a single lexical prefix test that needs no live filesystem.
  */
-function isUnderNodeModules(candidate, root) {
+function isUnderSubdir(candidate, root, subdir) {
     if (!candidate || !root)
         return false;
-    const prefix = `${normalizeForCompare(root)}/node_modules/`;
+    const prefix = `${normalizeForCompare(root)}/${subdir}/`;
     return normalizeForCompare(candidate).startsWith(prefix);
 }
+/**
+ * True when `candidate` lives under `<root>/node_modules/`. Anchored at a true
+ * directory boundary so a sibling such as `<root>-old/node_modules/...` can
+ * never match.
+ */
+function isUnderNodeModules(candidate, root) {
+    return isUnderSubdir(candidate, root, "node_modules");
+}
 /** The failing specifier from a `Cannot find module '<spec>'` message, or null. */
 function parseMissingSpecifier(message) {
     if (typeof message !== "string")
@@ -392,13 +432,87 @@ function bareSpecifierCaptureContext(err, resolvePackageRoot, fileSystem) {
         },
     };
 }
+/**
+ * Classify a NOT-suppressed CJS relative requirer LEXICALLY against the resolved
+ * root — never emitting the path itself, only one of four fixed values. A
+ * requirer under `<root>/node_modules/` with a resolved root is ALWAYS suppressed
+ * upstream, so that scope is unreachable here and deliberately absent from the
+ * enum.
+ *   - root null (both resolvers failed)  → 'unresolved-root'
+ *   - under `<root>/dist/`               → 'dist'   (hq-cli's own shipped output)
+ *   - under `<root>/assets/`             → 'assets' (hq-cli's own bundled assets)
+ *   - anything else (a user project, a `<root>-old` sibling, …) → 'outside-root'
+ */
+function classifyRelativeRequirerScope(requiringFile, root) {
+    if (!root)
+        return "unresolved-root";
+    if (isUnderSubdir(requiringFile, root, "dist"))
+        return "dist";
+    if (isUnderSubdir(requiringFile, root, "assets"))
+        return "assets";
+    return "outside-root";
+}
+/**
+ * When a CJS RELATIVE-specifier miss (HQ-CLI-1N's shape) reached the capture path
+ * WITHOUT being suppressed — its requirer sits under the install's own `dist/` or
+ * `assets/`, outside the running install entirely, or the install root could not
+ * be resolved — return a bounded `incomplete_install` block recording a
+ * four-value lexical scope so the next occurrence is attributable instead of
+ * bare; otherwise undefined. The suppression decision is delegated to
+ * incompleteInstallMessage against the SAME injected resolver, so a suppressed
+ * relative miss (requirer under `<root>/node_modules/` with a resolved root) is
+ * never double-attributed here. Never throws; never emits a path or the specifier.
+ */
+function relativeSpecifierCaptureContext(err, resolvePackageRoot, fileSystem) {
+    if (err === null || typeof err !== "object")
+        return undefined;
+    const record = err;
+    if (record.code !== "MODULE_NOT_FOUND")
+        return undefined;
+    const requireStack = record.requireStack;
+    if (!Array.isArray(requireStack) || typeof requireStack[0] !== "string")
+        return undefined;
+    const requiringFile = requireStack[0];
+    const specifier = parseMissingSpecifier(record.message);
+    if (specifier === null || !RELATIVE_SPECIFIER.test(specifier))
+        return undefined;
+    // Suppressed (requirer under <root>/node_modules with a resolved root) →
+    // printed-and-skipped, never captured. Delegated to the classifier against the
+    // SAME resolver so the two decisions can never diverge and nothing that would
+    // be suppressed is ever double-attributed.
+    if (incompleteInstallMessage(err, resolvePackageRoot, readFileFrom(fileSystem)) !== null) {
+        return undefined;
+    }
+    // Not suppressed: record which resolver answered and the lexical requirer scope.
+    const resolution = resolvePackageRoot === safePackageRoot
+        ? resolvePackageRootWithSource()
+        : {
+            root: resolveRootSafely(resolvePackageRoot),
+            source: "injected",
+        };
+    const root = resolution.root;
+    return {
+        incomplete_install: {
+            code: "MODULE_NOT_FOUND",
+            relativeSpecifier: true,
+            packageRoot: boundedDiagnosticValue(root ?? "<unresolved>", ROOT_DIAGNOSTIC_BYTES),
+            packageRootResolved: root !== null,
+            resolver: resolution.source,
+            requirerScope: classifyRelativeRequirerScope(requiringFile, root),
+        },
+    };
+}
 /**
  * When an incomplete-install failure reaches the capture path WITHOUT being
  * suppressed, return a bounded `contexts.incomplete_install` block so the next
  * occurrence carries the evidence this one lacked; otherwise return undefined
- * (bare capture). Two enriched shapes:
+ * (bare capture). Three enriched shapes:
  *   - a third-party BARE-specifier miss the requirer did not declare (HQ-CLI-1Q)
  *     → { missingPackage, requiringPackage, requirerDeclaresMissing:false };
+ *   - a CJS RELATIVE-specifier miss whose requirer sits under the install's own
+ *     dist/ or assets/, outside the install, or under an unresolved root
+ *     (HQ-CLI-1N) → { code, relativeSpecifier:true, packageRoot,
+ *     packageRootResolved, resolver, requirerScope };
  *   - an esm-loader ENOENT whose path did not survive delivery (HQ-CLI-1M) — the
  *     shape the delivered payload arrived in, where neither the exception value
  *     nor node_system_error carried a `path` → { packageRoot, packageJsonExists,
@@ -413,7 +527,11 @@ export function incompleteInstallCaptureContext(err, resolvePackageRoot = safePa
     const bare = bareSpecifierCaptureContext(err, resolvePackageRoot, fileSystem);
     if (bare)
         return bare;
-    // (B) HQ-CLI-1M — the path-less esm-loader ENOENT, unchanged.
+    // (B) HQ-CLI-1N — the not-suppressed CJS relative-sibling miss, made attributable.
+    const relative = relativeSpecifierCaptureContext(err, resolvePackageRoot, fileSystem);
+    if (relative)
+        return relative;
+    // (C) HQ-CLI-1M — the path-less esm-loader ENOENT, unchanged.
     if (!isEsmLoaderEnoent(err))
         return undefined;
     // Only instrument what we did NOT already confidently suppress: a path under
@@ -422,32 +540,40 @@ export function incompleteInstallCaptureContext(err, resolvePackageRoot = safePa
         return undefined;
     }
     const record = err;
-    const root = resolveRootSafely(resolvePackageRoot);
     const code = typeof record.code === "string" ? record.code : "";
-    let packageJsonExists = false;
-    let nodeModulesExists = false;
-    if (root) {
-        try {
-            packageJsonExists = fileSystem.existsSync(path.join(root, "package.json"));
-        }
-        catch {
-            packageJsonExists = false;
-        }
-        try {
-            nodeModulesExists = fileSystem.existsSync(path.join(root, "node_modules"));
-        }
-        catch {
-            nodeModulesExists = false;
-        }
-    }
-    return {
-        incomplete_install: {
-            packageRoot: boundedDiagnosticValue(root ?? "<unresolved>", ROOT_DIAGNOSTIC_BYTES),
-            packageJsonExists,
-            nodeModulesExists,
-            esmLoaderFrame: true,
-            code: boundedDiagnosticValue(code, CODE_DIAGNOSTIC_BYTES),
-        },
+    // The default resolver knows which strategy answered (manifest walk vs the
+    // string derivation that survives a torn tree); an injected resolver is
+    // opaque, so it is recorded as "injected" and its return used as the root.
+    const resolution = resolvePackageRoot === safePackageRoot
+        ? resolvePackageRootWithSource()
+        : {
+            root: resolveRootSafely(resolvePackageRoot),
+            source: "injected",
+        };
+    const root = resolution.root;
+    const diagnostics = {
+        packageRoot: boundedDiagnosticValue(root ?? "<unresolved>", ROOT_DIAGNOSTIC_BYTES),
+        packageRootResolved: root !== null,
+        resolver: resolution.source,
+        esmLoaderFrame: true,
+        code: boundedDiagnosticValue(code, CODE_DIAGNOSTIC_BYTES),
     };
+    // Report the existence booleans ONLY when a root was resolved. Reported for an
+    // unresolved root they were uninitialised `false`s indistinguishable from
+    // "resolved but missing" — the instrumentation defect the prior fix shipped.
+    if (root !== null) {
+        diagnostics.packageJsonExists = safeExistsSync(fileSystem, path.join(root, "package.json"));
+        diagnostics.nodeModulesExists = safeExistsSync(fileSystem, path.join(root, "node_modules"));
+    }
+    return { incomplete_install: diagnostics };
+}
+/** existsSync that never throws — any filesystem error reads as "absent". */
+function safeExistsSync(fileSystem, target) {
+    try {
+        return fileSystem.existsSync(target);
+    }
+    catch {
+        return false;
+    }
 }
 //# sourceMappingURL=incomplete-install-error.js.map

package/dist/utils/install-tree-torn.d.ts

@@ -29,8 +29,12 @@
  * ../startup-registration.ts; version-gate.ts / self-update.ts / update-lock.ts
  * are only READ (their exported symbols), never modified.
  */
-/** The two loader-error `code`s that mean "a module could not be resolved". */
-export type ModuleNotFoundCode = "ERR_MODULE_NOT_FOUND" | "MODULE_NOT_FOUND";
+/**
+ * The loader-error `code`s recovery classifies. The first two mean "a module
+ * could not be resolved"; `ENOENT` is the esm-loader dialect where a module was
+ * present at resolve and gone at read (HQ-CLI-1M) — see {@link ModuleErrorDialect}.
+ */
+export type ModuleNotFoundCode = "ERR_MODULE_NOT_FOUND" | "MODULE_NOT_FOUND" | "ENOENT";
 /**
  * The closed set of resolution-failure dialects, verified on Node v22.23.1 (the
  * @sentry/node import-in-the-middle hook does not change the shapes):
@@ -42,16 +46,28 @@ export type ModuleNotFoundCode = "ERR_MODULE_NOT_FOUND" | "MODULE_NOT_FOUND";
  *                    '<abs>'` + `requireStack`.
  *   - `cjs-package`: CJS require of a bare specifier — `Cannot find module
  *                    '<name>'` + `requireStack`.
+ *   - `cjs-relative`: CJS require of a RELATIVE specifier — `Cannot find module
+ *                    './x'` (or `../x`) + `requireStack`. Node reports the RAW
+ *                    relative token, never a resolved path, so it is re-resolved
+ *                    from the importer's directory rather than reduced by
+ *                    packageNameOf (which would yield the un-probeable name `.`).
+ *   - `esm-enoent`:  ESM loader ENOENT (HQ-CLI-1M) — a module present at RESOLVE
+ *                    and gone at READ, so getSourceSync/openSync raises ENOENT
+ *                    (not ERR_MODULE_NOT_FOUND). `err.path` is the vanished file.
  *   - `unknown`:     a module-not-found whose message did not parse; recovery
  *                    still waits on the lock / retired-dir / quiet signals.
  */
-export type ModuleErrorDialect = "esm-path" | "esm-package" | "cjs-path" | "cjs-package" | "unknown";
+export type ModuleErrorDialect = "esm-path" | "esm-package" | "cjs-path" | "cjs-package" | "cjs-relative" | "esm-enoent" | "unknown";
 /**
  * The missing thing, re-resolvable by the readiness probe:
- *   - `path`:    an absolute filesystem path (a `.js` file, or a package dir).
- *   - `package`: a bare package `name` resolvable from directory `from` upward.
- *   - `unknown`: the message did not parse; treated as "present" by the probe so
- *                readiness turns only on the lock / retired-dir / quiet signals.
+ *   - `path`:     an absolute filesystem path (a `.js` file, or a package dir).
+ *   - `package`:  a bare package `name` resolvable from directory `from` upward.
+ *   - `relative`: a RELATIVE `specifier` (`./x`, `../x`) re-resolved the way
+ *                 Node's CJS resolver does from directory `from` —
+ *                 `path.resolve(from, specifier)` plus the `.js`/`.json`/`.node`
+ *                 and directory forms.
+ *   - `unknown`:  the message did not parse; treated as "present" by the probe so
+ *                 readiness turns only on the lock / retired-dir / quiet signals.
  */
 export type ModuleErrorTarget = {
     kind: "path";
@@ -60,6 +76,10 @@ export type ModuleErrorTarget = {
     kind: "package";
     name: string;
     from: string;
+} | {
+    kind: "relative";
+    specifier: string;
+    from: string;
 } | {
     kind: "unknown";
 };
@@ -82,10 +102,11 @@ export declare function packageNameOf(specifier: string): string;
 /**
  * Classify a thrown value as a module-resolution failure and extract the missing
  * target, or return `null` for anything that is not one. The decision is
- * STRUCTURAL: `err.code` must be exactly `ERR_MODULE_NOT_FOUND` or
- * `MODULE_NOT_FOUND` — no argv, env, or free text is ever consulted, and any
- * other error (including an import-time throw of another class) returns `null`
- * so it is rethrown to the existing boundary unchanged.
+ * STRUCTURAL: `err.code` must be exactly `ERR_MODULE_NOT_FOUND`,
+ * `MODULE_NOT_FOUND`, or — for the esm-loader ENOENT dialect — `ENOENT` under
+ * the full conjunction below. No argv, env, or free text is ever consulted, and
+ * any other error (including an import-time throw of another class) returns
+ * `null` so it is rethrown to the existing boundary unchanged.
  */
 export declare function classifyModuleNotFound(err: unknown): ClassifiedModuleError | null;
 /** The filesystem surface the probe and wait use, injectable for hermetic tests. */
@@ -107,6 +128,11 @@ export interface InstallTreeFs {
  *                exact ancestor walk `getPackageJSONURL` performs, done WITHOUT
  *                `createRequire` so an ESM-only / export-conditioned package
  *                cannot false-negative.
+ *   - `relative`: re-resolve `path.resolve(from, specifier)` as Node's CJS
+ *                require would — a real file (exact / `.js` / `.json` / `.node`),
+ *                or a directory whose package.json `main` (or that main's index)
+ *                or own `index.*` is a real file. A bare or partially-extracted
+ *                directory is NOT loadable and reads as not-present.
  *   - `unknown`: true (readiness turns on the other signals).
  * Any filesystem error reads as "not present" rather than throwing.
  */

package/dist/utils/install-tree-torn.js

@@ -42,6 +42,23 @@ const PACKAGE_ROOT_BYTES = 256;
 const ESM_PACKAGE_RE = /^Cannot find package '([^']+)' imported from (.+)$/s;
 const CJS_MODULE_RE = /^Cannot find module '([^']+)'/s;
 const ESM_MODULE_IMPORTED_RE = /^Cannot find module '([^']+)' imported from (.+)$/s;
+/**
+ * The Node ESM loader's SOURCE-READ frame — `getSourceSync`/`defaultLoad` in
+ * `node:internal/modules/esm/load`. Requiring the `esm/load` module frame (not
+ * merely any frame under `modules/esm/`) is what proves the loader was READING
+ * the module's source, so an ordinary `fs.openSync`/`readFileSync` ENOENT that
+ * merely ESCAPES a module's EVALUATION — which runs under `esm/module_job`,
+ * never `esm/load` — is NOT misclassified as a torn install and does not trigger
+ * the settle wait. `load\b` also excludes the sibling `esm/loader` module.
+ */
+const ESM_LOADER_FRAME = /node:internal[\\/]modules[\\/]esm[\\/]load\b/;
+/**
+ * A relative module specifier — `./x`, `../x`, `.\x`, `..\x`, or a bare `.`/`..`.
+ * Mirrors the shape src/utils/incomplete-install-error.ts uses, extended with the
+ * bare-`.`/`..` case so a token that packageNameOf would reduce to the
+ * un-probeable name `.` is caught here and re-resolved instead.
+ */
+const RELATIVE_CJS_SPECIFIER = /^\.\.?([\\/]|$)/;
 /**
  * Reduce a bare specifier to its PACKAGE name: `@scope/name/sub` → `@scope/name`,
  * `name/sub` → `name`, `name` → `name`. This is the unit the readiness probe
@@ -54,19 +71,57 @@ export function packageNameOf(specifier) {
         return parts.slice(0, 2).join("/");
     return parts[0] ?? specifier;
 }
+/**
+ * Build a `package` target from an already-reduced name, UNLESS that name is not
+ * a plausible bare package: empty, a relative token reduced to `.`/`..`, or a
+ * subpath-imports token (`#internal`). Each of those reduces to a name whose
+ * `node_modules/<name>/package.json` ancestor probe can NEVER be true, so it
+ * falls back to `unknown` — readiness then turns on the lock / retired-dir /
+ * quiet signals rather than a probe that stays permanently false.
+ */
+function barePackageTarget(name, from) {
+    if (name.length === 0 || name.startsWith(".") || name.startsWith("#")) {
+        return { kind: "unknown" };
+    }
+    return { kind: "package", name, from };
+}
 /**
  * Classify a thrown value as a module-resolution failure and extract the missing
  * target, or return `null` for anything that is not one. The decision is
- * STRUCTURAL: `err.code` must be exactly `ERR_MODULE_NOT_FOUND` or
- * `MODULE_NOT_FOUND` — no argv, env, or free text is ever consulted, and any
- * other error (including an import-time throw of another class) returns `null`
- * so it is rethrown to the existing boundary unchanged.
+ * STRUCTURAL: `err.code` must be exactly `ERR_MODULE_NOT_FOUND`,
+ * `MODULE_NOT_FOUND`, or — for the esm-loader ENOENT dialect — `ENOENT` under
+ * the full conjunction below. No argv, env, or free text is ever consulted, and
+ * any other error (including an import-time throw of another class) returns
+ * `null` so it is rethrown to the existing boundary unchanged.
  */
 export function classifyModuleNotFound(err) {
     if (err === null || typeof err !== "object")
         return null;
     const record = err;
     const code = record.code;
+    // (0) esm-loader ENOENT (HQ-CLI-1M): a module present at RESOLVE and gone at
+    // READ, so Node's ESM loader raises ENOENT from getSourceSync/openSync rather
+    // than ERR_MODULE_NOT_FOUND at resolve. Gated on the FULL conjunction — code
+    // ENOENT AND syscall 'open' AND an esm-loader stack frame AND a string path —
+    // so an ordinary fs.readFileSync/openSync ENOENT written by hq's own code (no
+    // loader frame) cannot enter it. The vanished file IS the re-resolvable target
+    // the settle wait polls; recovery then waits and re-execs exactly as for the
+    // other dialects.
+    if (code === "ENOENT") {
+        if (record.syscall === "open" &&
+            typeof record.path === "string" &&
+            typeof record.stack === "string" &&
+            ESM_LOADER_FRAME.test(record.stack)) {
+            return {
+                code,
+                dialect: "esm-enoent",
+                specifier: record.path,
+                importer: "",
+                target: { kind: "path", path: record.path },
+            };
+        }
+        return null;
+    }
     if (code !== "ERR_MODULE_NOT_FOUND" && code !== "MODULE_NOT_FOUND")
         return null;
     const message = typeof record.message === "string" ? record.message : "";
@@ -94,7 +149,7 @@ export function classifyModuleNotFound(err) {
             dialect: "esm-package",
             specifier: spec,
             importer,
-            target: { kind: "package", name: spec, from: path.dirname(importer) },
+            target: barePackageTarget(spec, path.dirname(importer)),
         };
     }
     // (c) CJS `Cannot find module '<spec>'` (+ Require stack). Absolute → a path
@@ -108,12 +163,32 @@ export function classifyModuleNotFound(err) {
             if (path.isAbsolute(spec)) {
                 return { code, dialect: "cjs-path", specifier: spec, importer, target: { kind: "path", path: spec } };
             }
+            // Relative specifier (`./x`, `../x`): Node reports the RAW token, so
+            // packageNameOf would reduce it to `.`/`..` and build a package target
+            // whose ancestor probe can never be true. Re-resolve it from the importer's
+            // directory, and report the RESOLVED path as the diagnostic specifier
+            // (actionable — the missing sibling's real location), mirroring esm-path.
+            if (RELATIVE_CJS_SPECIFIER.test(spec)) {
+                if (importer && path.isAbsolute(importer)) {
+                    const from = path.dirname(importer);
+                    return {
+                        code,
+                        dialect: "cjs-relative",
+                        specifier: path.resolve(from, spec),
+                        importer,
+                        target: { kind: "relative", specifier: spec, from },
+                    };
+                }
+                // No usable (absolute) importer survived — fall back to the lock /
+                // retired-dir / quiet signals rather than a probe that cannot be true.
+                return { code, dialect: "cjs-relative", specifier: spec, importer, target: { kind: "unknown" } };
+            }
             return {
                 code,
                 dialect: "cjs-package",
                 specifier: spec,
                 importer,
-                target: { kind: "package", name: packageNameOf(spec), from: path.dirname(importer) },
+                target: barePackageTarget(packageNameOf(spec), path.dirname(importer)),
             };
         }
     }
@@ -145,6 +220,58 @@ function defaultIsPidAlive(pid) {
         return err.code === "EPERM";
     }
 }
+/** CJS extensions Node's LOAD_AS_FILE / LOAD_INDEX try, in order. */
+const CJS_FILE_EXTENSIONS = [".js", ".json", ".node"];
+/** Whether `p` exists AND is a regular file (not a directory); any fs error → false. */
+function isResolvableFile(p, fs) {
+    try {
+        return fs.existsSync(p) && !fs.statSync(p).isDirectory();
+    }
+    catch {
+        return false;
+    }
+}
+/** Node's LOAD_AS_FILE(X): X itself, then X + each CJS extension — each must be a file. */
+function loadAsFile(base, fs) {
+    if (isResolvableFile(base, fs))
+        return true;
+    return CJS_FILE_EXTENSIONS.some((ext) => isResolvableFile(base + ext, fs));
+}
+/** Node's LOAD_INDEX(X): X/index.{js,json,node} — each must be a file. */
+function loadIndex(dir, fs) {
+    return CJS_FILE_EXTENSIONS.some((ext) => isResolvableFile(path.join(dir, `index${ext}`), fs));
+}
+/**
+ * Whether a relative target's resolved `base` is loadable exactly as Node's CJS
+ * require would load it: LOAD_AS_FILE(base), else LOAD_AS_DIRECTORY(base) — its
+ * package.json `main` resolved as a file (or that main's index), else
+ * base/index.*. A bare or partially-extracted directory — one that holds neither
+ * a resolvable `main` nor an index file — is deliberately NOT loadable, so it
+ * reads as not-present and the single re-exec cannot fire on a still-torn tree
+ * (mirrors the MODULE_NOT_FOUND Node would still throw for that state).
+ */
+function relativeTargetResolvable(base, fs) {
+    if (loadAsFile(base, fs))
+        return true;
+    const manifest = path.join(base, "package.json");
+    if (isResolvableFile(manifest, fs)) {
+        let main = null;
+        try {
+            const parsed = JSON.parse(fs.readFileSync(manifest, "utf-8"));
+            if (typeof parsed.main === "string" && parsed.main.trim() !== "")
+                main = parsed.main;
+        }
+        catch {
+            main = null; // unreadable / unparseable manifest — fall back to index.*
+        }
+        if (main !== null) {
+            const mainBase = path.resolve(base, main);
+            if (loadAsFile(mainBase, fs) || loadIndex(mainBase, fs))
+                return true;
+        }
+    }
+    return loadIndex(base, fs);
+}
 /**
  * Whether the missing target is now present on disk — the readiness signal the
  * settle wait polls. It re-resolves the SAME step Node's resolver took:
@@ -155,6 +282,11 @@ function defaultIsPidAlive(pid) {
  *                exact ancestor walk `getPackageJSONURL` performs, done WITHOUT
  *                `createRequire` so an ESM-only / export-conditioned package
  *                cannot false-negative.
+ *   - `relative`: re-resolve `path.resolve(from, specifier)` as Node's CJS
+ *                require would — a real file (exact / `.js` / `.json` / `.node`),
+ *                or a directory whose package.json `main` (or that main's index)
+ *                or own `index.*` is a real file. A bare or partially-extracted
+ *                directory is NOT loadable and reads as not-present.
  *   - `unknown`: true (readiness turns on the other signals).
  * Any filesystem error reads as "not present" rather than throwing.
  */
@@ -175,6 +307,15 @@ export function installTargetPresent(target, fs = nodeInstallTreeFs) {
             }
             return true;
         }
+        if (target.kind === "relative") {
+            // Re-resolve exactly as Node's CJS require would from `from`, so the probe
+            // turns true only when the missing module is ACTUALLY loadable again — a
+            // bare or partially-extracted directory must not read as present, or the
+            // single re-exec would fire on a still-torn tree. The extensionless case
+            // matters — a production sibling shape (`./Base/TreeIterator`, HQ-CLI-1N)
+            // carries no extension, so an exact-path-only probe would stay false for it.
+            return relativeTargetResolvable(path.resolve(target.from, target.specifier), fs);
+        }
         // package: ancestor walk from `from`.
         let dir = path.resolve(target.from);
         for (;;) {

package/package.json

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