@openrig/cli 0.6.14 → 0.7.1

package/dist/daemon-lifecycle.d.ts

@@ -1,4 +1,5 @@
 import type { ChildProcess } from "node:child_process";
+export { daemonMayAnswer } from "./daemon-reachability.js";
 import type { DaemonStartLock } from "./daemon-start-lock.js";
 import type { InitWorkspaceResult, ManagedPathKind } from "@openrig/daemon/instance-initialization";
 export interface DaemonState {
@@ -22,6 +23,7 @@ export interface DaemonEventLoopEvidence {
     healthy: boolean;
 }
 export interface DaemonStatus {
+    databaseWarnings?: string[];
     /** RULING 1ae863d2 — C3 3-state semantics (canonical: daemon crash-cart-detect.ts, kept in
      *  lockstep): "stopped" requires POSITIVE evidence (connection refused); a probe TIMEOUT or
      *  other non-refusal failure is "unverified" — never a down assertion. */
@@ -30,7 +32,8 @@ export interface DaemonStatus {
      *  home (or a HOME-MOVED marker) exists — callers name BOTH paths, never assert down. */
     siblingHint?: {
         resolvedHome: string;
-        siblingHome: string;
+        siblingHome: string; /** an explicit HOME-MOVED marker, not just a live adjacent home */
+        moved?: true;
     };
     port?: number;
     host?: string;
@@ -82,9 +85,9 @@ export declare function daemonNotRunningError(): DaemonNotRunningError;
  *  what the probe KNOWS. UNVERIFIED/unhealthy = "did not respond" (down ≠ busy);
  *  stopped/stale = the plain not-running truth. Pure so every surface shares it. */
 export declare function statusGuardMessage(status: DaemonStatus): DaemonNotRunningError;
-/** B8-1b — THE precheck chokepoint: returns true when the daemon is running+healthy;
- *  otherwise prints the epistemic-matched 3-part (+ the wrong-home sibling hint when
- *  present), sets exit 1, returns false. Replaces the ~55 hand-rolled verbatim guards. */
+/** B8-1b — THE precheck chokepoint: returns true when the command should make its real request
+ *  ({@link daemonMayAnswer}); otherwise prints the epistemic-matched 3-part (+ the wrong-home sibling
+ *  hint when present), sets exit 1, returns false. Replaces the ~55 hand-rolled verbatim guards. */
 export declare function daemonStatusGuard(status: DaemonStatus, opts?: {
     json?: boolean;
 }): boolean;
@@ -105,6 +108,7 @@ export interface StartOptions {
     transcriptsLines?: number;
     transcriptsPollIntervalSeconds?: number;
     skipKernelBoot?: boolean;
+    allowDbConflict?: boolean;
 }
 export interface LifecycleDeps {
     /** Required by startDaemon; read-only lifecycle consumers need no launch capability. */
@@ -198,6 +202,7 @@ export declare function buildDaemonEnv(baseEnv: Record<string, string>, opts: {
     transcriptsLines?: number;
     transcriptsPollIntervalSeconds?: number;
     skipKernelBoot?: boolean;
+    allowDbConflict?: boolean;
 }): Record<string, string>;
 /** Resolve OPERATOR BIND INTENT from the dedicated surfaces ONLY: the --host flag, the
  *  daemon.host config key read from the FILE, or the dedicated OPENRIG_BIND_HOST env.
@@ -237,6 +242,7 @@ export declare function verifyRequiredListeners(input: {
     reason: string;
 } | {
     ok: "indeterminate";
+    hosts: string[];
     reason: string;
 }>;
 export declare function startDaemon(opts: StartOptions, deps: LifecycleDeps): Promise<DaemonState>;
@@ -274,6 +280,9 @@ export interface KernelReadyResult {
     kernelState: string | null;
     variant: string | null;
     detail: string | null;
+    /** The daemon is restoring an existing kernel a reboot left down, not booting a first one:
+     *  whether that restore is still running or has returned. */
+    existingRestore?: "in_progress" | "finished";
 }
 export declare function waitForKernelReady(baseUrl: string, timeoutMs: number, pollIntervalMs?: number): Promise<KernelReadyResult>;
 //# sourceMappingURL=daemon-lifecycle.d.ts.map

package/dist/daemon-lifecycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"daemon-lifecycle.d.ts","sourceRoot":"","sources":["../src/daemon-lifecycle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"daemon-lifecycle.d.ts","sourceRoot":"","sources":["../src/daemon-lifecycle.ts"],"names":[],"mappings":"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"}

package/dist/daemon-lifecycle.js

@@ -1,7 +1,8 @@
 import path from "node:path";
 import { existsSync } from "node:fs";
 import { DaemonClient, ForeignLocalDaemonError, connectionErrorCode, formatDaemonHostForUrl } from "./client.js";
-import { blockedConnectionGuidance, isBlockedConnectionCode } from "./daemon-reachability.js";
+import { blockedConnectionGuidance, daemonMayAnswer, isBlockedConnectionCode } from "./daemon-reachability.js";
+export { daemonMayAnswer } from "./daemon-reachability.js";
 import { DAEMON_STOP_WAIT_MS, DAEMON_SHUTDOWN_RECEIPT } from "../daemon/dist/daemon-shutdown.js";
 import { ConfigStore } from "./config-store.js";
 import { OPENRIG_HOME, LEGACY_RIGGED_HOME, readOpenRigEnv } from "./openrig-compat.js";
@@ -46,11 +47,11 @@ export function statusGuardMessage(status) {
         ...causeCode,
     };
 }
-/** B8-1b — THE precheck chokepoint: returns true when the daemon is running+healthy;
- *  otherwise prints the epistemic-matched 3-part (+ the wrong-home sibling hint when
- *  present), sets exit 1, returns false. Replaces the ~55 hand-rolled verbatim guards. */
+/** B8-1b — THE precheck chokepoint: returns true when the command should make its real request
+ *  ({@link daemonMayAnswer}); otherwise prints the epistemic-matched 3-part (+ the wrong-home sibling
+ *  hint when present), sets exit 1, returns false. Replaces the ~55 hand-rolled verbatim guards. */
 export function daemonStatusGuard(status, opts) {
-    if (status.state === "running" && status.healthy !== false)
+    if (daemonMayAnswer(status))
         return true;
     const err = statusGuardMessage(status);
     if (opts?.json) {
@@ -91,7 +92,18 @@ const DEFAULT_DB = "openrig.sqlite";
 // Fresh Linux hosts can take longer than a warmed dev machine to load native
 // modules, run startup reconciliation, and bind healthz. Keep the retry loop
 // bounded, but do not kill a healthy daemon during first-boot slack.
-const HEALTHZ_RETRIES = 80;
+// #1786: one elapsed deadline, started when the readiness loop begins (after the
+// child is spawned and its handlers are attached), covers every primary probe,
+// listener check and backoff (the 20s the old 80 x 250ms delays gave). Each probe
+// may take up to STARTUP_PROBE_TIMEOUT_MS, so a busy child that answers correctly
+// in a second is accepted, but no probe timer outlives the deadline (a 2s startup
+// ceiling, not a universal header wait). The deadline only stops new probes and
+// backoff: timers cannot preempt synchronous work in this process, so a verified
+// answer already in hand when the clock passes it is still used, with the usual
+// liveness and publication rechecks. A failed start may add up to
+// DAEMON_STOP_WAIT_MS of owned-child cleanup.
+const STARTUP_READINESS_DEADLINE_MS = 20_000;
+const STARTUP_PROBE_TIMEOUT_MS = 2_000;
 const HEALTHZ_DELAY_MS = 250;
 // OPR.0.4.7 slice-05 item-4: the WHOLE status health probe stays within ONE normal
 // CLI request window (~5s, matching DaemonClient's timeoutMs) — immediate connection
@@ -108,7 +120,7 @@ const STATUS_PROBE_MAX_ATTEMPTS = 5;
 const STATUS_PROBE_RETRY_DELAY_MS = 200;
 // Per-probe /healthz timeout for the SINGLE-SHOT callers that are NOT the status
 // settle path — checkPid classification and the start/stop recovery guards, plus
-// each iteration of startDaemon's own HEALTHZ_RETRIES poll loop. These keep their
+// startDaemon's pre-spawn checks (its readiness probes use STARTUP_PROBE_TIMEOUT_MS). These keep their
 // prior fixed-bound timing (the settle deadline above is status-probe-LOCAL); this
 // restores the timeout the removed HEALTHZ_PROBE_TIMEOUT_MS supplied to them.
 const HEALTHZ_PROBE_TIMEOUT_MS = 250;
@@ -312,6 +324,8 @@ export function buildDaemonEnv(baseEnv, opts) {
         env["OPENRIG_HOST"] = opts.host;
     }
     env["OPENRIG_DB"] = opts.db;
+    if (opts.allowDbConflict)
+        env["OPENRIG_ALLOW_DB_CONFLICT"] = "1";
     if (opts.transcriptsEnabled !== undefined) {
         env["OPENRIG_TRANSCRIPTS_ENABLED"] = String(opts.transcriptsEnabled);
     }
@@ -382,21 +396,21 @@ export async function verifyRequiredListeners(input) {
         else
             indeterminate.push(host);
     }
-    if (indeterminate.length > 0) {
-        // Indeterminate beats missing in precedence: with ANY listener unverifiable, the
-        // gate has no complete evidence set and must not authorize a kill.
-        return {
-            ok: "indeterminate",
-            reason: `listener state could not be checked for ${indeterminate.join(", ")} (transient probe failure) — the gate acts only on positive evidence and takes no action.`,
-        };
-    }
     if (missing.length > 0) {
+        // A refused or unhealthy listener is positive evidence, whatever else could not be checked.
         return {
             ok: false,
             missing,
             reason: `required listener(s) not answering /healthz: ${missing.join(", ")} — binding evidence beats config echo; a reported host must prove itself.`,
         };
     }
+    if (indeterminate.length > 0) {
+        return {
+            ok: "indeterminate",
+            hosts: indeterminate,
+            reason: `listener state could not be checked for ${indeterminate.join(", ")} (transient probe failure) — the gate acts only on positive evidence and takes no action.`,
+        };
+    }
     return { ok: true, verified };
 }
 function occupiedPortGuidance(port) {
@@ -490,6 +504,7 @@ async function startOwnedDaemon(opts, deps, lock) {
                 transcriptsLines: opts.transcriptsLines,
                 transcriptsPollIntervalSeconds: opts.transcriptsPollIntervalSeconds,
                 skipKernelBoot: opts.skipKernelBoot,
+                allowDbConflict: opts.allowDbConflict,
             }),
             stdio: ["ignore", logFd, logFd],
             detached: true,
@@ -513,7 +528,8 @@ async function startOwnedDaemon(opts, deps, lock) {
         const startupLog = deps.readFileFrom
             ? deps.readFileFrom(LOG_FILE, logOffset) ?? ""
             : Buffer.from(deps.readFile(LOG_FILE) ?? "").subarray(logOffset).toString();
-        const guidance = /\bEADDRINUSE\b/.test(startupLog)
+        const dbConflict = startupLog.match(/^(?:Error: )?(OPENRIG_DB_CONFLICT:[^\r\n]*)/m)?.[1];
+        const guidance = dbConflict ? ` ${dbConflict}` : /\bEADDRINUSE\b/.test(startupLog)
             ? ` ${occupiedPortGuidance(port)}`
             : ` See ${LOG_FILE} for details.`;
         childFailure = new Error(`Daemon child ${child.pid ?? "unknown"} exited before startup completed (code ${code}, signal ${signal ?? "none"}).${guidance}`);
@@ -534,14 +550,19 @@ async function startOwnedDaemon(opts, deps, lock) {
             throw new Error(`Daemon child ${pid} exited before startup completed`);
     };
     const healthzUrl = `http://${formatDaemonHostForUrl(probeHost)}:${port}/healthz`;
+    let deadline = Number.POSITIVE_INFINITY;
+    const remaining = () => Math.max(0, deadline - Date.now());
     const readOwnedHealth = async (url) => {
         assertChild();
+        // No new primary or listener fetch once the deadline has passed: a 0ms timer would still start one.
+        if (remaining() <= 0)
+            throw new HealthProbeTimeoutError(url);
         let timer;
         try {
             return await Promise.race([
                 failed,
                 new Promise((_, reject) => {
-                    timer = setTimeout(() => reject(new HealthProbeTimeoutError(url)), HEALTHZ_PROBE_TIMEOUT_MS);
+                    timer = setTimeout(() => reject(new HealthProbeTimeoutError(url)), Math.min(STARTUP_PROBE_TIMEOUT_MS, remaining()));
                 }),
                 (async () => {
                     const res = await deps.fetch(url);
@@ -571,11 +592,16 @@ async function startOwnedDaemon(opts, deps, lock) {
         assertChild();
         lock.recordChild(pid);
         let healthy = false;
+        let databaseWarnings = [];
         let lastProbe = "health endpoint not responding";
-        for (let i = 0; i < HEALTHZ_RETRIES; i++) {
+        let unverified = null;
+        deadline = Date.now() + STARTUP_READINESS_DEADLINE_MS;
+        while (remaining() > 0) {
+            unverified = null;
             try {
                 const body = await readOwnedHealth(healthzUrl);
                 if (body) {
+                    databaseWarnings = readDatabaseWarnings(body.databaseWarnings);
                     const bind = body.bind;
                     if (!bind || !["explicit", "default"].includes(bind.mode) || !Array.isArray(bind.hosts)
                         || bind.hosts.length === 0 || !bind.hosts.every((host) => typeof host === "string" && host.length > 0)
@@ -600,6 +626,7 @@ async function startOwnedDaemon(opts, deps, lock) {
                         healthy = true;
                         break;
                     }
+                    unverified = gate.hosts;
                     lastProbe = gate.reason;
                 }
             }
@@ -609,9 +636,16 @@ async function startOwnedDaemon(opts, deps, lock) {
                     throw error;
                 lastProbe = error instanceof Error ? error.message : String(error);
             }
-            await Promise.race([new Promise((resolve) => setTimeout(resolve, HEALTHZ_DELAY_MS)), failed]);
+            await Promise.race([new Promise((resolve) => setTimeout(resolve, Math.min(HEALTHZ_DELAY_MS, remaining()))), failed]);
         }
-        if (!healthy) {
+        // In the last round the child's own endpoint named its PID, and only another listener's check stayed
+        // uncertain: start, and say which listener is unverified.
+        const unverifiedSecondary = unverified !== null
+            && !unverified.some((host) => formatDaemonHostForUrl(host) === formatDaemonHostForUrl(probeHost));
+        if (!healthy && !unverifiedSecondary) {
+            if (unverified) {
+                throw new StartupChildPendingError(`Daemon child ${pid} responds at ${healthzUrl}, but listener verification is incomplete: ${lastProbe} Child left running; startup reservation retained. Inspect 'rig daemon status', daemon-start.lock and daemon.log before recovery.`);
+            }
             throw new Error(`${summarizeDaemonStartFailure(healthzUrl, deps.readFile(resolveLifecycleFile(deps, "daemon.log")))}. Last probe: ${lastProbe}`);
         }
         assertChild();
@@ -630,9 +664,16 @@ async function startOwnedDaemon(opts, deps, lock) {
             removeMatchingState(deps, STATE_FILE, state);
             throw error;
         }
+        for (const warning of databaseWarnings)
+            console.error(`Warning: ${warning}`);
+        if (unverifiedSecondary) {
+            console.error(`Warning: daemon started (pid ${pid}), but its listener on ${unverified.join(", ")} could not be verified: the check got no clear answer, not a refusal. Check /healthz on that address before relying on it.`);
+        }
         return state;
     }
     catch (error) {
+        if (error instanceof StartupChildPendingError)
+            throw error;
         // Only this launch's child may be cleaned up. A retained child also retains
         // the reservation so a retry cannot run another pre-bind initialization.
         // A failed ps is not exit evidence. This is our unreaped child: signal only
@@ -736,8 +777,11 @@ export async function stopDaemon(deps) {
         throw new Error(`Cannot stop safely: PID ${state.pid} is present but identity is not confirmed at ${check}; no signal sent, state preserved.`);
     }
     let notBefore = Date.parse(state.startedAt);
+    // Only a signalling stop names a request time: this process's clock just before kill, not delivery.
+    let requested = "";
     if (pidState !== "dead") {
         notBefore = Date.now();
+        requested = `; SIGTERM requested at ${new Date(notBefore).toISOString()}`;
         deps.kill(state.pid, "SIGTERM");
         // One signal. An already-exited target goes straight to the same judgment.
         const deadline = Date.now() + DAEMON_STOP_WAIT_MS;
@@ -747,7 +791,7 @@ export async function stopDaemon(deps) {
     }
     const present = deps.isProcessAlive(state.pid);
     const effect = await listener();
-    const observation = `targeted ${target}; checked ${check}; PID ${state.pid} ${present ? "present" : "absent"}; listener ${effect}`;
+    const observation = `targeted ${target}; checked ${check}; PID ${state.pid} ${present ? "present" : "absent"}; listener ${effect}${requested}`;
     if (present) {
         throw new Error(`Daemon did not exit after SIGTERM within ${DAEMON_STOP_WAIT_MS}ms; ${observation}` +
             (effect === "responding" ? " (still listening)" : "") + "; state file preserved.");
@@ -784,7 +828,7 @@ function findSiblingHome(deps) {
         if (deps.exists(marker)) {
             const target = deps.readFile(marker)?.trim();
             if (target)
-                return { resolvedHome: home, siblingHome: target };
+                return { resolvedHome: home, siblingHome: target, moved: true };
         }
         if (!deps.listDir)
             return undefined;
@@ -820,15 +864,25 @@ export async function getDaemonStatus(deps, options = {}) {
     // If OPENRIG_URL is set, bypass daemon.json and probe that URL directly
     const openrigUrl = readOpenRigEnv("OPENRIG_URL", "RIGGED_URL");
     if (openrigUrl) {
+        // An unverified daemon keeps the endpoint it was probed at, so a command can still make its request.
+        const endpoint = (() => {
+            try {
+                const url = new URL(openrigUrl);
+                return { port: Number(url.port) || DEFAULT_PORT, host: url.hostname || DEFAULT_HOST };
+            }
+            catch {
+                return {};
+            }
+        })();
         try {
             const res = await probeHealthzWithSettle(deps, `${openrigUrl}/healthz`);
             const ev = await readHealthEvidence(res);
             const url = new URL(openrigUrl);
-            return { state: "running", port: Number(url.port) || DEFAULT_PORT, host: url.hostname || DEFAULT_HOST, healthy: ev.healthy, reason: ev.reason, eventLoop: ev.eventLoop };
+            return { state: "running", port: Number(url.port) || DEFAULT_PORT, host: url.hostname || DEFAULT_HOST, healthy: ev.healthy, reason: ev.reason, eventLoop: ev.eventLoop, ...(ev.databaseWarnings ? { databaseWarnings: ev.databaseWarnings } : {}) };
         }
         catch (err) {
             // 1ae863d2: refusal = positive down; anything else (timeout/wedged/blocked) = unverified.
-            return isRefusedError(err) ? { state: "stopped" } : { state: "unverified", ...probeErrorCodeOf(err) };
+            return isRefusedError(err) ? { state: "stopped" } : { state: "unverified", ...endpoint, ...probeErrorCodeOf(err) };
         }
     }
     const state = readState(deps);
@@ -844,6 +898,7 @@ export async function getDaemonStatus(deps, options = {}) {
                 healthy: ev.healthy,
                 reason: ev.reason,
                 eventLoop: ev.eventLoop,
+                ...(ev.databaseWarnings ? { databaseWarnings: ev.databaseWarnings } : {}),
             };
         }
         catch (err) {
@@ -852,7 +907,9 @@ export async function getDaemonStatus(deps, options = {}) {
             const siblingHint = findSiblingHome(deps);
             if (siblingHint)
                 return { state: "unverified", siblingHint, ...probeErrorCodeOf(err) };
-            return isRefusedError(err) ? { state: "stopped" } : { state: "unverified", ...probeErrorCodeOf(err) };
+            return isRefusedError(err)
+                ? { state: "stopped" }
+                : { state: "unverified", port: configured.port, host: configured.host, ...probeErrorCodeOf(err) };
         }
     }
     const liveness = deps.processLiveness
@@ -874,17 +931,18 @@ export async function getDaemonStatus(deps, options = {}) {
         try {
             const res = await probeHealthzWithSettle(deps, `http://${formatDaemonHostForUrl(host)}:${state.port}/healthz`);
             const ev = await readHealthEvidence(res);
-            return { state: "running", port: state.port, host, pid: state.pid, healthy: ev.healthy, reason: ev.reason, eventLoop: ev.eventLoop };
+            return { state: "running", port: state.port, host, pid: state.pid, healthy: ev.healthy, reason: ev.reason, eventLoop: ev.eventLoop, ...(ev.databaseWarnings ? { databaseWarnings: ev.databaseWarnings } : {}) };
         }
         catch (err) {
             // 1ae863d2: refusal = positive down; anything else (timeout/wedged/blocked) = unverified.
-            return isRefusedError(err) ? { state: "stopped" } : { state: "unverified", pid: state.pid, ...probeErrorCodeOf(err) };
+            return isRefusedError(err) ? { state: "stopped" } : { state: "unverified", pid: state.pid, port: state.port, host, ...probeErrorCodeOf(err) };
         }
     }
     // Process alive — check healthz
     let healthy = false;
     let reason;
     let eventLoop;
+    let databaseWarnings;
     let probeFailure = {};
     try {
         const res = await probeHealthzWithSettle(deps, `http://${formatDaemonHostForUrl(host)}:${state.port}/healthz`);
@@ -892,6 +950,7 @@ export async function getDaemonStatus(deps, options = {}) {
         healthy = ev.healthy;
         reason = ev.reason;
         eventLoop = ev.eventLoop;
+        databaseWarnings = ev.databaseWarnings;
     }
     catch (err) {
         // OPR.0.4.3.21 — pid alive but healthz timed out: the honest wedged-loop
@@ -901,7 +960,7 @@ export async function getDaemonStatus(deps, options = {}) {
         probeFailure = probeErrorCodeOf(err);
     }
     // pid alive = running (state file preserved either way)
-    return { state: "running", port: state.port, host, pid: state.pid, healthy, reason, eventLoop, ...probeFailure };
+    return { state: "running", port: state.port, host, pid: state.pid, healthy, reason, eventLoop, ...(databaseWarnings ? { databaseWarnings } : {}), ...probeFailure };
 }
 /** #275 — keep the OS code of a failed health probe (absent for a timeout). */
 function probeErrorCodeOf(err) {
@@ -926,6 +985,9 @@ export function tailLogs(deps, opts) {
     });
     child.unref();
 }
+function readDatabaseWarnings(value) {
+    return Array.isArray(value) && value.every(item => typeof item === "string") ? value : [];
+}
 /**
  * OPR.0.4.3.21 — read event-loop wedge evidence from a healthz probe result.
  * A plain `{ ok: true }` (mocks, or a monitor-less daemon) → healthy with no
@@ -940,6 +1002,8 @@ async function readHealthEvidence(res) {
         return { healthy: true };
     try {
         const body = (await res.json());
+        const warnings = readDatabaseWarnings(body?.databaseWarnings);
+        const context = warnings.length ? { databaseWarnings: warnings } : {};
         const el = body?.eventLoop;
         if (el && typeof el.healthy === "boolean" && typeof el.lagMeanMs === "number") {
             const eventLoop = {
@@ -950,9 +1014,10 @@ async function readHealthEvidence(res) {
                 healthy: el.healthy,
             };
             return el.healthy
-                ? { healthy: true, eventLoop }
-                : { healthy: false, reason: "event-loop-starved", eventLoop };
+                ? { healthy: true, eventLoop, ...context }
+                : { healthy: false, reason: "event-loop-starved", eventLoop, ...context };
         }
+        return { healthy: true, ...context };
     }
     catch {
         // Body absent / not JSON — treat as plain healthy (res.ok already true).
@@ -1089,9 +1154,14 @@ export async function waitForKernelReady(baseUrl, timeoutMs, pollIntervalMs = 50
                     kernelState: body.kernel_state ?? null,
                     variant: body.variant ?? null,
                     detail: body.detail ?? null,
+                    ...(body.existing_restore === "in_progress" || body.existing_restore === "finished"
+                        ? { existingRestore: body.existing_restore } : {}),
                 };
                 if (last.ok)
                     return last;
+                // A restore of an existing kernel that has returned without a ready kernel won't change.
+                if (last.existingRestore === "finished")
+                    return last;
                 // Terminal non-ready states: don't keep polling.
                 if (body.kernel_state === "auth_blocked" ||
                     body.kernel_state === "spec_missing" ||