@openrig/cli 0.5.0 → 0.5.1

package/node_modules/@openrig/daemon/dist/domain/rigspec-instantiator.js

@@ -0,0 +1,1849 @@
+import nodePath from "node:path";
+import { resolvePermissionPolicyAttachment, resolvePermissionPolicyRefValue, } from "./permission-policy/policy-ref.js";
+import { deriveCanonicalSessionName, validateSessionComponents } from "./session-name.js";
+import { LegacyRigSpecSchema as RigSpecSchema } from "./rigspec-schema.js"; // TODO: AS-T08b — migrate to pod-aware RigSpec
+import { LegacyRigSpecCodec as RigSpecCodec } from "./rigspec-codec.js"; // TODO: AS-T08b — migrate to pod-aware RigSpec
+import { resolveLaunchCwd } from "./cwd-resolution.js";
+// Only these edge kinds constrain launch order
+const LAUNCH_DEPENDENCY_KINDS = new Set(["delegates_to", "spawned_by"]);
+export class RigInstantiator {
+    db;
+    rigRepo;
+    sessionRegistry;
+    eventBus;
+    nodeLauncher;
+    preflight;
+    tmuxAdapter;
+    constructor(deps) {
+        if (deps.db !== deps.rigRepo.db) {
+            throw new Error("RigInstantiator: rigRepo must share the same db handle");
+        }
+        if (deps.db !== deps.sessionRegistry.db) {
+            throw new Error("RigInstantiator: sessionRegistry must share the same db handle");
+        }
+        if (deps.db !== deps.eventBus.db) {
+            throw new Error("RigInstantiator: eventBus must share the same db handle");
+        }
+        if (deps.db !== deps.nodeLauncher.db) {
+            throw new Error("RigInstantiator: nodeLauncher must share the same db handle");
+        }
+        if (deps.db !== deps.preflight.db) {
+            throw new Error("RigInstantiator: preflight must share the same db handle");
+        }
+        this.db = deps.db;
+        this.rigRepo = deps.rigRepo;
+        this.sessionRegistry = deps.sessionRegistry;
+        this.eventBus = deps.eventBus;
+        this.nodeLauncher = deps.nodeLauncher;
+        this.preflight = deps.preflight;
+        this.tmuxAdapter = deps.tmuxAdapter;
+    }
+    async instantiate(spec) {
+        // 1. Validate
+        const raw = RigSpecCodec.parse(RigSpecCodec.serialize(spec));
+        const validation = RigSpecSchema.validate(raw);
+        if (!validation.valid) {
+            return { ok: false, code: "validation_failed", errors: validation.errors };
+        }
+        // 2. Preflight
+        const preflightResult = await this.preflight.check(spec);
+        if (!preflightResult.ready) {
+            return { ok: false, code: "preflight_failed", errors: preflightResult.errors, warnings: preflightResult.warnings };
+        }
+        // 3. Compute launch order BEFORE materialization (detect cycles early)
+        let launchOrder;
+        try {
+            launchOrder = this.computeLaunchOrder(spec);
+        }
+        catch (err) {
+            return {
+                ok: false,
+                code: "instantiate_error",
+                message: err instanceof Error ? err.message : String(err),
+            };
+        }
+        // 4. Atomic DB materialization: rig + nodes + edges
+        let rigId;
+        const nodeIdMap = {}; // logicalId -> DB id
+        try {
+            const txn = this.db.transaction(() => {
+                const rig = this.rigRepo.createRig(spec.name);
+                rigId = rig.id;
+                for (const specNode of spec.nodes) {
+                    const node = this.rigRepo.addNode(rig.id, specNode.id, {
+                        role: specNode.role,
+                        runtime: specNode.runtime,
+                        model: specNode.model,
+                        cwd: specNode.cwd,
+                        surfaceHint: specNode.surfaceHint,
+                        workspace: specNode.workspace,
+                        restorePolicy: specNode.restorePolicy,
+                        packageRefs: specNode.packageRefs,
+                    });
+                    nodeIdMap[specNode.id] = node.id;
+                }
+                for (const specEdge of spec.edges) {
+                    this.rigRepo.addEdge(rig.id, nodeIdMap[specEdge.from], nodeIdMap[specEdge.to], specEdge.kind);
+                }
+            });
+            txn();
+        }
+        catch (err) {
+            return {
+                ok: false,
+                code: "instantiate_error",
+                message: err instanceof Error ? err.message : String(err),
+            };
+        }
+        // 5. Launch nodes in topological order
+        const nodeResults = [];
+        const launchedSessionNames = [];
+        const instantiateWarnings = [];
+        for (const logicalId of launchOrder) {
+            const result = await this.nodeLauncher.launchNode(rigId, logicalId);
+            if (result.ok) {
+                nodeResults.push({ logicalId, status: "launched" });
+                launchedSessionNames.push(result.sessionName);
+                if (result.warnings?.length) {
+                    instantiateWarnings.push(...result.warnings);
+                }
+            }
+            else {
+                nodeResults.push({ logicalId, status: "failed", error: result.message });
+            }
+        }
+        // Check for total launch failure — kill orphan sessions and clean up the rig
+        const allFailed = nodeResults.every((n) => n.status === "failed");
+        if (allFailed && nodeResults.length > 0) {
+            // Kill orphan tmux sessions (best-effort)
+            if (this.tmuxAdapter) {
+                for (const sessionName of launchedSessionNames) {
+                    try {
+                        await this.tmuxAdapter.killSession(sessionName);
+                    }
+                    catch { /* best-effort */ }
+                }
+            }
+            try {
+                this.rigRepo.deleteRig(rigId);
+            }
+            catch {
+                // Best-effort cleanup
+            }
+            return {
+                ok: false,
+                code: "instantiate_error",
+                message: "all node launches failed",
+            };
+        }
+        // 6. Propagate restorePolicy to session metadata (best-effort)
+        try {
+            for (const specNode of spec.nodes) {
+                const restorePolicy = specNode.restorePolicy ?? "resume_if_possible";
+                const sessions = this.sessionRegistry.getSessionsForRig(rigId);
+                const nodeDbId = nodeIdMap[specNode.id];
+                const session = sessions.find((s) => s.nodeId === nodeDbId);
+                if (session) {
+                    this.db.prepare("UPDATE sessions SET restore_policy = ? WHERE id = ?")
+                        .run(restorePolicy, session.id);
+                }
+            }
+        }
+        catch {
+            // Best-effort: import succeeded even if restorePolicy propagation fails
+        }
+        // 6. Emit rig.imported (best-effort)
+        try {
+            this.eventBus.emit({
+                type: "rig.imported",
+                rigId: rigId,
+                specName: spec.name,
+                specVersion: spec.version,
+            });
+        }
+        catch {
+            // Best-effort: import succeeded even if event persistence fails
+        }
+        return {
+            ok: true,
+            result: {
+                rigId: rigId,
+                specName: spec.name,
+                specVersion: spec.version,
+                nodes: nodeResults,
+                warnings: instantiateWarnings.length > 0 ? instantiateWarnings : undefined,
+            },
+        };
+    }
+    computeLaunchOrder(spec) {
+        const nodes = spec.nodes;
+        const edges = spec.edges;
+        const inDegree = {};
+        const adjacency = {};
+        for (const node of nodes) {
+            inDegree[node.id] = 0;
+            adjacency[node.id] = [];
+        }
+        for (const edge of edges) {
+            if (!LAUNCH_DEPENDENCY_KINDS.has(edge.kind))
+                continue;
+            let from;
+            let to;
+            if (edge.kind === "delegates_to") {
+                from = edge.from;
+                to = edge.to;
+            }
+            else {
+                // spawned_by: target (parent) before source (child)
+                from = edge.to;
+                to = edge.from;
+            }
+            if (adjacency[from]) {
+                adjacency[from].push(to);
+                inDegree[to] = (inDegree[to] ?? 0) + 1;
+            }
+        }
+        // Topological sort with alphabetical tiebreaker
+        const queue = Object.keys(inDegree)
+            .filter((id) => inDegree[id] === 0)
+            .sort();
+        const order = [];
+        while (queue.length > 0) {
+            const current = queue.shift();
+            order.push(current);
+            const neighbors = (adjacency[current] ?? []).slice().sort();
+            for (const neighbor of neighbors) {
+                inDegree[neighbor] = (inDegree[neighbor] ?? 1) - 1;
+                if ((inDegree[neighbor] ?? 0) === 0) {
+                    // Insert sorted
+                    let inserted = false;
+                    for (let i = 0; i < queue.length; i++) {
+                        if (queue[i].localeCompare(neighbor) > 0) {
+                            queue.splice(i, 0, neighbor);
+                            inserted = true;
+                            break;
+                        }
+                    }
+                    if (!inserted)
+                        queue.push(neighbor);
+                }
+            }
+        }
+        // Cycle detection: if not all nodes reached, there's a cycle
+        if (order.length !== nodes.length) {
+            const missing = nodes.filter((n) => !order.includes(n.id)).map((n) => n.id);
+            throw new Error(`Dependency cycle detected among nodes: ${missing.join(", ")}`);
+        }
+        return order;
+    }
+}
+// -- Pod-aware instantiator (AgentSpec reboot) --
+import { RigSpecCodec as PodRigSpecCodec } from "./rigspec-codec.js";
+import { RigSpecSchema as PodRigSpecSchema, VALID_EDGE_KINDS } from "./rigspec-schema.js";
+import { rigPreflight, preflightValidatedSpec } from "./rigspec-preflight.js";
+import { resolveAgentRef } from "./agent-resolver.js";
+import { resolveNodeConfig } from "./profile-resolver.js";
+import { resolveStartup } from "./startup-resolver.js";
+import { planProjection, claudeConflictTargetPath, projectionConflictWarnings, filterProtectedProjections } from "./projection-planner.js";
+import { ProjectionManifestStore } from "./projection-manifest-store.js";
+import { resolveConcreteHint } from "./runtime-adapter.js";
+function defaultCultureStartupFile() {
+    const assetsRoot = nodePath.resolve(import.meta.dirname, "../../assets");
+    return {
+        path: "CULTURE-default.md",
+        absolutePath: nodePath.join(assetsRoot, "guidance/CULTURE-default.md"),
+        ownerRoot: assetsRoot,
+        deliveryHint: "guidance_merge",
+        required: true,
+        appliesOn: ["fresh_start", "restore"],
+    };
+}
+/**
+ * Pod-aware rig instantiator. Creates pods, nodes, edges, and runs
+ * startup orchestration per node with resolved agent specs.
+ */
+export class PodRigInstantiator {
+    db;
+    deps;
+    constructor(deps) {
+        if (deps.db !== deps.rigRepo.db)
+            throw new Error("PodRigInstantiator: rigRepo must share the same db handle");
+        if (deps.db !== deps.sessionRegistry.db)
+            throw new Error("PodRigInstantiator: sessionRegistry must share the same db handle");
+        if (deps.db !== deps.eventBus.db)
+            throw new Error("PodRigInstantiator: eventBus must share the same db handle");
+        if (deps.db !== deps.nodeLauncher.db)
+            throw new Error("PodRigInstantiator: nodeLauncher must share the same db handle");
+        this.db = deps.db;
+        this.deps = deps;
+    }
+    inheritedPermissionPolicy(targetRigId) {
+        if (!targetRigId)
+            return undefined;
+        const provenance = this.deps.rigRepo.getRigPolicyProvenance(targetRigId);
+        if (!provenance?.rigRef)
+            return undefined;
+        return {
+            ref: provenance.rigRef,
+            origin: provenance.origin,
+            launchPosture: provenance.launchPosture,
+            ...(provenance.resolvedTarget ? { resolvedTarget: provenance.resolvedTarget } : {}),
+            ...(provenance.declaringDir ? { declaringDir: provenance.declaringDir } : {}),
+        };
+    }
+    async materialize(rigSpecYaml, rigRoot, opts) {
+        let raw;
+        try {
+            raw = PodRigSpecCodec.parse(rigSpecYaml);
+        }
+        catch (err) {
+            return { ok: false, code: "validation_failed", errors: [err.message] };
+        }
+        const targetRig = opts?.targetRigId ? this.deps.rigRepo.getRig(opts.targetRigId) : null;
+        if (opts?.targetRigId && !targetRig) {
+            return { ok: false, code: "target_rig_not_found", message: `Rig "${opts.targetRigId}" not found` };
+        }
+        const validation = PodRigSpecSchema.validate(raw, {
+            externalQualifiedIds: targetRig?.nodes.map((node) => node.logicalId),
+        });
+        if (!validation.valid) {
+            return { ok: false, code: "validation_failed", errors: validation.errors };
+        }
+        const rigSpec = PodRigSpecSchema.normalize(raw);
+        const preflight = await rigPreflight({
+            rigSpecYaml,
+            rigRoot,
+            cwdOverride: opts?.cwdOverride,
+            fsOps: this.deps.fsOps,
+            rigNameOverride: targetRig?.rig.name,
+            externalQualifiedIds: targetRig?.nodes.map((node) => node.logicalId),
+            inheritedPermissionPolicy: this.inheritedPermissionPolicy(opts?.targetRigId),
+            exec: this.deps.exec,
+            claudeActivityAssets: this.deps.claudeActivityAssets, // §6: restore main's activity-hook asset threading
+        });
+        if (!preflight.ready) {
+            return { ok: false, code: "preflight_failed", errors: preflight.errors, warnings: preflight.warnings };
+        }
+        // OPR.0.3.3.24: parse/validate/preflight is the separable FRONT-END; the
+        // persistence CORE (createPod + create-node + edges + events, in one tx)
+        // takes the already-parsed+validated spec so `expand` and the `add_member`
+        // converge op compose it WITHOUT fabricating a synthetic rig spec.
+        return this.materializeValidatedSpec(rigSpec, rigRoot, preflight.warnings, opts);
+    }
+    /**
+     * materialize with a STRUCTURED front (OPR.0.3.3.24): the YAML-free sibling of
+     * materialize(). Runs the SAME front-end (validate + preflight, via the
+     * preflight CORE using this adapter's fsOps) on an already-built raw spec
+     * OBJECT, then the persistence core - so `expand` (and the add_member op) drop
+     * the synthetic-spec YAML round-trip. Byte-identical to materialize(yaml): same
+     * validate(externalQualifiedIds), same preflight checks, same MaterializeOutcome
+     * error codes (validation_failed / preflight_failed / target_rig_not_found /
+     * materialize_conflict). fsOps stays encapsulated here (the expansion service
+     * has none) - this wrapper is mechanics only, no behaviour/layering change.
+     */
+    async materializeStructured(raw, rigRoot, opts) {
+        const targetRig = opts?.targetRigId ? this.deps.rigRepo.getRig(opts.targetRigId) : null;
+        if (opts?.targetRigId && !targetRig) {
+            return { ok: false, code: "target_rig_not_found", message: `Rig "${opts.targetRigId}" not found` };
+        }
+        const validation = PodRigSpecSchema.validate(raw, {
+            externalQualifiedIds: targetRig?.nodes.map((node) => node.logicalId),
+        });
+        if (!validation.valid) {
+            return { ok: false, code: "validation_failed", errors: validation.errors };
+        }
+        const rigSpec = PodRigSpecSchema.normalize(raw);
+        const preflight = await preflightValidatedSpec(rigSpec, {
+            rigRoot,
+            cwdOverride: opts?.cwdOverride,
+            fsOps: this.deps.fsOps,
+            rigNameOverride: targetRig?.rig.name,
+            inheritedPermissionPolicy: this.inheritedPermissionPolicy(opts?.targetRigId),
+            exec: this.deps.exec,
+            claudeActivityAssets: this.deps.claudeActivityAssets, // §6: restore main's activity-hook asset threading
+        });
+        if (!preflight.ready) {
+            return { ok: false, code: "preflight_failed", errors: preflight.errors, warnings: preflight.warnings };
+        }
+        return this.materializeValidatedSpec(rigSpec, rigRoot, preflight.warnings, opts);
+    }
+    /**
+     * materialize CORE (OPR.0.3.3.24): the persistence body of materialize, taking
+     * an already-parsed + validated + preflighted PodRigSpec. Creates pods +
+     * member nodes (via the create-node primitive) + edges + events in one
+     * transaction. Parse/validate/preflight is the caller's separable front-end
+     * (materialize() for YAML; expand/add_member build + validate a structured
+     * spec). This is the cut that lets `expand` drop its synthetic-spec hack and
+     * `add_member` reuse the exact create path — create+launch only, no identity
+     * migration.
+     */
+    async materializeValidatedSpec(rigSpec, rigRoot, preflightWarnings, opts) {
+        const persistedEvents = [];
+        const nodeResults = [];
+        try {
+            let materializedRigId = opts?.targetRigId ?? "";
+            const tx = this.db.transaction(() => {
+                if (!materializedRigId) {
+                    const rig = this.deps.rigRepo.createRig(rigSpec.name);
+                    materializedRigId = rig.id;
+                    persistedEvents.push(this.deps.eventBus.persistWithinTransaction({ type: "rig.created", rigId: materializedRigId }));
+                }
+                // PL-007: persist the rig's typed workspace block when declared.
+                if (rigSpec.workspace) {
+                    this.deps.rigRepo.setRigWorkspace(materializedRigId, rigSpec.workspace);
+                }
+                // OPR.0.4.8.3 Seam B: persist the rig-level permission_policy REF (raw, like role) —
+                // this is ONE of TWO rig-persist sites (materializeValidatedSpec + instantiate); missing
+                // either drops the rig ref on that path (map correction, independently verified).
+                // Guard-F1: the RESOLVED rig attachment persists too (declaringDir = THIS rigRoot,
+                // the original declaring RigSpec dir) — restart-complete for organic seats,
+                // add-member under a different root, and successor continuity. STRICT (load-bearing).
+                if (rigSpec.permissionPolicy) {
+                    this.deps.rigRepo.setRigPermissionPolicy(materializedRigId, rigSpec.permissionPolicy);
+                    const rigAttachment = resolvePermissionPolicyAttachment(rigSpec.permissionPolicy, rigRoot, {
+                        readFile: (p) => this.deps.fsOps.readFile(p),
+                    });
+                    this.deps.rigRepo.setRigPolicyProvenance(materializedRigId, {
+                        origin: rigAttachment.origin,
+                        resolvedTarget: rigAttachment.resolvedTarget ?? null,
+                        declaringDir: rigAttachment.origin === "custom" ? rigRoot : null,
+                        launchPosture: rigAttachment.launchPosture,
+                    });
+                }
+                const currentRig = this.deps.rigRepo.getRig(materializedRigId);
+                const logicalIdToNodeId = new Map(currentRig.nodes.map((node) => [node.logicalId, node.id]));
+                const existingPodIds = new Set(currentRig.nodes
+                    .map((node) => node.logicalId.includes(".") ? node.logicalId.split(".")[0] : null)
+                    .filter((value) => value !== null));
+                for (const pod of rigSpec.pods) {
+                    if (existingPodIds.has(pod.id)) {
+                        throw { code: "materialize_conflict", message: `Pod id '${pod.id}' already exists in rig '${currentRig.rig.name}'` };
+                    }
+                    for (const member of pod.members) {
+                        const qualifiedId = `${pod.id}.${member.id}`;
+                        if (logicalIdToNodeId.has(qualifiedId)) {
+                            throw { code: "materialize_conflict", message: `Logical ID '${qualifiedId}' already exists in rig '${currentRig.rig.name}'` };
+                        }
+                    }
+                }
+                const podIdMap = {};
+                for (const pod of rigSpec.pods) {
+                    const podRecord = this.deps.podRepo.createPod(materializedRigId, pod.id, pod.label, {
+                        summary: pod.summary,
+                        continuityPolicyJson: pod.continuityPolicy ? JSON.stringify(pod.continuityPolicy) : undefined,
+                    });
+                    podIdMap[pod.id] = podRecord.id;
+                    persistedEvents.push(this.deps.eventBus.persistWithinTransaction({
+                        type: "pod.created",
+                        rigId: materializedRigId,
+                        podId: podRecord.id,
+                        namespace: podRecord.namespace,
+                        label: pod.label,
+                    }));
+                    for (const member of pod.members) {
+                        const qualifiedId = `${pod.id}.${member.id}`;
+                        const { node, event } = this.createMemberNode({
+                            rigId: materializedRigId,
+                            qualifiedId,
+                            member,
+                            podId: podRecord.id,
+                            rigRoot,
+                            cwdOverride: opts?.cwdOverride,
+                        });
+                        logicalIdToNodeId.set(qualifiedId, node.id);
+                        // Seam B R2: restart-stable provenance persists AT MATERIALIZE (a
+                        // materialized-but-never-launched seat must still restore its posture).
+                        // R2 HIGH-1: expansion into an EXISTING rig materializes through a SYNTHETIC
+                        // fragment with no rig-level ref — a ref-less member must inherit the
+                        // PERSISTED target-rig attachment (original declaring dir), never lose it.
+                        const materializeAttachment = this.resolveMemberPolicyAttachment(member.permissionPolicy, rigSpec.permissionPolicy, rigRoot);
+                        if (materializeAttachment) {
+                            this.persistNodePolicyProvenanceStrict(node.id, materializeAttachment);
+                        }
+                        else if (opts?.targetRigId) {
+                            const rigProv = this.deps.rigRepo.getRigPolicyProvenance(materializedRigId);
+                            if (rigProv) {
+                                this.deps.rigRepo.setNodePolicyProvenance(node.id, {
+                                    origin: rigProv.origin,
+                                    resolvedTarget: rigProv.resolvedTarget,
+                                    declaringDir: rigProv.declaringDir,
+                                    launchPosture: rigProv.launchPosture,
+                                });
+                            }
+                        }
+                        nodeResults.push({ logicalId: qualifiedId, status: "materialized" });
+                        persistedEvents.push(event);
+                    }
+                }
+                for (const pod of rigSpec.pods) {
+                    for (const edge of pod.edges) {
+                        const fromId = logicalIdToNodeId.get(`${pod.id}.${edge.from}`);
+                        const toId = logicalIdToNodeId.get(`${pod.id}.${edge.to}`);
+                        if (!fromId || !toId) {
+                            throw { code: "materialize_conflict", message: `Pod-local edge references missing node: ${pod.id}.${edge.from} -> ${pod.id}.${edge.to}` };
+                        }
+                        this.deps.rigRepo.addEdge(materializedRigId, fromId, toId, edge.kind);
+                    }
+                }
+                for (const edge of rigSpec.edges) {
+                    const fromId = logicalIdToNodeId.get(edge.from);
+                    const toId = logicalIdToNodeId.get(edge.to);
+                    if (!fromId || !toId) {
+                        throw { code: "materialize_conflict", message: `Cross-pod edge references missing node: ${edge.from} -> ${edge.to}` };
+                    }
+                    this.deps.rigRepo.addEdge(materializedRigId, fromId, toId, edge.kind);
+                }
+                if (!opts?.suppressSummaryEvent) {
+                    persistedEvents.push(this.deps.eventBus.persistWithinTransaction({
+                        type: "rig.imported",
+                        rigId: materializedRigId,
+                        specName: rigSpec.name,
+                        specVersion: rigSpec.version,
+                    }));
+                }
+            });
+            tx();
+            for (const event of persistedEvents) {
+                this.deps.eventBus.notifySubscribers(event);
+            }
+            return {
+                ok: true,
+                result: {
+                    rigId: materializedRigId,
+                    specName: rigSpec.name,
+                    specVersion: rigSpec.version,
+                    nodes: nodeResults,
+                    warnings: preflightWarnings,
+                },
+            };
+        }
+        catch (err) {
+            if (err && typeof err === "object" && "code" in err && "message" in err) {
+                const typed = err;
+                if (typed.code === "materialize_conflict") {
+                    return { ok: false, code: "materialize_conflict", message: typed.message };
+                }
+            }
+            return { ok: false, code: "materialize_error", message: err instanceof Error ? err.message : String(err) };
+        }
+    }
+    async launchMaterialized(rigSpecYaml, rigRoot, targetRigId) {
+        let raw;
+        try {
+            raw = PodRigSpecCodec.parse(rigSpecYaml);
+        }
+        catch (err) {
+            return { ok: false, code: "validation_failed", errors: [err.message] };
+        }
+        const targetRig = this.deps.rigRepo.getRig(targetRigId);
+        if (!targetRig) {
+            return { ok: false, code: "target_rig_not_found", message: `Rig "${targetRigId}" not found` };
+        }
+        const validation = PodRigSpecSchema.validate(raw, {
+            externalQualifiedIds: targetRig.nodes.map((node) => node.logicalId),
+        });
+        if (!validation.valid) {
+            return { ok: false, code: "validation_failed", errors: validation.errors };
+        }
+        const rigSpec = PodRigSpecSchema.normalize(raw);
+        return this.launchValidatedSpec(rigSpec, rigRoot, targetRigId);
+    }
+    /**
+     * launch CORE (OPR.0.3.3.24): given an already-parsed+validated spec whose
+     * nodes are already materialized, compute launch order and bring each node
+     * live via the launch-binding primitive. Extracted from launchMaterialized so
+     * `expand` (and the add_member op) launch a structured spec WITHOUT a YAML
+     * round-trip; launchMaterialized(yaml) is the parse/validate/normalize front
+     * over it. Behaviour identical (loop body relocated verbatim).
+     */
+    async launchValidatedSpec(rigSpec, rigRoot, targetRigId) {
+        const launchOrder = this.computePodLaunchOrder(rigSpec);
+        const podWarnings = [];
+        const nodeResults = [];
+        for (const logicalId of launchOrder) {
+            const memberContext = this.findMemberContext(rigSpec, logicalId);
+            if (!memberContext) {
+                nodeResults.push({
+                    logicalId,
+                    nodeId: "",
+                    status: "failed",
+                    error: `Unable to resolve member definition for "${logicalId}"`,
+                });
+                continue;
+            }
+            const node = this.deps.rigRepo.getRig(targetRigId)?.nodes.find((entry) => entry.logicalId === logicalId);
+            if (!node) {
+                nodeResults.push({
+                    logicalId,
+                    nodeId: "",
+                    status: "failed",
+                    error: `Node "${logicalId}" not found after materialization`,
+                });
+                continue;
+            }
+            const launched = await this.launchBinding({
+                rigId: targetRigId,
+                rigSpec,
+                rigRoot,
+                pod: memberContext.pod,
+                member: memberContext.member,
+                qualifiedId: logicalId,
+                nodeId: node.id,
+            });
+            if (launched.warnings?.length) {
+                podWarnings.push(...launched.warnings);
+            }
+            nodeResults.push({
+                logicalId,
+                nodeId: node.id,
+                status: launched.status,
+                error: launched.error,
+                sessionName: launched.sessionName,
+            });
+        }
+        return {
+            ok: true,
+            result: {
+                nodes: nodeResults,
+                warnings: podWarnings.length > 0 ? podWarnings : undefined,
+            },
+        };
+    }
+    /**
+     * add_member converge op (OPR.0.3.3.24): add a single MEMBER to an EXISTING
+     * pod in a live rig, composing the two extracted primitives — createMemberNode
+     * (create-node) + launchBinding (launch-binding) — WITHOUT createPod and
+     * WITHOUT fabricating a synthetic rig spec.
+     *
+     * Identity-migration-FREE: the new node mints a fresh node id + fresh logical
+     * id + fresh `@rigged_*` at launch; no existing seat's logical id,
+     * continuity_state, queue routing, or session is re-keyed. This is the
+     * source-visible fault line that lets add_member ship while move/fork wait for
+     * the 0.4.0 identity stack.
+     *
+     * Versus materialize: this does NOT call materializeValidatedSpec (which always
+     * createPods and carries the pod-exists conflict guard). It resolves the
+     * EXISTING pod's DB id via `podRepo.getPodByNamespace` and creates the one node
+     * directly under it. The pod-exists guard is lifted (adding to a live pod is
+     * not a conflict); the per-member duplicate-logical-id guard is KEPT (AC-3).
+     */
+    async addMemberToPod(rigId, podNamespace, memberFragment, rigRoot, opts) {
+        // 1. Resolve the rig.
+        const rig = this.deps.rigRepo.getRig(rigId);
+        if (!rig) {
+            return { ok: false, code: "rig_not_found", message: `Rig "${rigId}" not found.` };
+        }
+        // 2. Resolve the EXISTING pod's DB id via getPodByNamespace (the corrected
+        // pod-id source — NOT a pre-computed namespace->podId map). Honest not-found
+        // with the available namespaces so the caller can correct the handle.
+        const pod = this.deps.podRepo.getPodByNamespace(rigId, podNamespace);
+        if (!pod) {
+            const available = this.deps.podRepo.getPodsForRig(rigId).map((p) => p.namespace);
+            const hint = available.length > 0 ? available.join(", ") : "(none)";
+            return {
+                ok: false,
+                code: "pod_not_found",
+                message: `Pod "${podNamespace}" not found in rig "${rig.rig.name}". Existing pods: ${hint}. Check the namespace, or add a new pod with \`rig expand\`.`,
+            };
+        }
+        // 3. Build a minimal one-pod-one-member raw spec around the EXISTING pod so
+        // the new member runs the SAME validate + preflight the materialize front
+        // does — without a whole-rig spec or a YAML round-trip. The member fragment
+        // is embedded raw (spec snake_case shape, as expand's structured path emits);
+        // validate/normalize is the type gate.
+        const rawSpec = {
+            version: "0.2",
+            name: rig.rig.name,
+            pods: [{ id: podNamespace, label: pod.label, members: [memberFragment], edges: [] }],
+            edges: [],
+        };
+        // 4. Validate + normalize. externalQualifiedIds is the existing rig's node
+        // set (matches the materialize front; used for cross-pod edge resolution).
+        const validation = PodRigSpecSchema.validate(rawSpec, {
+            externalQualifiedIds: rig.nodes.map((node) => node.logicalId),
+        });
+        if (!validation.valid) {
+            return { ok: false, code: "validation_failed", errors: validation.errors };
+        }
+        const rigSpec = PodRigSpecSchema.normalize(rawSpec);
+        const member = rigSpec.pods[0].members[0];
+        const qualifiedId = `${podNamespace}.${member.id}`;
+        // 5. KEEP the per-member duplicate-logical-id guard (AC-3). The pod-exists
+        // guard is lifted (we are adding to a live pod on purpose), but minting a
+        // colliding logical id would be a real seat collision — reject it honestly.
+        // (validate's externalQualifiedIds only resolves edge targets; it does NOT
+        // reject a member colliding with an existing node, so this guard is load-bearing.)
+        if (rig.nodes.some((node) => node.logicalId === qualifiedId)) {
+            return {
+                ok: false,
+                code: "member_conflict",
+                message: `Member "${qualifiedId}" already exists in rig "${rig.rig.name}". Pick a different member id, or remove the existing seat first.`,
+            };
+        }
+        // 6. Preflight the new member on the normalized spec (same checks the
+        // materialize front runs, via the core, using this adapter's fsOps).
+        // rigNameOverride suppresses the rig-name-collision check (we are appending
+        // to an existing rig, exactly like expand's structured path).
+        const preflight = await preflightValidatedSpec(rigSpec, {
+            rigRoot,
+            cwdOverride: opts?.cwdOverride,
+            fsOps: this.deps.fsOps,
+            rigNameOverride: rig.rig.name,
+            inheritedPermissionPolicy: this.inheritedPermissionPolicy(rigId),
+            exec: this.deps.exec,
+        });
+        if (!preflight.ready) {
+            return { ok: false, code: "preflight_failed", errors: preflight.errors, warnings: preflight.warnings };
+        }
+        // 7. Validate + resolve any declared pod-local edges BEFORE creating the
+        // node, so a bad edge fails fast with no orphan seat. Two honest failure
+        // classes: (a) DECLARATION validity (non-array / empty fields / a kind
+        // outside the canonical VALID_EDGE_KINDS - mirrors the rigspec pod-local
+        // edge contract, NOT a second looser path) -> validation_failed; (b) live
+        // ENDPOINT resolution against the new member + existing pod-mates ->
+        // edge_unresolved. Edges carry NO runtime behavior yet (the edge-runtime
+        // fence); we persist the declared graph so it is NOT silently dropped (FM2).
+        const rawEdges = opts?.edges;
+        if (rawEdges !== undefined && rawEdges !== null && !Array.isArray(rawEdges)) {
+            return { ok: false, code: "validation_failed", errors: ["edges: must be an array of { from, to, kind }"] };
+        }
+        const declaredEdges = Array.isArray(rawEdges) ? rawEdges : [];
+        const edgeErrors = [];
+        declaredEdges.forEach((edge, i) => {
+            if (typeof edge?.from !== "string" || typeof edge?.to !== "string" || typeof edge?.kind !== "string"
+                || edge.from.trim() === "" || edge.to.trim() === "" || edge.kind.trim() === "") {
+                edgeErrors.push(`edges[${i}]: from, to, and kind are required non-empty strings`);
+                return;
+            }
+            if (!VALID_EDGE_KINDS.has(edge.kind)) {
+                edgeErrors.push(`edges[${i}].kind: must be one of ${[...VALID_EDGE_KINDS].join(", ")} (got "${edge.kind}")`);
+            }
+        });
+        if (edgeErrors.length > 0) {
+            return { ok: false, code: "validation_failed", errors: edgeErrors };
+        }
+        const knownLogicalIds = new Set([...rig.nodes.map((node) => node.logicalId), qualifiedId]);
+        const resolvedEdges = [];
+        for (const edge of declaredEdges) {
+            const from = `${podNamespace}.${edge.from}`;
+            const to = `${podNamespace}.${edge.to}`;
+            if (!knownLogicalIds.has(from) || !knownLogicalIds.has(to)) {
+                const missing = !knownLogicalIds.has(from) ? from : to;
+                return { ok: false, code: "edge_unresolved", message: `Pod-local edge references "${missing}", which is neither the new member "${qualifiedId}" nor an existing seat in rig "${rig.rig.name}". Use member ids within pod "${podNamespace}".` };
+            }
+            resolvedEdges.push({ from, to, kind: edge.kind });
+        }
+        // 8. create-node into the EXISTING pod (pod_id = resolved pod.id) + persist
+        // the resolved pod-local edges, all in one tx so the node row, the
+        // node.added event, and the edges commit atomically (mirroring the
+        // materialize core); subscribers notified after commit.
+        let createdNodeId = "";
+        let createdEvent;
+        const tx = this.db.transaction(() => {
+            const { node, event } = this.createMemberNode({
+                rigId,
+                qualifiedId,
+                member,
+                podId: pod.id,
+                rigRoot,
+                cwdOverride: opts?.cwdOverride,
+            });
+            createdNodeId = node.id;
+            createdEvent = event;
+            // Seam B Guard-F1: add_member runs under the CURRENT operation's root, which may
+            // differ from the ORIGINAL declaring RigSpec dir. A member OVERRIDE resolves against
+            // this operation's root (it is declared HERE); an INHERITED rig policy must reuse the
+            // PERSISTED rig attachment (original declaring root) — never re-resolve the raw rig
+            // ref against an unrelated root. STRICT persistence (load-bearing).
+            if (member.permissionPolicy) {
+                const memberAttachment = resolvePermissionPolicyAttachment(member.permissionPolicy, rigRoot, {
+                    readFile: (p) => this.deps.fsOps.readFile(p),
+                });
+                this.persistNodePolicyProvenanceStrict(node.id, memberAttachment);
+            }
+            else {
+                const rigProv = this.deps.rigRepo.getRigPolicyProvenance(rigId);
+                if (rigProv) {
+                    this.deps.rigRepo.setNodePolicyProvenance(node.id, {
+                        origin: rigProv.origin,
+                        resolvedTarget: rigProv.resolvedTarget,
+                        declaringDir: rigProv.declaringDir,
+                        launchPosture: rigProv.launchPosture,
+                    });
+                }
+            }
+            if (resolvedEdges.length > 0) {
+                const logicalIdToNodeId = new Map(rig.nodes.map((n) => [n.logicalId, n.id]));
+                logicalIdToNodeId.set(qualifiedId, node.id);
+                for (const edge of resolvedEdges) {
+                    this.deps.rigRepo.addEdge(rigId, logicalIdToNodeId.get(edge.from), logicalIdToNodeId.get(edge.to), edge.kind);
+                }
+            }
+        });
+        tx();
+        if (createdEvent)
+            this.deps.eventBus.notifySubscribers(createdEvent);
+        // 9. launch-binding for the one new node (startup projection + delivery +
+        // readiness + `@rigged_*`). The minimal spec supplies the member/pod/rig
+        // context launchBinding needs; the derived session name is
+        // `${podNamespace}-${member.id}@${rig.name}` — queue-addressable immediately.
+        const launched = await this.launchBinding({
+            rigId,
+            rigSpec,
+            rigRoot,
+            pod: rigSpec.pods[0],
+            member,
+            qualifiedId,
+            nodeId: createdNodeId,
+            cwdOverride: opts?.cwdOverride,
+        });
+        return {
+            ok: true,
+            result: {
+                podId: pod.id,
+                podNamespace,
+                node: {
+                    logicalId: qualifiedId,
+                    nodeId: createdNodeId,
+                    status: launched.status,
+                    error: launched.error,
+                    sessionName: launched.sessionName,
+                },
+                edges: resolvedEdges,
+                warnings: [...preflight.warnings, ...(launched.warnings ?? [])],
+            },
+        };
+    }
+    async instantiate(rigSpecYaml, rigRoot, opts) {
+        // 1. Parse + validate
+        let rigSpec;
+        try {
+            const raw = PodRigSpecCodec.parse(rigSpecYaml);
+            const validation = PodRigSpecSchema.validate(raw);
+            if (!validation.valid) {
+                return { ok: false, code: "validation_failed", errors: validation.errors };
+            }
+            rigSpec = PodRigSpecSchema.normalize(raw);
+        }
+        catch (err) {
+            return { ok: false, code: "validation_failed", errors: [err.message] };
+        }
+        // 2. Preflight
+        const preflight = await rigPreflight({ rigSpecYaml, rigRoot, cwdOverride: opts?.cwdOverride, fsOps: this.deps.fsOps, exec: this.deps.exec, claudeActivityAssets: this.deps.claudeActivityAssets });
+        if (!preflight.ready) {
+            return { ok: false, code: "preflight_failed", errors: preflight.errors, warnings: preflight.warnings };
+        }
+        // 3. Compute launch order from edges (rejects cycles)
+        //
+        // OPR.0.3.2.22 Bug 2: this MUST run BEFORE createRig. Pre-fix, a
+        // cycle in the spec left an orphan stopped-state rig record because
+        // createRig had already committed before the cycle check ran. The
+        // operator-facing consequence was the "ambiguous library-spec vs
+        // restore-target" UX trap on the very next `rig up <builtin>` retry.
+        let launchOrder;
+        try {
+            launchOrder = this.computePodLaunchOrder(rigSpec);
+        }
+        catch (err) {
+            return { ok: false, code: "cycle_error", message: err.message };
+        }
+        // 4. Create rig (after cycle check passes)
+        let rigId;
+        try {
+            const rig = this.deps.rigRepo.createRig(rigSpec.name);
+            rigId = rig.id;
+            // PL-007: persist typed workspace block (when declared) on the rig
+            // record. Whoami / node-inventory read it via getRigWorkspace().
+            if (rigSpec.workspace) {
+                this.deps.rigRepo.setRigWorkspace(rigId, rigSpec.workspace);
+            }
+            // OPR.0.4.8.3 Seam B: the SECOND rig-persist site (bootstrap instantiate path) —
+            // both sites must write or the rig ref silently drops on one instantiate path.
+            // Guard-F1: resolved rig attachment persists here too (declaringDir = rigRoot).
+            if (rigSpec.permissionPolicy) {
+                this.deps.rigRepo.setRigPermissionPolicy(rigId, rigSpec.permissionPolicy);
+                const rigAttachment = resolvePermissionPolicyAttachment(rigSpec.permissionPolicy, rigRoot, {
+                    readFile: (p) => this.deps.fsOps.readFile(p),
+                });
+                this.deps.rigRepo.setRigPolicyProvenance(rigId, {
+                    origin: rigAttachment.origin,
+                    resolvedTarget: rigAttachment.resolvedTarget ?? null,
+                    declaringDir: rigAttachment.origin === "custom" ? rigRoot : null,
+                    launchPosture: rigAttachment.launchPosture,
+                });
+            }
+        }
+        catch (err) {
+            return { ok: false, code: "instantiate_error", message: err.message };
+        }
+        // 5. Create pods + nodes + edges, then launch in topological order
+        const nodeResults = [];
+        const nodeIdMap = {}; // "pod.member" -> node DB id
+        const launchedSessionNames = []; // Track for orphan cleanup on total failure
+        const podInstantiateWarnings = preflight.warnings;
+        // Store per-member context for deferred launch
+        const memberContext = new Map();
+        // Phase 1: Create all pods and collect member entries
+        const podIdMap = {}; // pod.id -> DB pod id
+        const memberEntries = [];
+        for (const pod of rigSpec.pods) {
+            let podId;
+            try {
+                const podRecord = this.deps.podRepo.createPod(rigId, pod.id, pod.label, {
+                    summary: pod.summary,
+                    continuityPolicyJson: pod.continuityPolicy ? JSON.stringify(pod.continuityPolicy) : undefined,
+                });
+                podId = podRecord.id;
+                podIdMap[pod.id] = podId;
+            }
+            catch (err) {
+                nodeResults.push(...pod.members.map((m) => ({ logicalId: `${pod.id}.${m.id}`, status: "failed", error: `Pod creation failed: ${err.message}` })));
+                continue;
+            }
+            for (const member of pod.members) {
+                memberEntries.push({ pod, member, podId, qualifiedId: `${pod.id}.${member.id}` });
+            }
+        }
+        // Sort members by topological launch order
+        const orderMap = new Map(launchOrder.map((id, i) => [id, i]));
+        memberEntries.sort((a, b) => (orderMap.get(a.qualifiedId) ?? 999) - (orderMap.get(b.qualifiedId) ?? 999));
+        // Prelaunch hook: service gate runs after topology setup, before any node launch.
+        //
+        // OPR.0.3.2.22 Bug 2: if the hook fails, roll back the rig record so
+        // the spec name is left free for a clean retry. Pods rely on rigs
+        // via ON DELETE CASCADE so deleting the rig is sufficient.
+        if (opts?.prelaunchHook) {
+            const hookResult = await opts.prelaunchHook(rigId);
+            if (!hookResult.ok) {
+                this.deps.rigRepo.deleteRig(rigId);
+                return { ok: false, code: "service_boot_failed", message: hookResult.message };
+            }
+        }
+        // Phase 2: Process members in launch order
+        for (const { pod, member, podId, qualifiedId } of memberEntries) {
+            // Terminal fast-path: skip agent resolution and profile resolution
+            if (member.agentRef === "builtin:terminal") {
+                const termResult = await this.processTerminalMember(rigId, rigSpec, rigRoot, pod, member, podId, qualifiedId, nodeIdMap, launchedSessionNames, podInstantiateWarnings, opts?.cwdOverride);
+                nodeResults.push(termResult);
+                continue;
+            }
+            // Resolve agent ref
+            const resolveResult = resolveAgentRef(member.agentRef, rigRoot, this.deps.fsOps);
+            if (!resolveResult.ok) {
+                const msg = resolveResult.code === "validation_failed"
+                    ? resolveResult.errors.join("; ")
+                    : resolveResult.error;
+                nodeResults.push({ logicalId: qualifiedId, status: "failed", error: msg });
+                continue;
+            }
+            // Resolve node config (profile + precedence)
+            const configResult = resolveNodeConfig({
+                baseSpec: resolveResult.resolved,
+                importedSpecs: resolveResult.imports,
+                collisions: resolveResult.collisions,
+                profileName: member.profile,
+                specRoot: rigRoot,
+                cwdOverride: opts?.cwdOverride,
+                member,
+                pod,
+                rig: rigSpec,
+            });
+            if (!configResult.ok) {
+                nodeResults.push({ logicalId: qualifiedId, status: "failed", error: configResult.errors.join("; ") });
+                continue;
+            }
+            // Create node
+            const createUnit = this.db.transaction(() => {
+                const node = this.deps.rigRepo.addNode(rigId, qualifiedId, {
+                    // OPR.0.4.6.FAC1 (VM-caught): the pod-aware bootstrap
+                    // instantiate-from-YAML path (`rig up <spec>`) creates agent
+                    // nodes via this INLINE addNode, NOT createMemberNode — so
+                    // it needs its own role wire or every up'd rig persists
+                    // role=NULL and role→seat resolution can never match. This
+                    // is the FOURTH node-creation site (materialize/expand/
+                    // add_member share createMemberNode; this one does not); the
+                    // C1 sibling-layer sweep missed it because its tests
+                    // exercised the createMemberNode paths, not bootstrap.
+                    role: member.role,
+                    runtime: member.runtime,
+                    model: member.model,
+                    codexConfigProfile: member.codexConfigProfile,
+                    // OPR.0.4.8.3 Seam B: bootstrap inline addNode is the FOURTH node-creation
+                    // site (see the role wire note above) — same member-ref persistence as
+                    // createMemberNode or `rig up <spec>` seats lose their policy ref.
+                    permissionPolicy: member.permissionPolicy,
+                    cwd: configResult.config.cwd,
+                    restorePolicy: configResult.config.restorePolicy,
+                    podId,
+                    agentRef: member.agentRef,
+                    profile: member.profile,
+                    label: member.label,
+                    resolvedSpecName: configResult.config.resolvedSpecName,
+                    resolvedSpecVersion: configResult.config.resolvedSpecVersion,
+                    resolvedSpecHash: configResult.config.resolvedSpecHash,
+                });
+                // Guard multi-seat correction (16e853a7): node creation + required provenance
+                // are ONE ATOMIC UNIT (SQLite savepoint). A setter fault rolls the INSERT back
+                // too — under partial-success semantics the sibling may proceed, but a failed
+                // member can never survive as a half-created node whose restore posture would
+                // widen to the rig attachment. (Previously the row survived with provenance
+                // null, and resolveRestorePosture fell through to rig full_bypass.)
+                const bootstrapAttachment = this.resolveMemberPolicyAttachment(member.permissionPolicy, rigSpec.permissionPolicy, rigRoot);
+                if (bootstrapAttachment)
+                    this.persistNodePolicyProvenanceStrict(node.id, bootstrapAttachment);
+                return node.id;
+            });
+            let nodeId;
+            try {
+                nodeId = createUnit();
+                // nodeIdMap only AFTER the atomic unit succeeds (Guard contract item 2).
+                nodeIdMap[qualifiedId] = nodeId;
+            }
+            catch (err) {
+                nodeResults.push({ logicalId: qualifiedId, status: "failed", error: err.message });
+                continue;
+            }
+            const launched = await this.launchExistingAgentMember({
+                rigId,
+                rigSpec,
+                rigRoot,
+                cwdOverride: opts?.cwdOverride,
+                force: opts?.force,
+                pod,
+                member,
+                qualifiedId,
+                nodeId,
+                resolveResult,
+                configResult,
+            });
+            if (launched.sessionName) {
+                launchedSessionNames.push(launched.sessionName);
+            }
+            if (launched.warnings?.length) {
+                podInstantiateWarnings.push(...launched.warnings);
+            }
+            nodeResults.push({
+                logicalId: qualifiedId,
+                status: launched.status,
+                error: launched.error,
+                evidence: launched.evidence,
+                sessionName: launched.sessionName,
+            });
+        }
+        // Create pod-local edges (after all members created)
+        for (const pod of rigSpec.pods) {
+            for (const edge of pod.edges) {
+                const fromId = nodeIdMap[`${pod.id}.${edge.from}`];
+                const toId = nodeIdMap[`${pod.id}.${edge.to}`];
+                if (fromId && toId) {
+                    try {
+                        this.deps.rigRepo.addEdge(rigId, fromId, toId, edge.kind);
+                    }
+                    catch { /* best-effort */ }
+                }
+            }
+        }
+        // Create cross-pod edges
+        for (const edge of rigSpec.edges) {
+            const fromId = nodeIdMap[edge.from];
+            const toId = nodeIdMap[edge.to];
+            if (fromId && toId) {
+                try {
+                    this.deps.rigRepo.addEdge(rigId, fromId, toId, edge.kind);
+                }
+                catch { /* best-effort */ }
+            }
+        }
+        // OPR.0.3.2.CT (conveyor-trust-minimal-fix):
+        // Distinguish recoverable attention_required (e.g., workspace trust
+        // gate) from terminal failure. ANY attention_required node means
+        // the rig is operator-recoverable — do NOT tear down. Only when
+        // every node is TERMINALLY failed (status === "failed") does the
+        // tear-down run, preserving the existing failure-cleanup behavior.
+        //
+        // For all-attention_required (no successful launch, no terminal
+        // failure), surface an attention_required outcome that carries
+        // the actionable per-node detail. The route returns a 3-part
+        // error pointing the operator at the approve→resume path. Sessions
+        // remain in startup_status='attention_required' so `rig ps` lists
+        // them and tmux panes are NOT killed.
+        const hasAttention = nodeResults.some((n) => n.status === "attention_required");
+        const hasLaunched = nodeResults.some((n) => n.status === "launched");
+        const allTerminal = nodeResults.length > 0 && nodeResults.every((n) => n.status === "failed");
+        if (allTerminal) {
+            // Kill orphan tmux sessions
+            if (this.deps.tmuxAdapter) {
+                for (const sessionName of launchedSessionNames) {
+                    try {
+                        await this.deps.tmuxAdapter.killSession(sessionName);
+                    }
+                    catch { /* best-effort */ }
+                }
+            }
+            try {
+                this.deps.rigRepo.deleteRig(rigId);
+            }
+            catch { /* best-effort */ }
+            const details = nodeResults.map((n) => `${n.logicalId}: ${n.error ?? "unknown"}`).join("; ");
+            return { ok: false, code: "instantiate_error", message: `all node launches/startups failed — ${details}` };
+        }
+        if (hasAttention && !hasLaunched) {
+            // All-attention_required path — rig + sessions PRESERVED; no
+            // tear-down. The operator's path: attach to a session via
+            // `tmux attach -t <session>` and answer the runtime prompt. NO
+            // new trust primitive
+            // introduced (HG-5); reuses the runtime's shipped in-pane
+            // trust-grant prompt.
+            const attentionNodes = nodeResults
+                .filter((n) => n.status === "attention_required")
+                .map((n) => ({
+                logicalId: n.logicalId,
+                sessionName: n.sessionName ?? "",
+                evidence: n.evidence,
+                reason: n.error ?? "node awaiting attention",
+            }));
+            // Emit rig.imported so callers see the rig exists; nodes are
+            // attention_required, not "launched", so `rig ps` shows the
+            // correct lifecycle state.
+            try {
+                this.deps.eventBus.emit({ type: "rig.imported", rigId, specName: rigSpec.name, specVersion: rigSpec.version });
+            }
+            catch { /* best-effort */ }
+            return {
+                ok: false,
+                code: "attention_required",
+                message: `${attentionNodes.length} node${attentionNodes.length === 1 ? "" : "s"} require attention before becoming interactive (rig parked, NOT failed; approve and resume to proceed).`,
+                rigId,
+                attentionNodes,
+            };
+        }
+        // Emit rig.imported
+        try {
+            this.deps.eventBus.emit({ type: "rig.imported", rigId, specName: rigSpec.name, specVersion: rigSpec.version });
+        }
+        catch { /* best-effort */ }
+        // Carry sessionName + evidence through to InstantiateResult.nodes
+        // so BootstrapOrchestrator can build AttentionNode[] in the mixed
+        // launched+attention_required path (guard verdict
+        // qitem-20260518082933 BLOCKER 1).
+        const resultNodes = nodeResults.map((n) => ({
+            logicalId: n.logicalId,
+            status: n.status,
+            error: n.error,
+            sessionName: n.sessionName,
+            evidence: n.evidence,
+        }));
+        return {
+            ok: true,
+            result: { rigId, specName: rigSpec.name, specVersion: rigSpec.version, nodes: resultNodes, warnings: podInstantiateWarnings.length > 0 ? podInstantiateWarnings : undefined },
+        };
+    }
+    computePodLaunchOrder(rigSpec) {
+        const LAUNCH_DEP_KINDS = new Set(["delegates_to", "spawned_by"]);
+        const allIds = [];
+        const inDegree = {};
+        const adjacency = {};
+        // Collect all qualified member ids
+        for (const pod of rigSpec.pods) {
+            for (const member of pod.members) {
+                const qid = `${pod.id}.${member.id}`;
+                allIds.push(qid);
+                inDegree[qid] = 0;
+                adjacency[qid] = [];
+            }
+        }
+        // Build adjacency from pod-local edges (qualify them) and cross-pod edges (already qualified)
+        for (const pod of rigSpec.pods) {
+            for (const edge of pod.edges) {
+                if (!LAUNCH_DEP_KINDS.has(edge.kind))
+                    continue;
+                const from = `${pod.id}.${edge.kind === "delegates_to" ? edge.from : edge.to}`;
+                const to = `${pod.id}.${edge.kind === "delegates_to" ? edge.to : edge.from}`;
+                if (adjacency[from]) {
+                    adjacency[from].push(to);
+                    inDegree[to] = (inDegree[to] ?? 0) + 1;
+                }
+            }
+        }
+        for (const edge of rigSpec.edges) {
+            if (!LAUNCH_DEP_KINDS.has(edge.kind))
+                continue;
+            const from = edge.kind === "delegates_to" ? edge.from : edge.to;
+            const to = edge.kind === "delegates_to" ? edge.to : edge.from;
+            if (adjacency[from] && adjacency[to]) {
+                adjacency[from].push(to);
+                inDegree[to] = (inDegree[to] ?? 0) + 1;
+            }
+        }
+        // Topological sort with alphabetical tiebreaker
+        const queue = allIds.filter((id) => inDegree[id] === 0).sort();
+        const order = [];
+        while (queue.length > 0) {
+            const current = queue.shift();
+            order.push(current);
+            for (const neighbor of (adjacency[current] ?? []).sort()) {
+                inDegree[neighbor] -= 1;
+                if (inDegree[neighbor] === 0) {
+                    let inserted = false;
+                    for (let i = 0; i < queue.length; i++) {
+                        if (queue[i].localeCompare(neighbor) > 0) {
+                            queue.splice(i, 0, neighbor);
+                            inserted = true;
+                            break;
+                        }
+                    }
+                    if (!inserted)
+                        queue.push(neighbor);
+                }
+            }
+        }
+        // Cycle detection: if any nodes remain unvisited, the graph has a cycle
+        if (order.length < allIds.length) {
+            const cycled = allIds.filter((id) => !order.includes(id));
+            throw new Error(`Dependency cycle detected among nodes: ${cycled.join(", ")}`);
+        }
+        return order;
+    }
+    async processTerminalMember(rigId, rigSpec, rigRoot, pod, member, podId, qualifiedId, nodeIdMap, launchedSessionNames, warnings, cwdOverride) {
+        const effectiveCwd = resolveLaunchCwd(member.cwd, rigRoot, cwdOverride);
+        // Create node with sentinel values
+        let nodeId;
+        try {
+            const node = this.deps.rigRepo.addNode(rigId, qualifiedId, {
+                runtime: member.runtime,
+                model: member.model,
+                cwd: effectiveCwd,
+                restorePolicy: "checkpoint_only",
+                podId,
+                agentRef: member.agentRef,
+                profile: member.profile,
+                label: member.label,
+            });
+            nodeId = node.id;
+            nodeIdMap[qualifiedId] = nodeId;
+        }
+        catch (err) {
+            return { logicalId: qualifiedId, status: "failed", error: err.message };
+        }
+        const launched = await this.launchExistingTerminalMember({
+            rigId,
+            rigSpec,
+            rigRoot,
+            cwdOverride,
+            pod,
+            member,
+            qualifiedId,
+            nodeId,
+        });
+        if (launched.sessionName) {
+            launchedSessionNames.push(launched.sessionName);
+        }
+        if (launched.warnings?.length) {
+            warnings.push(...launched.warnings);
+        }
+        return {
+            logicalId: qualifiedId,
+            status: launched.status,
+            error: launched.error,
+        };
+    }
+    findMemberContext(rigSpec, qualifiedId) {
+        const [podId, memberId] = qualifiedId.split(".", 2);
+        if (!podId || !memberId)
+            return null;
+        const pod = rigSpec.pods.find((entry) => entry.id === podId);
+        const member = pod?.members.find((entry) => entry.id === memberId);
+        return pod && member ? { pod, member } : null;
+    }
+    /**
+     * create-node primitive (OPR.0.3.3.24): mint a fresh node row for one member
+     * (fresh stable id + fresh qualified logical id, `pod_id` = the given pod) plus
+     * the matching `node.added` event. Extracted from materialize's loop so the
+     * `add_member` converge op and a de-YAML'd `expand` create a member node
+     * WITHOUT fabricating a synthetic rig spec. Identity-migration-FREE: addNode
+     * mints a brand-new identity; nothing existing re-keys. The caller pushes the
+     * returned `event` into its transaction's persisted-events list.
+     */
+    createMemberNode(input) {
+        const effectiveCwd = resolveLaunchCwd(input.member.cwd, input.rigRoot, input.cwdOverride);
+        const node = this.deps.rigRepo.addNode(input.rigId, input.qualifiedId, {
+            role: input.member.role,
+            runtime: input.member.runtime,
+            model: input.member.model,
+            codexConfigProfile: input.member.codexConfigProfile,
+            // OPR.0.4.8.3 Seam B: the member's OWN raw ref persists on the node (like role);
+            // rig-level lives on the rig row; precedence applies at RESOLUTION, not storage.
+            permissionPolicy: input.member.permissionPolicy,
+            cwd: effectiveCwd,
+            restorePolicy: input.member.restorePolicy,
+            podId: input.podId,
+            agentRef: input.member.agentRef,
+            profile: input.member.profile,
+            label: input.member.label,
+        });
+        const event = this.deps.eventBus.persistWithinTransaction({
+            type: "node.added",
+            rigId: input.rigId,
+            nodeId: node.id,
+            logicalId: input.qualifiedId,
+        });
+        return { node, event };
+    }
+    /**
+     * launch-binding primitive (OPR.0.3.3.24): given an already-created node and
+     * its member context, bring it fully live — harness launch + startup
+     * projection + delivery + readiness + `@rigged_*` metadata. Dispatches the
+     * terminal vs agent launch path. Extracted as an independently-callable
+     * primitive so launchMaterialized's loop, `expand`, and the `add_member`
+     * converge op all launch a node WITHOUT fabricating a synthetic rig spec.
+     * Behaviour is identical to the prior inline dispatch.
+     */
+    async launchBinding(input) {
+        return input.member.agentRef === "builtin:terminal"
+            ? this.launchExistingTerminalMember(input)
+            : this.launchExistingAgentMember(input);
+    }
+    /**
+     * OPR.0.4.8.3 Seam B — the ONE precedence + resolution point for a seat's permission
+     * policy at launch: member ref > rig ref > absent (undefined = the env-driven floor).
+     * Custom refs resolve relative to the rig root (the declaring RigSpec's directory in a
+     * materialized rig). Returns undefined when no ref is attached at either level.
+     */
+    resolveMemberPolicyAttachment(memberRef, rigRef, rigRoot) {
+        const ref = resolvePermissionPolicyRefValue(memberRef, rigRef);
+        if (!ref)
+            return undefined;
+        return resolvePermissionPolicyAttachment(ref, rigRoot, {
+            readFile: (p) => this.deps.fsOps.readFile(p),
+        });
+    }
+    /** Seam B Guard-F2: the STRICT materialize/add-member persist — provenance here is
+     *  LOAD-BEARING restart state; a real write failure must fail the surrounding
+     *  transaction, never commit a node without it. (The repository setter itself still
+     *  no-ops on pre-057 legacy fixture DBs — that narrow compatibility is preserved.) */
+    persistNodePolicyProvenanceStrict(nodeId, attachment) {
+        this.deps.rigRepo.setNodePolicyProvenance(nodeId, {
+            origin: attachment.origin,
+            resolvedTarget: attachment.resolvedTarget ?? null,
+            declaringDir: attachment.declaringDir ?? null,
+            launchPosture: attachment.launchPosture,
+        });
+    }
+    /** Seam B: the LAUNCH-time refresh stays best-effort (idempotent re-write on an already-
+     *  materialized node; a transient failure must not block a launch). */
+    persistNodePolicyProvenance(nodeId, attachment) {
+        try {
+            this.persistNodePolicyProvenanceStrict(nodeId, attachment);
+        }
+        catch { /* best-effort on launch refresh only */ }
+    }
+    async launchExistingAgentMember(input) {
+        const resolveResult = input.resolveResult ?? resolveAgentRef(input.member.agentRef, input.rigRoot, this.deps.fsOps);
+        if (!resolveResult.ok) {
+            const msg = resolveResult.code === "validation_failed"
+                ? resolveResult.errors.join("; ")
+                : resolveResult.error;
+            return { status: "failed", error: msg };
+        }
+        const configResult = input.configResult ?? resolveNodeConfig({
+            baseSpec: resolveResult.resolved,
+            importedSpecs: resolveResult.imports,
+            collisions: resolveResult.collisions,
+            profileName: input.member.profile,
+            specRoot: input.rigRoot,
+            cwdOverride: input.cwdOverride,
+            member: input.member,
+            pod: input.pod,
+            rig: input.rigSpec,
+        });
+        if (!configResult.ok) {
+            return { status: "failed", error: configResult.errors.join("; ") };
+        }
+        this.updateNodeResolvedConfig(input.nodeId, configResult.config);
+        // OPR.0.4.8.3 Seam B: resolve the seat's permission-policy attachment once for this
+        // launch (member > rig precedence; declaring dir = the rig root, where the declaring
+        // RigSpec + its relative policy files live). Also persists restart-stable provenance.
+        // R2 HIGH-1: the LIVE binding must AGREE with persisted provenance — structured
+        // add-member/expansion launch with a SYNTHETIC minimal spec (no rig-level ref), so
+        // when the in-memory spec resolves nothing, the PERSISTED node provenance (written in
+        // the creation tx) and then the PERSISTED rig attachment are the binding's truth.
+        const policyAttachment = this.resolveMemberPolicyAttachment(input.member.permissionPolicy, input.rigSpec.permissionPolicy, input.rigRoot);
+        if (policyAttachment)
+            this.persistNodePolicyProvenance(input.nodeId, policyAttachment);
+        // R2 terminal (954d97a0): TRUE ABSENCE binds the locked MINIMUM FLOOR explicitly
+        // (README v4 "DEFAULT IF NONE ATTACHED = the minimum floor"; FINAL2) — ambient
+        // OPENRIG_YOLO must never widen a seat with no attachment. Absence stays honest
+        // (no fabricated attachment/provenance); only the lifecycle BINDING is explicit.
+        const launchPosture = policyAttachment?.launchPosture
+            ?? this.deps.rigRepo.getNodePolicyProvenance(input.nodeId)?.launchPosture
+            ?? this.deps.rigRepo.getRigPolicyProvenance(input.rigId)?.launchPosture
+            ?? "floor";
+        const sessionNameErrors = validateSessionComponents(input.pod.id, input.member.id, input.rigSpec.name);
+        if (sessionNameErrors.length > 0) {
+            return { status: "failed", error: sessionNameErrors.join("; ") };
+        }
+        const canonicalSessionName = deriveCanonicalSessionName(input.pod.id, input.member.id, input.rigSpec.name);
+        // Forward per-seat silenceWindowSeconds from the resolved profile.
+        // Currently inert: the live SeatActivityService poller uses the
+        // global 3s default. Retained for a future per-seat-poller decision.
+        const launchResult = await this.deps.nodeLauncher.launchNode(input.rigId, input.qualifiedId, {
+            sessionName: canonicalSessionName,
+            silenceWindowSeconds: configResult.config.activity?.silenceWindowSeconds,
+        });
+        if (!launchResult.ok) {
+            return { status: "failed", error: launchResult.message };
+        }
+        try {
+            this.db.prepare("UPDATE sessions SET restore_policy = ? WHERE id = ?")
+                .run(configResult.config.restorePolicy, launchResult.session.id);
+        }
+        catch { /* best-effort */ }
+        const adapter = this.deps.adapters[input.member.runtime];
+        if (!adapter) {
+            return { status: "failed", error: `No adapter for runtime "${input.member.runtime}"`, sessionName: canonicalSessionName, warnings: launchResult.warnings };
+        }
+        // P20 — the projection manifest: consulted so a divergent target is
+        // discriminated operator-modified (protect) vs stale-projection (safe
+        // overwrite). REAL store-backed lookup on this.db (never a mock/null — the
+        // uninjected-service dead-invalidator class the P17 comment below records).
+        const projectionManifest = new ProjectionManifestStore(this.db);
+        const planResult = planProjection({
+            config: configResult.config,
+            collisions: resolveResult.collisions,
+            fsOps: this.deps.fsOps,
+            // P17 (finding A2): the conflict detector's resolver, UNINJECTED since the
+            // 4.8 restack dropped the warnings-site threading — without it every entry
+            // classified safe_projection and divergent targets overwrote silently.
+            resolveTargetPath: claudeConflictTargetPath,
+            lastHashLookup: (targetPath) => projectionManifest.lastHash(targetPath),
+        });
+        if (!planResult.ok) {
+            return { status: "failed", error: planResult.errors.join("; "), sessionName: canonicalSessionName, warnings: launchResult.warnings };
+        }
+        // P17: a divergent target is never SILENT again — each conflict rides the
+        // instantiate warnings surface with the file, reason, and consequence.
+        (launchResult.warnings ??= []).push(...projectionConflictWarnings(planResult.plan));
+        const resolvedFiles = this.buildResolvedStartupFiles(resolveResult.resolved.spec, resolveResult.resolved.sourcePath, resolveResult.resolved.spec.profiles[input.member.profile], input.rigSpec, input.rigRoot, input.pod, input.member);
+        const managedDedupedFiles = this.dedupeProjectedManagedStartupFiles(planResult.plan, resolvedFiles);
+        // P20 atom-4 PROTECT: hold back operator-edited skill targets (operator_conflict)
+        // so the adapter never overwrites an operator's edit — unless the operator forces
+        // it (input.force). The per-conflict warning already tells the operator this.
+        const dedupedResolvedFiles = filterProtectedProjections(managedDedupedFiles, planResult.plan, { force: input.force }).delivered;
+        const binding = {
+            id: launchResult.binding.id,
+            nodeId: input.nodeId,
+            tmuxSession: launchResult.binding.tmuxSession,
+            tmuxWindow: null,
+            tmuxPane: null,
+            cmuxWorkspace: null,
+            cmuxSurface: null,
+            updatedAt: "",
+            cwd: configResult.config.cwd,
+            model: configResult.config.model,
+            codexConfigProfile: input.member.codexConfigProfile,
+            // OPR.0.4.8.3 Seam B: resolved launch posture (member > rig > persisted > FLOOR)
+            // binds per-seat explicitly; adapters thread it into the yolo-mode helpers.
+            launchPosture,
+        };
+        // session_source dispatch: fork (native runtime fork) vs rebuild (artifact-
+        // injected fresh launch) vs agent_image (PL-016 Item 4: dispatch through
+        // fork using the image's resume token). Mutually exclusive on a member.
+        let forkSourceOpt;
+        let rebuildArtifactsOpt;
+        // Stash the consumed image id + library handle so the post-launch block
+        // can bump fork_count only on startupResult.ok===true (lastUsedAt
+        // already bumped optimistically in the dispatch branch).
+        let consumedAgentImageId;
+        let consumedAgentImageLibrary;
+        if (input.member.sessionSource?.mode === "fork") {
+            const ref = input.member.sessionSource.ref;
+            forkSourceOpt = {
+                forkSource: {
+                    kind: ref.kind,
+                    ...(ref.value !== undefined ? { value: ref.value } : {}),
+                },
+            };
+        }
+        else if (input.member.sessionSource?.mode === "rebuild") {
+            const { resolveRebuildArtifacts } = await import("./session-source-rebuild-resolver.js");
+            const resolved = resolveRebuildArtifacts(input.member.sessionSource);
+            if (!resolved.ok) {
+                return { status: "failed", error: resolved.error, sessionName: canonicalSessionName };
+            }
+            rebuildArtifactsOpt = { rebuildArtifacts: resolved.files };
+        }
+        else if (input.member.sessionSource?.mode === "agent_image") {
+            // PL-016 Item 4: agent_image → resolve via library + dispatch
+            // through the native-fork code path so nativeResumeProbe
+            // semantics are preserved
+            // (docs/as-built/architecture/adapters-and-runtimes.md § Resume honesty).
+            const library = this.deps.agentImageLibrary;
+            if (!library) {
+                return {
+                    status: "failed",
+                    error: `session_source: mode: agent_image requires the daemon AgentImageLibraryService to be wired; restart the daemon or check ~/.openrig/agent-images/ exists.`,
+                    sessionName: canonicalSessionName,
+                };
+            }
+            const ref = input.member.sessionSource.ref;
+            const version = ref.version ?? "1";
+            const image = library.getByNameVersion(ref.value, version);
+            if (!image) {
+                return {
+                    status: "failed",
+                    error: `Agent image '${ref.value}' v${version} not found in library. Run 'rig agent-image list' to see what's installed.`,
+                    sessionName: canonicalSessionName,
+                };
+            }
+            if (image.runtime !== input.member.runtime) {
+                return {
+                    status: "failed",
+                    error: `Agent image '${ref.value}' v${version} runtime '${image.runtime}' does not match member '${input.member.id}' runtime '${input.member.runtime}'.`,
+                    sessionName: canonicalSessionName,
+                };
+            }
+            forkSourceOpt = {
+                forkSource: { kind: "native_id", value: image.sourceResumeToken },
+            };
+            // Pre-launch bump of lastUsedAt only — records the operator's
+            // INTENT to consume the image. forkCount increments later, gated
+            // on startupResult.ok===true (see post-startNode block below).
+            // Best-effort: stat-write failures don't abort launch.
+            try {
+                library.recordConsumption(image.id, { incrementForkCount: false });
+            }
+            catch (err) {
+                console.warn(`[openrig] agent-image stats update failed for ${image.id}: ${err.message}`);
+            }
+            // Stash the consumed image for the post-launch fork-count bump.
+            consumedAgentImageId = image.id;
+            consumedAgentImageLibrary = library;
+        }
+        // Agent Starter resolver dispatch (Agent Starter v1 vertical M2). When
+        // `member.starterRef` is set, resolve the named registry entry into a
+        // `ResolvedStartupFile[]` that prepends ahead of the member's per-agent
+        // and per-pod startup files (the new STARTER layer at the front of the
+        // layer chain). The resolver THROWS on a failed credential scan, missing
+        // registry entry, or malformed YAML; on any throw we abort the launch
+        // BEFORE `startNode` runs (no STARTER layer added; no adapter
+        // `deliverStartup` called) — load-bearing credential-safety contract.
+        let starterArtifacts;
+        if (input.member.starterRef) {
+            const { AgentStarterResolver } = await import("./agent-starter-resolver.js");
+            const resolver = new AgentStarterResolver();
+            try {
+                const resolved = resolver.resolveStarter(input.member.starterRef.name);
+                starterArtifacts = resolved.files;
+            }
+            catch (err) {
+                return {
+                    status: "failed",
+                    error: `Agent Starter resolver failed: ${err.message}`,
+                    sessionName: canonicalSessionName,
+                    warnings: launchResult.warnings,
+                };
+            }
+        }
+        // STARTER layer (artifact-seeded fresh-launch context; precedes per-agent
+        // and per-pod layers). Prepended to dedupedResolvedFiles so the existing
+        // `startupOrchestrator.startNode` consumes the combined chain via the
+        // existing `resolvedStartupFiles` input — NO new orchestrator branch.
+        const finalResolvedStartupFiles = starterArtifacts
+            ? [...starterArtifacts, ...dedupedResolvedFiles]
+            : dedupedResolvedFiles;
+        const startupResult = await this.deps.startupOrchestrator.startNode({
+            rigId: input.rigId,
+            nodeId: input.nodeId,
+            sessionId: launchResult.session.id,
+            binding,
+            adapter,
+            plan: planResult.plan,
+            resolvedStartupFiles: finalResolvedStartupFiles,
+            startupActions: [
+                ...configResult.config.startup.actions,
+                this.buildSessionIdentityAction({
+                    rigName: input.rigSpec.name,
+                    pod: input.pod,
+                    member: input.member,
+                    runtime: input.member.runtime,
+                    sessionName: canonicalSessionName,
+                    resolvedSpecName: configResult.config.resolvedSpecName,
+                }),
+            ],
+            isRestore: false,
+            ...(forkSourceOpt ?? {}),
+            ...(rebuildArtifactsOpt ?? {}),
+        });
+        // Bump fork_count only on launch success. lastUsedAt already
+        // updated optimistically in the agent_image dispatch branch above.
+        if (startupResult.ok && consumedAgentImageId && consumedAgentImageLibrary) {
+            try {
+                consumedAgentImageLibrary.recordConsumption(consumedAgentImageId, { incrementForkCount: true });
+            }
+            catch (err) {
+                console.warn(`[openrig] agent-image fork_count bump failed for ${consumedAgentImageId}: ${err.message}`);
+            }
+        }
+        // OPR.0.3.2.CT — preserve the attention_required distinction so
+        // the instantiator can leave a recoverable rig + sessions instead
+        // of zero-collapsing. The session row's startup_status was already
+        // persisted by startupOrchestrator.fail() (see startup-orchestrator.ts
+        // lines 223-225, 241-243).
+        if (startupResult.ok) {
+            return {
+                status: "launched",
+                sessionName: canonicalSessionName,
+                warnings: launchResult.warnings,
+            };
+        }
+        return {
+            status: startupResult.startupStatus === "attention_required" ? "attention_required" : "failed",
+            error: startupResult.errors.join("; "),
+            evidence: startupResult.evidence,
+            sessionName: canonicalSessionName,
+            warnings: launchResult.warnings,
+        };
+    }
+    async launchExistingTerminalMember(input) {
+        const effectiveCwd = resolveLaunchCwd(input.member.cwd, input.rigRoot, input.cwdOverride);
+        const terminalPolicyAttachment = this.resolveMemberPolicyAttachment(input.member.permissionPolicy, input.rigSpec.permissionPolicy, input.rigRoot);
+        if (terminalPolicyAttachment)
+            this.persistNodePolicyProvenance(input.nodeId, terminalPolicyAttachment);
+        const terminalLaunchPosture = terminalPolicyAttachment?.launchPosture
+            ?? this.deps.rigRepo.getNodePolicyProvenance(input.nodeId)?.launchPosture
+            ?? this.deps.rigRepo.getRigPolicyProvenance(input.rigId)?.launchPosture
+            ?? "floor"; // R2 terminal: absence = the locked floor, explicitly
+        const sessionNameErrors = validateSessionComponents(input.pod.id, input.member.id, input.rigSpec.name);
+        if (sessionNameErrors.length > 0) {
+            return { status: "failed", error: sessionNameErrors.join("; ") };
+        }
+        const canonicalSessionName = deriveCanonicalSessionName(input.pod.id, input.member.id, input.rigSpec.name);
+        const launchResult = await this.deps.nodeLauncher.launchNode(input.rigId, input.qualifiedId, { sessionName: canonicalSessionName });
+        if (!launchResult.ok) {
+            return { status: "failed", error: launchResult.message };
+        }
+        try {
+            this.db.prepare("UPDATE nodes SET restore_policy = ? WHERE id = ?")
+                .run("checkpoint_only", input.nodeId);
+        }
+        catch { /* best-effort */ }
+        try {
+            this.db.prepare("UPDATE sessions SET restore_policy = ? WHERE id = ?")
+                .run("checkpoint_only", launchResult.session.id);
+        }
+        catch { /* best-effort */ }
+        const startup = resolveStartup({
+            specStartup: { files: [], actions: [] },
+            profileStartup: undefined,
+            rigCultureFile: input.rigSpec.cultureFile,
+            rigStartup: input.rigSpec.startup,
+            podStartup: input.pod.startup,
+            memberStartup: input.member.startup,
+            operatorStartup: undefined,
+        });
+        const resolvedFiles = this.buildTerminalResolvedStartupFiles(input.rigSpec, input.rigRoot, input.pod, input.member);
+        const binding = {
+            id: launchResult.binding.id,
+            nodeId: input.nodeId,
+            tmuxSession: launchResult.binding.tmuxSession,
+            tmuxWindow: null,
+            tmuxPane: null,
+            cmuxWorkspace: null,
+            cmuxSurface: null,
+            updatedAt: "",
+            cwd: effectiveCwd,
+            // Seam B: a terminal seat has no harness posture flag, but the resolved/persisted
+            // posture (floor when absent) still binds for provenance-consuming consumers.
+            launchPosture: terminalLaunchPosture,
+        };
+        const adapter = this.deps.adapters["terminal"];
+        if (!adapter) {
+            return { status: "failed", error: 'No adapter for runtime "terminal"', sessionName: canonicalSessionName, warnings: launchResult.warnings };
+        }
+        const emptyPlan = {
+            entries: [],
+            diagnostics: [],
+            conflicts: [],
+            noOps: [],
+            runtime: "terminal",
+            cwd: effectiveCwd,
+        };
+        const startupResult = await this.deps.startupOrchestrator.startNode({
+            rigId: input.rigId,
+            nodeId: input.nodeId,
+            sessionId: launchResult.session.id,
+            binding,
+            adapter,
+            plan: emptyPlan,
+            resolvedStartupFiles: resolvedFiles,
+            startupActions: startup.actions,
+            isRestore: false,
+        });
+        return {
+            status: startupResult.ok ? "launched" : "failed",
+            error: startupResult.ok ? undefined : startupResult.errors.join("; "),
+            sessionName: canonicalSessionName,
+            warnings: launchResult.warnings,
+        };
+    }
+    updateNodeResolvedConfig(nodeId, config) {
+        try {
+            this.db.prepare(`UPDATE nodes
+         SET restore_policy = ?,
+             resolved_spec_name = ?,
+             resolved_spec_version = ?,
+             resolved_spec_hash = ?
+         WHERE id = ?`).run(config.restorePolicy, config.resolvedSpecName, config.resolvedSpecVersion, config.resolvedSpecHash, nodeId);
+        }
+        catch {
+            /* best-effort */
+        }
+    }
+    buildTerminalResolvedStartupFiles(rigSpec, rigRoot, pod, member) {
+        const files = [];
+        // Skip layers 1-2 (agent base, profile) — terminal nodes have no agent spec
+        // Layer 3: OpenRig culture floor, then the rig-specific overlay.
+        files.push(defaultCultureStartupFile());
+        if (rigSpec.cultureFile) {
+            files.push({
+                path: rigSpec.cultureFile,
+                absolutePath: nodePath.resolve(rigRoot, rigSpec.cultureFile),
+                ownerRoot: rigRoot,
+                deliveryHint: "auto",
+                required: true,
+                appliesOn: ["fresh_start", "restore"],
+            });
+        }
+        // Layer 4: Rig startup
+        if (rigSpec.startup) {
+            for (const f of rigSpec.startup.files) {
+                files.push({ ...f, absolutePath: nodePath.resolve(rigRoot, f.path), ownerRoot: rigRoot });
+            }
+        }
+        // Layer 5: Pod startup
+        if (pod.startup) {
+            for (const f of pod.startup.files) {
+                files.push({ ...f, absolutePath: nodePath.resolve(rigRoot, f.path), ownerRoot: rigRoot });
+            }
+        }
+        // Layer 6: Member startup
+        if (member.startup) {
+            for (const f of member.startup.files) {
+                files.push({ ...f, absolutePath: nodePath.resolve(rigRoot, f.path), ownerRoot: rigRoot });
+            }
+        }
+        return this.resolveAutoHints(files);
+    }
+    buildResolvedStartupFiles(agentSpec, agentSourcePath, profile, rigSpec, rigRoot, pod, member) {
+        const files = [];
+        // nodePath imported at top level (ESM)
+        // 1. Agent base startup
+        for (const f of agentSpec.startup.files) {
+            files.push({ ...f, absolutePath: nodePath.resolve(agentSourcePath, f.path), ownerRoot: agentSourcePath });
+        }
+        // 2. Profile startup
+        if (profile?.startup) {
+            for (const f of profile.startup.files) {
+                files.push({ ...f, absolutePath: nodePath.resolve(agentSourcePath, f.path), ownerRoot: agentSourcePath });
+            }
+        }
+        // 3. OpenRig culture floor, then the rig-specific overlay.
+        files.push(defaultCultureStartupFile());
+        if (rigSpec.cultureFile) {
+            files.push({
+                path: rigSpec.cultureFile,
+                absolutePath: nodePath.resolve(rigRoot, rigSpec.cultureFile),
+                ownerRoot: rigRoot,
+                deliveryHint: "auto",
+                required: true,
+                appliesOn: ["fresh_start", "restore"],
+            });
+        }
+        // 4. Rig startup
+        if (rigSpec.startup) {
+            for (const f of rigSpec.startup.files) {
+                files.push({ ...f, absolutePath: nodePath.resolve(rigRoot, f.path), ownerRoot: rigRoot });
+            }
+        }
+        // 5. Pod startup
+        if (pod.startup) {
+            for (const f of pod.startup.files) {
+                files.push({ ...f, absolutePath: nodePath.resolve(rigRoot, f.path), ownerRoot: rigRoot });
+            }
+        }
+        // 6. Member startup
+        if (member.startup) {
+            for (const f of member.startup.files) {
+                files.push({ ...f, absolutePath: nodePath.resolve(rigRoot, f.path), ownerRoot: rigRoot });
+            }
+        }
+        // 7. Built-in OpenRig onboarding overlay (appended last, does not replace agent guidance)
+        const onboardingPath = nodePath.resolve(import.meta.dirname, "../../assets/guidance/openrig-start.md");
+        files.push({
+            path: "openrig-start.md",
+            absolutePath: onboardingPath,
+            ownerRoot: nodePath.resolve(import.meta.dirname, "../../assets"),
+            deliveryHint: "guidance_merge",
+            required: false,
+            appliesOn: ["fresh_start", "restore"],
+        });
+        return this.resolveAutoHints(files);
+    }
+    dedupeProjectedManagedStartupFiles(plan, files) {
+        const projectedManagedGuidancePaths = new Set(plan.entries
+            .filter((entry) => entry.category === "guidance" && entry.mergeStrategy === "managed_block")
+            .map((entry) => entry.absolutePath));
+        return files.filter((file) => {
+            if (file.deliveryHint !== "guidance_merge") {
+                return true;
+            }
+            return !projectedManagedGuidancePaths.has(file.absolutePath);
+        });
+    }
+    buildSessionIdentityAction(input) {
+        const lines = [
+            input.sessionName,
+            "OpenRig session identity:",
+            `- rig: ${input.rigName}`,
+            `- pod: ${input.pod.id}`,
+            `- pod_label: ${input.pod.label}`,
+            `- member: ${input.member.id}`,
+            input.member.label ? `- member_label: ${input.member.label}` : null,
+            `- logical_id: ${input.pod.id}.${input.member.id}`,
+            input.resolvedSpecName ? `- agent_spec: ${input.resolvedSpecName}` : null,
+            `- runtime: ${input.runtime}`,
+            `- session: ${input.sessionName}`,
+            "This is your startup identity hint. For durable identity recovery after compaction, run:",
+            "  rig whoami --json",
+            "That command returns your full topology context: rig, pod, peers, edges, and transcript path.",
+        ].filter((line) => Boolean(line));
+        return {
+            type: "send_text",
+            value: lines.join("\n"),
+            phase: "after_ready",
+            appliesOn: ["fresh_start", "restore"],
+            idempotent: true,
+            builtin: "session_identity",
+        };
+    }
+    /**
+     * Resolve any remaining 'auto' delivery hints to concrete hints at plan time.
+     * Uses the shared resolveConcreteHint resolver (single source of truth).
+     * After this, no file should have deliveryHint === 'auto'.
+     */
+    resolveAutoHints(files) {
+        return files.map((f) => {
+            if (f.deliveryHint !== "auto")
+                return f;
+            try {
+                const content = this.deps.fsOps.readFile(f.absolutePath);
+                return { ...f, deliveryHint: resolveConcreteHint(f.path, content) };
+            }
+            catch {
+                // If file can't be read, default to send_text (safest — delivered after harness ready)
+                return { ...f, deliveryHint: "send_text" };
+            }
+        });
+    }
+}
+//# sourceMappingURL=rigspec-instantiator.js.map