@openrig/cli 0.5.8 → 0.5.9

package/dist/commands/launch.js

@@ -10,6 +10,15 @@ const NON_RUNNING_LAUNCH_STATUSES = new Set(["awaiting-decision", "attention_req
 function launchStatusRunning(status) {
     return !NON_RUNNING_LAUNCH_STATUSES.has(status);
 }
+function printSnapshotSelection(selection) {
+    if (!selection)
+        return;
+    console.log(`Snapshot: ${selection.snapshotId} (${selection.kind}, ${selection.mode}, age ${Math.round(selection.ageMs / 1000)}s)`);
+    console.log(`Selection: ${selection.rationale}`);
+    const newer = selection.newerUsableAlternative;
+    if (newer?.snapshotId)
+        console.log(`Newer usable alternative: ${newer.snapshotId}${newer.kind ? ` (${newer.kind})` : ""}`);
+}
 export function launchCommand(depsOverride) {
     const cmd = new Command("launch").description("Launch or relaunch a node in a running rig");
     const getDeps = () => depsOverride ?? { lifecycleDeps: realDeps(), clientFactory: (url) => new DaemonClient(url) };
@@ -24,6 +33,8 @@ export function launchCommand(depsOverride) {
         .argument("[nodeRef]", "Node logical ID or node ID (single target)")
         .option("--seats <ids>", "Comma-separated logical IDs for subset launch")
         .option("--hold-reason <reason>", "Reason for holding non-target seats")
+        .option("--snapshot-id <id>", "Use this exact restore-usable snapshot")
+        .option("--plan", "Show subset selection and non-target effects without mutation")
         .option("--json", "JSON output")
         .option("--host <id>", "Run on a remote host declared in ~/.openrig/hosts.yaml")
         .action(async (rigId, nodeRef, opts) => {
@@ -39,11 +50,21 @@ export function launchCommand(depsOverride) {
             let body;
             if (seatList.length > 0) {
                 apiPath = `/api/rigs/${encodeURIComponent(rigId)}/nodes/launch-subset`;
-                body = { seats: seatList, ...(opts.holdReason ? { holdReason: opts.holdReason } : {}) };
+                body = { seats: seatList, ...(opts.holdReason ? { holdReason: opts.holdReason } : {}), ...(opts.snapshotId ? { snapshotId: opts.snapshotId } : {}), ...(opts.plan ? { plan: true } : {}) };
             }
             else if (nodeRef) {
+                if (opts.holdReason) {
+                    console.error("--hold-reason applies only to multi-seat --seats launch; single-seat launch never changes non-targets");
+                    process.exitCode = 1;
+                    return;
+                }
+                if (opts.plan) {
+                    console.error("--plan currently applies only to multi-seat --seats launch");
+                    process.exitCode = 1;
+                    return;
+                }
                 apiPath = `/api/rigs/${encodeURIComponent(rigId)}/nodes/${encodeURIComponent(nodeRef)}/launch`;
-                body = opts.holdReason ? { holdReason: opts.holdReason } : {};
+                body = opts.snapshotId ? { snapshotId: opts.snapshotId } : {};
             }
             else {
                 console.error("Either a node reference or --seats is required for launch --host");
@@ -75,6 +96,10 @@ export function launchCommand(depsOverride) {
             const body = { seats: seatList };
             if (opts.holdReason)
                 body.holdReason = opts.holdReason;
+            if (opts.snapshotId)
+                body.snapshotId = opts.snapshotId;
+            if (opts.plan)
+                body.plan = true;
             const res = await client.post(`/api/rigs/${encodeURIComponent(rigId)}/nodes/launch-subset`, body);
             if (opts.json) {
                 console.log(JSON.stringify(res.data, null, 2));
@@ -82,6 +107,16 @@ export function launchCommand(depsOverride) {
                     process.exitCode = 1;
                 return;
             }
+            if (opts.plan && res.data.planOnly) {
+                console.log("Plan only; no changes made.");
+                printSnapshotSelection(res.data.snapshotSelection);
+                console.log(`Non-target effect: ${res.data.nonTargetEffects?.mode ?? "unavailable"}`);
+                for (const node of res.data.nonTargetEffects?.affected ?? []) {
+                    const affected = node;
+                    console.log(`  ${affected.logicalId ?? "unknown"}: ${affected.reason ?? "unspecified"}`);
+                }
+                return;
+            }
             // Hard failure (no per-seat result to render — e.g. rig_not_found): error + exit.
             if (!res.data.launched && !res.data.held && !res.data.alreadyRunning) {
                 console.error(res.data.error ?? `Launch failed (HTTP ${res.status})`);
@@ -92,6 +127,7 @@ export function launchCommand(depsOverride) {
             // A seat that landed awaiting-decision / attention_required / failed is NOT
             // launched (no session running) — print it honestly + exit non-zero.
             const launchedAll = res.data.launched ?? [];
+            printSnapshotSelection(res.data.snapshotSelection);
             const running = launchedAll.filter((n) => launchStatusRunning(n.status));
             const needsDecision = launchedAll.filter((n) => !launchStatusRunning(n.status));
             const heldIds = (res.data.held ?? []).map((n) => `${n.logicalId} (${n.reason})`).join(", ");
@@ -125,9 +161,19 @@ export function launchCommand(depsOverride) {
             process.exitCode = 1;
             return;
         }
+        if (opts.plan) {
+            console.error("--plan currently applies only to multi-seat --seats launch");
+            process.exitCode = 1;
+            return;
+        }
+        if (opts.holdReason) {
+            console.error("--hold-reason applies only to multi-seat --seats launch; single-seat launch never changes non-targets");
+            process.exitCode = 1;
+            return;
+        }
         const body = {};
-        if (opts.holdReason)
-            body.holdReason = opts.holdReason;
+        if (opts.snapshotId)
+            body.snapshotId = opts.snapshotId;
         const res = await client.post(`/api/rigs/${encodeURIComponent(rigId)}/nodes/${encodeURIComponent(nodeRef)}/launch`, body);
         if (opts.json) {
             console.log(JSON.stringify(res.data, null, 2));
@@ -141,6 +187,7 @@ export function launchCommand(depsOverride) {
             return;
         }
         const logicalId = res.data.logicalId ?? nodeRef;
+        printSnapshotSelection(res.data.snapshotSelection);
         // OPR.0.4.3.28 correction — proceed-with-warning: print non-blocking launch warnings (e.g.
         // liveness_probe_unknown) WITHOUT setting a non-zero exit.
         const printLaunchWarnings = () => {

package/dist/commands/launch.js.map

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

package/dist/commands/restore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"restore.d.ts","sourceRoot":"","sources":["../../src/commands/restore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAI9C,wBAAgB,cAAc,CAAC,YAAY,CAAC,EAAE,UAAU,GAAG,OAAO,CAqGjE"}
+{"version":3,"file":"restore.d.ts","sourceRoot":"","sources":["../../src/commands/restore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAI9C,wBAAgB,cAAc,CAAC,YAAY,CAAC,EAAE,UAAU,GAAG,OAAO,CAqJjE"}

package/dist/commands/restore.js

@@ -4,10 +4,13 @@ import { getDaemonStatus, getDaemonUrl, daemonStatusGuard } from "../daemon-life
 import { realDeps } from "./daemon.js";
 const LONG_RUNNING_TIMEOUT_MS = 45_000;
 export function restoreCommand(depsOverride) {
-    const cmd = new Command("restore").description("Restore a rig from a snapshot");
+    const cmd = new Command("restore")
+        .description("Restore a rig from a snapshot")
+        .addHelpText("after", "\nDirect restore: rig restore <snapshotId> --rig <rigId>");
     const getDeps = () => depsOverride ?? { lifecycleDeps: realDeps(), clientFactory: (url) => new DaemonClient(url) };
     cmd
-        .argument("<snapshotId>", "Snapshot ID to restore")
+        .command("apply <snapshotId>", { isDefault: true, hidden: true })
+        .description("Restore a rig from a snapshot")
         .requiredOption("--rig <rigId>", "Rig ID to restore into")
         .action(async (snapshotId, opts) => {
         const deps = getDeps();
@@ -37,7 +40,12 @@ export function restoreCommand(depsOverride) {
                 process.exitCode = 1;
                 return;
             }
-            console.error(`Restore conflict: ${res.data.error ?? "rig may still be running"}. Stop the rig first with: rig down ${rigId}`);
+            if (res.data.code === "snapshot_unusable") {
+                console.error(`Restore refused: ${res.data.error ?? "the selected snapshot is not restore-usable"}. Choose a different snapshot.`);
+            }
+            else {
+                console.error(`Restore conflict: ${res.data.error ?? "rig may still be running"}. Stop the rig first with: rig down ${rigId}`);
+            }
             process.exitCode = 1;
         }
         else if (res.status >= 400) {
@@ -73,6 +81,38 @@ export function restoreCommand(depsOverride) {
             }
         }
     });
+    cmd
+        .command("status <attemptId>")
+        .description("Show the derived current receipt for one restore attempt")
+        .requiredOption("--rig <rigId>", "Rig ID containing the restore attempt")
+        .option("--json", "JSON output")
+        .action(async (attemptId, opts) => {
+        const deps = getDeps();
+        const status = await getDaemonStatus(deps.lifecycleDeps);
+        if (!daemonStatusGuard(status))
+            return;
+        const client = deps.clientFactory(getDaemonUrl(status));
+        const res = await client.get(`/api/rigs/${encodeURIComponent(opts.rig)}/restore/status/${encodeURIComponent(attemptId)}`);
+        if (res.status >= 400 || !res.data.ok) {
+            console.error(res.data.error ?? `Restore attempt status failed (HTTP ${res.status})`);
+            process.exitCode = 1;
+            return;
+        }
+        if (opts.json) {
+            console.log(JSON.stringify(res.data, null, 2));
+            return;
+        }
+        console.log(`Restore attempt ${res.data.attemptId ?? attemptId}`);
+        if (res.data.snapshotSelection) {
+            console.log(`Snapshot: ${res.data.snapshotSelection.snapshotId} (${res.data.snapshotSelection.kind}, ${res.data.snapshotSelection.mode})`);
+            console.log(`Selection: ${res.data.snapshotSelection.rationale}`);
+        }
+        console.log(`Original verdict: ${res.data.originalResult?.rigResult ?? "unknown"}`);
+        console.log(`Current intended-set verdict: ${res.data.currentIntendedSetVerdict ?? "unknown"}`);
+        console.log(`Intended: ${res.data.intendedRoster?.length ?? 0}; excluded historical: ${res.data.excludedNodes?.length ?? 0}; unresolved: ${res.data.unresolvedIntendedSeats?.length ?? 0}`);
+        for (const node of res.data.unresolvedIntendedSeats ?? [])
+            console.log(`  ${node.logicalId}: ${node.status}`);
+    });
     return cmd;
 }
 function printRestoreNotAttempted(data) {

package/dist/commands/restore.js.map

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

package/dist/commands/scope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scope.d.ts","sourceRoot":"","sources":["../../src/commands/scope.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAoBpC,OAAO,EACL,sBAAsB,EAMvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAgBL,gBAAgB,EAGjB,MAAM,0BAA0B,CAAC;AAy2DlC,wBAAgB,YAAY,IAAI,OAAO,CAkCtC;AAGD,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"scope.d.ts","sourceRoot":"","sources":["../../src/commands/scope.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAoBpC,OAAO,EACL,sBAAsB,EAMvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAiBL,gBAAgB,EAGjB,MAAM,0BAA0B,CAAC;AAq8DlC,wBAAgB,YAAY,IAAI,OAAO,CAkCtC;AAGD,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,CAAC"}

package/dist/commands/scope.js

@@ -14,11 +14,12 @@ import { getDaemonStatus, getDaemonUrl, statusGuardMessage } from "../daemon-lif
 import { realDeps } from "./daemon.js";
 import { CLOSE_REASONS, MISSION_TEMPLATE_KINDS, SLICE_TEMPLATE_KINDS, STAGE_VALUES, ScopeCliError, } from "../lib/scope/types.js";
 import { DEFAULT_PROJECT_PREFIX, inferMissionDotId, isMissionDotId, isSliceDotId, nextEscapeBandOrdinal, sliceIdFromMission, } from "../lib/scope/dot-id.js";
-import { buildMissionDependencyGraph, ensureMissionId, ensureMissionIdPersisted, findMission, resolveNodeFile, findSlice, listMissions, listSlices, moveSlice, nextSliceNN, NOTES_FILE_PRECEDENCE, pad2, readFrontmatter, resolveNotesFile, resolveMissionsRoot, splitFrontmatter, todayDateISO, updateFrontmatter, } from "../lib/scope/scope-fs.js";
+import { buildMissionDependencyGraph, ensureMissionId, ensureMissionIdPersisted, findMission, resolveNodeFile, findSlice, listMissions, listSlices, moveSlice, rollbackMovedSlice, nextSliceNN, NOTES_FILE_PRECEDENCE, pad2, readFrontmatter, resolveNotesFile, resolveMissionsRoot, splitFrontmatter, todayDateISO, updateFrontmatter, } from "../lib/scope/scope-fs.js";
 import { renderCapabilityDeltaTemplate, renderNotesTemplate, renderMissionProgressTemplate, renderMissionTemplate, renderSliceProofTemplate, renderSliceProgressTemplate, renderSliceTemplate, titleFromSlug, } from "../lib/scope/templates.js";
 import { addProgressRow, DEFAULT_PROGRESS_SECTION, parseStatus, PROGRESS_STATUSES, setProgressRow, } from "../lib/scope/progress-edit.js";
 import { deriveScopeTrust } from "../lib/scope/trust.js";
 import { capabilityDeltaExpiryFindings } from "../lib/scope/capability-delta.js";
+import { applyMissionCompositionEdits, nextMissionMembershipOrder, planMissionMembershipAdd, planMissionMembershipRemove, } from "../lib/scope/mission-composition.js";
 function makeStdout() {
     return { write: (text) => process.stdout.write(text) };
 }
@@ -27,6 +28,7 @@ kind: mission
 composition:
   mission_markdown:
     spec: SPEC.md
+  slices: []
 # Optional team and SDLC sections are added here.
 `;
 const SLICE_MANIFEST = `schema: openrig.slice/v0alpha1
@@ -76,6 +78,16 @@ function slugify(raw) {
         .replace(/[^a-z0-9]+/g, "-")
         .replace(/^-+|-+$/g, "");
 }
+function sliceManifestRef(missionPath, slicePath) {
+    return path.relative(missionPath, path.join(slicePath, "slice.yaml")).split(path.sep).join("/");
+}
+function rollbackComposition(edits) {
+    applyMissionCompositionEdits(edits.map((edit) => ({
+        manifestPath: edit.manifestPath,
+        original: edit.updated,
+        updated: edit.original,
+    })));
+}
 function getOpts(cmd) {
     // commander v13 attaches opts on the parent.
     let walker = cmd;
@@ -240,11 +252,6 @@ function buildSliceCreateCommand() {
             }
             const missionsRoot = resolveMissionsRoot({ override: getOpts(command).workspace });
             const mission = findMission(missionsRoot, missionName);
-            // Persist the parent mission's id back into its README at the
-            // SAME moment we mint the child's id (per convention §1
-            // lazy-adoption rule + guard BC BLOCK 3 — every child-mint site
-            // must persist the parent's id, not just slice create).
-            const missionId = ensureMissionIdPersisted(mission, missionsRoot);
             const nn = nextSliceNN(mission.absPath);
             const sliceFolder = `${pad2(nn)}-${slug}`;
             const sliceAbs = path.join(mission.absPath, "slices", sliceFolder);
@@ -255,9 +262,11 @@ function buildSliceCreateCommand() {
                     action: "Pick a different slug, or rm -rf the existing folder first.",
                 });
             }
-            const id = sliceIdFromMission(missionId, nn);
             const title = opts.title ?? titleFromSlug(slug);
             const intent = opts.intent ?? title;
+            const compositionEdit = planMissionMembershipAdd(mission.absPath, `slices/${sliceFolder}/slice.yaml`, nextMissionMembershipOrder(mission.absPath));
+            const missionId = ensureMissionId(mission, missionsRoot);
+            const id = sliceIdFromMission(missionId, nn);
             const dependsOn = Array.isArray(opts.dependsOn) ? [...new Set(opts.dependsOn)] : [];
             for (const dependency of dependsOn) {
                 if (!isSliceDotId(dependency) || !dependency.startsWith(`${missionId}.`)) {
@@ -280,22 +289,35 @@ function buildSliceCreateCommand() {
                 depends_on: dependsOn,
             });
             const proofBody = renderSliceProofTemplate({ id, title });
-            fs.mkdirSync(sliceAbs, { recursive: true });
-            fs.mkdirSync(path.join(sliceAbs, "proof"), { recursive: true });
-            // New scaffolds author SPEC.md; existing README-backed nodes are never rewritten.
+            const originalMissionNode = mission.readmePath ? fs.readFileSync(mission.readmePath, "utf8") : null;
             const readmePath = path.join(sliceAbs, "SPEC.md");
-            const readmeOnly = Boolean(opts.readmeOnly);
-            if (readmeOnly) {
-                const markerBody = body.replace(/^(---\n)/, `---\nprogress_rail: readme-only\n`);
-                fs.writeFileSync(readmePath, markerBody, "utf8");
+            try {
+                // Persist the parent id in the same rollback boundary as the child
+                // and composition membership. Validation above performs no writes.
+                ensureMissionIdPersisted(mission, missionsRoot);
+                fs.mkdirSync(sliceAbs, { recursive: true });
+                fs.mkdirSync(path.join(sliceAbs, "proof"), { recursive: true });
+                // New scaffolds author SPEC.md; existing README-backed nodes are never rewritten.
+                const readmeOnly = Boolean(opts.readmeOnly);
+                if (readmeOnly) {
+                    const markerBody = body.replace(/^(---\n)/, `---\nprogress_rail: readme-only\n`);
+                    fs.writeFileSync(readmePath, markerBody, "utf8");
+                }
+                else {
+                    fs.writeFileSync(readmePath, body, "utf8");
+                    const progressPath = path.join(sliceAbs, "PROGRESS.md");
+                    fs.writeFileSync(progressPath, renderSliceProgressTemplate(title), "utf8");
+                }
+                fs.writeFileSync(path.join(sliceAbs, "slice.yaml"), SLICE_MANIFEST, "utf8");
+                fs.writeFileSync(path.join(sliceAbs, "PROOF.md"), proofBody, "utf8");
+                applyMissionCompositionEdits(compositionEdit ? [compositionEdit] : []);
             }
-            else {
-                fs.writeFileSync(readmePath, body, "utf8");
-                const progressPath = path.join(sliceAbs, "PROGRESS.md");
-                fs.writeFileSync(progressPath, renderSliceProgressTemplate(title), "utf8");
+            catch (error) {
+                fs.rmSync(sliceAbs, { recursive: true, force: true });
+                if (originalMissionNode !== null && mission.readmePath)
+                    fs.writeFileSync(mission.readmePath, originalMissionNode, "utf8");
+                throw error;
             }
-            fs.writeFileSync(path.join(sliceAbs, "slice.yaml"), SLICE_MANIFEST, "utf8");
-            fs.writeFileSync(path.join(sliceAbs, "PROOF.md"), proofBody, "utf8");
             const payload = {
                 ok: true,
                 slice: {
@@ -336,37 +358,61 @@ function buildSliceShipCommand() {
             const missionsRoot = resolveMissionsRoot({ override: getOpts(command).workspace });
             const slice = findSlice(missionsRoot, slicePath, opts.mission ?? null);
             const target = findMission(missionsRoot, releaseMission);
+            if (target.name === slice.missionName) {
+                throw new ScopeCliError({ fact: "Source and release mission are the same.", consequence: "Slice not shipped.", action: "Choose a different release mission." });
+            }
             const targetSlicesDir = path.join(target.absPath, "slices");
-            fs.mkdirSync(targetSlicesDir, { recursive: true });
             const newNN = nextSliceNN(target.absPath);
             const slug = slice.slug ?? slugify(slice.name);
             const newName = `${pad2(newNN)}-${slug}`;
             const destAbs = path.join(targetSlicesDir, newName);
-            const { usedGit, repoRoot } = moveSlice(slice.absPath, destAbs);
-            const targetId = ensureMissionIdPersisted(target, missionsRoot);
-            const newSliceId = sliceIdFromMission(targetId, newNN);
-            const newReadme = resolveNodeFile(destAbs);
-            if (newReadme) {
-                updateFrontmatter(newReadme, {
-                    id: newSliceId,
-                    mission: target.name,
-                    status: `shipped-to-${target.name}`,
-                    "shipped-on": todayDateISO(),
-                    "shipped-from": slice.missionName,
-                });
+            const sourceMission = findMission(missionsRoot, slice.missionName);
+            const edits = [
+                planMissionMembershipRemove(sourceMission.absPath, sliceManifestRef(sourceMission.absPath, slice.absPath)),
+                planMissionMembershipAdd(target.absPath, `slices/${newName}/slice.yaml`, nextMissionMembershipOrder(target.absPath)),
+            ].filter((edit) => edit !== null);
+            applyMissionCompositionEdits(edits);
+            let moveResult = null;
+            const originalNode = slice.readmePath ? fs.readFileSync(slice.readmePath, "utf8") : null;
+            const originalTargetNode = target.readmePath ? fs.readFileSync(target.readmePath, "utf8") : null;
+            try {
+                moveResult = moveSlice(slice.absPath, destAbs);
+                const targetId = ensureMissionIdPersisted(target, missionsRoot);
+                const newSliceId = sliceIdFromMission(targetId, newNN);
+                const newReadme = resolveNodeFile(destAbs);
+                if (newReadme) {
+                    updateFrontmatter(newReadme, {
+                        id: newSliceId,
+                        mission: target.name,
+                        status: `shipped-to-${target.name}`,
+                        "shipped-on": todayDateISO(),
+                        "shipped-from": slice.missionName,
+                    });
+                }
+                const { usedGit, repoRoot } = moveResult;
+                emit(out, {
+                    ok: true,
+                    shipped: {
+                        from: { mission: slice.missionName, name: slice.name, id: slice.id },
+                        to: { mission: target.name, name: newName, id: newSliceId, path: destAbs },
+                        git: { usedGit, repoRoot },
+                    },
+                }, json, [
+                    `Shipped ${slice.missionName}/${slice.name} → ${target.name}/slices/${newName}`,
+                    `  id: ${newSliceId}`,
+                    `  git: ${usedGit ? "git mv" : "fs.rename (not in a git repo)"}`,
+                ]);
+            }
+            catch (error) {
+                if (moveResult)
+                    rollbackMovedSlice(slice.absPath, destAbs, moveResult);
+                if (originalNode !== null && slice.readmePath)
+                    fs.writeFileSync(slice.readmePath, originalNode, "utf8");
+                if (originalTargetNode !== null && target.readmePath)
+                    fs.writeFileSync(target.readmePath, originalTargetNode, "utf8");
+                rollbackComposition(edits);
+                throw error;
             }
-            emit(out, {
-                ok: true,
-                shipped: {
-                    from: { mission: slice.missionName, name: slice.name, id: slice.id },
-                    to: { mission: target.name, name: newName, id: newSliceId, path: destAbs },
-                    git: { usedGit, repoRoot },
-                },
-            }, json, [
-                `Shipped ${slice.missionName}/${slice.name} → ${target.name}/slices/${newName}`,
-                `  id: ${newSliceId}`,
-                `  git: ${usedGit ? "git mv" : "fs.rename (not in a git repo)"}`,
-            ]);
         }
         catch (err) {
             fail(err, json, out);
@@ -400,19 +446,39 @@ function buildSliceCloseCommand() {
             const slice = findSlice(missionsRoot, slicePath, opts.mission ?? null);
             const mission = findMission(missionsRoot, slice.missionName);
             const closedDir = path.join(mission.absPath, "closed");
-            fs.mkdirSync(closedDir, { recursive: true });
             const destName = slice.name;
             const destAbs = path.join(closedDir, destName);
-            const { usedGit, repoRoot } = moveSlice(slice.absPath, destAbs);
+            const compositionEdit = planMissionMembershipRemove(mission.absPath, sliceManifestRef(mission.absPath, slice.absPath));
+            const edits = compositionEdit ? [compositionEdit] : [];
+            applyMissionCompositionEdits(edits);
+            let moveResult = null;
+            const originalNode = slice.readmePath ? fs.readFileSync(slice.readmePath, "utf8") : null;
+            try {
+                moveResult = moveSlice(slice.absPath, destAbs);
+            }
+            catch (error) {
+                rollbackComposition(edits);
+                throw error;
+            }
+            const { usedGit, repoRoot } = moveResult;
             const newReadme = resolveNodeFile(destAbs);
-            if (newReadme) {
-                const updates = {
-                    status: `closed-${reason}`,
-                    "closed-on": todayDateISO(),
-                };
-                if (opts.note)
-                    updates["closure-note"] = opts.note;
-                updateFrontmatter(newReadme, updates);
+            try {
+                if (newReadme) {
+                    const updates = {
+                        status: `closed-${reason}`,
+                        "closed-on": todayDateISO(),
+                    };
+                    if (opts.note)
+                        updates["closure-note"] = opts.note;
+                    updateFrontmatter(newReadme, updates);
+                }
+            }
+            catch (error) {
+                rollbackMovedSlice(slice.absPath, destAbs, moveResult);
+                if (originalNode !== null && slice.readmePath)
+                    fs.writeFileSync(slice.readmePath, originalNode, "utf8");
+                rollbackComposition(edits);
+                throw error;
             }
             emit(out, {
                 ok: true,
@@ -453,36 +519,60 @@ function buildSliceMoveCommand() {
             const missionsRoot = resolveMissionsRoot({ override: getOpts(command).workspace });
             const slice = findSlice(missionsRoot, slicePath, opts.mission ?? null);
             const target = findMission(missionsRoot, destMission);
+            if (target.name === slice.missionName) {
+                throw new ScopeCliError({ fact: "Source and destination mission are the same.", consequence: "Slice not moved.", action: "Choose a different destination mission." });
+            }
             const targetSlicesDir = path.join(target.absPath, "slices");
-            fs.mkdirSync(targetSlicesDir, { recursive: true });
             const newNN = nextSliceNN(target.absPath);
             const slug = slice.slug ?? slugify(slice.name);
             const newName = `${pad2(newNN)}-${slug}`;
             const destAbs = path.join(targetSlicesDir, newName);
-            const { usedGit, repoRoot } = moveSlice(slice.absPath, destAbs);
-            const targetId = ensureMissionIdPersisted(target, missionsRoot);
-            const newSliceId = sliceIdFromMission(targetId, newNN);
-            const newReadme = resolveNodeFile(destAbs);
-            if (newReadme) {
-                updateFrontmatter(newReadme, {
-                    id: newSliceId,
-                    mission: target.name,
-                    "moved-on": todayDateISO(),
-                    "moved-from": slice.missionName,
-                });
+            const sourceMission = findMission(missionsRoot, slice.missionName);
+            const edits = [
+                planMissionMembershipRemove(sourceMission.absPath, sliceManifestRef(sourceMission.absPath, slice.absPath)),
+                planMissionMembershipAdd(target.absPath, `slices/${newName}/slice.yaml`, nextMissionMembershipOrder(target.absPath)),
+            ].filter((edit) => edit !== null);
+            applyMissionCompositionEdits(edits);
+            let moveResult = null;
+            const originalNode = slice.readmePath ? fs.readFileSync(slice.readmePath, "utf8") : null;
+            const originalTargetNode = target.readmePath ? fs.readFileSync(target.readmePath, "utf8") : null;
+            try {
+                moveResult = moveSlice(slice.absPath, destAbs);
+                const targetId = ensureMissionIdPersisted(target, missionsRoot);
+                const newSliceId = sliceIdFromMission(targetId, newNN);
+                const newReadme = resolveNodeFile(destAbs);
+                if (newReadme) {
+                    updateFrontmatter(newReadme, {
+                        id: newSliceId,
+                        mission: target.name,
+                        "moved-on": todayDateISO(),
+                        "moved-from": slice.missionName,
+                    });
+                }
+                const { usedGit, repoRoot } = moveResult;
+                emit(out, {
+                    ok: true,
+                    moved: {
+                        from: { mission: slice.missionName, name: slice.name, id: slice.id },
+                        to: { mission: target.name, name: newName, id: newSliceId, path: destAbs },
+                        git: { usedGit, repoRoot },
+                    },
+                }, json, [
+                    `Moved ${slice.missionName}/${slice.name} → ${target.name}/slices/${newName}`,
+                    `  id: ${newSliceId}`,
+                    `  git: ${usedGit ? "git mv" : "fs.rename (not in a git repo)"}`,
+                ]);
+            }
+            catch (error) {
+                if (moveResult)
+                    rollbackMovedSlice(slice.absPath, destAbs, moveResult);
+                if (originalNode !== null && slice.readmePath)
+                    fs.writeFileSync(slice.readmePath, originalNode, "utf8");
+                if (originalTargetNode !== null && target.readmePath)
+                    fs.writeFileSync(target.readmePath, originalTargetNode, "utf8");
+                rollbackComposition(edits);
+                throw error;
             }
-            emit(out, {
-                ok: true,
-                moved: {
-                    from: { mission: slice.missionName, name: slice.name, id: slice.id },
-                    to: { mission: target.name, name: newName, id: newSliceId, path: destAbs },
-                    git: { usedGit, repoRoot },
-                },
-            }, json, [
-                `Moved ${slice.missionName}/${slice.name} → ${target.name}/slices/${newName}`,
-                `  id: ${newSliceId}`,
-                `  git: ${usedGit ? "git mv" : "fs.rename (not in a git repo)"}`,
-            ]);
         }
         catch (err) {
             fail(err, json, out);