@openrig/cli 0.3.3 → 0.3.4

package/daemon/dist/domain/rigspec-preflight.js

@@ -108,7 +108,7 @@ const SUPPORTED_RUNTIMES = new Set(["claude-code", "codex", "terminal"]);
  * @param input - rig spec YAML, rig root, and filesystem ops
  * @returns PreflightResult
  */
-export function rigPreflight(input) {
+export async function rigPreflight(input) {
     // FRONT-END (OPR.0.3.3.24): YAML is only the input adapter. Parse + validate +
     // normalize, then delegate every actual check to the structured core so
     // callers holding an already-parsed+validated spec (expand / add_member)
@@ -130,6 +130,7 @@ export function rigPreflight(input) {
         cwdOverride: input.cwdOverride,
         fsOps: input.fsOps,
         rigNameOverride: input.rigNameOverride,
+        exec: input.exec,
     });
 }
 /**
@@ -139,7 +140,7 @@ export function rigPreflight(input) {
  * checks/order/error-strings so expand/add_member preflight a structured spec
  * with no YAML round-trip; rigPreflight(yaml) is the parse/normalize front over it.
  */
-export function preflightValidatedSpec(rigSpec, preflightCtx) {
+export async function preflightValidatedSpec(rigSpec, preflightCtx) {
     const errors = [];
     const warnings = [];
     // 2. Validate session name components for all pod members
@@ -223,6 +224,40 @@ export function preflightValidatedSpec(rigSpec, preflightCtx) {
             }
         }
     }
+    // OPR.0.3.4.7 — Codex profile-LOAD probe, integrated into preflight.
+    // Runs only when exec is provided and the sync checks passed.
+    if (errors.length === 0 && preflightCtx.exec) {
+        const profileErrors = await verifyCodexProfiles(rigSpec, preflightCtx.exec);
+        errors.push(...profileErrors);
+    }
     return { ready: errors.length === 0, errors, warnings };
 }
+/**
+ * OPR.0.3.4.7 — async post-preflight probe: verify Codex profile-v2 LOADS
+ * for all Codex nodes with a non-empty codex_config_profile. Called AFTER
+ * the synchronous preflight passes (codex --version already verified).
+ * Returns errors to append to the preflight result; empty = all profiles load.
+ */
+export async function verifyCodexProfiles(rigSpec, exec) {
+    const { verifyCodexProfileLoads } = await import("./codex-profile-preflight.js");
+    const errors = [];
+    const checkedProfiles = new Set();
+    for (const pod of rigSpec.pods) {
+        for (const member of pod.members) {
+            if (member.runtime !== "codex")
+                continue;
+            const profile = member.codexConfigProfile?.trim();
+            if (!profile)
+                continue;
+            if (checkedProfiles.has(profile))
+                continue;
+            checkedProfiles.add(profile);
+            const result = await verifyCodexProfileLoads(profile, exec);
+            if (!result.ok) {
+                errors.push(`${pod.id}.${member.id}: ${result.error}${result.migrationHint ? ` Fix: ${result.migrationHint}` : ""}`);
+            }
+        }
+    }
+    return errors;
+}
 //# sourceMappingURL=rigspec-preflight.js.map

package/daemon/dist/domain/rigspec-preflight.js.map

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

package/daemon/dist/domain/seat-attention-reconciler.d.ts

@@ -0,0 +1,54 @@
+import type { SessionRegistry } from "./session-registry.js";
+import type { EventBus } from "./event-bus.js";
+import type { AgentActivityStore } from "./agent-activity-store.js";
+export interface ClearAttentionResult {
+    ok: boolean;
+    code?: "not_in_attention" | "not_demonstrably_responsive" | "cleared";
+    from?: string;
+    to?: string;
+    clearedBy?: "evidence" | "operator_attestation";
+    evidence?: {
+        kind: string;
+        state?: string;
+        reason?: string;
+    };
+    reason?: string;
+    detail?: string;
+    previousError?: string | null;
+}
+export interface SendVerifyFn {
+    (sessionName: string, text: string, opts?: {
+        verify?: boolean;
+    }): Promise<{
+        ok: boolean;
+        outcome?: string;
+        verified?: boolean;
+    }>;
+}
+export interface CaptureFn {
+    (sessionName: string, opts?: {
+        lines?: number;
+    }): Promise<{
+        ok: boolean;
+        sessionName: string;
+        content?: string;
+        error?: string;
+    }>;
+}
+interface ClearAttentionDeps {
+    sessionRegistry: SessionRegistry;
+    eventBus: EventBus;
+    agentActivityStore: AgentActivityStore;
+    sendVerify?: SendVerifyFn;
+    capture?: CaptureFn;
+}
+export declare class SeatAttentionReconciler {
+    private deps;
+    constructor(deps: ClearAttentionDeps);
+    clearAttention(sessionName: string, opts?: {
+        reason?: string;
+    }): Promise<ClearAttentionResult>;
+    private findLatestSessionByName;
+}
+export {};
+//# sourceMappingURL=seat-attention-reconciler.d.ts.map

package/daemon/dist/domain/seat-attention-reconciler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"seat-attention-reconciler.d.ts","sourceRoot":"","sources":["../../src/domain/seat-attention-reconciler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAGpE,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,OAAO,CAAC;IACZ,IAAI,CAAC,EAAE,kBAAkB,GAAG,6BAA6B,GAAG,SAAS,CAAC;IACtE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,UAAU,GAAG,sBAAsB,CAAC;IAChD,QAAQ,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,YAAY;IAC3B,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;CAClI;AAED,MAAM,WAAW,SAAS;IACxB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACnI;AAED,UAAU,kBAAkB;IAC1B,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,QAAQ,CAAC;IACnB,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,UAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,OAAO,CAAC,EAAE,SAAS,CAAC;CACrB;AAID,qBAAa,uBAAuB;IAClC,OAAO,CAAC,IAAI,CAAqB;gBAErB,IAAI,EAAE,kBAAkB;IAI9B,cAAc,CAClB,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GACzB,OAAO,CAAC,oBAAoB,CAAC;IAmJhC,OAAO,CAAC,uBAAuB;CA0ChC"}

package/daemon/dist/domain/seat-attention-reconciler.js

@@ -0,0 +1,176 @@
+// OPR.0.3.4.10 — seat attention reconciler: evidence-gated clear of stuck
+// startup_status=attention_required. Managed writer + append-only audit.
+const POSITIVE_STATES = new Set(["running", "idle"]);
+export class SeatAttentionReconciler {
+    deps;
+    constructor(deps) {
+        this.deps = deps;
+    }
+    async clearAttention(sessionName, opts) {
+        const { sessionRegistry, eventBus, agentActivityStore } = this.deps;
+        // Resolve session -> node + current startup_status.
+        const session = this.findLatestSessionByName(sessionName);
+        if (!session) {
+            return { ok: false, code: "not_in_attention", detail: `Session '${sessionName}' not found` };
+        }
+        if (session.startupStatus !== "attention_required" && session.startupStatus !== "failed") {
+            return { ok: false, code: "not_in_attention", detail: `Session startup_status is '${session.startupStatus}', not attention_required/failed` };
+        }
+        const previousError = session.latestError ?? null;
+        // Operator attestation override (--reason).
+        if (opts?.reason) {
+            sessionRegistry.updateStartupStatus(session.id, "ready", new Date().toISOString());
+            eventBus.emit({
+                type: "seat.attention_cleared",
+                rigId: session.rigId,
+                nodeId: session.nodeId,
+                sessionName,
+                from: session.startupStatus,
+                to: "ready",
+                clearedBy: "operator_attestation",
+                reason: opts.reason,
+                previousError,
+            });
+            return {
+                ok: true,
+                code: "cleared",
+                from: session.startupStatus,
+                to: "ready",
+                clearedBy: "operator_attestation",
+                reason: opts.reason,
+                previousError,
+            };
+        }
+        // Evidence-gated clear.
+        const activity = agentActivityStore.getLatestForNode({
+            nodeId: session.nodeId,
+            sessionName,
+        });
+        if (activity && activity.stale !== true && POSITIVE_STATES.has(activity.state)) {
+            sessionRegistry.updateStartupStatus(session.id, "ready", new Date().toISOString());
+            eventBus.emit({
+                type: "seat.attention_cleared",
+                rigId: session.rigId,
+                nodeId: session.nodeId,
+                sessionName,
+                from: session.startupStatus,
+                to: "ready",
+                clearedBy: "evidence",
+                evidence: { kind: "fresh_activity", state: activity.state, reason: activity.reason },
+                previousError,
+            });
+            return {
+                ok: true,
+                code: "cleared",
+                from: session.startupStatus,
+                to: "ready",
+                clearedBy: "evidence",
+                evidence: { kind: "fresh_activity", state: activity.state, reason: activity.reason },
+                previousError,
+            };
+        }
+        // Second evidence path: active send-verify round-trip.
+        if (this.deps.sendVerify) {
+            try {
+                const probeText = `# OpenRig attention-clear liveness probe ${Date.now()}`;
+                const sendResult = await this.deps.sendVerify(sessionName, probeText, { verify: true });
+                if (sendResult.ok && (sendResult.outcome === "delivered" || sendResult.verified === true)) {
+                    sessionRegistry.updateStartupStatus(session.id, "ready", new Date().toISOString());
+                    eventBus.emit({
+                        type: "seat.attention_cleared",
+                        rigId: session.rigId,
+                        nodeId: session.nodeId,
+                        sessionName,
+                        from: session.startupStatus,
+                        to: "ready",
+                        clearedBy: "evidence",
+                        evidence: { kind: "send_verify_roundtrip", state: sendResult.outcome ?? "delivered" },
+                        previousError,
+                    });
+                    return {
+                        ok: true,
+                        code: "cleared",
+                        from: session.startupStatus,
+                        to: "ready",
+                        clearedBy: "evidence",
+                        evidence: { kind: "send_verify_roundtrip", state: sendResult.outcome ?? "delivered" },
+                        previousError,
+                    };
+                }
+                // rendered-unconfirmed: text landed but verify raced a TUI redraw.
+                // Attempt capture-confirmation if capture dep is available.
+                if (sendResult.ok && sendResult.outcome === "rendered-unconfirmed" && this.deps.capture) {
+                    try {
+                        const captureResult = await this.deps.capture(sessionName, { lines: 50 });
+                        if (captureResult.ok && captureResult.content && captureResult.content.includes(probeText)) {
+                            sessionRegistry.updateStartupStatus(session.id, "ready", new Date().toISOString());
+                            eventBus.emit({
+                                type: "seat.attention_cleared",
+                                rigId: session.rigId,
+                                nodeId: session.nodeId,
+                                sessionName,
+                                from: session.startupStatus,
+                                to: "ready",
+                                clearedBy: "evidence",
+                                evidence: { kind: "send_verify_capture_confirmed", state: "rendered-unconfirmed" },
+                                previousError,
+                            });
+                            return {
+                                ok: true,
+                                code: "cleared",
+                                from: session.startupStatus,
+                                to: "ready",
+                                clearedBy: "evidence",
+                                evidence: { kind: "send_verify_capture_confirmed", state: "rendered-unconfirmed" },
+                                previousError,
+                            };
+                        }
+                    }
+                    catch {
+                        // Capture failed — transport error. Do not clear on capture failure.
+                    }
+                }
+                // No capture dep, or capture didn't confirm: could-not-confirm, NOT dead.
+                // failed: transport did not land. Neither clears.
+            }
+            catch {
+                // Send failed — transport error. Do not clear.
+            }
+        }
+        return {
+            ok: false,
+            code: "not_demonstrably_responsive",
+            detail: activity
+                ? `Latest activity: state='${activity.state}', stale=${activity.stale ?? false}, reason='${activity.reason}' -- not positive evidence; send-verify also not confirmed`
+                : "No recent agent activity found; send-verify also not confirmed",
+        };
+    }
+    findLatestSessionByName(sessionName) {
+        const row = this.deps.sessionRegistry.db.prepare(`SELECT s.id, s.node_id, n.rig_id, s.startup_status,
+              (SELECT e.payload FROM events e WHERE e.node_id = s.node_id AND e.type IN ('node.startup_attention_required','node.startup_failed') ORDER BY e.seq DESC LIMIT 1) as latest_error_payload
+       FROM sessions s
+       JOIN nodes n ON n.id = s.node_id
+       WHERE s.session_name = ?
+       ORDER BY s.created_at DESC, s.id DESC LIMIT 1`).get(sessionName);
+        if (!row)
+            return null;
+        let latestError = null;
+        if (row.latest_error_payload) {
+            try {
+                const parsed = JSON.parse(row.latest_error_payload);
+                latestError = parsed.error ?? parsed.message ?? row.latest_error_payload;
+            }
+            catch {
+                latestError = row.latest_error_payload;
+            }
+        }
+        return {
+            id: row.id,
+            nodeId: row.node_id,
+            rigId: row.rig_id,
+            startupStatus: row.startup_status ?? "pending",
+            latestError,
+        };
+    }
+}
+//# sourceMappingURL=seat-attention-reconciler.js.map

package/daemon/dist/domain/seat-attention-reconciler.js.map

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

package/daemon/dist/domain/snapshot-repository.d.ts

@@ -11,15 +11,19 @@ export declare class SnapshotRepository {
     getSnapshot(id: string): Snapshot | null;
     findLatestAutoPreDown(rigId: string): Snapshot | null;
     /**
-     * L3b: returns the latest snapshot whose persisted `data` carries the minimum
+     * Returns the latest snapshot whose persisted `data` carries the minimum
      * structural metadata `RestoreOrchestrator.restore`'s pre-validation requires.
-     * Prefers `auto-pre-down` over other kinds when both are present.
      *
-     * The single SQL query orders snapshots by `(kind = 'auto-pre-down') DESC,
-     * created_at DESC, id DESC` so an auto-pre-down candidate always comes first
-     * if any exists. The in-memory loop then validates each candidate and skips
-     * snapshots with corrupted JSON or missing topology metadata, returning the
-     * first usable row. Returns null when no usable snapshot exists.
+     * OPR.0.3.4.9 Option Y: prefers the most-recent of the crash-insurance tier
+     * {auto-pre-down, auto-periodic} -- the freshest of the two wins. A newer
+     * auto-periodic beats a stale auto-pre-down (the crash fix); a genuinely-
+     * fresher auto-pre-down still wins (graceful-cycle preserved). Manual,
+     * pre_restore, and auto-rehydrate remain below the tier (unchanged).
+     *
+     * The SQL query orders by `(kind IN ('auto-pre-down','auto-periodic')) DESC,
+     * created_at DESC, id DESC`. The in-memory loop validates each candidate and
+     * skips snapshots with corrupted JSON or missing topology metadata, returning
+     * the first usable row. Returns null when no usable snapshot exists.
      *
      * Distinct from `findLatestUsableSnapshot` (rig-repository.ts, L2): that
      * helper requires at least one persisted resume token and is consumed by
@@ -31,6 +35,10 @@ export declare class SnapshotRepository {
     getLatestSnapshot(rigId: string): Snapshot | null;
     listSnapshots(rigId: string, opts?: ListOptions): Snapshot[];
     pruneSnapshots(rigId: string, keepCount: number): number;
+    /** OPR.0.3.4.9 — kind-scoped retention. Keeps the newest `keepCount` rows
+     *  of the given kind and deletes only older rows of THAT kind. Never touches
+     *  other kinds. Hard floor: keepCount >= 1 (never prune to zero). */
+    pruneSnapshotsByKind(rigId: string, kind: string, keepCount: number): number;
     private rowToSnapshot;
 }
 export {};

package/daemon/dist/domain/snapshot-repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snapshot-repository.d.ts","sourceRoot":"","sources":["../../src/domain/snapshot-repository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAEzD,UAAU,WAAW;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,kBAAkB;IAC7B,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC;gBAEnB,EAAE,EAAE,QAAQ,CAAC,QAAQ;IAIjC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,QAAQ;IAazE,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAOxC,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IASrD;;;;;;;;;;;;;;;;OAgBG;IACH,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAoBvD,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IASjD,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,QAAQ,EAAE;IAoB5D,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IA2BxD,OAAO,CAAC,aAAa;CAUtB"}
+{"version":3,"file":"snapshot-repository.d.ts","sourceRoot":"","sources":["../../src/domain/snapshot-repository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAEzD,UAAU,WAAW;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,kBAAkB;IAC7B,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC;gBAEnB,EAAE,EAAE,QAAQ,CAAC,QAAQ;IAIjC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,QAAQ;IAazE,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAOxC,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IASrD;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAoBvD,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IASjD,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,QAAQ,EAAE;IAoB5D,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IA2BxD;;yEAEqE;IACrE,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IAyB5E,OAAO,CAAC,aAAa;CAUtB"}

package/daemon/dist/domain/snapshot-repository.js

@@ -24,15 +24,19 @@ export class SnapshotRepository {
         return row ? this.rowToSnapshot(row) : null;
     }
     /**
-     * L3b: returns the latest snapshot whose persisted `data` carries the minimum
+     * Returns the latest snapshot whose persisted `data` carries the minimum
      * structural metadata `RestoreOrchestrator.restore`'s pre-validation requires.
-     * Prefers `auto-pre-down` over other kinds when both are present.
      *
-     * The single SQL query orders snapshots by `(kind = 'auto-pre-down') DESC,
-     * created_at DESC, id DESC` so an auto-pre-down candidate always comes first
-     * if any exists. The in-memory loop then validates each candidate and skips
-     * snapshots with corrupted JSON or missing topology metadata, returning the
-     * first usable row. Returns null when no usable snapshot exists.
+     * OPR.0.3.4.9 Option Y: prefers the most-recent of the crash-insurance tier
+     * {auto-pre-down, auto-periodic} -- the freshest of the two wins. A newer
+     * auto-periodic beats a stale auto-pre-down (the crash fix); a genuinely-
+     * fresher auto-pre-down still wins (graceful-cycle preserved). Manual,
+     * pre_restore, and auto-rehydrate remain below the tier (unchanged).
+     *
+     * The SQL query orders by `(kind IN ('auto-pre-down','auto-periodic')) DESC,
+     * created_at DESC, id DESC`. The in-memory loop validates each candidate and
+     * skips snapshots with corrupted JSON or missing topology metadata, returning
+     * the first usable row. Returns null when no usable snapshot exists.
      *
      * Distinct from `findLatestUsableSnapshot` (rig-repository.ts, L2): that
      * helper requires at least one persisted resume token and is consumed by
@@ -42,7 +46,7 @@ export class SnapshotRepository {
      */
     findLatestRestoreUsable(rigId) {
         const rows = this.db
-            .prepare("SELECT * FROM snapshots WHERE rig_id = ? ORDER BY (kind = 'auto-pre-down') DESC, created_at DESC, id DESC")
+            .prepare("SELECT * FROM snapshots WHERE rig_id = ? ORDER BY (kind IN ('auto-pre-down', 'auto-periodic')) DESC, created_at DESC, id DESC")
             .all(rigId);
         for (const row of rows) {
             let data;
@@ -98,6 +102,27 @@ export class SnapshotRepository {
             .run(...toDelete.map((r) => r.id));
         return toDelete.length;
     }
+    /** OPR.0.3.4.9 — kind-scoped retention. Keeps the newest `keepCount` rows
+     *  of the given kind and deletes only older rows of THAT kind. Never touches
+     *  other kinds. Hard floor: keepCount >= 1 (never prune to zero). */
+    pruneSnapshotsByKind(rigId, kind, keepCount) {
+        const effectiveKeep = Math.max(1, keepCount);
+        const keepers = this.db
+            .prepare("SELECT id FROM snapshots WHERE rig_id = ? AND kind = ? ORDER BY created_at DESC LIMIT ?")
+            .all(rigId, kind, effectiveKeep);
+        const keepIds = new Set(keepers.map((r) => r.id));
+        const all = this.db
+            .prepare("SELECT id FROM snapshots WHERE rig_id = ? AND kind = ?")
+            .all(rigId, kind);
+        const toDelete = all.filter((r) => !keepIds.has(r.id));
+        if (toDelete.length === 0)
+            return 0;
+        const placeholders = toDelete.map(() => "?").join(",");
+        this.db
+            .prepare(`DELETE FROM snapshots WHERE id IN (${placeholders})`)
+            .run(...toDelete.map((r) => r.id));
+        return toDelete.length;
+    }
     rowToSnapshot(row) {
         return {
             id: row.id,

package/daemon/dist/domain/snapshot-repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"snapshot-repository.js","sourceRoot":"","sources":["../../src/domain/snapshot-repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"snapshot-repository.js","sourceRoot":"","sources":["../../src/domain/snapshot-repository.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAQ5B,MAAM,OAAO,kBAAkB;IACpB,EAAE,CAAoB;IAE/B,YAAY,EAAqB;QAC/B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IAED,cAAc,CAAC,KAAa,EAAE,IAAY,EAAE,IAAkB;QAC5D,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC;QAClB,IAAI,CAAC,EAAE;aACJ,OAAO,CACN,oEAAoE,CACrE;aACA,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAE9C,OAAO,IAAI,CAAC,aAAa,CACvB,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAgB,CAC/E,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,EAAU;QACpB,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CAAC,sCAAsC,CAAC;aAC/C,GAAG,CAAC,EAAE,CAA4B,CAAC;QACtC,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9C,CAAC;IAED,qBAAqB,CAAC,KAAa;QACjC,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CACN,sGAAsG,CACvG;aACA,GAAG,CAAC,KAAK,CAA4B,CAAC;QACzC,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9C,CAAC;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,uBAAuB,CAAC,KAAa;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE;aACjB,OAAO,CACN,+HAA+H,CAChI;aACA,GAAG,CAAC,KAAK,CAAkB,CAAC;QAE/B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,IAAkB,CAAC;YACvB,IAAI,CAAC;gBACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAiB,CAAC;YAC9C,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS;YACX,CAAC;YACD,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC;gBAAE,SAAS;YACjD,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACjC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iBAAiB,CAAC,KAAa;QAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CACN,2EAA2E,CAC5E;aACA,GAAG,CAAC,KAAK,CAA4B,CAAC;QACzC,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9C,CAAC;IAED,aAAa,CAAC,KAAa,EAAE,IAAkB;QAC7C,IAAI,GAAG,GAAG,0CAA0C,CAAC;QACrD,MAAM,MAAM,GAAc,CAAC,KAAK,CAAC,CAAC;QAElC,IAAI,IAAI,EAAE,IAAI,EAAE,CAAC;YACf,GAAG,IAAI,eAAe,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;QAED,GAAG,IAAI,2BAA2B,CAAC;QAEnC,IAAI,IAAI,EAAE,KAAK,EAAE,CAAC;YAChB,GAAG,IAAI,UAAU,CAAC;YAClB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,CAAkB,CAAC;QAClE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,cAAc,CAAC,KAAa,EAAE,SAAiB;QAC7C,8BAA8B;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE;aACpB,OAAO,CACN,4EAA4E,CAC7E;aACA,GAAG,CAAC,KAAK,EAAE,SAAS,CAAqB,CAAC;QAE7C,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAElD,sCAAsC;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CAAC,2CAA2C,CAAC;aACpD,GAAG,CAAC,KAAK,CAAqB,CAAC;QAElC,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEvD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,CAAC,CAAC;QAEpC,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACvD,IAAI,CAAC,EAAE;aACJ,OAAO,CAAC,sCAAsC,YAAY,GAAG,CAAC;aAC9D,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAErC,OAAO,QAAQ,CAAC,MAAM,CAAC;IACzB,CAAC;IAED;;yEAEqE;IACrE,oBAAoB,CAAC,KAAa,EAAE,IAAY,EAAE,SAAiB;QACjE,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE;aACpB,OAAO,CACN,yFAAyF,CAC1F;aACA,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,aAAa,CAAqB,CAAC;QAEvD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAElD,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CAAC,wDAAwD,CAAC;aACjE,GAAG,CAAC,KAAK,EAAE,IAAI,CAAqB,CAAC;QAExC,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACvD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,CAAC,CAAC;QAEpC,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACvD,IAAI,CAAC,EAAE;aACJ,OAAO,CAAC,sCAAsC,YAAY,GAAG,CAAC;aAC9D,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAErC,OAAO,QAAQ,CAAC,MAAM,CAAC;IACzB,CAAC;IAEO,aAAa,CAAC,GAAgB;QACpC,OAAO;YACL,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,KAAK,EAAE,GAAG,CAAC,MAAM;YACjB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAiB;YAC1C,SAAS,EAAE,GAAG,CAAC,UAAU;SAC1B,CAAC;IACJ,CAAC;CACF;AAWD,mEAAmE;AACnE,2DAA2D;AAC3D,EAAE;AACF,6EAA6E;AAC7E,2EAA2E;AAC3E,6EAA6E;AAC7E,qBAAqB;AACrB,EAAE;AACF,YAAY;AACZ,4BAA4B;AAC5B,oEAAoE;AACpE,iCAAiC;AACjC,yEAAyE;AACzE,yBAAyB;AACzB,EAAE;AACF,6EAA6E;AAC7E,6EAA6E;AAC7E,gFAAgF;AAChF,SAAS,2BAA2B,CAAC,IAAa;IAChD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACpD,MAAM,CAAC,GAAG,IAAoB,CAAC;IAC/B,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAClF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7C,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,OAAO,CAAC,CAAC,WAAW,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACtE,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC3B,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAC9C,IAAI,OAAO,CAAC,CAAC,WAAW,KAAK,QAAQ,IAAI,CAAC,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAClF,IAAI,OAAO,CAAC,CAAC,MAAM,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;IAC1E,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/daemon/dist/domain/topology-converge.d.ts

@@ -1,4 +1,5 @@
 import type { PodRigInstantiator, AddMemberOutcome } from "./rigspec-instantiator.js";
+import type { ClaimService, ReconcileSessionOutcome } from "./claim-service.js";
 /**
  * Topology-mutation converge spine (OPR.0.3.3.24, AC-6 scaffold).
  *
@@ -25,6 +26,11 @@ export type TopologyOp = {
         to: string;
         kind: string;
     }>;
+} | {
+    kind: "reconcile_session";
+    sessionName: string;
+    rigId?: string;
+    logicalId?: string;
 } | {
     kind: "remove_member";
     logicalId: string;
@@ -51,6 +57,10 @@ export type ConvergeResult = {
     kind: "add_member";
     supported: true;
     outcome: AddMemberOutcome;
+} | {
+    kind: "reconcile_session";
+    supported: true;
+    outcome: ReconcileSessionOutcome;
 } | {
     kind: TopologyOpKind;
     detected: true;
@@ -84,14 +94,26 @@ export interface LiveMember {
  * classifies them honestly when handed one directly.
  */
 export declare function diffTopology(declared: DeclaredMember[], live: LiveMember[]): TopologyOp[];
+/** The domain services the converge boundary composes per op kind (OPR.0.3.4.3:
+ *  the spine grew a second implemented op, so convergeOp takes a deps object —
+ *  add_member runs on the instantiator, reconcile_session on the claim service's
+ *  no-input reconcile binding). */
+export interface ConvergeDeps {
+    instantiator: PodRigInstantiator;
+    /** Required for reconcile_session ops; add_member-only callers may omit it. */
+    claimService?: ClaimService;
+}
 /**
  * Apply a single topology op. `add_member` runs the extracted create-node +
- * launch-binding seam via PodRigInstantiator.addMemberToPod. Every other kind is
- * reported honestly as detected-but-unsupported (NEVER silently skipped). The
- * agent-ergonomics (json + honest 3-part errors) the CLI and MCP expose live ON
- * this converge boundary, so future verbs inherit human/agent parity.
+ * launch-binding seam via PodRigInstantiator.addMemberToPod; `reconcile_session`
+ * runs ClaimService.reconcileSession — the NO-LAUNCH, NO-INPUT adopt of a live
+ * hand-resumed session into its persisted node (never reaches NodeLauncher.
+ * launchNode or any pane-input primitive). Every other kind is reported honestly
+ * as detected-but-unsupported (NEVER silently skipped). The agent-ergonomics
+ * (json + honest 3-part errors) the CLI and MCP expose live ON this converge
+ * boundary, so future verbs inherit human/agent parity.
  */
-export declare function convergeOp(instantiator: PodRigInstantiator, rigId: string, op: TopologyOp, rigRoot: string, opts?: {
+export declare function convergeOp(deps: ConvergeDeps, rigId: string, op: TopologyOp, rigRoot: string, opts?: {
     cwdOverride?: string;
 }): Promise<ConvergeResult>;
 //# sourceMappingURL=topology-converge.d.ts.map

package/daemon/dist/domain/topology-converge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"topology-converge.d.ts","sourceRoot":"","sources":["../../src/domain/topology-converge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAEtF;;;;;;;;;;;;;;;GAeG;AAEH,kDAAkD;AAClD,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,GAC/H;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC5C;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACzD;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAC5D;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnE,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;AAEhD,yFAAyF;AACzF,eAAO,MAAM,kBAAkB,EAAE,SAAS,cAAc,EAAmB,CAAC;AAE5E,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAE/D;AAED,wFAAwF;AACxF,eAAO,MAAM,kBAAkB,gDAAgD,CAAC;AAEhF,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,SAAS,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,gBAAgB,CAAA;CAAE,GAClE;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,QAAQ,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,iFAAiF;AACjF,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,mDAAmD;AACnD,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAsBzF;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,YAAY,EAAE,kBAAkB,EAChC,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9B,OAAO,CAAC,cAAc,CAAC,CAmBzB"}
+{"version":3,"file":"topology-converge.d.ts","sourceRoot":"","sources":["../../src/domain/topology-converge.ts"],"names":[],"mappings":"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"}

package/daemon/dist/domain/topology-converge.js

@@ -1,5 +1,5 @@
 /** The op-kinds converge() implements this release. The rest are classified-deferred. */
-export const SUPPORTED_OP_KINDS = ["add_member"];
+export const SUPPORTED_OP_KINDS = ["add_member", "reconcile_session"];
 export function isSupportedOpKind(kind) {
     return SUPPORTED_OP_KINDS.includes(kind);
 }
@@ -42,20 +42,38 @@ export function diffTopology(declared, live) {
 }
 /**
  * Apply a single topology op. `add_member` runs the extracted create-node +
- * launch-binding seam via PodRigInstantiator.addMemberToPod. Every other kind is
- * reported honestly as detected-but-unsupported (NEVER silently skipped). The
- * agent-ergonomics (json + honest 3-part errors) the CLI and MCP expose live ON
- * this converge boundary, so future verbs inherit human/agent parity.
+ * launch-binding seam via PodRigInstantiator.addMemberToPod; `reconcile_session`
+ * runs ClaimService.reconcileSession — the NO-LAUNCH, NO-INPUT adopt of a live
+ * hand-resumed session into its persisted node (never reaches NodeLauncher.
+ * launchNode or any pane-input primitive). Every other kind is reported honestly
+ * as detected-but-unsupported (NEVER silently skipped). The agent-ergonomics
+ * (json + honest 3-part errors) the CLI and MCP expose live ON this converge
+ * boundary, so future verbs inherit human/agent parity.
  */
-export async function convergeOp(instantiator, rigId, op, rigRoot, opts) {
+export async function convergeOp(deps, rigId, op, rigRoot, opts) {
     switch (op.kind) {
         case "add_member": {
-            const outcome = await instantiator.addMemberToPod(rigId, op.pod, op.member, rigRoot, {
+            const outcome = await deps.instantiator.addMemberToPod(rigId, op.pod, op.member, rigRoot, {
                 cwdOverride: opts?.cwdOverride,
                 edges: op.edges,
             });
             return { kind: "add_member", supported: true, outcome };
         }
+        case "reconcile_session": {
+            if (!deps.claimService) {
+                return {
+                    kind: "reconcile_session",
+                    supported: true,
+                    outcome: { ok: false, code: "reconcile_error", message: "Claim service unavailable; cannot reconcile." },
+                };
+            }
+            const outcome = await deps.claimService.reconcileSession({
+                sessionName: op.sessionName,
+                rigId: op.rigId,
+                logicalId: op.logicalId,
+            });
+            return { kind: "reconcile_session", supported: true, outcome };
+        }
         case "remove_member":
         case "move_member":
         case "fork_member":