@openrig/cli 0.5.7 → 0.5.9

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

@@ -165,6 +165,12 @@ export class RigInstantiator {
         }
         // 6. Emit rig.imported (best-effort)
         try {
+            this.eventBus.emit({
+                type: "topology.roster_recorded",
+                rigId: rigId,
+                intendedNodeIds: Object.values(nodeIdMap),
+                source: "materialized_topology",
+            });
             this.eventBus.emit({
                 type: "rig.imported",
                 rigId: rigId,
@@ -289,6 +295,18 @@ export class PodRigInstantiator {
         this.db = deps.db;
         this.deps = deps;
     }
+    /** One configured catalog root for preflight, materialization, and launch. */
+    resolveSkillsRoot() {
+        return this.deps.skillsRootResolver?.();
+    }
+    systemWorldResolutionContext() {
+        const resolution = this.deps.systemWorldResolver?.();
+        if (!resolution)
+            return {};
+        if (!resolution.ok)
+            return { systemWorldError: resolution.error.message };
+        return { systemSkills: resolution.manifest?.skills ?? [] };
+    }
     inheritedPermissionPolicy(targetRigId) {
         if (!targetRigId)
             return undefined;
@@ -327,6 +345,8 @@ export class PodRigInstantiator {
             rigRoot,
             cwdOverride: opts?.cwdOverride,
             fsOps: this.deps.fsOps,
+            skillsRoot: this.resolveSkillsRoot(),
+            ...this.systemWorldResolutionContext(),
             rigNameOverride: targetRig?.rig.name,
             externalQualifiedIds: targetRig?.nodes.map((node) => node.logicalId),
             inheritedPermissionPolicy: this.inheritedPermissionPolicy(opts?.targetRigId),
@@ -369,6 +389,8 @@ export class PodRigInstantiator {
             rigRoot,
             cwdOverride: opts?.cwdOverride,
             fsOps: this.deps.fsOps,
+            skillsRoot: this.resolveSkillsRoot(),
+            ...this.systemWorldResolutionContext(),
             rigNameOverride: targetRig?.rig.name,
             inheritedPermissionPolicy: this.inheritedPermissionPolicy(opts?.targetRigId),
             exec: this.deps.exec,
@@ -439,7 +461,7 @@ export class PodRigInstantiator {
                     .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)) {
+                    if (existingPodIds.has(pod.id) && opts?.existingPodNamespace !== pod.id) {
                         throw { code: "materialize_conflict", message: `Pod id '${pod.id}' already exists in rig '${currentRig.rig.name}'` };
                     }
                     for (const member of pod.members) {
@@ -451,18 +473,26 @@ export class PodRigInstantiator {
                 }
                 const podIdMap = {};
                 for (const pod of rigSpec.pods) {
-                    const podRecord = this.deps.podRepo.createPod(materializedRigId, pod.id, pod.label, {
+                    const existingPod = opts?.existingPodNamespace === pod.id
+                        ? this.deps.podRepo.getPodByNamespace(materializedRigId, pod.id)
+                        : null;
+                    if (opts?.existingPodNamespace === pod.id && !existingPod) {
+                        throw { code: "materialize_conflict", message: `Existing pod '${pod.id}' not found in rig '${currentRig.rig.name}'` };
+                    }
+                    const podRecord = existingPod ?? 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,
-                    }));
+                    if (!existingPod) {
+                        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({
@@ -516,6 +546,12 @@ export class PodRigInstantiator {
                     }
                     this.deps.rigRepo.addEdge(materializedRigId, fromId, toId, edge.kind);
                 }
+                persistedEvents.push(this.deps.eventBus.persistWithinTransaction({
+                    type: "topology.roster_recorded",
+                    rigId: materializedRigId,
+                    intendedNodeIds: [...logicalIdToNodeId.values()],
+                    source: "materialized_topology",
+                }));
                 if (!opts?.suppressSummaryEvent) {
                     persistedEvents.push(this.deps.eventBus.persistWithinTransaction({
                         type: "rig.imported",
@@ -534,10 +570,11 @@ export class PodRigInstantiator {
             // overwritten). Best-effort AFTER the persistence tx: a rig never fails
             // to materialize over a defaults copy, but failures are surfaced as
             // named warnings, never swallowed.
-            if (this.deps.topologyRootResolver) {
+            if (this.deps.topologyRootResolver && !opts?.existingPodNamespace) {
                 const defaults = installTopologyDefaults({
                     specDir: rigRoot,
                     rigName: rigSpec.name,
+                    podIds: rigSpec.pods.map((pod) => pod.id),
                     topologyRoot: this.deps.topologyRootResolver(),
                 });
                 for (const f of defaults.failed) {
@@ -594,7 +631,7 @@ export class PodRigInstantiator {
      * round-trip; launchMaterialized(yaml) is the parse/validate/normalize front
      * over it. Behaviour identical (loop body relocated verbatim).
      */
-    async launchValidatedSpec(rigSpec, rigRoot, targetRigId) {
+    async launchValidatedSpec(rigSpec, rigRoot, targetRigId, cwdOverride) {
         const launchOrder = this.computePodLaunchOrder(rigSpec);
         const podWarnings = [];
         const nodeResults = [];
@@ -627,6 +664,7 @@ export class PodRigInstantiator {
                 member: memberContext.member,
                 qualifiedId: logicalId,
                 nodeId: node.id,
+                cwdOverride,
             });
             if (launched.warnings?.length) {
                 podWarnings.push(...launched.warnings);
@@ -649,9 +687,10 @@ export class PodRigInstantiator {
     }
     /**
      * 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.
+     * pod in a live rig. S9 makes this the ordinary-growth front over the same
+     * materializeValidatedSpec + launchValidatedSpec effect ingress used by pod
+     * expansion; this method owns validation and result shaping, not a sibling
+     * create/launch transaction.
      *
      * Identity-migration-FREE: the new node mints a fresh node id + fresh logical
      * id + fresh `@rigged_*` at launch; no existing seat's logical id,
@@ -659,11 +698,10 @@ export class PodRigInstantiator {
      * 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).
+     * It resolves the EXISTING pod's DB id via `podRepo.getPodByNamespace`, then
+     * explicitly tells the shared materializer to reuse that pod. The pod-exists
+     * guard is lifted only for this named target; the per-member duplicate-logical-
+     * id guard is KEPT (AC-3).
      */
     async addMemberToPod(rigId, podNamespace, memberFragment, rigRoot, opts) {
         // 1. Resolve the rig.
@@ -726,6 +764,8 @@ export class PodRigInstantiator {
             rigRoot,
             cwdOverride: opts?.cwdOverride,
             fsOps: this.deps.fsOps,
+            skillsRoot: this.resolveSkillsRoot(),
+            ...this.systemWorldResolutionContext(),
             rigNameOverride: rig.rig.name,
             inheritedPermissionPolicy: this.inheritedPermissionPolicy(rigId),
             exec: this.deps.exec,
@@ -771,70 +811,42 @@ export class PodRigInstantiator {
             }
             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,
+        // 8. Feed the already-validated member and edges to the ONE creation
+        // effect. Pod-local edges may name existing pod-mates, so they are checked
+        // above against the live topology, then attached after schema validation.
+        rigSpec.pods[0].edges = declaredEdges;
+        const materialized = await this.materializeValidatedSpec(rigSpec, rigRoot, preflight.warnings, {
+            targetRigId: rigId,
+            suppressSummaryEvent: true,
             cwdOverride: opts?.cwdOverride,
+            existingPodNamespace: podNamespace,
         });
+        if (!materialized.ok) {
+            const message = "message" in materialized
+                ? materialized.message
+                : "errors" in materialized
+                    ? materialized.errors.join("; ")
+                    : "member materialization failed";
+            if (materialized.code === "materialize_conflict") {
+                return { ok: false, code: "member_conflict", message };
+            }
+            return { ok: false, code: "materialize_error", message };
+        }
+        // 9. The shared launch effect owns startup projection + delivery +
+        // readiness + `@rigged_*` for both expansion and ordinary growth.
+        const launchOutcome = await this.launchValidatedSpec(rigSpec, rigRoot, rigId, opts?.cwdOverride);
+        if (!launchOutcome.ok) {
+            const message = "message" in launchOutcome
+                ? launchOutcome.message
+                : "errors" in launchOutcome
+                    ? launchOutcome.errors.join("; ")
+                    : "member launch failed";
+            return { ok: false, code: "materialize_error", message };
+        }
+        const launched = launchOutcome.result.nodes.find((node) => node.logicalId === qualifiedId);
+        if (!launched) {
+            return { ok: false, code: "materialize_error", message: `No launch outcome returned for member "${qualifiedId}".` };
+        }
         return {
             ok: true,
             result: {
@@ -842,13 +854,13 @@ export class PodRigInstantiator {
                 podNamespace,
                 node: {
                     logicalId: qualifiedId,
-                    nodeId: createdNodeId,
+                    nodeId: launched.nodeId,
                     status: launched.status,
                     error: launched.error,
                     sessionName: launched.sessionName,
                 },
                 edges: resolvedEdges,
-                warnings: [...preflight.warnings, ...(launched.warnings ?? [])],
+                warnings: [...(materialized.result.warnings ?? []), ...(launchOutcome.result.warnings ?? [])],
             },
         };
     }
@@ -877,7 +889,7 @@ export class PodRigInstantiator {
         if (!nameGuard.ok)
             return nameGuard;
         // 2. Preflight
-        const preflight = await rigPreflight({ rigSpecYaml, rigRoot, cwdOverride: opts?.cwdOverride, fsOps: this.deps.fsOps, exec: this.deps.exec, claudeActivityAssets: this.deps.claudeActivityAssets });
+        const preflight = await rigPreflight({ rigSpecYaml, rigRoot, cwdOverride: opts?.cwdOverride, fsOps: this.deps.fsOps, skillsRoot: this.resolveSkillsRoot(), ...this.systemWorldResolutionContext(), exec: this.deps.exec, claudeActivityAssets: this.deps.claudeActivityAssets });
         if (!preflight.ready) {
             return { ok: false, code: "preflight_failed", errors: preflight.errors, warnings: preflight.warnings };
         }
@@ -942,6 +954,7 @@ export class PodRigInstantiator {
                 const defaults = installTopologyDefaults({
                     specDir: rigRoot,
                     rigName: rigSpec.name,
+                    podIds: rigSpec.pods.map((pod) => pod.id),
                     topologyRoot: this.deps.topologyRootResolver(),
                 });
                 for (const f of defaults.failed) {
@@ -1018,6 +1031,8 @@ export class PodRigInstantiator {
                 member,
                 pod,
                 rig: rigSpec,
+                skillsRoot: this.resolveSkillsRoot(),
+                ...this.systemWorldResolutionContext(),
             });
             if (!configResult.ok) {
                 nodeResults.push({ logicalId: qualifiedId, status: "failed", error: configResult.errors.join("; ") });
@@ -1178,6 +1193,12 @@ export class PodRigInstantiator {
             // attention_required, not "launched", so `rig ps` shows the
             // correct lifecycle state.
             try {
+                this.deps.eventBus.emit({
+                    type: "topology.roster_recorded",
+                    rigId,
+                    intendedNodeIds: Object.values(nodeIdMap),
+                    source: "materialized_topology",
+                });
                 this.deps.eventBus.emit({ type: "rig.imported", rigId, specName: rigSpec.name, specVersion: rigSpec.version });
             }
             catch { /* best-effort */ }
@@ -1191,6 +1212,12 @@ export class PodRigInstantiator {
         }
         // Emit rig.imported
         try {
+            this.deps.eventBus.emit({
+                type: "topology.roster_recorded",
+                rigId,
+                intendedNodeIds: Object.values(nodeIdMap),
+                source: "materialized_topology",
+            });
             this.deps.eventBus.emit({ type: "rig.imported", rigId, specName: rigSpec.name, specVersion: rigSpec.version });
         }
         catch { /* best-effort */ }
@@ -1428,6 +1455,8 @@ export class PodRigInstantiator {
             member: input.member,
             pod: input.pod,
             rig: input.rigSpec,
+            skillsRoot: this.resolveSkillsRoot(),
+            ...this.systemWorldResolutionContext(),
         });
         if (!configResult.ok) {
             return { status: "failed", error: configResult.errors.join("; ") };
@@ -1456,6 +1485,24 @@ export class PodRigInstantiator {
             return { status: "failed", error: sessionNameErrors.join("; ") };
         }
         const canonicalSessionName = deriveCanonicalSessionName(input.pod.id, input.member.id, input.rigSpec.name);
+        if (configResult.config.skillLoadout
+            && this.deps.skillReconciler
+            && (configResult.config.runtime === "claude-code" || configResult.config.runtime === "codex")) {
+            const projection = this.deps.skillReconciler({
+                loadout: configResult.config.skillLoadout,
+                runtime: configResult.config.runtime,
+                cwd: configResult.config.cwd,
+                apply: true,
+                topologyOwner: canonicalSessionName,
+            });
+            if (!projection.ok) {
+                return {
+                    status: "failed",
+                    error: projection.errors.map((error) => `${error.code}: ${error.message}`).join("; "),
+                    sessionName: canonicalSessionName,
+                };
+            }
+        }
         // 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.