@indigoai-us/hq-cli 5.345.24 → 5.345.26

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 
+## [5.345.26] — 2026-10-06
+- Give users recovery guidance for malformed HTTP 200 integration gateway errors while keeping the gateway defect reportable.
+- Fix Claude plugin setup on CLI versions that reject `--json` for marketplace add and remove. Failed Claude plugin commands show a bounded stderr excerpt with quoted and unquoted credential fields redacted.
+- Add `hq lanes repair-company` for legacy lanes with missing company attribution, report company-less lead lanes in `hq lanes keep-alive-audit`, and inherit company attribution from company-bound seniors when creating child lanes.
+- Resolve resume hire-carve policy from the senior record and remove the misleading alive-child helper alias.
+- Keep install-tree recovery waiting through the bounded settle deadline when a retired npm sibling cannot be fully inspected.
+
+## [5.345.25] — 2026-10-06
+- Route qmd post-sync indexing and ontology README drift through isolated fast handlers; cover all rebuild-index targets in fast-route parity and benchmarks.
+
+- Keep native register-project and ontology source-worklist commands aligned with staging behavior for Board identifiers, DM participant audiences, and transient ACL retries.
+
 ## [5.345.24] — 2026-10-06
 - Keep native core ontology, delegate-secret, share-suggestion-state, and trusted-bind behavior aligned with their scaffold scripts.
 

package/assets/scaffold/core/scripts/ontology-source-worklist.sh

@@ -203,8 +203,18 @@ for f in "$D"/*.md; do
       # test/sources/inbound/slack-personal-dm.test.ts.
       [ -n "$aud" ] || aud="$(participant_ids "$f" resolved_participants | grep -E '@|^(prs|agt)_' | paste -sd, -)"
       if [ -z "$aud" ]; then
-        aud="$("$HQ" files --company "$co" acl "$rel" --json 2>/dev/null \
-          | jq -r '[.direct[]? | select(.granteeType=="person" or .granteeType=="email" or .granteeType=="agent") | select(.permission=="read" or .permission=="write" or .permission=="admin") | .granteeId] | unique | join(",")' 2>/dev/null)"
+        # A transient ACL or jq failure must not turn a source into a durable
+        # no-audience skip. Retry once, while treating valid empty ACL output as
+        # a completed lookup that needs no retry.
+        for attempt in 1 2; do
+          acl_output=""
+          if acl_output="$("$HQ" files --company "$co" acl "$rel" --json 2>/dev/null \
+            | jq -r '[.direct[]? | select(.granteeType=="person" or .granteeType=="email" or .granteeType=="agent") | select(.permission=="read" or .permission=="write" or .permission=="admin") | .granteeId] | unique | join(",")' 2>/dev/null)"; then
+            aud="$acl_output"
+            break
+          fi
+          aud=""
+        done
       fi ;;
   esac
   if [ -z "$aud" ]; then

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

@@ -11395,6 +11395,31 @@ export declare const COMMAND_CATALOG: readonly [{
             readonly hidden: false;
         }];
         readonly subcommands: readonly [];
+    }, {
+        readonly name: "repair-company-target";
+        readonly description: "";
+        readonly aliases: readonly [];
+        readonly hidden: true;
+        readonly helpOption: true;
+        readonly helpCommand: false;
+        readonly usage: "[options] <lane-id>";
+        readonly helpText: readonly [];
+        readonly arguments: readonly [{
+            readonly name: "lane-id";
+            readonly required: true;
+            readonly variadic: false;
+            readonly description: "Lane id";
+        }];
+        readonly options: readonly [{
+            readonly flags: "--company <slug>";
+            readonly description: "Company slug to assign";
+            readonly hidden: false;
+        }, {
+            readonly flags: "--json";
+            readonly description: "JSON on stdout (always)";
+            readonly hidden: false;
+        }];
+        readonly subcommands: readonly [];
     }, {
         readonly name: "grant-target";
         readonly description: "";
@@ -12328,6 +12353,31 @@ export declare const COMMAND_CATALOG: readonly [{
             readonly hidden: false;
         }];
         readonly subcommands: readonly [];
+    }, {
+        readonly name: "repair-company";
+        readonly description: "Set missing company attribution on a legacy lane";
+        readonly aliases: readonly [];
+        readonly hidden: false;
+        readonly helpOption: true;
+        readonly helpCommand: false;
+        readonly usage: "[options] <lane-id>";
+        readonly helpText: readonly [];
+        readonly arguments: readonly [{
+            readonly name: "lane-id";
+            readonly required: true;
+            readonly variadic: false;
+            readonly description: "Lane id";
+        }];
+        readonly options: readonly [{
+            readonly flags: "--company <slug>";
+            readonly description: "Company slug to assign";
+            readonly hidden: false;
+        }, {
+            readonly flags: "--json";
+            readonly description: "JSON on stdout (always)";
+            readonly hidden: false;
+        }];
+        readonly subcommands: readonly [];
     }, {
         readonly name: "logs";
         readonly description: "Print a lane's local logs";

package/dist/command-catalog.generated.js

@@ -13843,6 +13843,37 @@ export const COMMAND_CATALOG = [
                 ],
                 "subcommands": []
             },
+            {
+                "name": "repair-company-target",
+                "description": "",
+                "aliases": [],
+                "hidden": true,
+                "helpOption": true,
+                "helpCommand": false,
+                "usage": "[options] <lane-id>",
+                "helpText": [],
+                "arguments": [
+                    {
+                        "name": "lane-id",
+                        "required": true,
+                        "variadic": false,
+                        "description": "Lane id"
+                    }
+                ],
+                "options": [
+                    {
+                        "flags": "--company <slug>",
+                        "description": "Company slug to assign",
+                        "hidden": false
+                    },
+                    {
+                        "flags": "--json",
+                        "description": "JSON on stdout (always)",
+                        "hidden": false
+                    }
+                ],
+                "subcommands": []
+            },
             {
                 "name": "grant-target",
                 "description": "",
@@ -14991,6 +15022,37 @@ export const COMMAND_CATALOG = [
                 ],
                 "subcommands": []
             },
+            {
+                "name": "repair-company",
+                "description": "Set missing company attribution on a legacy lane",
+                "aliases": [],
+                "hidden": false,
+                "helpOption": true,
+                "helpCommand": false,
+                "usage": "[options] <lane-id>",
+                "helpText": [],
+                "arguments": [
+                    {
+                        "name": "lane-id",
+                        "required": true,
+                        "variadic": false,
+                        "description": "Lane id"
+                    }
+                ],
+                "options": [
+                    {
+                        "flags": "--company <slug>",
+                        "description": "Company slug to assign",
+                        "hidden": false
+                    },
+                    {
+                        "flags": "--json",
+                        "description": "JSON on stdout (always)",
+                        "hidden": false
+                    }
+                ],
+                "subcommands": []
+            },
             {
                 "name": "logs",
                 "description": "Print a lane's local logs",

package/dist/commands/core-ontology-native.js

@@ -831,6 +831,77 @@ function itemList(file, field) {
     }
     return output;
 }
+function participantIds(file, field) {
+    if (!fs.existsSync(file))
+        return [];
+    const output = [];
+    let frontmatterLines = 0;
+    let inList = false;
+    let personUid = "";
+    let email = "";
+    const flush = () => {
+        if (personUid)
+            output.push(personUid);
+        else if (email)
+            output.push(email);
+        personUid = "";
+        email = "";
+    };
+    const setField = (line) => {
+        const person = line.match(/^person_uid:[\t ]*(.*)$/);
+        const mail = line.match(/^email:[\t ]*(.*)$/);
+        const value = (person?.[1] ?? mail?.[1] ?? "").replace(/["']/g, "").replace(/^[\t ]+|[\t ]+$/g, "");
+        if (person && value)
+            personUid = value;
+        if (mail && value)
+            email = value;
+    };
+    for (const rawLine of fs.readFileSync(file, "utf8").split("\n")) {
+        const line = rawLine.replace(/\r$/, "");
+        if (line === "---") {
+            frontmatterLines += 1;
+            if (frontmatterLines === 2) {
+                if (inList)
+                    flush();
+                break;
+            }
+            continue;
+        }
+        if (frontmatterLines !== 1)
+            continue;
+        if (line.startsWith(`${field}:`)) {
+            inList = true;
+            continue;
+        }
+        if (!inList)
+            continue;
+        if (/^[^\t -]/.test(line)) {
+            flush();
+            inList = false;
+            continue;
+        }
+        const dash = line.match(/^[\t ]*-[\t ]+(.*)$/);
+        if (dash) {
+            flush();
+            let value = dash[1];
+            if (value.startsWith("{")) {
+                value = value.replace(/[{}"']/g, "");
+                for (const fieldValue of value.split(",")) {
+                    const separator = fieldValue.indexOf(":");
+                    if (separator < 0)
+                        continue;
+                    setField(`${fieldValue.slice(0, separator).trim()}:${fieldValue.slice(separator + 1)}`);
+                }
+                flush();
+                continue;
+            }
+            setField(value);
+            continue;
+        }
+        setField(line.replace(/^[\t ]+/, ""));
+    }
+    return output;
+}
 export function worklistCommand(args, root) {
     let company = "";
     let channel = "";
@@ -1012,22 +1083,33 @@ export function worklistCommand(args, root) {
             audience = itemList(file, "audience").join(",");
             if (!audience)
                 audience = itemList(file, "attendees").filter((value) => /@|^(prs|agt)_/.test(value)).join(",");
+            if (!audience)
+                audience = participantIds(file, "resolved_participants").filter((value) => /@|^(prs|agt)_/.test(value)).join(",");
             if (!audience) {
-                const acl = runHq(["files", "--company", company, "acl", relative, "--json"]);
-                try {
-                    const payload = JSON.parse(acl.stdout);
-                    const principals = (payload.direct ?? []).filter((value) => {
-                        if (!value || typeof value !== "object")
-                            return false;
-                        const row = value;
-                        return ["person", "email", "agent"].includes(String(row.granteeType))
-                            && ["read", "write", "admin"].includes(String(row.permission));
-                    }).map((value) => String(value.granteeId ?? "")).sort(byteSort);
-                    audience = [...new Set(principals)].join(",");
-                }
-                catch (parseError) {
-                    // jq emits no stdout or stderr for malformed ACL JSON in this pipeline.
-                    void parseError;
+                for (let attempt = 0; attempt < 2; attempt += 1) {
+                    const acl = runHq(["files", "--company", company, "acl", relative, "--json"]);
+                    if (acl.status !== 0)
+                        continue;
+                    try {
+                        const payload = JSON.parse(acl.stdout);
+                        const direct = payload && typeof payload === "object" && "direct" in payload
+                            ? payload.direct
+                            : undefined;
+                        if (!Array.isArray(direct))
+                            throw new Error("ACL direct grants are not an array");
+                        const principals = direct.filter((value) => {
+                            if (!value || typeof value !== "object")
+                                return false;
+                            const row = value;
+                            return ["person", "email", "agent"].includes(String(row.granteeType))
+                                && ["read", "write", "admin"].includes(String(row.permission));
+                        }).map((value) => String(value.granteeId ?? "")).sort(byteSort);
+                        audience = [...new Set(principals)].join(",");
+                        break;
+                    }
+                    catch {
+                        // The shell suppresses jq diagnostics and retries a failed ACL parse.
+                    }
                 }
             }
         }
@@ -1040,7 +1122,9 @@ export function worklistCommand(args, root) {
         const key = shellSubstitution(audienceKey(audience).stdout);
         output.push(`${JSON.stringify({ file: relative, audience_key: key, audience: audience.split(",") })}\n`);
     }
-    return ok(output.join(""));
+    const stdout = output.join("");
+    // Git Bash captures jq.exe's record terminators as CRLF; preserve those bytes on Windows.
+    return ok(process.platform === "win32" ? stdout.replace(/\n/gu, "\r\n") : stdout);
 }
 export function registerCoreOntologyNativeCommands(ontology, rootFor) {
     const entries = [

package/dist/commands/core-ontology-readme-drift-fast.d.ts

@@ -0,0 +1,2 @@
+export declare function runOntologyReadmeDriftFast(args: readonly string[], _stdin: string, _cwd: string, hqRoot: string | undefined): number;
+//# sourceMappingURL=core-ontology-readme-drift-fast.d.ts.map

package/dist/commands/core-ontology-readme-drift-fast.js

@@ -0,0 +1,5 @@
+import { ontologyReadmeDrift } from "../lib/core-utils/ontology-readme-drift.js";
+export function runOntologyReadmeDriftFast(args, _stdin, _cwd, hqRoot) {
+    return ontologyReadmeDrift([...args], { root: hqRoot });
+}
+//# sourceMappingURL=core-ontology-readme-drift-fast.js.map

package/dist/commands/core-qmd-reindex-after-sync-fast.d.ts

@@ -0,0 +1,3 @@
+/** Fast adapter for the post-sync QMD entry point. Uses the same persisted flag snapshot as other native fast routes. */
+export declare function runQmdReindexAfterSyncFast(args: readonly string[], _stdin: string, cwd: string, _hqRoot?: string, _commandName?: string, hqRootArg?: string): Promise<number>;
+//# sourceMappingURL=core-qmd-reindex-after-sync-fast.d.ts.map

package/dist/commands/core-qmd-reindex-after-sync-fast.js

@@ -0,0 +1,26 @@
+import { QMD_REINDEX_STARTUP_WARNING_FLAG, qmdReindexAfterSync, } from "../lib/core-utils/qmd-reindex-after-sync.js";
+import { reconcileCollections } from "../lib/search-index/index.js";
+import { QMD_COLLECTION_PATH_REPAIR_FLAG } from "../lib/search-index/collection-path-repair-flag-constants.js";
+import { QMD_REINDEX_SINGLE_FLIGHT_FLAG } from "../lib/search-index/reindex-single-flight-flag-constants.js";
+import { fastFlagEnabled } from "../native-fast-route.js";
+/** Fast adapter for the post-sync QMD entry point. Uses the same persisted flag snapshot as other native fast routes. */
+export async function runQmdReindexAfterSyncFast(args, _stdin, cwd, _hqRoot, _commandName, hqRootArg) {
+    const [singleFlight, startupWarnings, repairCollectionPaths] = await Promise.all([
+        fastFlagEnabled(QMD_REINDEX_SINGLE_FLIGHT_FLAG, process.env, { numericEnvironmentOverride: false }),
+        fastFlagEnabled(QMD_REINDEX_STARTUP_WARNING_FLAG, process.env, { numericEnvironmentOverride: false }),
+        fastFlagEnabled(QMD_COLLECTION_PATH_REPAIR_FLAG, process.env, { numericEnvironmentOverride: false }),
+    ]);
+    // The full command adapter injects the explicit HQ root as the first positional
+    // argument when the caller supplies --hq-root. The fast route parses that
+    // global option before dispatch, so restore the same operand when the command
+    // did not receive its own path (help/unknown options and --embed-only calls).
+    const hasRootOperand = args.some((arg) => arg !== "--embed" && !arg.startsWith("--"));
+    const forwardedArgs = hasRootOperand ? [...args] : [hqRootArg ?? cwd, ...args];
+    return qmdReindexAfterSync(forwardedArgs, {
+        cwd,
+        singleFlightEnabled: () => singleFlight,
+        startupFailureWarningsEnabled: () => startupWarnings,
+        reconcile: (root, options) => reconcileCollections(root, { ...options, repairPathDrift: repairCollectionPaths }),
+    });
+}
+//# sourceMappingURL=core-qmd-reindex-after-sync-fast.js.map

package/dist/commands/core-register-project-native.js

@@ -7,7 +7,7 @@ import { serializeJqJson } from "../lib/core-utils/jq-json-serializer.js";
 import { resolveBundledAsset } from "../utils/hq-roots-core.js";
 import { buildSpawnPlan } from "../utils/windows-spawn.js";
 export const REGISTER_PROJECT_ASSET = "core/scripts/register-project.sh";
-const USAGE = "usage: register-project.sh <company> <project> | --audit <company> | --backfill <company> --only-active [--yes] | --retry-pending <company>";
+const USAGE = "usage: register-project.sh <company> <project> | --brainstorm <company> <board-project-id> | --audit <company> | --backfill <company> --only-active [--yes] | --retry-pending <company>";
 const MIN_HQ_CLI = "5.139.0";
 export function createRegisterProjectHqRunner(spawn = spawnSync) {
     return (args, options) => {
@@ -117,8 +117,20 @@ function projectRows(board) {
         return record;
     });
 }
-function matchesProject(row, id, rel) {
-    return row.id === id || row.prd_path === rel || row.mesh_project_id === id;
+function matchesProject(row, id, rel, meshProjectId = id) {
+    return row.id === id || row.prd_path === rel || row.mesh_project_id === id || row.id === meshProjectId || row.mesh_project_id === meshProjectId;
+}
+function meshProjectIdForPrd(company, project, deps) {
+    const rel = `companies/${company}/projects/${project}/prd.json`;
+    try {
+        const row = projectRows(boardData(company, boardPath(company, deps), deps)).find((item) => item.prd_path === rel || item.id === project);
+        const value = jqString(jqOr(asRecord(row)?.mesh_project_id, jqOr(asRecord(row)?.id, "")));
+        return value || project;
+    }
+    catch {
+        // The shell suppresses jq's board lookup error and falls back to the local id.
+        return project;
+    }
 }
 function atomicJqWrite(target, value, deps, initialize = false) {
     deps.fs.mkdirSync(path.dirname(target), { recursive: true });
@@ -167,12 +179,13 @@ function ensureOne(company, project, deps) {
         catch { /* legacy jq/write errors remain a failed registration */ }
         return errorResult(`hq-cli ${MIN_HQ_CLI} or newer is required; ${company}/${project} stays local until then`);
     }
+    const meshProject = meshProjectIdForPrd(company, project, deps);
     // The shell builds this argument from its raw HQ_ROOT plus POSIX separators.
     // On Git Bash that preserves a Win32 drive prefix and appends `/companies/...`.
     const hqPrd = process.platform === "win32"
         ? `${deps.root.replace(/[\\/]+$/u, "")}/companies/${company}/projects/${project}/prd.json`
         : prd;
-    const ensure = deps.runHq(["mesh", "project", "ensure", project, "--company", company, "--stories-file", hqPrd, "--json"], {
+    const ensure = deps.runHq(["mesh", "project", "ensure", meshProject, "--company", company, "--stories-file", hqPrd, "--json"], {
         cwd: deps.cwd, env: deps.env, capture: true,
     });
     if (ensure.code !== 0)
@@ -204,9 +217,9 @@ function ensureOne(company, project, deps) {
     const rows = projectRows(document);
     if (rows.some((row) => matchesProject(row, project, rel))) {
         document.projects = rows.map((row) => {
-            if (!matchesProject(row, project, rel))
+            if (!matchesProject(row, project, rel, meshProject))
                 return row;
-            const updated = { ...row, threadId: thread, channelId: channel, updated_at: now, prd_path: jqOr(row.prd_path, rel), mesh_project_id: project };
+            const updated = { ...row, threadId: thread, channelId: channel, updated_at: now, prd_path: jqOr(row.prd_path, rel), mesh_project_id: meshProject };
             delete updated.pending_registration;
             return updated;
         });
@@ -224,11 +237,62 @@ function ensureOne(company, project, deps) {
         return errorResult("registration incomplete: board.json write failed");
     }
     const written = boardData(company, board, deps);
-    const verified = projectRows(written).some((row) => matchesProject(row, project, rel) && row.threadId === thread && row.channelId === channel);
+    const verified = projectRows(written).some((row) => matchesProject(row, project, rel, meshProject) && row.mesh_project_id === meshProject && row.threadId === thread && row.channelId === channel);
     if (!verified)
         return errorResult(`registration incomplete: board.json entry for ${project} did not verify`);
     return { code: 0, stdout: `registered ${company}/${project} thread=${thread} channel=${channel}\n`, stderr: "" };
 }
+function registerBrainstorm(company, project, deps) {
+    if (!companyUid(company, deps))
+        return errorResult(`no company uid for ${company} (set HQ_COMPANY_UID, companies/${company}/.company-uid, or manifest cloud_uid)`);
+    const board = boardPath(company, deps);
+    if (!deps.fs.existsSync(board))
+        return errorResult(`registration incomplete: missing ${board}`);
+    const document = boardData(company, board, deps);
+    const row = projectRows(document).find((item) => item.id === project || item.mesh_project_id === project);
+    const title = jqString(jqOr(asRecord(row)?.title, ""));
+    const description = jqString(jqOr(asRecord(row)?.description, ""));
+    if (!title)
+        return errorResult(`registration incomplete: missing local Board project ${company}/${project}`);
+    const set = deps.runHq(["mesh", "project", "set", project, "--company", company, "--name", title, "--description", description, "--create", "--json"], {
+        cwd: deps.cwd, env: deps.env, capture: true,
+    });
+    if (set.code !== 0)
+        return errorResult(`registration incomplete: hq mesh project set failed for ${company}/${project}`);
+    let result;
+    try {
+        result = asRecord(JSON.parse(set.stdout));
+    }
+    catch {
+        return errorResult("registration incomplete: project set output missing threadId");
+    }
+    const registration = asRecord(result?.registration);
+    const thread = jqString(jqOr(registration?.threadId, jqOr(result?.threadId, "")));
+    if (!thread)
+        return errorResult("registration incomplete: project set output missing threadId");
+    const channel = jqString(jqOr(registration?.channelId, jqOr(result?.channelId, "")));
+    if (!channel)
+        return errorResult("registration incomplete: project set output missing channelId");
+    const now = timestamp(deps);
+    const rows = projectRows(document);
+    document.projects = rows.map((item) => item.id === project || item.mesh_project_id === project
+        ? { ...item, threadId: thread, channelId: channel, mesh_project_id: project, mesh_registration_prompt_state: "accepted", updated_at: now }
+        : item);
+    for (const updated of document.projects) {
+        if (updated.id === project || updated.mesh_project_id === project)
+            delete updated.pending_registration;
+    }
+    try {
+        atomicJqWrite(board, document, deps);
+    }
+    catch {
+        return errorResult("registration incomplete: local Board registration did not verify");
+    }
+    const verified = projectRows(boardData(company, board, deps)).some((item) => (item.id === project || item.mesh_project_id === project) && item.threadId === thread && item.channelId === channel);
+    if (!verified)
+        return errorResult("registration incomplete: local Board registration did not verify");
+    return { code: 0, stdout: `registered ${company}/${project} thread=${thread} channel=${channel}\n`, stderr: "" };
+}
 function audit(company, deps) {
     if (!company)
         return errorResult("usage: register-project.sh --audit <company>");
@@ -253,7 +317,10 @@ function audit(company, deps) {
                 stderr += `no company uid for ${company} (set HQ_COMPANY_UID, companies/${company}/.company-uid, or manifest cloud_uid)\n`;
                 return true;
             }
-            return !deps.fs.existsSync(path.join(deps.env.HOME || os.homedir(), ".hq/work-mesh/cache/projects", uid, `${project}.json`));
+            const cache = path.join(deps.env.HOME || os.homedir(), ".hq/work-mesh/cache/projects", uid);
+            const meshProject = meshProjectIdForPrd(company, project, deps);
+            return !deps.fs.existsSync(path.join(cache, `${meshProject}.json`))
+                && !deps.fs.existsSync(path.join(cache, `${project}.json`));
         }
         catch {
             return false;
@@ -360,6 +427,11 @@ function retryPending(company, deps) {
 export function runRegisterProject(args, deps) {
     try {
         const [mode, arg1, ...rest] = args;
+        if (mode === "--brainstorm") {
+            if (args.length !== 3)
+                return errorResult("usage: register-project.sh --brainstorm <company> <board-project-id>");
+            return registerBrainstorm(arg1 ?? "", rest[0] ?? "", deps);
+        }
         if (mode === "--audit")
             return audit(arg1 ?? "", deps);
         if (mode === "--backfill")

package/dist/commands/core.js

@@ -63,7 +63,11 @@ import { tokenUsageReport } from "../lib/core-utils/token-usage-report.js";
 import { createWorktree } from "../lib/core-utils/worktree.js";
 import { runCodexSkillBridgeCommand } from "../lib/core-utils/codex-skill-bridge-entry.js";
 import { archiveOldThreads } from "../lib/core-utils/archive-old-threads.js";
-import { qmdReindexAfterSync } from "../lib/core-utils/qmd-reindex-after-sync.js";
+import { QMD_REINDEX_STARTUP_WARNING_FLAG, qmdReindexAfterSync } from "../lib/core-utils/qmd-reindex-after-sync.js";
+import { qmdReindexSingleFlightEnabled } from "../lib/search-index/reindex-single-flight-flag.js";
+import { qmdCollectionPathRepairEnabled } from "../lib/search-index/collection-path-repair-flag.js";
+import { reconcileCollections } from "../lib/search-index/index.js";
+import { resolveProcessFlagGate } from "../lib/flag-registry.js";
 import { softTimeoutCommand } from "../lib/core-utils/soft-timeout.js";
 import { timeoutGuardCommand } from "../lib/core-utils/timeout-guard.js";
 import { readSentryReportStdin, reportSentryEvent } from "../lib/core-utils/sentry-report.js";
@@ -87,7 +91,18 @@ export const NATIVE_UTILITY_COMMANDS = [
     { name: "worktree", asset: "core/scripts/worktree.sh", root: "live", summary: "Create a git worktree under workspace/worktrees/", run: (args, context) => createWorktree(args, { cwd: context.cwd, hqRoot: context.hqRoot }) },
     { name: "codex-skill-bridge", asset: "core/scripts/codex-skill-bridge.sh", root: "live", summary: "Install/inspect the Codex skill bridge", run: (args, context) => runCodexSkillBridgeCommand(args, { root: context.hqRoot ?? context.cwd }) },
     { name: "archive-old-threads", asset: "core/scripts/archive-old-threads.sh", root: "live", summary: "Archive aged session-thread files", run: (args, context) => archiveOldThreads(args, { hqRoot: context.hqRoot ?? context.cwd }) },
-    { name: "qmd-reindex-after-sync", asset: "core/scripts/qmd-reindex-after-sync.sh", root: "cwd", summary: "Refresh qmd collections after a sync", run: (args, context) => qmdReindexAfterSync(args, { cwd: context.cwd }) },
+    {
+        name: "qmd-reindex-after-sync",
+        asset: "core/scripts/qmd-reindex-after-sync.sh",
+        root: "cwd",
+        summary: "Refresh qmd collections after a sync",
+        run: (args, context) => qmdReindexAfterSync(args, {
+            cwd: context.cwd,
+            singleFlightEnabled: qmdReindexSingleFlightEnabled,
+            reconcile: (root, options) => reconcileCollections(root, { ...options, repairPathDrift: qmdCollectionPathRepairEnabled() }),
+            startupFailureWarningsEnabled: () => resolveProcessFlagGate(QMD_REINDEX_STARTUP_WARNING_FLAG, { fallback: false }, () => false),
+        }),
+    },
 ];
 export const NATIVE_SCAFFOLD_COMMANDS = [
     {

package/dist/commands/index-cmd.js

@@ -5,13 +5,14 @@ import { defaultEmbedLockDependencies, runWithEmbedLock, } from '../lib/search-i
 import { checkEmbedLoad, defaultLoadGateDependencies, recordSuccessfulEmbed, } from '../lib/search-index/load-gate.js';
 import { applyIndexSizeLimit } from '../lib/search-index/max-doc-bytes.js';
 import { qmdReindexSingleFlightEnabled } from '../lib/search-index/reindex-single-flight-flag.js';
+import { qmdCollectionPathRepairEnabled } from '../lib/search-index/collection-path-repair-flag.js';
 import { findHqRoot } from '../utils/manifest.js';
 import { QMD_NATIVE_BINDING_REMEDY, isQmdNativeBindingError, } from '../utils/qmd-native-binding-error.js';
 import { isQmdStoreMissingError, qmdStoreMissingMessage, } from '../utils/qmd-store-missing-error.js';
 import { isQmdStoreUnopenableError, qmdStoreUnopenableMessage, } from '../utils/qmd-store-unopenable-error.js';
 import { isQmdWorkdirMissingError, qmdWorkdirMissingMessage, } from '../utils/qmd-workdir-missing-error.js';
 const defaults = {
-    reconcileCollections,
+    reconcileCollections: (root) => reconcileCollections(root, { repairPathDrift: qmdCollectionPathRepairEnabled() }),
     applyIndexSizeLimit,
     deriveCollections,
     listRegisteredCollections,

package/dist/commands/install-global.js

@@ -76,8 +76,23 @@ function runClaudeCli(args, home, env) {
     const childEnv = { ...process.env, ...env, HOME: home, CLAUDE_CONFIG_DIR: path.join(home, '.claude') };
     const result = spawnSync('claude', ['plugin', ...args], { encoding: 'utf8', env: childEnv, timeout: 120_000, windowsHide: true });
     if (result.error || result.status !== 0) {
+        if (result.error?.code === 'ENOENT') {
+            throw Object.assign(new Error('Claude Code plugin command failed because the Claude Code CLI was not found. Ensure the Claude Code CLI is installed and try again.'), { expected: true });
+        }
+        const stderr = typeof result.stderr === 'string' ? result.stderr : '';
+        let excerpt = stderr.replace(/\s+/g, ' ').trim();
+        excerpt = excerpt
+            .replace(/\bBearer\s+\S+/gi, 'Bearer [redacted]')
+            .replace(/(?:"((?:(?:access|refresh|id)[_-]?)?token|secret|password|authorization|api[_-]?key)"|'((?:(?:access|refresh|id)[_-]?)?token|secret|password|authorization|api[_-]?key)'|\b((?:(?:access|refresh|id)[_-]?)?token|secret|password|authorization|api[_-]?key)\b)\s*[:=]\s*(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|[^\s,}\]]+)/gi, (_match, doubleQuotedKey, singleQuotedKey, unquotedKey) => `${doubleQuotedKey ?? singleQuotedKey ?? unquotedKey}=[redacted]`)
+            .replace(/\beyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}\b/g, '[redacted]')
+            .replace(/\b(?:gh[pousr]_|github_pat_|sk-|xox[baprs]-)[A-Za-z0-9_-]{16,}\b/g, '[redacted]');
+        for (const value of Object.values(childEnv).filter((value) => typeof value === 'string' && value.length >= 4).sort((a, b) => b.length - a.length)) {
+            excerpt = excerpt.split(value).join('[redacted]');
+        }
+        excerpt = excerpt.slice(0, 240);
         const cause = result.error?.message ?? `exit status ${String(result.status)}`;
-        throw Object.assign(new Error(`Claude Code plugin command failed (${cause}). Ensure the Claude Code CLI is installed and try again.`), { expected: true });
+        const detail = excerpt ? `; stderr: ${excerpt}` : '';
+        throw Object.assign(new Error(`Claude Code plugin command failed (${cause}${detail}).`), { expected: true });
     }
 }
 function removePluginSettings(doc, plugin, removePlugin, removeMarketplace, pluginSettingBefore) {
@@ -374,7 +389,7 @@ export function installGlobalClaude(opts) {
         try {
             if (marketplaceNeedsAdd) {
                 marketplaceMayNeedRollback = true;
-                runClaude(['marketplace', 'add', '--scope', 'user', '--json', pluginSource.sourceDir], home, env);
+                runClaude(['marketplace', 'add', '--scope', 'user', pluginSource.sourceDir], home, env);
             }
             if (pluginNeedsInstall)
                 runClaude(['install', '--scope', 'user', '--json', '-y', pluginSource.pluginId], home, env);
@@ -391,7 +406,7 @@ export function installGlobalClaude(opts) {
             }
             if (marketplaceMayNeedRollback) {
                 try {
-                    runClaude(['marketplace', 'remove', '--scope', 'user', '--json', pluginSource.marketplaceName], home, env);
+                    runClaude(['marketplace', 'remove', '--scope', 'user', pluginSource.marketplaceName], home, env);
                 }
                 catch (rollbackError) {
                     rollbackErrors.push(`marketplace removal: ${rollbackError.message}`);
@@ -574,7 +589,7 @@ export function uninstallGlobalClaude(opts = {}) {
         runClaude(['uninstall', '--scope', 'user', '--json', pluginSource.pluginId], home, env);
     }
     if (pluginSource && state?.plugin?.marketplaceAdded) {
-        runClaude(['marketplace', 'remove', '--scope', 'user', '--json', pluginSource.marketplaceName], home, env);
+        runClaude(['marketplace', 'remove', '--scope', 'user', pluginSource.marketplaceName], home, env);
     }
     unregisterClaudeServer({ name: HQ_MCP_SERVER_NAME, pack: HQ_ANYWHERE_PACK, env: { home } });
     if (fs.existsSync(t.settingsJson)) {

package/dist/commands/integrations-core.d.ts

@@ -113,6 +113,7 @@ interface GatewayMessage {
     error?: unknown;
 }
 export type GatewayErrorShape = "string_error" | "object_no_code" | "object_code" | "string_code" | "nested_code" | "empty" | "redacted_empty";
+export type GatewayFailureCode = "invalid_envelope";
 export declare class IntegrationsCliError extends Error {
     /**
      * True when the error is the caller's request/state/permission (a client 4xx
@@ -152,6 +153,8 @@ export declare class IntegrationsCliError extends Error {
     readonly gatewaySubcommand?: "tools_list" | "tools_call" | "other";
     /** Fixed vocabulary describing the shape of an upstream JSON-RPC error. */
     readonly gatewayErrorShape?: GatewayErrorShape;
+    /** Fixed classification for malformed gateway envelopes. */
+    readonly gatewayFailureCode?: GatewayFailureCode;
     /**
      * HQ's own OAuth callback URL, carried on the errors that say a provider
      * refused to register HQ automatically. The provider must register the exact
@@ -168,6 +171,7 @@ export declare class IntegrationsCliError extends Error {
         rpcCode?: number;
         gatewaySubcommand?: "tools_list" | "tools_call" | "other";
         gatewayErrorShape?: GatewayErrorShape;
+        gatewayFailureCode?: GatewayFailureCode;
         redirectUri?: string;
     });
 }