@indigoai-us/hq-cli 5.342.11 → 5.342.13

package/dist/commands/monitor.js

@@ -10,6 +10,9 @@ import { appendDropboxMessageAtPath, drainDropboxAtPath, formatDropboxMessages }
 import { dispatchLaneDelivery } from "../lib/lanes/delivery-core.js";
 import { MONITOR_FLAG, MONITOR_FLAG_DEFAULT, MONITOR_DEFAULT_CHECKIN_MS, MONITOR_DEFAULT_TIMEOUT_MS, MONITOR_POLL_INTERVAL_MS, MONITOR_BATCH_WINDOW_MS, MONITOR_MAX_EVENTS_PER_WINDOW, MONITOR_MAX_FLOOD_WINDOWS, MONITOR_RATE_WINDOW_MS, MONITOR_SCHEMA_VERSION, monitorDir, monitorSessionDir, monitorSessionHasActiveMarkerForOwner, monitorSessionHasActiveMarkers, monitorSessionHasWork, monitorSessionInboxHasEvents, monitorTargetKey, assertMonitorTimeoutCompatibility, parseMonitorDuration, parseMonitorTarget, detectMonitorTarget, findNearestMonitorRuntime, makeMonitorId, recordMonitorTargetDelivery, recordMonitorTargetActivity, recordMonitorTargetDeliveryAtPath, runMonitorCheckinTick, readMonitorPidLiveness, recordHookSessionMapping, resolveMappedSessionId, parseHookSessionId, withMonitorTargetLock, nextMonitorEventSequence, recordMonitorEventState, requestMonitorStop, nextMonitorTimeoutDelay } from "../lib/monitor.js";
 import { readProcStarttime } from "../lib/lanes/spawn.js";
+import { createMonitorLaneMessageApi } from "./lanes.js";
+import { releaseCurrentPackageUseLease, releasePackageUseLeaseAfterResidentPreload } from "../utils/package-use-lease.js";
+import { preloadResidentPackageModules, reportResidentPackagePreloadFailure, runResidentCommandWithPackageLease, } from "../utils/resident-package-preload.js";
 const RUNTIME_ENV = {
     claude: "CLAUDE_CODE_SESSION_ID",
     codex: "CODEX_THREAD_ID",
@@ -418,7 +421,7 @@ function removeActiveMarker(hqRoot, meta) {
         return;
     fs.rmSync(path.join(monitorSessionDir(hqRoot, meta.target.provider, meta.target.sessionId), "active", meta.monitor_id), { force: true });
 }
-async function deliverLaneEvent(hqRoot, meta, sequence, text) {
+async function deliverLaneEvent(hqRoot, meta, sequence, text, inProcess) {
     if (meta.target.kind !== "lane")
         throw new LanesError("monitor_lane_target_required", "Lane delivery requires a lane target.");
     const lane = tryReadLane(hqRoot, meta.target.laneId);
@@ -427,8 +430,8 @@ async function deliverLaneEvent(hqRoot, meta, sequence, text) {
     let dispatched;
     try {
         dispatched = await dispatchLaneDelivery(lane, {
-            dropbox: () => invokeLaneMonitorMessage(hqRoot, meta, sequence, text),
-            resume: () => invokeLaneMonitorMessage(hqRoot, meta, sequence, text),
+            dropbox: () => invokeLaneMonitorMessage(hqRoot, meta, sequence, text, inProcess),
+            resume: () => invokeLaneMonitorMessage(hqRoot, meta, sequence, text, inProcess),
         });
     }
     catch (err) {
@@ -438,9 +441,24 @@ async function deliverLaneEvent(hqRoot, meta, sequence, text) {
     }
     return { ...dispatched.value, outcome: `${dispatched.mechanism}:${dispatched.value.outcome}` };
 }
-function invokeLaneMonitorMessage(hqRoot, meta, sequence, text) {
+export function invokeLaneMonitorMessage(hqRoot, meta, sequence, text, inProcess) {
     if (meta.target.kind !== "lane")
         throw new LanesError("monitor_lane_target_required", "Lane delivery requires a lane target.");
+    if (inProcess) {
+        return inProcess(meta.target.laneId, { text, monitor_id: meta.monitor_id, description: meta.description, sequence })
+            .then((result) => {
+            if (!result.ok)
+                return { delivered: false, outcome: result.errorCode };
+            const response = result.response;
+            if (response === undefined) {
+                throw new LanesError("monitor_lane_delivery_invalid_response", "The lane delivery command returned invalid JSON: Unexpected end of JSON input.", {});
+            }
+            return {
+                delivered: response.accepted === true,
+                outcome: String(response.delivery_status ?? response.delivery ?? "accepted"),
+            };
+        });
+    }
     const cliEntrypoint = process.argv[1];
     if (!cliEntrypoint)
         throw new LanesError("monitor_cli_path_missing", "Could not locate the hq CLI entry point for lane delivery.");
@@ -488,16 +506,16 @@ function deliverSessionEvent(hqRoot, meta, sequence, text) {
     });
     return { delivered: true, outcome: "session_inbox" };
 }
-async function deliverTargetEvent(hqRoot, meta, sequence, text) {
+async function deliverTargetEvent(hqRoot, meta, sequence, text, inProcess) {
     return meta.target.kind === "lane"
-        ? deliverLaneEvent(hqRoot, meta, sequence, text)
+        ? deliverLaneEvent(hqRoot, meta, sequence, text, inProcess)
         : deliverSessionEvent(hqRoot, meta, sequence, text);
 }
-export async function deliverNormalEvent(hqRoot, meta, state, rawText) {
+export async function deliverNormalEvent(hqRoot, meta, state, rawText, inProcess) {
     return withMonitorTargetLock(hqRoot, meta.target_key, async (activityPath) => {
         const current = readJson(statePath(hqRoot, meta.monitor_id)) ?? state;
         const sequence = nextMonitorEventSequence(current);
-        const outcome = await deliverTargetEvent(hqRoot, meta, sequence, rawText);
+        const outcome = await deliverTargetEvent(hqRoot, meta, sequence, rawText, inProcess);
         const event = { seq: sequence, at: new Date().toISOString(), text: rawText, delivery: outcome.delivered ? "delivered" : `undeliverable:${outcome.outcome}` };
         const next = appendEventRecord(hqRoot, meta.monitor_id, current, event);
         if (outcome.delivered)
@@ -512,7 +530,7 @@ function targetEnded(hqRoot, meta) {
     const lane = tryReadLane(hqRoot, meta.target.laneId);
     return !lane || ["killed", "cancelled", "failed"].includes(lane.state);
 }
-async function monitorCheckin(hqRoot, meta, state) {
+async function monitorCheckin(hqRoot, meta, state, inProcess) {
     await runMonitorCheckinTick(hqRoot, meta.target_key, {
         now: () => new Date(),
         isWakeable: async (targetKey) => {
@@ -540,7 +558,7 @@ async function monitorCheckin(hqRoot, meta, state) {
                 return { delivered: false, outcome: "no_live_monitor" };
             const monitorState = readJson(statePath(hqRoot, monitor.monitor_id)) ?? state;
             const sequence = nextMonitorEventSequence(monitorState);
-            const outcome = await deliverTargetEvent(hqRoot, monitor, sequence, text);
+            const outcome = await deliverTargetEvent(hqRoot, monitor, sequence, text, inProcess);
             const event = { seq: sequence, at: new Date().toISOString(), text, delivery: outcome.delivered ? "delivered" : `undeliverable:${outcome.outcome}` };
             appendEventRecord(hqRoot, monitor.monitor_id, monitorState, event);
             return outcome;
@@ -557,6 +575,16 @@ function activeTargetMeta(hqRoot, targetKey) {
         return meta?.target_key === targetKey && state?.status === "running" && state.pid !== null && readMonitorPidLiveness(state.pid, state.starttime) ? [meta] : [];
     });
 }
+export async function preloadMonitorLaneMessageApi(hqRoot, meta, deps = {}) {
+    if (meta.target.kind !== "lane")
+        return undefined;
+    let laneMessageApi;
+    await releasePackageUseLeaseAfterResidentPreload(async () => {
+        await (deps.preloadResidentModules ?? (() => preloadResidentPackageModules("monitor-run")))();
+        laneMessageApi = (deps.createLaneMessageApi ?? createMonitorLaneMessageApi)(hqRoot, meta.cwd, process.env);
+    }, deps.reportPreloadFailure ?? reportResidentPackagePreloadFailure, deps.releasePackageUseLease ?? releaseCurrentPackageUseLease);
+    return laneMessageApi;
+}
 export async function runSupervisor(id, deps = {}) {
     const hqRoot = (deps.resolveRoot ?? resolveLanesHqRoot)();
     const dir = monitorDir(hqRoot, id);
@@ -569,6 +597,7 @@ export async function runSupervisor(id, deps = {}) {
         removeActiveMarker(hqRoot, meta);
         return;
     }
+    const laneMessageApi = await preloadMonitorLaneMessageApi(hqRoot, meta, deps);
     let state = { ...stateAtStart, status: "running", pid: process.pid, starttime: readProcStarttime(process.pid), started_at: new Date().toISOString() };
     writeJsonAtomic(statePath(hqRoot, id), state);
     let commandChild = null;
@@ -587,7 +616,7 @@ export async function runSupervisor(id, deps = {}) {
     let suppressed = 0;
     let floodWindows = 0;
     let checkinRunning = false;
-    const deliver = deps.deliver ?? deliverNormalEvent;
+    const deliver = deps.deliver ?? ((root, metadata, current, text) => deliverNormalEvent(root, metadata, current, text, laneMessageApi));
     const perWindowCap = (() => {
         const candidate = Number.parseInt(process.env.HQ_MONITOR_MAX_EVENTS_PER_WINDOW ?? "", 10);
         return Number.isInteger(candidate) && candidate > 0 ? candidate : MONITOR_MAX_EVENTS_PER_WINDOW;
@@ -711,7 +740,7 @@ export async function runSupervisor(id, deps = {}) {
         }
         if (!checkinRunning) {
             checkinRunning = true;
-            void monitorCheckin(hqRoot, meta, state)
+            void monitorCheckin(hqRoot, meta, state, laneMessageApi)
                 .then((next) => { state = next; })
                 .catch((err) => writeStderr(`check-in failed: ${errorPath(err)}\n`))
                 .finally(() => { checkinRunning = false; });
@@ -966,11 +995,11 @@ export function registerMonitorCommand(parent) {
     });
     monitor.command("wait", { hidden: true }).requiredOption("--provider <provider>")
         .action(async (options) => {
-        const result = await runMonitorHookSafely("wait", async () => {
+        const result = await runResidentCommandWithPackageLease("monitor-wait", () => runMonitorHookSafely("wait", async () => {
             if (options.provider !== "claude")
                 throw new LanesError("monitor_wait_provider_unsupported", "Only Claude Stop hooks can wait for session monitor events.", { provider: options.provider });
             return waitForSession(options.provider);
-        });
+        }));
         if (result.stdout)
             process.stdout.write(result.stdout);
         process.exitCode = result.exitCode;

package/dist/lib/doctor/checks/anywhere.js

@@ -99,12 +99,15 @@ export async function runAnywhereChecks(context, deps = {}) {
             health = unreachableHealth(socketPath);
         }
     }
-    const healthCheck = runtimeHealthCheck(health, healthUnsupported);
-    if (!runtimeEnabled)
-        return [healthCheck];
     const claude = claudeTargets(home);
     const codex = codexTargets(home);
     const installed = [claude.hqPointer, claude.stateFile, codex.stateFile].some((p) => fs.existsSync(p));
+    const serviceState = runtimeEnabled && installed
+        ? (deps.serviceState ?? (() => defaultServiceState(home)))()
+        : undefined;
+    const healthCheck = runtimeHealthCheck(health, healthUnsupported, serviceState);
+    if (!runtimeEnabled)
+        return [healthCheck];
     const remoteModes = [
         result("WARN", "chatgpt-mode", `ChatGPT integration mode: ${CHATGPT_MODE}; host connector setup is managed in ChatGPT`, "hq install --global --runtime chatgpt"),
         result("WARN", "grok-mode", `Grok integration mode: ${GROK_MODE}; host connector setup is managed in Grok`, "hq install --global --runtime grok"),
@@ -117,7 +120,7 @@ export async function runAnywhereChecks(context, deps = {}) {
     out.push(checkInstallMode(claude.stateFile));
     out.push(checkPointer(claude.hqPointer));
     out.push(checkRegistry(registryFile(registryDir(home, env))));
-    const service = (deps.serviceState ?? (() => defaultServiceState(home)))();
+    const service = serviceState;
     if (!service.installed)
         out.push(result("FAIL", "daemon-installed", `daemon service is not installed (${service.detail})`, REMEDIATION.daemonInstall));
     else if (!service.loaded)
@@ -162,7 +165,7 @@ function unreachableHealth(socketPath) {
         socket: { path: socketPath, transport: process.platform === "win32" ? "windows_named_pipe" : "unix_socket", mode: null, ownerMatchesUser: null, userOnly: null },
     };
 }
-function runtimeHealthCheck(health, healthUnsupported = false) {
+function runtimeHealthCheck(health, healthUnsupported = false, serviceState) {
     const { flag, resolution, socket } = health;
     const age = flag.lastSuccessfulReadAgeMs === null
         ? "unknown"
@@ -189,7 +192,9 @@ function runtimeHealthCheck(health, healthUnsupported = false) {
     const message = health.reachable
         ? `hqd reachable; version ${health.version ?? "unknown"}; uptime ${health.uptimeMs === null ? "unknown" : `${new Intl.NumberFormat("en-US").format(health.uptimeMs)} ms`}; runtime flag ${flagLabel}; last successful flag read ${age} ago; held through read error: ${flag.heldThroughReadError ? "yes" : "no"}; cwd binding ${binding}; socket ${socket.path}; ${socketSecurity}${warningNotes.length ? `; ${warningNotes.join("; ")}` : ""}`
         : unreachableMessage;
-    const remediation = healthUnsupported || socketNotUserOnly ? REMEDIATION.daemonRestart : undefined;
+    const remediation = !health.reachable && socket.transport === "unix_socket" && serviceState
+        ? serviceState.installed ? REMEDIATION.daemonRestart : REMEDIATION.daemonInstall
+        : healthUnsupported || socketNotUserOnly ? REMEDIATION.daemonRestart : undefined;
     return {
         status: health.reachable && warningNotes.length === 0 ? "PASS" : "WARN",
         checkId: "anywhere.runtime-health",