@openrig/cli 0.6.4 → 0.6.6

package/daemon/dist/domain/restore-check-service.d.ts

@@ -1,3 +1,5 @@
+import type { CurrentStateRehydrateEligibility } from "./rehydrate-eligibility.js";
+import type { Snapshot, RigServicesRecord } from "./types.js";
 export type CheckStatus = "green" | "yellow" | "red";
 export type Verdict = "restorable" | "restorable_with_caveats" | "not_restorable" | "unknown";
 export type ReadinessStatus = "ready" | "ready_with_caveats" | "not_ready" | "unknown";
@@ -94,6 +96,11 @@ export interface StartupContextProjectionEntry {
     effectiveId?: string | null;
     category?: string | null;
     sourcePath?: string | null;
+    resourceType?: string | null;
+}
+export interface QueueStoreProbeResult {
+    available: boolean;
+    evidence: string;
 }
 export type StartupContextProbeResult = {
     status: "ok";
@@ -129,6 +136,8 @@ export interface RestoreCheckOpts {
     /** OPR.0.4.0.29 FR-2: in compact mode, still assemble ready-seat detail so
      *  `--ready` shows ready seats without dropping to the full firehose. */
     includeReady?: boolean;
+    /** Composed status polls need preconditions only for rigs needing recovery. */
+    recoveryOnly?: boolean;
 }
 export interface NodeInventoryEntry {
     nodeId?: string | null;
@@ -164,6 +173,16 @@ export interface RestoreCheckDeps {
         id: string;
         kind: string;
     } | null;
+    /** Exact ordinary-restore input; never captures an auto-rehydrate snapshot. */
+    getRestoreInputs: (rigId: string) => {
+        snapshot: Pick<Snapshot, "id" | "kind" | "data">;
+        servicesRecord: RigServicesRecord | null;
+    } | {
+        currentStateRehydrate: CurrentStateRehydrateEligibility;
+        reason: string;
+    } | {
+        unavailable: string;
+    };
     /** Probe daemon health: returns { healthy: boolean; evidence: string } */
     probeDaemonHealth: () => {
         healthy: boolean;
@@ -173,17 +192,18 @@ export interface RestoreCheckDeps {
     exists: (path: string) => boolean;
     /** Read a declaration/config file. Kept injectable so restore-check remains testable and source-safe. */
     readFile: (path: string) => string;
-    /** Substrate root for queue file path resolution */
+    /** Shared-docs root for rig spec path resolution. */
     substrateRoot?: string;
+    /** Read-only probe of the daemon SQLite queue store. */
+    probeQueueStore?: () => QueueStoreProbeResult;
+    /** Relay-backed Claude hook events derived from the shipped hook manifest. */
+    getClaudeActivityHookEvents?: () => string[];
 }
-export declare const CLAUDE_HOOKS_ROOT: string;
-export declare const CLAUDE_SESSION_START_COMPACT_COMMAND: string;
-export declare const CLAUDE_USER_PROMPT_SUBMIT_COMMAND: string;
-export declare const CLAUDE_HOOK_FRAGMENT_PATH: string;
 export declare class RestoreCheckService {
     private deps;
     constructor(deps: RestoreCheckDeps);
     check(opts: RestoreCheckOpts): RestoreCheckResult;
+    private checkRestorePreconditions;
     /** Returns CheckEntry on success/definite-down; null on probe exception
      *  (uninspectable state → caller should produce verdict: unknown). */
     private checkDaemonReachable;
@@ -198,10 +218,9 @@ export declare class RestoreCheckService {
     private checkResumePath;
     private checkStartupContext;
     private buildStartupContextAvailabilityCheck;
-    private checkQueueFile;
+    private checkQueueStore;
     private checkHooks;
-    private getClaudeSettingsCandidates;
-    private hasClaudeCommandHook;
+    private hasActivityRelayHook;
     private checkSpecPresent;
     private inspectLatestSnapshot;
     private buildResult;

package/daemon/dist/domain/restore-check-service.d.ts.map

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

package/daemon/dist/domain/restore-check-service.js

@@ -1,23 +1,11 @@
 import { accessSync, constants } from "node:fs";
-import { homedir } from "node:os";
-import { isAbsolute, join, relative } from "node:path";
+import { isAbsolute, join, relative, sep } from "node:path";
 import { getCompatibleOpenRigPath } from "../openrig-compat.js";
+import { shellQuote as quoteShellArgument } from "../adapters/shell-quote.js";
 import { reanchorBuiltinStartupFile, reanchorShippedProjectionEntry } from "./builtin-startup-files.js";
+import { validatePreRestore } from "./restore-preconditions.js";
 // --- Service ---
 const DAEMON_HEALTHY_PATTERN = /^Daemon running\b/m;
-// OPR.0.3.2.14 — fallback subpath uses a generic .openrig placeholder
-// rather than an internal-team layout, to close the source-side
-// privacy leak. Fallback preserved per slice README §"Architecture
-// note" (option-A removal cascaded 36 test yellows in 0.3.1 cleanup).
-const SUBSTRATE_SHARED_DOCS_ROOT = process.env["OPENRIG_SUBSTRATE_SHARED_DOCS"]
-    ?? join(homedir(), ".openrig", "shared-docs");
-// OPR.0.3.2.14 — these four constants used to be copy-pasted in 7+
-// test files. Exporting from source + importing in tests eliminates
-// the divergence class that broke 17 tests during 0.3.1 cleanup.
-export const CLAUDE_HOOKS_ROOT = join(SUBSTRATE_SHARED_DOCS_ROOT, "control-plane", "services", "claude-hooks");
-export const CLAUDE_SESSION_START_COMPACT_COMMAND = join(CLAUDE_HOOKS_ROOT, "bin", "session-start-compact-context.sh");
-export const CLAUDE_USER_PROMPT_SUBMIT_COMMAND = join(CLAUDE_HOOKS_ROOT, "bin", "userpromptsubmit-queue-attention.sh");
-export const CLAUDE_HOOK_FRAGMENT_PATH = join(CLAUDE_HOOKS_ROOT, "config", "settings.fragment.json");
 export class RestoreCheckService {
     deps;
     constructor(deps) {
@@ -32,6 +20,7 @@ export class RestoreCheckService {
         const deferredAssessmentChecks = [];
         const rigRollupInputs = [];
         const recoveryRigInputs = [];
+        const restoreInputsByRig = new Map();
         // Host-level checks — daemon probe throw produces unknown (not not_restorable).
         // Daemon definitely-down (healthy=false, negative text) is red/not_restorable.
         // Daemon probe exception (socket unavailable, etc.) is unknown.
@@ -88,6 +77,17 @@ export class RestoreCheckService {
                     { check: "probe.error", status: "red", evidence: `Failed to get node inventory for ${rig.name}: ${err instanceof Error ? err.message : String(err)}`, remediation: "Check daemon status" },
                 ]);
             }
+            // No added snapshot/history read on a routine status poll for an all-ready rig.
+            // Explicit restore-check still assesses its next restore, even while it is running.
+            let preconditionError;
+            const allReady = nodes.length > 0 && nodes.every((node) => Boolean(node.canonicalSessionName) && node.sessionStatus === "running" && node.startupStatus === "ready");
+            if (!opts.recoveryOnly || !allReady) {
+                const preconditions = this.checkRestorePreconditions(rig);
+                checks.push(preconditions.check);
+                rigChecks.push(preconditions.check);
+                preconditionError = preconditions.error;
+                restoreInputsByRig.set(rig.rigId, { snapshot: preconditions.snapshot, error: preconditions.error });
+            }
             for (const node of nodes) {
                 const readinessCheck = this.checkSeatReadiness(node);
                 checks.push(readinessCheck);
@@ -129,7 +129,7 @@ export class RestoreCheckService {
                 checks.push(resumeCheck);
                 rigChecks.push(resumeCheck);
                 if (!opts.noQueue) {
-                    const queueCheck = this.checkQueueFile(rig.name, node);
+                    const queueCheck = this.checkQueueStore(node);
                     checks.push(queueCheck);
                     rigChecks.push(queueCheck);
                 }
@@ -139,11 +139,11 @@ export class RestoreCheckService {
                     rigChecks.push(hooksCheck);
                 }
             }
-            rigRollupInputs.push({ rig, nodes, checks: rigChecks });
+            rigRollupInputs.push({ rig, nodes, checks: rigChecks, preconditionError });
         }
         const rigRollups = rigRollupInputs.map((input) => this.buildRigRollup(input));
         for (const rollup of rigRollups) {
-            const latestSnapshot = this.inspectLatestSnapshot(rollup.rigId);
+            const latestSnapshot = restoreInputsByRig.get(rollup.rigId) ?? this.inspectLatestSnapshot(rollup.rigId);
             recoveryRigInputs.push({
                 rigId: rollup.rigId,
                 rigName: rollup.rigName,
@@ -156,6 +156,55 @@ export class RestoreCheckService {
         }
         return this.buildResult(checks, rigRollups, hostInfraCheck.hostInfra, recoveryRigInputs, deferredAssessmentChecks);
     }
+    checkRestorePreconditions(rig) {
+        const check = `rig.${rig.name}.restore-preconditions`;
+        try {
+            const input = this.deps.getRestoreInputs(rig.rigId);
+            if ("unavailable" in input)
+                throw new Error(input.unavailable);
+            if ("currentStateRehydrate" in input) {
+                const { ok, blockers } = input.currentStateRehydrate;
+                return {
+                    snapshot: null,
+                    check: {
+                        check,
+                        status: ok ? "yellow" : "red",
+                        evidence: ok
+                            ? `${input.reason}; restore inputs not inspected. Current-state rehydrate is eligible to attempt: ordinary rig up would capture current state. This does not validate that future snapshot or prove native continuity.`
+                            : `${input.reason}; current-state rehydrate is not eligible: ${blockers.join("; ")}`,
+                        remediation: "Inspect the rig's persisted state before choosing manual recovery",
+                        remediationSafe: true,
+                    },
+                };
+            }
+            const validation = validatePreRestore(input.snapshot.data, {
+                fsOps: { exists: this.deps.exists },
+                servicesRecord: input.servicesRecord,
+            });
+            const { blockers, warnings } = validation;
+            return {
+                snapshot: { id: input.snapshot.id, kind: input.snapshot.kind },
+                check: {
+                    check,
+                    status: blockers.length > 0 ? "red" : warnings.length > 0 ? "yellow" : "green",
+                    evidence: `Snapshot ${input.snapshot.id}: ${[
+                        ...blockers.map((blocker) => `${blocker.code}: ${blocker.message}`),
+                        ...warnings,
+                    ].join("; ") || "restore pre-validation passed (not a native resume proof)"}`,
+                    remediation: blockers.map((blocker) => blocker.remediation).join("; "),
+                    remediationSafe: false,
+                },
+            };
+        }
+        catch (err) {
+            const error = `Restore preconditions unavailable for ${rig.name}: ${err instanceof Error ? err.message : String(err)}`;
+            return {
+                snapshot: null,
+                error,
+                check: { check, status: "yellow", evidence: error, remediation: "Inspect the rig's restore snapshot and persisted inputs before trusting restore", remediationSafe: true },
+            };
+        }
+    }
     /** Returns CheckEntry on success/definite-down; null on probe exception
      *  (uninspectable state → caller should produce verdict: unknown). */
     checkDaemonReachable() {
@@ -414,7 +463,7 @@ export class RestoreCheckService {
             const openRigHome = getCompatibleOpenRigPath("");
             const resolved = join(openRigHome, relativePath);
             const relativeToHome = relative(openRigHome, resolved);
-            if (relativeToHome.startsWith("..") || isAbsolute(relativeToHome)) {
+            if (relativeToHome === ".." || relativeToHome.startsWith(`..${sep}`) || isAbsolute(relativeToHome)) {
                 return { error: "path traversal outside OPENRIG_HOME rejected" };
             }
             return { path: resolved };
@@ -600,25 +649,26 @@ export class RestoreCheckService {
             remediationSafe: false,
         };
     }
-    checkQueueFile(rigName, node) {
+    checkQueueStore(node) {
         const session = node.canonicalSessionName ?? node.logicalId;
-        const check = `seat.${session}.queue-file`;
-        // Derive queue file path from pod/member
-        const podName = node.podNamespace ?? (node.logicalId.includes(".") ? node.logicalId.split(".")[0] : null);
-        const memberName = node.logicalId.includes(".") ? node.logicalId.split(".").slice(1).join(".") : node.logicalId;
-        if (!podName) {
-            return { check, status: "yellow", evidence: "Cannot derive queue path (no pod namespace)", remediation: "" };
+        const check = `seat.${session}.queue-store`;
+        let probe;
+        try {
+            probe = this.deps.probeQueueStore?.();
         }
-        // OPR.0.3.2.14 — subpath scrubbed (internal-team layout → generic placeholder).
-        const substrateRoot = this.deps.substrateRoot ?? join(process.env["HOME"] ?? "~", ".openrig", "shared-docs");
-        const queuePath = join(substrateRoot, "rigs", rigName, "state", podName, `${memberName}.queue.md`);
-        if (this.deps.exists(queuePath)) {
-            return { check, status: "green", evidence: `Queue file exists at ${queuePath}`, remediation: "" };
+        catch (err) {
+            probe = {
+                available: false,
+                evidence: `Daemon SQLite queue_items store probe failed: ${err instanceof Error ? err.message : String(err)}`,
+            };
+        }
+        if (probe?.available) {
+            return { check, status: "green", evidence: probe.evidence, remediation: "" };
         }
         return {
             check, status: "yellow",
-            evidence: `Queue file missing: ${queuePath}`,
-            remediation: "Create the missing durable queue file before relying on restored queue continuity",
+            evidence: probe?.evidence ?? "Daemon SQLite queue store could not be inspected",
+            remediation: "Restore the daemon SQLite queue store before relying on queue continuity",
             remediationSafe: false,
         };
     }
@@ -638,105 +688,118 @@ export class RestoreCheckService {
                 remediation: "",
             };
         }
-        const candidates = this.getClaudeSettingsCandidates(node);
-        const searchedPaths = candidates.map((candidate) => candidate.path);
-        const cwdUnavailable = !node.cwd;
-        const inspections = [];
-        const malformed = [];
-        for (const candidate of candidates) {
-            if (!this.deps.exists(candidate.path))
-                continue;
-            let parsed;
+        // Current Claude activity hooks are selected as a runtime resource and
+        // delivered by ClaudeCodeAdapter into the seat CWD. Do not require the
+        // retired internal control-plane shell hooks on public installs.
+        const startup = node.nodeId ? this.deps.getStartupContext(node.nodeId) : null;
+        if (startup?.status === "ok" && !startup.projectionEntries.some((entry) => (entry.category === "runtime_resource" && entry.resourceType === "claude_activity_hooks"))) {
+            return {
+                check: `seat.${session}.hooks`, status: "green",
+                evidence: "Claude activity hooks are not selected for this seat; hook inspection is not applicable",
+                remediation: "",
+            };
+        }
+        if (startup?.status === "ok") {
+            if (!node.cwd) {
+                return {
+                    check: `seat.${session}.hooks`, status: "yellow",
+                    evidence: "Claude activity hooks are selected, but seat cwd is unavailable for delivery inspection",
+                    remediation: "Restore the seat working directory before trusting activity-hook readiness",
+                    remediationSafe: false,
+                };
+            }
+            const settingsPath = join(node.cwd, ".claude", "settings.local.json");
+            const relayPath = join(node.cwd, ".openrig", "hooks", "scripts", "activity-relay.cjs");
+            const events = this.deps.getClaudeActivityHookEvents?.() ?? [];
+            if (events.length === 0) {
+                return {
+                    check: `seat.${session}.hooks`, status: "yellow",
+                    evidence: "Claude activity hook events could not be derived from the shipped manifest",
+                    remediation: "Restore the daemon's Claude activity-hook assets before trusting hook readiness",
+                    remediationSafe: false,
+                };
+            }
+            if (!this.deps.exists(relayPath) || !this.deps.exists(settingsPath)) {
+                return {
+                    check: `seat.${session}.hooks`, status: "yellow",
+                    evidence: `Claude activity hook delivery is incomplete: expected relay ${relayPath} and settings ${settingsPath}`,
+                    remediation: "Relaunch the seat to project its selected Claude activity hooks",
+                    remediationSafe: false,
+                };
+            }
+            let settings;
             try {
-                parsed = JSON.parse(this.deps.readFile(candidate.path));
+                settings = JSON.parse(this.deps.readFile(settingsPath));
             }
             catch (err) {
-                malformed.push(`${candidate.path}: ${err instanceof Error ? err.message : String(err)}`);
-                continue;
+                return {
+                    check: `seat.${session}.hooks`, status: "yellow",
+                    evidence: `Claude activity-hook settings could not be trusted at ${settingsPath}: ${err instanceof Error ? err.message : String(err)}`,
+                    remediation: `Fix the Claude settings JSON at ${settingsPath}`,
+                    remediationSafe: false,
+                };
+            }
+            if (isRecord(settings) && settings["disableAllHooks"] === true) {
+                return {
+                    check: `seat.${session}.hooks`, status: "yellow",
+                    evidence: `Selected Claude activity hooks are explicitly disabled in ${settingsPath}; projection does not prove usable hooks`,
+                    remediation: "Review the intentional hook-disable setting before relying on activity-hook readiness",
+                    remediationSafe: false,
+                };
+            }
+            const missingEvents = events.filter((event) => !this.hasActivityRelayHook(settings, event, relayPath));
+            if (missingEvents.length === 0) {
+                return {
+                    check: `seat.${session}.hooks`, status: "green",
+                    evidence: `Selected Claude activity hooks are projected in ${settingsPath}, with relay present at ${relayPath}; hook execution is not verified`,
+                    remediation: "",
+                };
             }
-            inspections.push({
-                path: candidate.path,
-                hasSessionStartCompact: this.hasClaudeCommandHook(parsed, "SessionStart", CLAUDE_SESSION_START_COMPACT_COMMAND, "compact"),
-                hasUserPromptSubmit: this.hasClaudeCommandHook(parsed, "UserPromptSubmit", CLAUDE_USER_PROMPT_SUBMIT_COMMAND),
-            });
-        }
-        if (malformed.length > 0) {
             return {
                 check: `seat.${session}.hooks`, status: "yellow",
-                evidence: `Malformed applicable Claude settings file(s): ${malformed.join("; ")}. Claude hook configuration could not be trusted until the malformed applicable settings file is fixed. Searched settings paths: ${searchedPaths.join(", ")}`,
-                remediation: `Fix Claude settings JSON before trusting hook readiness: ${malformed.map((entry) => entry.split(":")[0]).join(", ")}`,
+                evidence: `Claude activity-hook settings at ${settingsPath} are missing relay entries for: ${missingEvents.join(", ")}`,
+                remediation: "Relaunch the seat to project its selected Claude activity hooks",
                 remediationSafe: false,
             };
         }
-        const sessionStartPaths = inspections
-            .filter((inspection) => inspection.hasSessionStartCompact)
-            .map((inspection) => inspection.path);
-        const userPromptSubmitPaths = inspections
-            .filter((inspection) => inspection.hasUserPromptSubmit)
-            .map((inspection) => inspection.path);
-        const hasSessionStart = sessionStartPaths.length > 0;
-        const hasUserPromptSubmit = userPromptSubmitPaths.length > 0;
-        if (hasSessionStart && hasUserPromptSubmit) {
-            return {
-                check: `seat.${session}.hooks`, status: "green",
-                evidence: `Claude Code hook configuration present, not hook-execution verified; SessionStart matcher compact command found in ${sessionStartPaths.join(", ")}; UserPromptSubmit command found in ${userPromptSubmitPaths.join(", ")}. Searched settings paths: ${searchedPaths.join(", ")}`,
-                remediation: "",
-            };
-        }
-        const missing = [];
-        if (!hasSessionStart) {
-            missing.push(`SessionStart matcher compact command ${CLAUDE_SESSION_START_COMPACT_COMMAND}`);
-        }
-        if (!hasUserPromptSubmit) {
-            missing.push(`UserPromptSubmit command ${CLAUDE_USER_PROMPT_SUBMIT_COMMAND}`);
-        }
-        const inspected = inspections.length > 0
-            ? `Existing settings inspected: ${inspections.map((inspection) => inspection.path).join(", ")}.`
-            : "No existing Claude settings files were found.";
-        const cwdEvidence = cwdUnavailable
-            ? " project settings were not inspected because cwd is unavailable."
-            : "";
         return {
             check: `seat.${session}.hooks`, status: "yellow",
-            evidence: `Claude Code hook configuration missing required entries: ${missing.join("; ")}. Searched settings paths: ${searchedPaths.join(", ")}. ${inspected}${cwdEvidence}`,
-            remediation: `Merge required Claude hook entries from ${CLAUDE_HOOK_FRAGMENT_PATH} into host-global or project Claude settings`,
+            evidence: startup?.status === "probe_error"
+                ? `Claude activity-hook selection could not be inspected: ${startup.evidence}`
+                : "Claude activity-hook selection could not be inspected because persisted startup context is unavailable",
+            remediation: "Restore the seat startup context before trusting hook readiness",
             remediationSafe: false,
         };
     }
-    getClaudeSettingsCandidates(node) {
-        const home = process.env["HOME"] ?? "~";
-        const candidates = [{
-                path: join(home, ".claude", "settings.json"),
-                scope: "host-global",
-            }];
-        if (node.cwd) {
-            candidates.push({
-                path: join(node.cwd, ".claude", "settings.json"),
-                scope: "project",
-            });
-            candidates.push({
-                path: join(node.cwd, ".claude", "settings.local.json"),
-                scope: "project-local",
-            });
-        }
-        return candidates;
-    }
-    hasClaudeCommandHook(settings, eventName, requiredCommand, requiredMatcher) {
+    hasActivityRelayHook(settings, eventName, relayPath) {
         if (!isRecord(settings) || !isRecord(settings["hooks"]))
             return false;
         const eventEntries = settings["hooks"][eventName];
         if (!Array.isArray(eventEntries))
             return false;
-        return eventEntries.some((entry) => {
-            if (!isRecord(entry))
-                return false;
-            if (requiredMatcher !== undefined && entry["matcher"] !== requiredMatcher)
-                return false;
-            const hooks = entry["hooks"];
-            if (!Array.isArray(hooks))
+        const contexts = eventName === "SessionStart" ? ["startup", "resume"]
+            : eventName === "Notification" ? ["permission_prompt", "idle_prompt"] : [null];
+        return contexts.every((context) => eventEntries.some((entry) => {
+            if (!isRecord(entry) || !Array.isArray(entry["hooks"]))
                 return false;
-            return hooks.some((hook) => isRecord(hook) && hook["command"] === requiredCommand);
-        });
+            if (context !== null && entry["matcher"] !== undefined && entry["matcher"] !== "" && entry["matcher"] !== "*") {
+                if (typeof entry["matcher"] !== "string")
+                    return false;
+                try {
+                    const matcher = entry["matcher"];
+                    const matches = /^[a-zA-Z0-9_\- ,|]+$/.test(matcher)
+                        ? matcher.split(/[|,]/).some((value) => value.trim() === context)
+                        : new RegExp(matcher).test(context);
+                    if (!matches)
+                        return false;
+                }
+                catch {
+                    return false;
+                }
+            }
+            return entry["hooks"].some((hook) => (isRecord(hook) && hook["type"] === "command" && typeof hook["command"] === "string" &&
+                hook["command"] === `node ${quoteShellArgument(relayPath)}`));
+        }));
     }
     checkSpecPresent(rig) {
         // OPR.0.3.2.14 — subpath scrubbed (internal-team layout → generic placeholder).
@@ -744,11 +807,13 @@ export class RestoreCheckService {
         const rigRoot = join(substrateRoot, "rigs", rig.name);
         const rigYaml = join(rigRoot, "rig.yaml");
         if (!this.deps.exists(rigRoot)) {
+            // A rig can launch from a spec anywhere, and restore reads the snapshot, never the spec,
+            // so a spec this check cannot find is a caveat, not a blocker.
             return {
-                check: `rig.${rig.name}.spec-present`, status: "red",
-                evidence: `Rig root missing: ${rigRoot}`,
-                remediation: `Create the rig root directory at ${rigRoot} with a rig.yaml spec`,
-                remediationSafe: false,
+                check: `rig.${rig.name}.spec-present`, status: "yellow",
+                evidence: `Not checked: no launch spec location could be established; looked for ${rigYaml}, and ${rigRoot} does not exist`,
+                remediation: `Confirm where this rig's spec lives; restore-check only looks at ${rigYaml}`,
+                remediationSafe: true,
             };
         }
         if (!this.deps.exists(rigYaml)) {
@@ -790,6 +855,9 @@ export class RestoreCheckService {
         if (red > 0) {
             verdict = "not_restorable";
         }
+        else if (rigs.some((rig) => rig.status === "unknown")) {
+            verdict = "unknown";
+        }
         else if (yellow > 0) {
             verdict = "restorable_with_caveats";
         }
@@ -877,12 +945,12 @@ export class RestoreCheckService {
                 attention_required: acc.attention_required + r.classCounts.attention_required,
                 unknown: acc.unknown + r.classCounts.unknown,
             }), { ready: 0, ready_with_caveats: 0, not_ready: 0, attention_required: 0, unknown: 0 }),
-            hostInfra: result.verdict === "unknown"
+            hostInfra: hostInfra ?? (result.verdict === "unknown"
                 ? {
                     status: "unknown",
                     evidence: "Host bootstrap/autostart source could not be inspected because restore-check state is unknown",
                 }
-                : (hostInfra ?? {
+                : {
                     status: "not_inspected",
                     evidence: "No host bootstrap/autostart source inspected by v0; readiness only covers observable daemon, rig, and seat checks",
                 }),
@@ -898,14 +966,14 @@ export class RestoreCheckService {
             proven.push("transcript_readable");
         if (checks.some((c) => c.check.endsWith(".spec-present") && c.status === "green"))
             proven.push("spec_present");
-        if (checks.some((c) => c.check.endsWith(".queue-file") && c.status === "green"))
-            proven.push("queue_file_present");
+        if (checks.some((c) => c.check.endsWith(".queue-store") && c.status === "green"))
+            proven.push("queue_store_available");
         if (checks.some((c) => c.check.endsWith(".resume-path") && c.status === "green"))
             proven.push("seat_identity_resolvable");
         return proven;
     }
     buildRecovery(verdict, checks, recoveryInputs) {
-        if (verdict === "unknown") {
+        if (verdict === "unknown" && recoveryInputs.length === 0) {
             const evidence = checks.find((check) => check.status === "red")?.evidence
                 ?? "Restore-check state could not be inspected";
             return {
@@ -935,7 +1003,9 @@ export class RestoreCheckService {
                 unknown: [],
             };
         }
-        const allReady = recoveryInputs.every((input) => input.runningReadyNodes === input.expectedNodes);
+        const allReady = recoveryInputs.every((input) => !input.snapshotLookupError
+            && input.runningReadyNodes === input.expectedNodes
+            && !input.blockingChecks.some((check) => this.classifyRecoveryBlockingCheck(check) === "restore_input"));
         if (allReady) {
             return {
                 status: "not_needed",
@@ -949,8 +1019,6 @@ export class RestoreCheckService {
         const blocked = [];
         const unknown = [];
         for (const input of recoveryInputs) {
-            if (input.runningReadyNodes === input.expectedNodes)
-                continue;
             if (input.snapshotLookupError) {
                 unknown.push({
                     scope: "rig",
@@ -970,6 +1038,8 @@ export class RestoreCheckService {
                 });
                 continue;
             }
+            if (input.runningReadyNodes === input.expectedNodes)
+                continue;
             if (input.latestSnapshot) {
                 actions.push({
                     scope: "rig",
@@ -989,7 +1059,7 @@ export class RestoreCheckService {
                 rigName: input.rigName,
                 action: "restore_from_latest_snapshot",
                 command: `rig up --existing ${shellQuote(input.rigName)}`,
-                reason: "Rig has persisted current DB state but no latest snapshot; rig up will capture an auto-rehydrate snapshot and restore.",
+                reason: "Current persisted state is eligible for an ordinary restore attempt; rig up would capture an auto-rehydrate snapshot whose restore inputs have not been inspected.",
                 safe: false,
                 blocking: true,
             });
@@ -1012,6 +1082,8 @@ export class RestoreCheckService {
     classifyRecoveryBlockingCheck(check) {
         if (check.status !== "red")
             return "other";
+        if (check.check.startsWith("rig.") && check.check.endsWith(".restore-preconditions"))
+            return "restore_input";
         if (check.check.startsWith("seat.") && check.check.endsWith(".readiness")) {
             if (check.evidence.includes("Missing canonical session identity")) {
                 return "restore_input";
@@ -1088,7 +1160,11 @@ export class RestoreCheckService {
         }
         let verdict;
         let status;
-        if (blockingChecks.length > 0) {
+        if (input.preconditionError) {
+            verdict = "unknown";
+            status = "unknown";
+        }
+        else if (blockingChecks.length > 0) {
             verdict = "not_restorable";
             status = "not_ready";
         }