@openrig/cli 0.6.14 → 0.7.0

package/daemon/dist/domain/rehydrate-eligibility.js

@@ -9,33 +9,71 @@ import { readFreshOccupantRelations } from "./fresh-occupant-relation.js";
  * not permission to revive a historical occupant; current-state capture
  * preserves the ambiguity and restore refuses it explicitly.
  */
-export function snapshotMatchesCurrentOccupants(db, rig, snapshot) {
+export function assessSnapshotCurrentOccupants(db, rig, snapshot, preserveStoppedInitial = false) {
+    const stoppedNodeIds = new Set();
+    const mismatch = () => ({ matches: false, stoppedNodeIds: new Set() });
     if (rig.nodes.length === 0)
-        return true;
-    const rows = db.prepare(`SELECT s.id, s.node_id AS nodeId, s.status,
+        return { matches: true, stoppedNodeIds };
+    const rows = db.prepare(`SELECT s.*, s.node_id AS nodeId,
             s.resume_type AS resumeType, s.resume_token AS resumeToken
        FROM sessions s
        JOIN nodes n ON n.id = s.node_id
-       WHERE n.rig_id = ? AND s.status != 'superseded'`).all(rig.rig.id);
+       WHERE n.rig_id = ? ORDER BY s.created_at DESC, s.id DESC`).all(rig.rig.id);
     const recorded = readFreshOccupantRelations(db, rig.rig.id);
     // A clean down exits the fresh occupant without revoking its relation.
     // Keep that row for snapshot comparison, but exclude unrelated exited history.
-    const candidates = rows.filter((row) => row.status !== "exited" || recorded[row.nodeId] === row.id);
+    const candidates = rows.filter((row) => row.status !== "superseded" && (row.status !== "exited" || recorded[row.nodeId] === row.id));
     for (const node of rig.nodes) {
         const current = resolveActiveOccupantRow(candidates, Object.prototype.hasOwnProperty.call(recorded, node.id) ? recorded : undefined, node.id);
-        if (current.kind === "none")
+        if (current.kind === "none" && !preserveStoppedInitial)
             continue;
         if (current.kind === "ambiguous")
-            return false;
+            return mismatch();
         const captured = resolveActiveSnapshotSession(snapshot.data, node.id);
+        const stoppedHistoryMatches = (session) => {
+            const history = snapshot.data.sessions.filter(s => s.nodeId === node.id && s.id === session.id);
+            return captured.kind === "none" && snapshot.data.activeOccupantsByNode?.[node.id]?.kind === "absent"
+                && session.status === "exited" && session.intentionally_stopped === 1
+                && history.length === 1 && history[0].status === "exited"
+                && (history[0].resumeType ?? null) === session.resumeType
+                && (history[0].resumeToken ?? null) === session.resumeToken;
+        };
+        if (current.kind === "none") {
+            // Only explicit existing-rig up extends the stop rule to the original
+            // occupant. The newest session and newest initial tenure own the stop,
+            // including after restore. An older row's flag cannot hold its successor.
+            const newest = rows.find(row => row.nodeId === node.id);
+            const tenure = preserveStoppedInitial && node.runtime && node.runtime !== "terminal" && newest
+                ? db.prepare("SELECT kind FROM occupant_tenures WHERE node_id=? ORDER BY generation_ordinal DESC LIMIT 1").get(node.id)
+                : undefined;
+            if (tenure?.kind === "initial" && newest && stoppedHistoryMatches(newest)) {
+                stoppedNodeIds.add(node.id);
+            }
+            continue;
+        }
+        // An absent occupant is current only with the deliberate stop, the exact
+        // exited/native history, and a fresh effect fenced to the current tenure.
+        // Missing/ambiguous legacy relations never qualify as recorded absence.
+        if (stoppedHistoryMatches(current.session) && recorded[node.id] === current.session.id
+            && db.prepare("SELECT kind FROM occupant_tenures WHERE node_id=? ORDER BY generation_ordinal DESC LIMIT 1").get(node.id)?.kind === "fresh") {
+            stoppedNodeIds.add(node.id);
+            continue;
+        }
         if (captured.kind !== "resolved"
             || captured.session.id !== current.session.id
             || (captured.session.resumeType ?? null) !== current.session.resumeType
             || (captured.session.resumeToken ?? null) !== current.session.resumeToken) {
-            return false;
+            return mismatch();
         }
     }
-    return true;
+    return { matches: true, stoppedNodeIds };
+}
+export function snapshotMatchesCurrentOccupants(db, rig, snapshot) {
+    return assessSnapshotCurrentOccupants(db, rig, snapshot).matches;
+}
+export function stoppedSnapshotReason(logicalId, rigName) {
+    const seat = `'${`${logicalId}@${rigName}`.replace(/'/g, `'"'"'`)}'`;
+    return `Seat '${logicalId}' was deliberately stopped in the current generation and this snapshot. It remains stopped. To explicitly start this seat in a new conversation, run: rig seat launch ${seat} --fresh --reason "<why>".`;
 }
 /**
  * Determines whether current persisted DB state is sufficient to synthesize a

package/daemon/dist/domain/rehydrate-eligibility.js.map

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

package/daemon/dist/domain/restore-orchestrator.d.ts

@@ -1,3 +1,4 @@
+import { type AutomaticSeatReplacement } from "./existing-rig-restore.js";
 import type Database from "better-sqlite3";
 import type { RigRepository } from "./rig-repository.js";
 import { type SessionRegistry } from "./session-registry.js";
@@ -133,6 +134,12 @@ export declare class RestoreOrchestrator {
          * resume-policy seats STOP as `awaiting-decision` instead.
          */
         freshLogicalIds?: string[];
+        /** Explicit existing-rig up only: include proved original-occupant stops. */
+        preserveStoppedInitial?: boolean;
+        /** Internal unattended entry; explicit requests coordinate before taking seat leases. */
+        automatic?: boolean;
+        /** Internal exact occupants selected after the unattended attempt has settled. */
+        automaticReplacements?: AutomaticSeatReplacement[];
         /** Explicit rig launch choice; persisted only after restore preconditions pass. */
         nonInterruptive?: boolean;
         /** Selection evidence from an automatic caller. Direct restore defaults
@@ -145,6 +152,8 @@ export declare class RestoreOrchestrator {
          * continues in the background.
          */
         onAttemptStarted?: (attemptId: number) => void;
+        /** Told each session this restore launches, as soon as its row is committed. */
+        onSessionLaunched?: (nodeId: string, sessionId: string) => void;
     }): Promise<RestoreOutcome>;
     launchNodeSubset(rigId: string, logicalIds: string[], opts?: {
         adapters?: Record<string, import("./runtime-adapter.js").RuntimeAdapter>;
@@ -176,6 +185,8 @@ export declare class RestoreOrchestrator {
      * AFTER the pre_restore snapshot is captured, unknown sessions fail closed.
      */
     private classifyRunningSessions;
+    /** Called under a new lifecycle lease, after startup has released its own leases. */
+    private stopAutomaticOccupant;
     private clearStaleState;
     private restoreNodeState;
     private computeRestorePlan;

package/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/daemon/dist/domain/restore-orchestrator.js

@@ -1,4 +1,7 @@
+import { observeSolePane } from "./pane-binding-observation.js";
+import { automaticRestoreOverrides } from "./existing-rig-restore.js";
 import { restoreRuntimeCompatibilityError } from "./restore-runtime-compatibility.js";
+import { assessSnapshotCurrentOccupants, stoppedSnapshotReason } from "./rehydrate-eligibility.js";
 import { nonInterruptiveNotice, nonInterruptiveSummary } from "../adapters/non-interruptive.js";
 import { effortPrecedence, readSeatEffort } from "./seat-effort.js";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
@@ -29,6 +32,8 @@ import { communityHarnessOf } from "./built-in-runtimes.js";
 import { seatAdapter } from "../adapters/community-harness-runtime-adapter.js";
 import { pluginPathsOf } from "./claude-core-plugin-env.js";
 export { resolveActiveSnapshotSession } from "./active-occupant.js";
+/** Pre-restore blockers that concern one seat's own startup content; see restore(). */
+const SEAT_STARTUP_BLOCKERS = new Set(["required_startup_file_missing", "startup_owner_root_missing"]);
 export function rollupRestoreRigResult(nodes) {
     if (nodes.length === 0)
         return "failed";
@@ -160,8 +165,28 @@ export class RestoreOrchestrator {
         if (!rig) {
             return { ok: false, code: "rig_not_found", message: `Rig ${rigId} not found` };
         }
+        if (!opts?.automatic && !opts?.automaticReplacements) {
+            const overrides = await automaticRestoreOverrides({ rigRepo: this.rigRepo, snapshotRepo: this.snapshotRepo }, rigId, opts);
+            if (overrides.refusal)
+                return { ok: false, code: "rig_not_stopped", message: overrides.refusal };
+            opts = { ...opts, automaticReplacements: overrides.replacements };
+        }
+        const replacements = opts?.automaticReplacements ?? [];
+        const selectedIds = new Set(replacements.map(target => target.nodeId));
+        // Only this invocation's resume input changes; historical snapshots remain immutable.
+        if (replacements.length) {
+            snapshot.data = structuredClone(snapshot.data);
+            snapshot.data.topologyRoster = { version: 1, source: "operator_explicit", intendedNodeIds: [...selectedIds] };
+            for (const target of replacements.filter(target => target.corrected)) {
+                const active = resolveActiveSnapshotSession(snapshot.data, target.nodeId);
+                if (active.kind !== "resolved")
+                    return { ok: false, code: "restore_error", message: "Corrected seat has no unambiguous snapshot occupant; nothing replaced." };
+                active.session.resumeType = target.resumeType;
+                active.session.resumeToken = target.resumeToken;
+            }
+        }
         const guard = this.tmuxAdapter.deliveryGuard;
-        const guardedIds = rig.nodes.map(node => node.id);
+        const guardedIds = rig.nodes.filter(node => !replacements.length || selectedIds.has(node.id)).map(node => node.id);
         if (guard && guardedIds.some(id => !guard.ownsLifecycle(id))) {
             return guard.lifecycle(guardedIds, () => this.restore(snapshotId, opts));
         }
@@ -173,8 +198,8 @@ export class RestoreOrchestrator {
         // This determines whether the rig is safe to restore before any state
         // changes occur — critical for pre_restore snapshot ordering (snapshot
         // must capture original DB state, not post-reconciliation state).
-        const classification = await this.classifyRunningSessions(rigId);
-        if (classification.live.length > 0 || classification.unknown.length > 0) {
+        const classification = await this.classifyRunningSessions(rigId, replacements.length ? selectedIds : undefined);
+        if (classification.unknown.length > 0 || classification.live.some(id => !replacements.some(target => target.sessionId === id))) {
             return { ok: false, code: "rig_not_stopped", message: `Rig ${rigId} has live sessions. Stop the rig with 'rig down' before restoring, or use the latest auto-pre-down snapshot.` };
         }
         // Per-rig concurrency lock
@@ -190,7 +215,19 @@ export class RestoreOrchestrator {
                 currentRuntimes: Object.fromEntries((this.rigRepo.getRig(rigId)?.nodes ?? []).map((current) => [current.logicalId, current.runtime])),
             });
             const topology = resolveSnapshotRestoreTopology(snapshot.data);
-            if (validation.blockers.length > 0) {
+            // A required startup file that is missing holds only its own seat. That seat isn't launched, because it would start
+            // without its startup content; it's reported failed with the reason, and the rest of the rig restores. Any other
+            // blocker, or holds on every seat this restore would launch, still stops the whole restore before any mutation.
+            const heldForStartup = new Map();
+            for (const blocker of validation.blockers) {
+                if (!SEAT_STARTUP_BLOCKERS.has(blocker.code) || !blocker.nodeId)
+                    continue;
+                const reason = `${blocker.message} ${blocker.remediation}`;
+                heldForStartup.set(blocker.nodeId, heldForStartup.has(blocker.nodeId) ? `${heldForStartup.get(blocker.nodeId)} ${reason}` : reason);
+            }
+            const planIds = this.computeRestorePlan(snapshot.data).filter(entry => !replacements.length || selectedIds.has(entry.node.id)).map(entry => entry.node.id);
+            const rigWide = validation.blockers.some((blocker) => !SEAT_STARTUP_BLOCKERS.has(blocker.code) || !blocker.nodeId);
+            if (rigWide || planIds.every((id) => heldForStartup.has(id))) {
                 const result = {
                     snapshotId,
                     preRestoreSnapshotId: null,
@@ -238,7 +275,7 @@ export class RestoreOrchestrator {
                 // logic crash the restore pipeline.
             }
             // 3b. Service gate: boot services before agent restore if this rig has services
-            if (this.serviceOrchestrator) {
+            if (this.serviceOrchestrator && replacements.length === 0) {
                 const svcRecord = this.rigRepo.getServicesRecord(rigId);
                 if (svcRecord) {
                     const bootResult = await this.serviceOrchestrator.boot(rigId);
@@ -263,7 +300,8 @@ export class RestoreOrchestrator {
                 }
             }
             // 4. Compute restore plan
-            const plan = this.computeRestorePlan(snapshot.data);
+            const plan = this.computeRestorePlan(snapshot.data).filter(entry => !replacements.length || selectedIds.has(entry.node.id));
+            const { stoppedNodeIds } = assessSnapshotCurrentOccupants(this.db, rig, snapshot, opts?.preserveStoppedInitial);
             // 5. Execute restore with compensating pattern per node
             const nodeResults = [];
             const restoreWarnings = [...validation.warnings];
@@ -272,8 +310,17 @@ export class RestoreOrchestrator {
             else if (opts?.nonInterruptive === false)
                 restoreWarnings.push(nonInterruptiveSummary(false));
             for (const entry of plan) {
-                const result = await this.restoreNodeWithCompensation(entry, rigId, snapshotId, snapshot.data, opts, restoreWarnings);
+                const held = heldForStartup.get(entry.node.id);
+                if (held) {
+                    nodeResults.push({ nodeId: entry.node.id, logicalId: entry.node.logicalId, status: "failed", error: `Not launched: ${held}` });
+                    continue;
+                }
+                const replacement = replacements.find(target => target.nodeId === entry.node.id);
+                const result = await this.restoreNodeWithCompensation(entry, rigId, snapshotId, snapshot.data, opts, restoreWarnings, stoppedNodeIds.has(entry.node.id));
                 nodeResults.push(result);
+                if (replacement && this.db.prepare("SELECT status FROM sessions WHERE id = ?").get(replacement.sessionId)?.status === "exited") {
+                    restoreWarnings.push(`Stopped ${entry.node.logicalId}'s startup occupant for explicit replacement; replacement outcome: ${result.status}.`);
+                }
             }
             const restoreResult = {
                 snapshotId,
@@ -527,14 +574,25 @@ export class RestoreOrchestrator {
      * to act on: live sessions block restore, stale sessions get marked detached
      * AFTER the pre_restore snapshot is captured, unknown sessions fail closed.
      */
-    async classifyRunningSessions(rigId) {
+    async classifyRunningSessions(rigId, selectedIds) {
         const live = [];
         const stale = [];
         const unknown = [];
         for (const session of this.sessionRegistry.getSessionsForRig(rigId)) {
-            if (session.status !== "running")
+            if (session.status !== "running" || (selectedIds && !selectedIds.has(session.nodeId)))
                 continue;
             try {
+                // Replacement must preserve unknown transport state before any reconciliation write.
+                if (selectedIds) {
+                    const probe = await this.tmuxAdapter.probeSession(session.sessionName);
+                    if (probe.state === "present")
+                        live.push(session.id);
+                    else if (probe.state === "absent")
+                        stale.push(session.id);
+                    else
+                        unknown.push(session.id);
+                    continue;
+                }
                 const alive = await this.tmuxAdapter.hasSession(session.sessionName);
                 if (alive) {
                     live.push(session.id);
@@ -550,6 +608,48 @@ export class RestoreOrchestrator {
         }
         return { live, stale, unknown };
     }
+    /** Called under a new lifecycle lease, after startup has released its own leases. */
+    async stopAutomaticOccupant(target) {
+        const current = (stopped = false) => {
+            const row = this.db.prepare(`SELECT s.id, s.status, s.session_name AS name, s.resume_type AS resumeType,
+        s.resume_token AS resumeToken, s.resume_provenance AS provenance, s.origin, b.tmux_session AS bound, b.tmux_pane AS pane
+        FROM sessions s LEFT JOIN bindings b ON b.node_id = s.node_id
+        WHERE s.node_id = ? AND s.status != 'superseded' ORDER BY s.created_at DESC, s.id DESC LIMIT 1`)
+                .get(target.nodeId);
+            return row?.id === target.sessionId && row.status === (stopped ? "exited" : "running") && row.origin !== "claimed" && row.bound === row.name
+                && row.resumeType === target.resumeType && row.resumeToken === target.resumeToken
+                && (!target.corrected || row.provenance === "operator") ? row : null;
+        };
+        const row = current();
+        if (!row)
+            return "Startup occupant or correction changed; no replacement attempted.";
+        const probe = await this.tmuxAdapter.probeSession(row.name);
+        if (probe.state !== "present")
+            return "Startup terminal is absent or unknown; no replacement attempted.";
+        const observedPane = await observeSolePane(this.tmuxAdapter, row.name);
+        if (!observedPane.ok || observedPane.pane !== row.pane)
+            return "Startup terminal pane no longer matches its managed binding; nothing replaced.";
+        const afterProbe = current();
+        if (!afterProbe || afterProbe.name !== row.name || afterProbe.pane !== row.pane)
+            return "Startup occupant or correction changed during the terminal probe; no replacement attempted.";
+        this.tmuxAdapter.deliveryGuard?.checkInput(row.name);
+        const killed = await this.tmuxAdapter.killSession(row.name);
+        if (!killed.ok)
+            return "Could not stop the startup occupant; no replacement attempted.";
+        if (!current())
+            return "Startup occupant changed during stop; no replacement launched.";
+        this.sessionRegistry.updateStatus(target.sessionId, "exited");
+        this.tmuxAdapter.deliveryGuard?.rebindLifecycle(target.nodeId);
+        // Killing the last session ends tmux's server. Reopen an empty server before proving absence.
+        await this.tmuxAdapter.startServer();
+        const absent = await this.tmuxAdapter.probeSession(row.name);
+        if (absent.state !== "absent")
+            return "Startup terminal absence is unconfirmed; no replacement launched.";
+        if (!current(true))
+            return "Startup occupant changed during stop; no replacement launched.";
+        // Retain the name pin; ordinary restore clears it. Compensation sees an exited predecessor.
+        return null;
+    }
     clearStaleState(nodeId, rigId) {
         this.sessionRegistry.clearBinding(nodeId);
         const sessions = this.sessionRegistry.getSessionsForRig(rigId);
@@ -661,7 +761,7 @@ export class RestoreOrchestrator {
      * Restore one planned seat, checking continuity before launching its occupant.
      * Preserve prior state so a failed launch or resume can be compensated.
      */
-    async restoreNodeWithCompensation(entry, rigId, snapshotId, data, opts, warnings) {
+    async restoreNodeWithCompensation(entry, rigId, snapshotId, data, opts, warnings, preserveStoppedCurrent = false) {
         // Compare against the live logical target without changing saved post-launch inputs.
         const node = entry.node;
         const liveNode = this.rigRepo.getRig(rigId)?.nodes.find(current => current.logicalId === node.logicalId);
@@ -682,6 +782,9 @@ export class RestoreOrchestrator {
             };
         }
         const freshRequested = opts?.freshLogicalIds?.includes(node.logicalId) ?? false;
+        if (occupantResolution.kind === "none" && preserveStoppedCurrent && !freshRequested) {
+            return { nodeId, logicalId: node.logicalId, status: "awaiting-decision", error: stoppedSnapshotReason(node.logicalId, data.rig.name) };
+        }
         const runtimeError = restoreRuntimeCompatibilityError(liveNode ? liveNode.runtime : node.runtime, data.nodeStartupContext?.[nodeId]?.runtime);
         if (runtimeError) {
             return { nodeId, logicalId: node.logicalId, status: "awaiting-decision", error: runtimeError };
@@ -699,6 +802,9 @@ export class RestoreOrchestrator {
             const continuityRow = this.db.prepare("SELECT status FROM continuity_state WHERE pod_id = ? AND node_id = ?").get(node.podId, nodeId);
             if (continuityRow) {
                 if (continuityRow.status === "restoring") {
+                    if (opts?.automaticReplacements?.some(target => target.nodeId === nodeId)) {
+                        return { nodeId, logicalId: node.logicalId, status: "awaiting-decision", error: "Continuity recovery owns this seat; its startup occupant was left unchanged." };
+                    }
                     warnings?.push(`Node ${node.logicalId}: continuity state is 'restoring', skipping`);
                     return { nodeId, logicalId: node.logicalId, status: "fresh" };
                 }
@@ -747,7 +853,14 @@ export class RestoreOrchestrator {
                 };
             }
         }
-        // Capture prior state for compensation
+        // All ordinary per-seat preflight decisions precede the destructive effect.
+        const replacement = opts?.automaticReplacements?.find(target => target.nodeId === nodeId);
+        if (replacement) {
+            const error = await this.stopAutomaticOccupant(replacement);
+            if (error)
+                return { nodeId, logicalId: node.logicalId, status: "failed", error };
+        }
+        // Capture prior state for compensation, including an exited replacement predecessor.
         const priorState = this.captureNodeState(nodeId, rigId);
         // Clear stale state so NodeLauncher doesn't see already_bound
         this.clearStaleState(nodeId, rigId);
@@ -817,12 +930,13 @@ export class RestoreOrchestrator {
             }
         }
         // Attempt launch — compensate ONLY if launch itself fails
-        // The snapshot's saved startup context says which plugins the seat selected; without one the launcher reads the
-        // node's own saved context.
+        // Preserve the snapshot's selected plugins and record the committed session before launch continues.
         const savedStartup = data.nodeStartupContext?.[nodeId];
+        const onSessionLaunched = opts?.onSessionLaunched;
         const launchResult = await this.nodeLauncher.launchNode(rigId, node.logicalId, {
             ...launchOpts,
             ...(savedStartup ? { pluginPaths: pluginPathsOf(savedStartup.projectionEntries) } : {}),
+            ...(onSessionLaunched ? { onSessionRegistered: (sessionId) => onSessionLaunched(nodeId, sessionId) } : {}),
         });
         if (!launchResult.ok) {
             // Launch failed — restore prior state (compensating action)
@@ -1245,7 +1359,7 @@ export class RestoreOrchestrator {
                                 ? ((startupResult.continuityOutcome === "resumed" || nativeContinuityProved) ? "resumed" : baseStatus)
                                 : baseStatus;
                             if (finalStatus === "resumed") {
-                                return this.finishJoinedResume(node, sessionName, resumeToken, launchResult?.session.id, isPodAware && node.runtime === "claude-code");
+                                return this.finishJoinedResume(node, sessionName, resumeToken, launchResult?.session.id, isPodAware && node.runtime === "claude-code", startupResult.resumedProcess);
                             }
                             return { nodeId: node.id, logicalId: node.logicalId, status: finalStatus };
                         }
@@ -1329,7 +1443,9 @@ export class RestoreOrchestrator {
     }
     /** A native resume is only a full success after the restored terminal is
      * rebound and its process identity agrees with the declared seat runtime. */
-    async finishJoinedResume(node, sessionName, resumeToken, sessionId, managedClaudeResume = false) {
+    async finishJoinedResume(node, sessionName, resumeToken, sessionId, managedClaudeResume = false, 
+    /** Codex (#1524): the process the adapter proved the resume on. The join must verify that same process. */
+    provenCodexProcess) {
         const identity = await rebindAndVerifyPaneIdentity({
             db: this.db,
             sessionRegistry: this.sessionRegistry,
@@ -1360,6 +1476,19 @@ export class RestoreOrchestrator {
                 error: `Exact native session resumed, but joined restore proof is incomplete: ${identity.detail}. The resumed session was preserved; no replacement was started.`,
             };
         }
+        // #1524 (b): the adapter proved the resume on one Codex process. The join observed later, after startup's awaits;
+        // a different process (or none matched) there is not certified by that proof. No new read, wait or relaunch.
+        if (node.runtime === "codex" && provenCodexProcess) {
+            const joined = identity.nativeProcess;
+            if (!joined || joined.pid !== provenCodexProcess.pid || joined.startedAt !== provenCodexProcess.startedAt) {
+                const store = new SeatIdentityStore(this.db);
+                const proof = store.getForNode(node.id);
+                if (proof)
+                    store.upsert({ ...proof, verdict: "mismatch", reason: "process_identity_mismatch" });
+                return { nodeId: node.id, logicalId: node.logicalId, status: "attention_required",
+                    error: `Codex resume was proven on process ${provenCodexProcess.pid} (started ${provenCodexProcess.startedAt}), but the restore join verified ${joined ? `process ${joined.pid} (started ${joined.startedAt ?? "unknown"})` : "no matching Codex process"}. The session was preserved; nothing was restarted.` };
+            }
+        }
         // Legacy resume adapters do not write native metadata. Fill only the
         // launched row's empty token after proof; never overwrite a hook/operator.
         const provedClaudeWrapper = node.runtime === "claude-code"