@indigoai-us/hq-cli 5.324.0 → 5.326.0

package/dist/lib/daemon/server.js

@@ -11,12 +11,15 @@ import * as net from "node:net";
 import * as path from "node:path";
 import { CLI_VERSION } from "../../cli-version.js";
 import { canonicalDir, readRegistry, registryFile, resolveCompanyForDir } from "../registry/registry.js";
-import { createLineSplitter, encodeMessage, parseRequestLine } from "./protocol.js";
+import { createLineSplitter, encodeMessage, HQD_DEFAULT_REQUEST_TIMEOUT_MS, HQD_MAX_LINE_BYTES, parseRequestLine } from "./protocol.js";
 import { SessionRegistry } from "./session-registry.js";
 import { journalAppend, JournalOpError } from "./ops/journal.js";
 import { memoryGet, memoryPut, MemoryOpError } from "./ops/memory.js";
 import { meshPresence, MeshOpError } from "./ops/mesh.js";
 import { PolicyIndex, PolicyOpError, policyCheck } from "./ops/policy.js";
+import { HqMcpBridge, jsonResult, McpOpError, runWorker } from "./ops/mcp.js";
+import { HQ_MCP_TOOL_NAMES, HQD_NATIVE_TOOL_NAMES } from "../mcp/tools.js";
+import { anywhereRuntimeEnabled, HQ_ANYWHERE_RUNTIME_FLAG } from "../../commands/anywhere-runtime-flag.js";
 class OpError extends Error {
     code;
     constructor(code, message) {
@@ -87,19 +90,28 @@ export async function startHqdServer(opts) {
             throw new OpError("no_hq_root", "hqd has no HQ root configured (set hqRoot in daemon config or HQ_ROOT)");
         return opts.hqRoot;
     };
-    /** Company for a call: explicit arg, else the open session's, else the registry's answer for cwd. */
+    const assertCompanyMatchesBinding = (explicit, bound) => {
+        if (explicit && bound && explicit !== bound) {
+            throw new OpError("company_mismatch", `explicit company ${explicit} conflicts with bound company ${bound}`);
+        }
+    };
+    /** Resolve a call's company while keeping any session or cwd binding authoritative. */
     const companyFor = (args) => {
         const explicit = stringArg(args, "company", false);
-        if (explicit)
-            return explicit;
         const runtime = stringArg(args, "runtime", false);
         const sessionId = stringArg(args, "sessionId", false);
         const session = runtime && sessionId ? sessions.get(runtime, sessionId) : null;
-        if (session?.company)
-            return session.company;
         const cwd = stringArg(args, "cwd", false);
-        return cwd ? (resolve(cwd).company ?? undefined) : undefined;
+        const cwdCompany = cwd ? (resolve(cwd).company ?? undefined) : undefined;
+        if (session?.company && cwdCompany && session.company !== cwdCompany) {
+            throw new OpError("company_mismatch", `session company ${session.company} conflicts with cwd-bound company ${cwdCompany}`);
+        }
+        const boundCompany = session?.company ?? cwdCompany;
+        assertCompanyMatchesBinding(explicit, boundCompany);
+        return explicit ?? boundCompany;
     };
+    let hqMcp = opts.mcpBridge;
+    const mcpEnabled = opts.mcpEnabled ?? (() => anywhereRuntimeEnabled(env));
     if (!isPipe) {
         fs.mkdirSync(path.dirname(socketPath), { recursive: true, mode: 0o700 });
         if (fs.existsSync(socketPath)) {
@@ -108,7 +120,7 @@ export async function startHqdServer(opts) {
             fs.unlinkSync(socketPath);
         }
     }
-    /** Synchronous ops answer in request order; only policy.check returns a promise. */
+    /** Synchronous ops answer in request order; policy.check and mcp.call may return a promise. */
     const handle = (req) => {
         const args = req.args ?? {};
         switch (req.op) {
@@ -129,7 +141,9 @@ export async function startHqdServer(opts) {
                 const sessionId = stringArg(args, "sessionId");
                 const cwd = stringArg(args, "cwd");
                 const explicit = stringArg(args, "company", false);
-                const company = explicit ?? resolve(cwd).company;
+                const boundCompany = resolve(cwd).company;
+                assertCompanyMatchesBinding(explicit, boundCompany ?? undefined);
+                const company = explicit ?? boundCompany;
                 return sessions.open({ runtime, sessionId, cwd: canonicalDir(cwd), company });
             }
             case "session.get": {
@@ -197,6 +211,57 @@ export async function startHqdServer(opts) {
                     reason: stringArg(args, "reason", false),
                 }, { hqRoot: opts.hqRoot, workMeshRoot: opts.workMeshRoot, env, now: clock });
             }
+            case "mcp.call": {
+                const name = stringArg(args, "name");
+                const raw = args.arguments ?? {};
+                if (raw === null || typeof raw !== "object" || Array.isArray(raw))
+                    throw new OpError("bad_args", "arguments must be an object");
+                // Preserve the tool cwd for its operation; caller cwd remains the tenant binding.
+                const toolArgs = { ...(args.cwd !== undefined ? { cwd: args.cwd } : {}), ...raw };
+                const companyArgs = { ...toolArgs, ...(args.cwd !== undefined ? { cwd: args.cwd } : {}) };
+                delete companyArgs.runtime;
+                delete companyArgs.sessionId;
+                const runtime = stringArg(args, "runtime", false);
+                const sessionId = stringArg(args, "sessionId", false);
+                if (runtime !== undefined)
+                    companyArgs.runtime = runtime;
+                if (sessionId !== undefined)
+                    companyArgs.sessionId = sessionId;
+                const call = (op, a) => handle({ id: req.id, op, args: a });
+                const asResult = (value) => (value instanceof Promise ? value.then(jsonResult) : jsonResult(value));
+                switch (name) {
+                    case "hq_resolve_company":
+                        return asResult(call("resolve", { cwd: toolArgs.cwd ?? process.cwd() }));
+                    case "hq_policy_check":
+                        return asResult(call("policy.check", companyArgs));
+                    case "hq_journal_append":
+                        return asResult(call("journal.append", companyArgs));
+                    case "hq_run_worker": {
+                        const tool = companyArgs;
+                        return runWorker({
+                            worker: stringArg(tool, "worker"),
+                            skill: stringArg(tool, "skill", false),
+                            args: typeof tool.args === "string" ? tool.args : undefined,
+                            company: companyFor(tool),
+                        }, requireRoot(), env, clock()).then(jsonResult);
+                    }
+                    default: {
+                        if (HQD_NATIVE_TOOL_NAMES.has(name) || !HQ_MCP_TOOL_NAMES.has(name))
+                            throw new OpError("unknown_tool", `unknown tool ${name}`);
+                        companyFor(companyArgs);
+                        const timeoutMs = typeof args.timeoutMs === "number" && Number.isFinite(args.timeoutMs)
+                            ? Math.max(1, Math.min(args.timeoutMs, 120_000))
+                            : HQD_DEFAULT_REQUEST_TIMEOUT_MS;
+                        return Promise.resolve(mcpEnabled()).then((enabled) => {
+                            if (!enabled) {
+                                throw new McpOpError("hq_mcp_unavailable", `Hosted hq-mcp forwarding is disabled by the ${HQ_ANYWHERE_RUNTIME_FLAG} flag.`);
+                            }
+                            hqMcp ??= new HqMcpBridge({ env });
+                            return hqMcp.callTool(name, raw, timeoutMs);
+                        });
+                    }
+                }
+            }
             case "shutdown":
                 return { stopping: true };
             default:
@@ -231,7 +296,8 @@ export async function startHqdServer(opts) {
                     err instanceof PolicyOpError ||
                     err instanceof JournalOpError ||
                     err instanceof MemoryOpError ||
-                    err instanceof MeshOpError
+                    err instanceof MeshOpError ||
+                    err instanceof McpOpError
                     ? { code: err.code, message: err.message }
                     : { code: "internal", message: err instanceof Error ? err.message : String(err) };
                 if (error.code === "internal") {
@@ -260,7 +326,7 @@ export async function startHqdServer(opts) {
         }, () => {
             respond(socket, { id: null, ok: false, error: { code: "too_large", message: "request line too large" } });
             socket.end();
-        });
+        }, HQD_MAX_LINE_BYTES);
         socket.on("data", push);
     });
     await new Promise((resolveListen, rejectListen) => {
@@ -287,6 +353,7 @@ export async function startHqdServer(opts) {
         sessions,
         close: () => (closing ??= new Promise((done) => {
             policyIndex?.close();
+            hqMcp?.close();
             server.close(() => done());
             // Answered-but-idle clients would otherwise hold close() open.
             for (const client of clients)

package/dist/lib/install/claude-targets.d.ts

@@ -21,10 +21,14 @@ export interface ClaudeTargets {
 }
 export declare function claudeTargets(home: string): ClaudeTargets;
 export declare function masterHookPath(hqRoot: string): string;
+/** hqd hook shim (US-010): registered instead of master-hook.sh once hqd is installed. */
+export declare function shimPath(hqRoot: string): string;
+/** Which HQ hook script the user-scope install registers. */
+export type HookTarget = 'master' | 'shim';
 export declare function charterPath(hqRoot: string): string;
 export declare function hqSkillsSource(hqRoot: string): string;
 /** The exact hook command registered for one event (absolute path, quoted). */
-export declare function hookCommand(hqRoot: string, event: string): string;
+export declare function hookCommand(hqRoot: string, event: string, target?: HookTarget): string;
 export declare function claudeMdBlock(hqRoot: string): string;
 /** Append the block (replacing any prior HQ block). `null` input = file absent. */
 export declare function addClaudeMdBlock(current: string | null, hqRoot: string): string;
@@ -32,11 +36,14 @@ export declare function addClaudeMdBlock(current: string | null, hqRoot: string)
 export declare function removeClaudeMdBlock(current: string): string;
 export declare function hasClaudeMdBlock(current: string | null): boolean;
 type Doc = Record<string, unknown>;
-/** Add one master-hook group per event; idempotent. Foreign hooks are untouched. */
-export declare function addHqHooks(doc: Doc, hqRoot: string): Doc;
+/**
+ * Add one HQ hook group per event; idempotent. An HQ entry for the other
+ * target (master-hook.sh vs the hqd shim) is swapped out. Foreign hooks are untouched.
+ */
+export declare function addHqHooks(doc: Doc, hqRoot: string, target?: HookTarget): Doc;
 /** Remove only HQ master-hook entries; drop containers this left empty. */
 export declare function removeHqHooks(doc: Doc, hqRoot: string): Doc;
-export declare function hasAllHqHooks(doc: Doc, hqRoot: string): boolean;
+export declare function hasAllHqHooks(doc: Doc, hqRoot: string, target?: HookTarget): boolean;
 /**
  * Minimal line diff (LCS) with -/+ prefixes. Only changed lines and `context`
  * unchanged lines around them are shown, so a dry run never echoes a whole

package/dist/lib/install/claude-targets.js

@@ -37,6 +37,10 @@ export function claudeTargets(home) {
 export function masterHookPath(hqRoot) {
     return path.join(hqRoot, '.claude', 'hooks', 'master-hook.sh');
 }
+/** hqd hook shim (US-010): registered instead of master-hook.sh once hqd is installed. */
+export function shimPath(hqRoot) {
+    return path.join(hqRoot, 'core', 'scripts', 'hqd-hook-shim.sh');
+}
 export function charterPath(hqRoot) {
     return path.join(hqRoot, '.claude', 'CLAUDE.md');
 }
@@ -44,7 +48,9 @@ export function hqSkillsSource(hqRoot) {
     return path.join(hqRoot, '.claude', 'skills');
 }
 /** The exact hook command registered for one event (absolute path, quoted). */
-export function hookCommand(hqRoot, event) {
+export function hookCommand(hqRoot, event, target = 'master') {
+    if (target === 'shim')
+        return `/bin/sh ${JSON.stringify(shimPath(hqRoot))} ${event} --runtime claude`;
     return `bash ${JSON.stringify(masterHookPath(hqRoot))} ${event}`;
 }
 // ---------------------------------------------------------------------------
@@ -86,18 +92,24 @@ function isHqHookEntry(entry, hqRoot) {
     if (!entry || typeof entry !== 'object')
         return false;
     const cmd = entry.command;
-    return typeof cmd === 'string' && cmd.includes(JSON.stringify(masterHookPath(hqRoot)));
+    return (typeof cmd === 'string' &&
+        (cmd.includes(JSON.stringify(masterHookPath(hqRoot))) || cmd.includes(JSON.stringify(shimPath(hqRoot)))));
 }
-/** Add one master-hook group per event; idempotent. Foreign hooks are untouched. */
-export function addHqHooks(doc, hqRoot) {
+/**
+ * Add one HQ hook group per event; idempotent. An HQ entry for the other
+ * target (master-hook.sh vs the hqd shim) is swapped out. Foreign hooks are untouched.
+ */
+export function addHqHooks(doc, hqRoot, target = 'master') {
     const hooks = { ...(doc.hooks ?? {}) };
     let changed = false;
     for (const event of GLOBAL_HOOK_EVENTS) {
-        const groups = Array.isArray(hooks[event]) ? [...hooks[event]] : [];
-        const present = groups.some((g) => Array.isArray(g?.hooks) && g.hooks.some((h) => isHqHookEntry(h, hqRoot)));
+        const want = hookCommand(hqRoot, event, target);
+        let groups = Array.isArray(hooks[event]) ? [...hooks[event]] : [];
+        const present = groups.some((g) => Array.isArray(g?.hooks) && g.hooks.some((h) => h.command === want));
         if (present)
             continue;
-        groups.push({ hooks: [{ type: 'command', command: hookCommand(hqRoot, event), timeout: 300 }] });
+        groups = removeHqHooks({ hooks: { [event]: groups } }, hqRoot).hooks?.[event] ?? [];
+        groups.push({ hooks: [{ type: 'command', command: want, timeout: 300 }] });
         hooks[event] = groups;
         changed = true;
     }
@@ -141,8 +153,8 @@ export function removeHqHooks(doc, hqRoot) {
         next.hooks = hooks;
     return next;
 }
-export function hasAllHqHooks(doc, hqRoot) {
-    return addHqHooks(doc, hqRoot) === doc;
+export function hasAllHqHooks(doc, hqRoot, target = 'master') {
+    return addHqHooks(doc, hqRoot, target) === doc;
 }
 // ---------------------------------------------------------------------------
 // Dry-run diff.

package/dist/lib/install/codex-targets.d.ts

@@ -1,3 +1,4 @@
+import { type HookTarget } from './claude-targets.js';
 /** Events the Codex hook adapter is registered for at user scope. */
 export declare const CODEX_HOOK_EVENTS: readonly ["SessionStart", "UserPromptSubmit", "PreToolUse", "PostToolUse", "Stop"];
 export declare const AGENTS_MD_BEGIN = "<!-- hq-anywhere:begin (managed by `hq install --global --runtime codex`; remove with `hq uninstall --global --runtime codex`) -->";
@@ -24,18 +25,21 @@ export declare function codexCharterSource(hqRoot: string): string;
  * Hook command for every event. The adapter reads the event from
  * `hook_event_name` and falls back to its own $PWD when Codex sends no `cwd`.
  */
-export declare function codexHookCommand(hqRoot: string): string;
+export declare function codexHookCommand(hqRoot: string, target?: HookTarget): string;
 export declare function agentsMdBlock(charter: string): string;
 /** Append the block (replacing any prior HQ block). `null` input = file absent. */
 export declare function addAgentsMdBlock(current: string | null, charter: string): string;
 /** Strip the HQ block, plus the separator `addAgentsMdBlock` put before it. */
 export declare function removeAgentsMdBlock(current: string): string;
 type Doc = Record<string, unknown>;
-/** Add one adapter group per event; idempotent. Foreign hooks are untouched. */
-export declare function addCodexHooks(doc: Doc, hqRoot: string): Doc;
+/**
+ * Add one HQ hook group per event; idempotent. An HQ entry for the other
+ * target (adapter vs the hqd shim) is swapped out. Foreign hooks are untouched.
+ */
+export declare function addCodexHooks(doc: Doc, hqRoot: string, target?: HookTarget): Doc;
 /** Remove only HQ adapter entries; drop containers this left empty. */
 export declare function removeCodexHooks(doc: Doc, hqRoot: string): Doc;
-export declare function hasAllCodexHooks(doc: Doc, hqRoot: string): boolean;
+export declare function hasAllCodexHooks(doc: Doc, hqRoot: string, target?: HookTarget): boolean;
 export type LegacySkillsMirror = {
     kind: 'absent';
 }

package/dist/lib/install/codex-targets.js

@@ -11,6 +11,7 @@
  */
 import * as fs from 'fs';
 import * as path from 'path';
+import { shimPath } from './claude-targets.js';
 /** Events the Codex hook adapter is registered for at user scope. */
 export const CODEX_HOOK_EVENTS = [
     'SessionStart',
@@ -50,7 +51,9 @@ export function codexCharterSource(hqRoot) {
  * Hook command for every event. The adapter reads the event from
  * `hook_event_name` and falls back to its own $PWD when Codex sends no `cwd`.
  */
-export function codexHookCommand(hqRoot) {
+export function codexHookCommand(hqRoot, target = 'master') {
+    if (target === 'shim')
+        return `/bin/sh ${JSON.stringify(shimPath(hqRoot))} --runtime codex`;
     return `/bin/bash ${JSON.stringify(codexAdapterPath(hqRoot))}`;
 }
 // ---------------------------------------------------------------------------
@@ -88,18 +91,24 @@ function isAdapterEntry(entry, hqRoot) {
     if (!entry || typeof entry !== 'object')
         return false;
     const cmd = entry.command;
-    return typeof cmd === 'string' && cmd.includes(JSON.stringify(codexAdapterPath(hqRoot)));
+    return (typeof cmd === 'string' &&
+        (cmd.includes(JSON.stringify(codexAdapterPath(hqRoot))) || cmd.includes(JSON.stringify(shimPath(hqRoot)))));
 }
-/** Add one adapter group per event; idempotent. Foreign hooks are untouched. */
-export function addCodexHooks(doc, hqRoot) {
+/**
+ * Add one HQ hook group per event; idempotent. An HQ entry for the other
+ * target (adapter vs the hqd shim) is swapped out. Foreign hooks are untouched.
+ */
+export function addCodexHooks(doc, hqRoot, target = 'master') {
     const hooks = { ...(doc.hooks ?? {}) };
     let changed = false;
+    const want = codexHookCommand(hqRoot, target);
     for (const event of CODEX_HOOK_EVENTS) {
-        const groups = Array.isArray(hooks[event]) ? [...hooks[event]] : [];
-        const present = groups.some((g) => Array.isArray(g?.hooks) && g.hooks.some((h) => isAdapterEntry(h, hqRoot)));
+        let groups = Array.isArray(hooks[event]) ? [...hooks[event]] : [];
+        const present = groups.some((g) => Array.isArray(g?.hooks) && g.hooks.some((h) => h.command === want));
         if (present)
             continue;
-        groups.push({ hooks: [{ type: 'command', command: codexHookCommand(hqRoot), timeout: 300 }] });
+        groups = removeCodexHooks({ hooks: { [event]: groups } }, hqRoot).hooks?.[event] ?? [];
+        groups.push({ hooks: [{ type: 'command', command: want, timeout: 300 }] });
         hooks[event] = groups;
         changed = true;
     }
@@ -143,8 +152,8 @@ export function removeCodexHooks(doc, hqRoot) {
         next.hooks = hooks;
     return next;
 }
-export function hasAllCodexHooks(doc, hqRoot) {
-    return addCodexHooks(doc, hqRoot) === doc;
+export function hasAllCodexHooks(doc, hqRoot, target = 'master') {
+    return addCodexHooks(doc, hqRoot, target) === doc;
 }
 function within(child, parent) {
     const rel = path.relative(parent, child);

package/dist/lib/lanes/watcher-main.js

@@ -6,9 +6,9 @@
  * Requires HQ_ROOT in the environment.
  */
 import { spawn, spawnSync } from "node:child_process";
-import { existsSync, realpathSync } from "node:fs";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
+import { isMainModule } from "../../utils/is-main-module.js";
 import { runWatcherLoop } from "./watcher.js";
 import { spawnEnvelopeRepairViaCurrentCli, } from "./envelope-repair-dispatch.js";
 import { LanesError } from "./errors.js";
@@ -100,9 +100,7 @@ function main() {
         process.exit(1);
     });
 }
-const invokedEntryPath = process.argv[1] ? path.resolve(process.argv[1]) : undefined;
-const currentModule = realpathSync(fileURLToPath(import.meta.url));
-if (invokedEntryPath && existsSync(invokedEntryPath) && realpathSync(invokedEntryPath) === currentModule) {
+if (isMainModule(import.meta.url)) {
     main();
 }
 //# sourceMappingURL=watcher-main.js.map

package/dist/lib/mcp/hosted-search-tools.d.ts

@@ -0,0 +1,4 @@
+import type { McpToolDefinition } from "./types.js";
+/** OpenAI-compatible tools the cloud Lambda adds in place of hq_knowledge_search. */
+export declare const HOSTED_SEARCH_FETCH_TOOLS: readonly McpToolDefinition[];
+//# sourceMappingURL=hosted-search-tools.d.ts.map

package/dist/lib/mcp/hosted-search-tools.js

@@ -0,0 +1,28 @@
+/** OpenAI-compatible tools the cloud Lambda adds in place of hq_knowledge_search. */
+export const HOSTED_SEARCH_FETCH_TOOLS = [
+    {
+        name: "search",
+        description: "Search the authenticated user's chat-visible HQ knowledge, files, projects, policies, and skills. Returns ranked document references across every company the user is a member of and their personal vault. Use the returned `id` with `fetch` to retrieve the full document body.",
+        inputSchema: {
+            type: "object",
+            properties: {
+                query: { type: "string", minLength: 1, description: "Natural-language search query" },
+            },
+            required: ["query"],
+            additionalProperties: false,
+        },
+    },
+    {
+        name: "fetch",
+        description: "Retrieve the full body of a document returned by `search`. Enforces the same access scope as `search` — an id from a vault the caller no longer has access to is rejected. Skill bodies are returned as document text, not executable local tools.",
+        inputSchema: {
+            type: "object",
+            properties: {
+                id: { type: "string", minLength: 1, description: "An `id` from a prior `search` result" },
+            },
+            required: ["id"],
+            additionalProperties: false,
+        },
+    },
+];
+//# sourceMappingURL=hosted-search-tools.js.map

package/dist/lib/mcp/hq-mcp-tools.generated.d.ts

@@ -0,0 +1,3 @@
+import type { McpToolDefinition } from "./types.js";
+export declare const HQ_MCP_TOOLS: readonly McpToolDefinition[];
+//# sourceMappingURL=hq-mcp-tools.generated.d.ts.map