@openrig/cli 0.6.4 → 0.6.6

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

@@ -39,7 +39,7 @@ export class RigInstantiator {
         this.preflight = deps.preflight;
         this.tmuxAdapter = deps.tmuxAdapter;
     }
-    async instantiate(spec) {
+    async instantiate(spec, opts) {
         // 1. Validate
         const raw = RigSpecCodec.parse(RigSpecCodec.serialize(spec));
         const validation = RigSpecSchema.validate(raw);
@@ -80,11 +80,14 @@ export class RigInstantiator {
             const txn = this.db.transaction(() => {
                 const rig = this.rigRepo.createRig(spec.name);
                 rigId = rig.id;
+                if (opts?.nonInterruptive !== undefined)
+                    this.rigRepo.setRigNonInterruptive(rig.id, opts.nonInterruptive);
                 for (const specNode of spec.nodes) {
                     const node = this.rigRepo.addNode(rig.id, specNode.id, {
                         role: specNode.role,
                         runtime: specNode.runtime,
                         model: specNode.model,
+                        effort: specNode.effort,
                         cwd: specNode.cwd,
                         surfaceHint: specNode.surfaceHint,
                         workspace: specNode.workspace,
@@ -265,6 +268,7 @@ import { planProjection, claudeConflictTargetPath, projectionConflictWarnings, f
 import { ProjectionManifestStore } from "./projection-manifest-store.js";
 import { resolveConcreteHint } from "./runtime-adapter.js";
 import { installTopologyDefaults } from "./topology-defaults-installer.js";
+import { isKeptPluginSkill } from "./skill-catalog.js";
 function defaultCultureStartupFile() {
     const assetsRoot = nodePath.resolve(import.meta.dirname, "../../assets");
     return {
@@ -930,7 +934,7 @@ export class PodRigInstantiator {
         const initialRefusal = eligible();
         if (initialRefusal)
             return refuse(initialRefusal);
-        const retainedFields = new Set(["id", "label", "agent_ref", "profile", "runtime", "model", "cwd", "role", "codex_config_profile", "permission_policy", "restore_policy"]);
+        const retainedFields = new Set(["id", "label", "agent_ref", "profile", "runtime", "model", "effort", "cwd", "role", "codex_config_profile", "permission_policy", "restore_policy"]);
         if (Object.keys(memberFragment).some(key => !retainedFields.has(key)))
             return refuse("Retry accepts only retained member fields; topology and startup overrides require a separate change.");
         const rawSpec = { version: "0.2", name: rig.rig.name, pods: [{ id: podRow.namespace, label: podRow.label, members: [memberFragment], edges: [] }], edges: [] };
@@ -959,8 +963,8 @@ export class PodRigInstantiator {
             profileName: member.profile, specRoot: rigRoot, member, pod, rig: rigSpec, skillsRoot: this.resolveSkillsRoot(), ...this.systemWorldResolutionContext() });
         if (!config.ok)
             return refuse(config.errors.join("; "));
-        if (!same(config.config.model, node.model) || !same(config.config.cwd, node.cwd) || !same(config.config.restorePolicy, node.restorePolicy)) {
-            return refuse("Resolved model, cwd or restore policy differs from the failed first start.");
+        if (!same(config.config.model, node.model) || !same(config.config.effort, node.effort) || !same(config.config.cwd, node.cwd) || !same(config.config.restorePolicy, node.restorePolicy)) {
+            return refuse("Resolved model, effort, cwd or restore policy differs from the failed first start.");
         }
         const preflight = await preflightValidatedSpec(rigSpec, { rigRoot, fsOps: this.deps.fsOps, skillsRoot: this.resolveSkillsRoot(),
             ...this.systemWorldResolutionContext(), rigNameOverride: rig.rig.name, inheritedPermissionPolicy: this.inheritedPermissionPolicy(rigId), exec: this.deps.exec });
@@ -1100,6 +1104,9 @@ export class PodRigInstantiator {
             const rig = create();
             rigId = rig.id;
             createdRigId = rig.id;
+            const nonInterruptive = opts?.nonInterruptive ?? rigSpec.nonInterruptive;
+            if (nonInterruptive !== undefined)
+                this.deps.rigRepo.setRigNonInterruptive(rigId, nonInterruptive);
             // PL-007: persist typed workspace block (when declared) on the rig
             // record. Whoami / node-inventory read it via getRigWorkspace().
             if (rigSpec.workspace) {
@@ -1198,13 +1205,17 @@ export class PodRigInstantiator {
         // 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.
+        let rollbackServices;
         if (opts?.prelaunchHook) {
-            const hookResult = await opts.prelaunchHook(rigId);
+            const hookResult = await opts.prelaunchHook(rigId, archivedGenerations);
             if (!hookResult.ok) {
-                this.deps.rigRepo.deleteRig(rigId);
-                restoreArchived();
-                return { ok: false, code: "service_boot_failed", message: hookResult.message };
+                if (!hookResult.retainRig) {
+                    this.deps.rigRepo.deleteRig(rigId);
+                    restoreArchived();
+                }
+                return { ok: false, code: hookResult.code === "compose_project_conflict" ? "compose_project_conflict" : "service_boot_failed", message: hookResult.message };
             }
+            rollbackServices = hookResult.rollback;
         }
         // Phase 2: Process members in launch order
         for (const { pod, member, podId, qualifiedId } of memberEntries) {
@@ -1255,7 +1266,8 @@ export class PodRigInstantiator {
                     // exercised the createMemberNode paths, not bootstrap.
                     role: member.role,
                     runtime: member.runtime,
-                    model: member.model,
+                    model: member.model ?? configResult.config.model,
+                    effort: member.effort ?? configResult.config.effort,
                     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
@@ -1361,14 +1373,35 @@ export class PodRigInstantiator {
         const hasLaunched = nodeResults.some((n) => n.status === "launched");
         const allTerminal = nodeResults.length > 0 && nodeResults.every((n) => n.status === "failed");
         if (allTerminal) {
+            let serviceCleanupError;
             const cleanup = async () => {
                 if (this.deps.tmuxAdapter) {
                     for (const sessionName of launchedSessionNames) {
+                        if (this.deps.tmuxAdapter.probeSession) {
+                            let probe;
+                            try {
+                                probe = await this.deps.tmuxAdapter.probeSession(sessionName);
+                            }
+                            catch {
+                                return; // Unknown state: retain the rig for recovery.
+                            }
+                            if (probe.state === "absent")
+                                continue;
+                            if (probe.state !== "present")
+                                return;
+                        }
                         const stopped = await this.deps.tmuxAdapter.killSession(sessionName);
-                        if (!stopped.ok)
-                            return; // Do not forget a still-protected/uncertain session.
+                        if (!stopped.ok && (stopped.code !== "session_not_found" || /no server running/i.test(stopped.message ?? "")))
+                            return;
                     }
                 }
+                try {
+                    await rollbackServices?.();
+                }
+                catch (error) {
+                    serviceCleanupError = `Service cleanup failed; rig ${rigId} retained for recovery: ${String(error)}`;
+                    return;
+                }
                 this.deps.rigRepo.deleteRig(rigId);
                 restoreArchived();
             };
@@ -1378,7 +1411,7 @@ export class PodRigInstantiator {
             else
                 await cleanup();
             const details = nodeResults.map((n) => `${n.logicalId}: ${n.error ?? "unknown"}`).join("; ");
-            return { ok: false, code: "instantiate_error", message: `all node launches/startups failed — ${details}` };
+            return { ok: false, code: "instantiate_error", message: `all node launches/startups failed — ${details}${serviceCleanupError ? `; ${serviceCleanupError}` : ""}` };
         }
         if (hasAttention && !hasLaunched) {
             // All-attention_required path — rig + sessions PRESERVED; no
@@ -1516,6 +1549,7 @@ export class PodRigInstantiator {
             const node = this.deps.rigRepo.addNode(rigId, qualifiedId, {
                 runtime: member.runtime,
                 model: member.model,
+                effort: member.effort,
                 cwd: effectiveCwd,
                 restorePolicy: "checkpoint_only",
                 podId,
@@ -1574,6 +1608,7 @@ export class PodRigInstantiator {
             role: input.member.role,
             runtime: input.member.runtime,
             model: input.member.model,
+            effort: input.member.effort,
             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.
@@ -1694,16 +1729,28 @@ export class PodRigInstantiator {
             return { status: "failed", error: sessionNameErrors.join("; ") };
         }
         const canonicalSessionName = deriveCanonicalSessionName(input.pod.id, input.member.id, input.rigSpec.name);
+        const keptSkillWarnings = [];
         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,
+            const reconcile = (selected) => this.deps.skillReconciler({
+                loadout: selected,
                 runtime: configResult.config.runtime,
                 cwd: configResult.config.cwd,
                 apply: true,
                 topologyOwner: canonicalSessionName,
             });
+            const loadout = configResult.config.skillLoadout;
+            let projection = reconcile(loadout);
+            // Plugin skills never stop a seat that launched before them: if they cannot be
+            // projected, the seat starts with the rest of its loadout and says why.
+            if (!projection.ok && loadout.entries.some((entry) => entry.pluginId)) {
+                const withoutPlugins = reconcile({ ...loadout, entries: loadout.entries.filter((entry) => !entry.pluginId) });
+                if (withoutPlugins.ok) {
+                    keptSkillWarnings.push(`plugin_skills_not_projected: ${projection.errors.map((error) => `${error.code}: ${error.message}`).join("; ")}`);
+                    projection = withoutPlugins;
+                }
+            }
             if (!projection.ok) {
                 return {
                     status: "failed",
@@ -1711,6 +1758,9 @@ export class PodRigInstantiator {
                     sessionName: canonicalSessionName,
                 };
             }
+            for (const receipt of projection.receipts.filter(isKeptPluginSkill)) {
+                keptSkillWarnings.push(`plugin_skill_kept: ${receipt.id}: ${receipt.detail.slice("kept: ".length)} (${receipt.target})`);
+            }
         }
         // Forward per-seat silenceWindowSeconds from the resolved profile.
         // Currently inert: the live SeatActivityService poller uses the
@@ -1744,10 +1794,13 @@ export class PodRigInstantiator {
             // 4.8 restack dropped the warnings-site threading — without it every entry
             // classified safe_projection and divergent targets overwrote silently.
             // #25: a Claude seat's guidance conflict target is the rig's selected file (rig row,
-            // the same source startNode binds for the write).
+            // the same source startNode binds for the write). An adapter that writes skills
+            // outside the project tree (OMP's seat agent dir) names its own skill target.
             resolveTargetPath: (category, effectiveId, cwd, sourcePath) => input.member.runtime === "codex" && category === "skill"
                 ? nodePath.join(cwd, ".agents", "skills", effectiveId, "SKILL.md")
-                : claudeConflictTargetPath(category, effectiveId, cwd, sourcePath, input.member.runtime === "claude-code" ? this.deps.rigRepo.getRigClaudeManagedBlockFile(input.rigId) ?? undefined : undefined),
+                : category === "skill" && adapter.skillTargetPath
+                    ? adapter.skillTargetPath(launchResult.binding.tmuxSession, effectiveId)
+                    : claudeConflictTargetPath(category, effectiveId, cwd, sourcePath, input.member.runtime === "claude-code" ? this.deps.rigRepo.getRigClaudeManagedBlockFile(input.rigId) ?? undefined : undefined),
             lastHashLookup: (targetPath) => projectionManifest.lastHash(targetPath),
         });
         if (!planResult.ok) {
@@ -1755,7 +1808,7 @@ export class PodRigInstantiator {
         }
         // 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));
+        (launchResult.warnings ??= []).push(...[...(configResult.config.skillWarnings ?? []), ...keptSkillWarnings].map(warning => `${canonicalSessionName}: ${warning}`), ...projectionConflictWarnings(planResult.plan));
         // Codex project() writes plan entries before startup-file delivery. Protect
         // edited skills there too; filtering only startup files is insufficient.
         if (input.member.runtime === "codex" && !input.force) {
@@ -1778,6 +1831,7 @@ export class PodRigInstantiator {
             updatedAt: "",
             cwd: configResult.config.cwd,
             model: configResult.config.model,
+            effort: configResult.config.effort,
             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.
@@ -1945,7 +1999,7 @@ export class PodRigInstantiator {
             return {
                 status: "launched",
                 sessionName: canonicalSessionName,
-                warnings: launchResult.warnings,
+                warnings: startupResult.warnings?.length ? [...(launchResult.warnings ?? []), ...startupResult.warnings] : launchResult.warnings,
             };
         }
         return {
@@ -1953,7 +2007,7 @@ export class PodRigInstantiator {
             error: startupResult.errors.join("; "),
             evidence: startupResult.evidence,
             sessionName: canonicalSessionName,
-            warnings: launchResult.warnings,
+            warnings: startupResult.warnings?.length ? [...(launchResult.warnings ?? []), ...startupResult.warnings] : launchResult.warnings,
         };
     }
     async launchExistingTerminalMember(input) {
@@ -2039,7 +2093,7 @@ export class PodRigInstantiator {
             status: startupResult.ok ? "launched" : "failed",
             error: startupResult.ok ? undefined : startupResult.errors.join("; "),
             sessionName: canonicalSessionName,
-            warnings: launchResult.warnings,
+            warnings: startupResult.warnings?.length ? [...(launchResult.warnings ?? []), ...startupResult.warnings] : launchResult.warnings,
         };
     }
     updateNodeResolvedConfig(nodeId, config) {
@@ -2050,6 +2104,14 @@ export class PodRigInstantiator {
              resolved_spec_version = ?,
              resolved_spec_hash = ?
          WHERE id = ?`).run(config.restorePolicy, config.resolvedSpecName, config.resolvedSpecVersion, config.resolvedSpecHash, nodeId);
+            // Always write the resolved effort — present value sets it, absent value
+            // clears a previously-stored effort so spec changes take effect on next launch.
+            if (config.effort) {
+                this.deps.rigRepo.setNodeEffort(nodeId, config.effort);
+            }
+            else {
+                this.deps.rigRepo.clearNodeEffort(nodeId);
+            }
         }
         catch {
             /* best-effort */