@openrig/cli 0.5.8 → 0.5.10

package/node_modules/@openrig/daemon/dist/domain/restore-orchestrator.d.ts

@@ -11,7 +11,7 @@ import type { ClaudeResumeAdapter } from "../adapters/claude-resume.js";
 import type { CodexResumeAdapter } from "../adapters/codex-resume.js";
 import type { PiResumeAdapter } from "../adapters/pi-resume.js";
 import type { TranscriptStore } from "./transcript-store.js";
-import type { RestoreOutcome, RestoreRigResult, RestoreNodeResult } from "./types.js";
+import type { RestoreOutcome, RestoreRigResult, RestoreNodeResult, RestoreSnapshotSelection } from "./types.js";
 export type ReconcileNodeResult = {
     ok: true;
     attemptId: number;
@@ -25,7 +25,7 @@ export type ReconcileNodeResult = {
     };
 } | {
     ok: false;
-    code: "node_not_found" | "no_attempt" | "outcome_not_upgradable" | "tmux_session_missing" | "fg_process_not_runtime" | "resume_token_not_used" | "pane_not_usable";
+    code: "node_not_found" | "no_attempt" | "outcome_not_upgradable" | "tmux_session_missing" | "binding_mismatch" | "process_lineage_mismatch" | "fg_process_not_runtime" | "resume_token_not_used" | "pane_not_usable";
     detail: string;
 };
 export { resolveActiveSnapshotSession } from "./active-occupant.js";
@@ -38,6 +38,44 @@ export declare const NON_RUNNING_LAUNCH_STATUSES: ReadonlySet<string>;
 /** True when a restore/launch status means a session is actually running (a real
  *  successful launch): resumed / rebuilt / fresh / fresh-primed / operator_recovered. */
 export declare function launchStatusIsRunning(status: string): boolean;
+export interface NarrowLaunchResult {
+    ok: boolean;
+    planOnly?: boolean;
+    code?: string;
+    message?: string;
+    launched?: RestoreNodeResult[];
+    held?: Array<{
+        nodeId: string;
+        logicalId: string;
+        reason: string;
+    }>;
+    alreadyRunning?: Array<{
+        nodeId: string;
+        logicalId: string;
+    }>;
+    failedTargets?: Array<{
+        nodeId: string;
+        logicalId: string;
+        reason: string;
+    }>;
+    targetNodes?: Array<{
+        nodeId: string;
+        logicalId: string;
+    }>;
+    unmatchedIds?: string[];
+    warnings?: string[];
+    snapshotSelection?: RestoreSnapshotSelection;
+    nonTargetEffects?: {
+        mode: "unchanged" | "detach_and_hold";
+        reason: string | null;
+        affected: Array<{
+            nodeId: string;
+            logicalId: string;
+            reason: string;
+        }>;
+        condition?: string;
+    };
+}
 interface RestoreOrchestratorDeps {
     db: Database.Database;
     rigRepo: RigRepository;
@@ -92,6 +130,9 @@ export declare class RestoreOrchestrator {
          * resume-policy seats STOP as `awaiting-decision` instead.
          */
         freshLogicalIds?: string[];
+        /** Selection evidence from an automatic caller. Direct restore defaults
+         * to explicit because its public door names the snapshot id. */
+        snapshotSelection?: RestoreSnapshotSelection;
         /**
          * L3: fired with the persisted `restore.started` event seq as soon as the
          * orchestrator commits to running per-node restore. Routes use this to
@@ -106,28 +147,20 @@ export declare class RestoreOrchestrator {
             exists(path: string): boolean;
         };
         holdReason?: string;
-    }): Promise<{
-        ok: boolean;
-        code?: string;
-        message?: string;
-        launched?: RestoreNodeResult[];
-        held?: Array<{
-            nodeId: string;
-            logicalId: string;
-            reason: string;
-        }>;
-        alreadyRunning?: Array<{
-            nodeId: string;
-            logicalId: string;
-        }>;
-        failedTargets?: Array<{
-            nodeId: string;
-            logicalId: string;
-            reason: string;
-        }>;
-        unmatchedIds?: string[];
-        warnings?: string[];
-    }>;
+        snapshotId?: string;
+    }): Promise<NarrowLaunchResult>;
+    planNodeSubset(rigId: string, logicalIds: string[], opts?: {
+        holdReason?: string;
+        snapshotId?: string;
+    }): NarrowLaunchResult;
+    launchSingleNode(rigId: string, logicalId: string, opts?: {
+        adapters?: Record<string, import("./runtime-adapter.js").RuntimeAdapter>;
+        fsOps?: {
+            exists(path: string): boolean;
+        };
+        snapshotId?: string;
+    }): Promise<NarrowLaunchResult>;
+    private launchNodeTargets;
     private validatePreRestore;
     private pathLike;
     private captureNodeState;

package/node_modules/@openrig/daemon/dist/domain/restore-orchestrator.d.ts.map

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

package/node_modules/@openrig/daemon/dist/domain/restore-orchestrator.js

@@ -4,6 +4,7 @@ import { resolvePermissionPolicyAttachment } from "./permission-policy/policy-re
 import { assessNativeResumeProbe } from "./native-resume-probe.js";
 import { AppliedLaunchObservationStore } from "./applied-launch-observation-store.js";
 import { rebindAndVerifyPaneIdentity } from "./seat-attention-reconciler.js";
+import { resolveSnapshotRestoreTopology } from "./restore-topology.js";
 // Only these edge kinds constrain launch order
 const LAUNCH_DEPENDENCY_KINDS = new Set(["delegates_to", "spawned_by"]);
 // OPR.0.5.7.1 consumer alignment: the four-way active-occupant ladder lives
@@ -105,6 +106,10 @@ export class RestoreOrchestrator {
         if (!rig) {
             return { ok: false, code: "rig_not_found", message: `Rig ${rigId} not found` };
         }
+        const selectionOutcome = opts?.snapshotSelection ? null : this.snapshotRepo.selectRestoreUsable(rigId, snapshotId);
+        if (selectionOutcome && !selectionOutcome.ok)
+            return selectionOutcome;
+        const snapshotSelection = opts?.snapshotSelection ?? selectionOutcome?.selection;
         // Classify DB-running sessions against tmux reality WITHOUT mutating DB.
         // This determines whether the rig is safe to restore before any state
         // changes occur — critical for pre_restore snapshot ordering (snapshot
@@ -124,6 +129,7 @@ export class RestoreOrchestrator {
                 servicesRecord: this.rigRepo.getServicesRecord(rigId),
                 freshLogicalIds: opts?.freshLogicalIds,
             });
+            const topology = resolveSnapshotRestoreTopology(snapshot.data);
             if (validation.blockers.length > 0) {
                 const result = {
                     snapshotId,
@@ -132,6 +138,9 @@ export class RestoreOrchestrator {
                     nodes: [],
                     warnings: validation.warnings,
                     blockers: validation.blockers,
+                    snapshotSelection,
+                    intendedRoster: topology.intendedRoster,
+                    excludedNodes: topology.excludedNodes,
                 };
                 return {
                     ok: false,
@@ -150,7 +159,14 @@ export class RestoreOrchestrator {
             }
             // 3. Emit restore.started — the persisted event seq IS the attempt id
             //    (Decision 1: no separate restore_attempts table).
-            const restoreStartedEvent = this.eventBus.emit({ type: "restore.started", rigId, snapshotId });
+            const restoreStartedEvent = this.eventBus.emit({
+                type: "restore.started",
+                rigId,
+                snapshotId,
+                snapshotSelection,
+                intendedRoster: topology.intendedRoster,
+                excludedNodes: topology.excludedNodes,
+            });
             const attemptId = restoreStartedEvent.seq;
             try {
                 opts?.onAttemptStarted?.(attemptId);
@@ -165,7 +181,21 @@ export class RestoreOrchestrator {
                 if (svcRecord) {
                     const bootResult = await this.serviceOrchestrator.boot(rigId);
                     if (!bootResult.ok) {
-                        this.eventBus.emit({ type: "restore.completed", rigId, snapshotId, result: { snapshotId, preRestoreSnapshotId: preRestoreSnapshot.id, rigResult: "failed", nodes: [], warnings: [`Service boot failed: ${bootResult.error}`] } });
+                        this.eventBus.emit({
+                            type: "restore.completed",
+                            rigId,
+                            snapshotId,
+                            result: {
+                                snapshotId,
+                                preRestoreSnapshotId: preRestoreSnapshot.id,
+                                rigResult: "failed",
+                                nodes: [],
+                                warnings: [`Service boot failed: ${bootResult.error}`],
+                                snapshotSelection,
+                                intendedRoster: topology.intendedRoster,
+                                excludedNodes: topology.excludedNodes,
+                            },
+                        });
                         return { ok: false, code: "service_boot_failed", message: `Service boot failed before agent restore: ${bootResult.error}` };
                     }
                 }
@@ -185,6 +215,9 @@ export class RestoreOrchestrator {
                 rigResult: rollupRestoreRigResult(nodeResults),
                 nodes: nodeResults,
                 warnings: restoreWarnings,
+                snapshotSelection,
+                intendedRoster: topology.intendedRoster,
+                excludedNodes: topology.excludedNodes,
             };
             // 7. Emit restore.completed
             this.eventBus.emit({ type: "restore.completed", rigId, snapshotId, result: restoreResult });
@@ -202,19 +235,60 @@ export class RestoreOrchestrator {
         }
     }
     async launchNodeSubset(rigId, logicalIds, opts) {
+        return this.launchNodeTargets(rigId, logicalIds, { ...opts, nonTargetMode: "detach_and_hold" });
+    }
+    planNodeSubset(rigId, logicalIds, opts) {
+        const rig = this.rigRepo.getRig(rigId);
+        if (!rig)
+            return { ok: false, code: "rig_not_found", message: `Rig ${rigId} not found` };
+        const selected = this.snapshotRepo.selectRestoreUsable(rigId, opts?.snapshotId);
+        if (!selected.ok)
+            return selected;
+        const intendedNodes = resolveSnapshotRestoreTopology(selected.snapshot.data).intendedNodes;
+        const targetIds = new Set(intendedNodes.filter((node) => logicalIds.includes(node.logicalId)).map((node) => node.logicalId));
+        if (targetIds.size === 0) {
+            return { ok: false, code: "no_matching_nodes", message: `No nodes match logical ids: ${logicalIds.join(", ")}` };
+        }
+        const reason = opts?.holdReason ?? "excluded_from_subset";
+        return {
+            ok: true,
+            planOnly: true,
+            snapshotSelection: selected.selection,
+            targetNodes: intendedNodes
+                .filter((node) => targetIds.has(node.logicalId))
+                .map((node) => ({ nodeId: node.id, logicalId: node.logicalId })),
+            unmatchedIds: logicalIds.filter((logicalId) => !targetIds.has(logicalId)),
+            nonTargetEffects: {
+                mode: "detach_and_hold",
+                reason,
+                affected: rig.nodes
+                    .filter((node) => !targetIds.has(node.logicalId))
+                    .map((node) => ({ nodeId: node.id, logicalId: node.logicalId, reason })),
+                condition: "applies only to non-target seats proven not live at execution time",
+            },
+        };
+    }
+    async launchSingleNode(rigId, logicalId, opts) {
+        return this.launchNodeTargets(rigId, [logicalId], { ...opts, nonTargetMode: "unchanged" });
+    }
+    async launchNodeTargets(rigId, logicalIds, opts) {
         const rig = this.rigRepo.getRig(rigId);
         if (!rig)
             return { ok: false, code: "rig_not_found", message: `Rig ${rigId} not found` };
-        const snapshot = this.snapshotRepo.findLatestRestoreUsable(rigId);
-        if (!snapshot)
-            return { ok: false, code: "no_usable_snapshot", message: `No usable snapshot for rig ${rigId}` };
+        const selected = this.snapshotRepo.selectRestoreUsable(rigId, opts.snapshotId);
+        if (!selected.ok)
+            return selected;
+        const { snapshot, selection: snapshotSelection } = selected;
         const allNodes = rig.nodes;
-        const targetNodes = allNodes.filter((n) => logicalIds.includes(n.logicalId));
+        const targetNodes = resolveSnapshotRestoreTopology(snapshot.data).intendedNodes
+            .filter((node) => logicalIds.includes(node.logicalId));
         const matchedIds = new Set(targetNodes.map((n) => n.logicalId));
         const unmatchedIds = logicalIds.filter((id) => !matchedIds.has(id));
         if (targetNodes.length === 0)
             return { ok: false, code: "no_matching_nodes", message: `No nodes match logical ids: ${logicalIds.join(", ")}` };
-        const nonTargetNodes = allNodes.filter((n) => !logicalIds.includes(n.logicalId));
+        const nonTargetNodes = opts.nonTargetMode === "detach_and_hold"
+            ? allNodes.filter((node) => !targetNodes.some((target) => target.id === node.id))
+            : [];
         // Per-target tmux-liveness classification (runtime truth, fail-closed)
         const launched = [];
         const alreadyRunning = [];
@@ -269,6 +343,7 @@ export class RestoreOrchestrator {
                 rigResult: rollupRestoreRigResult(launched),
                 nodes: launched,
                 warnings: subsetWarnings,
+                snapshotSelection,
             };
             this.eventBus.emit({ type: "restore.subset_completed", rigId, snapshotId: snapshot.id, result: subsetResult });
         }
@@ -307,7 +382,21 @@ export class RestoreOrchestrator {
             });
             held.push({ nodeId: node.id, logicalId: node.logicalId, reason: holdReasonText });
         }
-        return { ok: true, launched, held, alreadyRunning, failedTargets, unmatchedIds: unmatchedIds.length > 0 ? unmatchedIds : undefined, warnings: subsetWarnings.length > 0 ? subsetWarnings : undefined };
+        return {
+            ok: true,
+            launched,
+            held,
+            alreadyRunning,
+            failedTargets,
+            unmatchedIds: unmatchedIds.length > 0 ? unmatchedIds : undefined,
+            warnings: subsetWarnings.length > 0 ? subsetWarnings : undefined,
+            snapshotSelection,
+            nonTargetEffects: {
+                mode: opts.nonTargetMode,
+                reason: opts.nonTargetMode === "detach_and_hold" ? holdReasonText : null,
+                affected: held,
+            },
+        };
     }
     validatePreRestore(data, opts) {
         const blockers = [];
@@ -366,7 +455,18 @@ export class RestoreOrchestrator {
         if (!nodes || !checkpoints) {
             return { blockers, warnings };
         }
-        for (const node of nodes) {
+        const topology = resolveSnapshotRestoreTopology(data);
+        for (const invalidNodeId of topology.invalidRosterIds) {
+            add({
+                code: "invalid_topology_roster",
+                severity: "critical",
+                nodeId: invalidNodeId,
+                target: "snapshot.topologyRoster",
+                message: `Intended topology roster names node ${invalidNodeId}, which is absent from snapshot.nodes.`,
+                remediation: "Capture a new snapshot from the authoritative materialized topology.",
+            });
+        }
+        for (const node of topology.intendedNodes) {
             const checkpoint = checkpoints[node.id] ?? null;
             if (checkpoint && !node.cwd) {
                 add({
@@ -565,7 +665,7 @@ export class RestoreOrchestrator {
         }
     }
     computeRestorePlan(data) {
-        const nodes = data.nodes;
+        const nodes = resolveSnapshotRestoreTopology(data).intendedNodes;
         const edges = data.edges;
         // Build adjacency for launch-dependency edges only
         // For delegates_to: source must launch before target
@@ -1011,6 +1111,7 @@ export class RestoreOrchestrator {
                             isRestore: replayAsRestore,
                             skipHarnessLaunch: !shouldLaunchHarness,
                             resumeToken: (isPodAware && resumeRequested) ? resumeToken ?? undefined : undefined,
+                            resumeType: (isPodAware && resumeRequested) ? resumeType ?? undefined : undefined,
                             sessionName: sessionName,
                             allowFreshFallback: !(isPodAware && resumeRequested),
                         });
@@ -1119,6 +1220,7 @@ export class RestoreOrchestrator {
             sessionName,
             runtime: node.runtime ?? null,
             expectedResumeToken: resumeToken,
+            requireExactResumeLineage: true,
             ...(this.listProcesses ? { listProcesses: this.listProcesses } : {}),
         });
         if (!identity.ok) {
@@ -1331,12 +1433,32 @@ export class RestoreOrchestrator {
             return { ok: false, code: "outcome_not_upgradable", detail: `Reconciliation only upgrades failed or attention_required; current outcome is ${nodeStatus}.` };
         }
         const fromStatus = nodeStatus;
+        const priorReconciliation = this.db.prepare("SELECT payload FROM events WHERE rig_id = ? AND node_id = ? AND type = 'restore.outcome_reconciled' AND json_extract(payload, '$.attemptId') = ? ORDER BY seq DESC LIMIT 1").get(rigId, nodeId, attemptId);
+        if (priorReconciliation) {
+            try {
+                const prior = JSON.parse(priorReconciliation.payload);
+                if ("tmux" in prior.evidence) {
+                    return { ok: true, attemptId, from: prior.from, to: "operator_recovered", evidence: prior.evidence };
+                }
+            }
+            catch {
+                // A malformed prior row is not positive evidence; continue to the live proof.
+            }
+        }
         // Resolve canonical session name for this node so we can probe tmux/pane.
         const bindingRow = this.db.prepare("SELECT tmux_session FROM bindings WHERE node_id = ?").get(nodeId);
         const sessionName = bindingRow?.tmux_session ?? null;
         if (!sessionName) {
             return { ok: false, code: "tmux_session_missing", detail: "No tmux session bound for this node." };
         }
+        const sessRow = this.db.prepare("SELECT session_name, resume_token FROM sessions WHERE node_id = ? ORDER BY created_at DESC, id DESC LIMIT 1").get(nodeId);
+        if (!sessRow || sessRow.session_name !== sessionName) {
+            return { ok: false, code: "binding_mismatch", detail: `Canonical binding ${sessionName} does not match the latest session row.` };
+        }
+        const expectedResumeToken = sessRow.resume_token;
+        if (!expectedResumeToken) {
+            return { ok: false, code: "resume_token_not_used", detail: "No resume token recorded on the latest session row." };
+        }
         // Precondition #1: tmux session exists.
         let alive = false;
         try {
@@ -1350,26 +1472,30 @@ export class RestoreOrchestrator {
         if (!alive) {
             return { ok: false, code: "tmux_session_missing", detail: `Tmux session ${sessionName} is not currently alive.` };
         }
-        // Resolve runtime + capture pane state for preconditions #2 and #4.
+        // Resolve runtime and prove exact native-token process lineage. Executable
+        // basename alone is never sufficient for no-input recovery.
         const nodeRow = this.db.prepare("SELECT runtime FROM nodes WHERE id = ?").get(nodeId);
         const runtime = nodeRow?.runtime ?? null;
-        const paneCommand = await this.tmuxAdapter.getPaneCommand(sessionName);
-        const paneContent = (await this.tmuxAdapter.capturePaneContent(sessionName, 40)) ?? "";
-        // Precondition #2: foreground process is the runtime (claude or codex).
+        const identity = await rebindAndVerifyPaneIdentity({
+            db: this.db,
+            sessionRegistry: this.sessionRegistry,
+            tmux: this.tmuxAdapter,
+            nodeId,
+            sessionName,
+            runtime,
+            expectedResumeToken,
+            requireExactResumeLineage: true,
+            ...(this.listProcesses ? { listProcesses: this.listProcesses } : {}),
+        });
+        if (!identity.ok) {
+            return { ok: false, code: "process_lineage_mismatch", detail: identity.detail };
+        }
+        const paneCommand = await this.tmuxAdapter.getPaneCommand(identity.pane);
+        const paneContent = (await this.tmuxAdapter.capturePaneContent(identity.pane, 40)) ?? "";
         const probe = assessNativeResumeProbe({ runtime, paneCommand, paneContent });
-        const fgProcess = paneCommand && (paneCommand === "claude" || paneCommand.startsWith("codex"))
-            ? (paneCommand === "claude" ? "claude" : "codex")
-            : null;
+        const fgProcess = runtime === "claude-code" ? "claude" : runtime === "codex" ? "codex" : null;
         if (!fgProcess) {
-            return { ok: false, code: "fg_process_not_runtime", detail: `Foreground process is "${paneCommand ?? "(unknown)"}", not claude/codex.` };
-        }
-        // Precondition #3: the resume token was actually used at launch.
-        // Stored on the latest session row; null/empty means resume was not
-        // exercised so a "recovered" claim has no basis.
-        const sessRow = this.db.prepare("SELECT resume_token FROM sessions WHERE node_id = ? ORDER BY id DESC LIMIT 1").get(nodeId);
-        const resumeTokenUsed = typeof sessRow?.resume_token === "string" && sessRow.resume_token.length > 0;
-        if (!resumeTokenUsed) {
-            return { ok: false, code: "resume_token_not_used", detail: "No resume token recorded on the latest session row." };
+            return { ok: false, code: "fg_process_not_runtime", detail: `Node runtime is ${runtime ?? "unknown"}, not claude/codex.` };
         }
         // Precondition #4: pane is at a usable/idle state — explicitly NOT a
         // resume-selection prompt and not the "returned to shell" failure mode.