@openrig/cli 0.6.14 → 0.7.1

package/daemon/dist/domain/claude-compaction-enforcer.js

@@ -1,3 +1,4 @@
+import { TerminalPolicyRefusal } from "./terminal-policy.js";
 import { DeliveryGuardError } from "./seat-delivery-guard.js";
 import * as fs from "node:fs";
 import { randomUUID } from "node:crypto";
@@ -23,10 +24,19 @@ import * as path from "node:path";
  *   session must drop below threshold before another auto-compact can
  *   fire. The dedup window still blocks immediate flaps; the threshold
  *   crossing rule prevents one high-usage session from receiving
- *   /compact every 60s. State is intentionally NOT persisted; daemon
- *   restart resets the window which is the safer-failure direction
- *   (might re-compact once on restart in rare cases, won't lock out
- *   forever).
+ *   /compact every 60s. This window is intentionally NOT persisted; daemon
+ *   restart resets it, which is the safer-failure direction (might
+ *   re-compact once on restart in rare cases, won't lock out forever).
+ * - Restart: each attempt's record (COMPACTION-STATE.json, beside its map)
+ *   says what the daemon last did for it, so a restarted daemon resumes an
+ *   owed restore and waits on an open preparation instead of starting a
+ *   second one (`recoverAfterRestart`). A prompt or /compact is marked in
+ *   flight at its write, so a restart never sends it again. A restart between
+ *   a post-compact stage's send and its record can send that one stage again.
+ * - A /compact whose outcome is unknown owes its restore steps, with or
+ *   without a restart. Its text may wait unsubmitted in the input box, where
+ *   any Enter would submit it, so each step goes only into an empty box and
+ *   is held, visibly, while the box holds text or can't be read.
  * - Definite pre-write prep failures retry at most three times. Uncertain
  *   delivery never replays. Unfinished preparation stops visibly until an
  *   explicit retry; it cannot arm a delayed compact after its deadline.
@@ -35,9 +45,8 @@ import * as path from "node:path";
  *   write an attempt-bound restore map. Existing polls send /compact only after
  *   atomic publication of that completed artifact, within the preparation deadline.
  * - Post-compact restore: after a successful auto-compact, the enforcer
- *   first sends a turn-boundary handshake once context usage drops below
- *   threshold, or when the latest sample is stale or unknown (a seat that
- *   takes no turn after /compact never refreshes its sample), then sends the
+ *   first sends a turn-boundary handshake when the pane is idle, independently
+ *   of trigger usage (including stale or unknown samples), then sends the
  *   restore prompt on a later polling tick.
  *   This is intentionally active because Claude hooks can provide
  *   context, but they do not create a new assistant turn by themselves.
@@ -51,6 +60,9 @@ export const POST_COMPACT_RESTORE_COOLDOWN_MS_DEFAULT = 10 * 60_000;
 export const MANUAL_PREP_WAIT_MS_DEFAULT = 180_000;
 // Operational ceiling, not a measured optimum. Existing context polls advance auto preparation.
 export const AUTO_PREP_WAIT_MS_DEFAULT = 25 * 60_000;
+// How long a stopped attempt holds automatic compaction off for its seat before a fresh attempt may begin. Without it one
+// failed preparation turned automatic compaction off for the seat until someone noticed. Operational, not measured.
+export const AUTO_RETRY_AFTER_STOP_MS_DEFAULT = 10 * 60_000;
 const PREP_SEND_ATTEMPTS_MAX = 3;
 // Slices 13–14 fix — each post-compact back-half send (turn_boundary → restore →
 // audit) is idle-gated so it cannot be injected into the busy pane right after
@@ -233,7 +245,8 @@ export function buildPostCompactRestorePrompt(input) {
         // refused at the source. Tell the seat NOT to seek it out (it is not its state).
         pieces.push("A post-compaction instruction file declaring a DIFFERENT seat was present and has been IGNORED — it is not yours; do NOT read or follow it. Rely on the per-seat marker and the JSONL transcript for restore.");
     }
-    pieces.push("Load/read the claude-compaction-restore skill, follow the marker's restoreInstruction and postCompactInstruction when present, read your newest restore map and use the restore packet as a lookup, then reply with: restored from packet at <path>; resumed at step <X>.");
+    const restoreMap = input.attemptMapPath ? "this preparation attempt's restore map" : "your newest restore map";
+    pieces.push(`Load/read the claude-compaction-restore skill, follow the marker's restoreInstruction and postCompactInstruction when present, read ${restoreMap} and use the restore packet as a lookup, then reply with: restored from packet at <path>; resumed at step <X>.`);
     pieces.push(`During this restore, read ${path.join(input.openrigHome, "plugins", "openrig-core", "skills", "refocusing", "SKILL.md")} and consume the current topology and work traces delivered with this restore request, if present; do not rerun Python just to duplicate a delivered trace. Missing trace delivery is a named gap. Read required notes and full sources with the native file-read tool; a pointer, compact summary or truncated extract is not a full source read. Name any missing source, the current user outcome, and your next action from the files you actually read, not from the compact summary.`);
     return pieces.join(" ");
 }
@@ -255,11 +268,49 @@ export function buildPostCompactTurnBoundaryPrompt() {
         "Do not restore yet; the next normal user message will contain the restore instructions.",
     ].join(" ");
 }
+/** The file, beside an attempt's restore map, where the daemon records what it last did for that attempt. The agent
+ *  never writes it. A restarted daemon reads it to pick the attempt up again. */
+export const COMPACTION_RECORD_FILE = "COMPACTION-STATE.json";
+/** How old a record may be for a restarted daemon to resume it. An older open record isn't resumed: it reads as
+ *  stranded, so whoever reaches the seat is told its restore may still be owed. Operational, not measured. */
+export const RESTART_RECOVERY_WINDOW_MS_DEFAULT = 6 * 60 * 60_000;
+/** This daemon process. A record this process wrote is its own state, never something to recover. */
+const DAEMON_PROCESS_ID = randomUUID();
+const RECORD_PHASES = new Set(["preparing", "turn_boundary", "restore_prompt", "compliance_prompt", "compact_uncertain", "done", "ended"]);
+const RECORD_DELIVERIES = new Set(["pending", "not_sent", "delivered", "uncertain"]);
+/** A record only in the shape this daemon writes. Any other (a newer daemon's after a rollback, a damaged file) is ignored,
+ *  so it can't hold up a seat's compaction. */
+function readCompactionRecord(file) {
+    try {
+        const r = JSON.parse(fs.readFileSync(file, "utf8"));
+        const text = (v) => typeof v === "string";
+        const textOrNull = (v) => v === null || typeof v === "string";
+        const carry = r.restoreCarry;
+        const valid = text(r.daemon) && text(r.attemptId) && text(r.session) && textOrNull(r.occupantGeneration)
+            && (r.mode === "automatic" || r.mode === "manual") && RECORD_PHASES.has(r.phase) && RECORD_DELIVERIES.has(r.delivery)
+            && (r.deadlineAt === null || Number.isFinite(r.deadlineAt)) && Number.isInteger(r.sends) && r.sends >= 0 && r.sends <= PREP_SEND_ATTEMPTS_MAX
+            && text(r.mapPath) && text(r.marker) && text(r.compactInstruction) && textOrNull(r.preparationRoot) && Number.isFinite(r.updatedAt)
+            && (r.operatorInitiated === undefined || typeof r.operatorInitiated === "boolean") && (r.compactSending === undefined || r.compactSending === true)
+            && (r.uncertainCompact === undefined || r.uncertainCompact === true)
+            && (carry === undefined || (typeof carry === "object" && carry !== null && textOrNull(carry.mapPath) && textOrNull(carry.compactInstruction)
+                && (carry.skipMap === undefined || (text(carry.skipMap?.mapPath) && text(carry.skipMap?.marker)))));
+        return valid ? r : null;
+    }
+    catch {
+        return null;
+    }
+}
+/** Input-box readings that hold nothing typed: an owed step after an uncertain /compact may go in. A harness suggestion isn't input. */
+const INPUT_BOX_CLEAR = new Set(["empty", "likely-suggestion"]);
+function strandedSummary(record) {
+    return { attemptId: record.attemptId, mapPath: record.mapPath, phase: record.phase, recordedAt: new Date(record.updatedAt).toISOString() };
+}
 export class ClaudeCompactionEnforcer {
     settingsStore;
     sessionTransport;
     dedupWindowMs;
     postCompactRestoreCooldownMs;
+    autoRetryAfterStopMs;
     openrigHome;
     // OPR.0.4.3.14 — max time to wait for the manual prep turn to complete (seat
     // idle) before sending /compact. Bounds the two-phase wait-for-idle.
@@ -282,19 +333,37 @@ export class ClaudeCompactionEnforcer {
     // unknown). At drain we compare it to the LIVE generation; a mismatch = a successor inheriting a
     // retired-generation stage → refuse. Injected resolver (atom-B's currentOccupantTenure by session).
     pendingStageGeneration = new Map();
+    /** Each seat's current attempt record, as last written beside its map. */
+    records = new Map();
+    /** Seats whose records this daemon has already looked for after starting. */
+    recovered = new Set();
+    /** Open records too old to resume: the seat's restore may still be owed. */
+    stranded = new Map();
+    /** Seats whose owed restore steps follow a /compact whose outcome is unknown: its text may wait unsubmitted in the input
+     *  box, where any Enter would submit it, so each step goes only into an empty box. */
+    afterUncertainCompact = new Set();
+    /** What the input box last read for such a seat, before an owed step (absent until the first check). */
+    lastInputBox = new Map();
+    restartRecoveryWindowMs;
+    daemonInstance;
     resolveOccupantGeneration;
     onPostRestoreComplete;
+    terminalPolicies;
     constructor(settingsStore, sessionTransport, opts) {
+        this.terminalPolicies = opts?.terminalPolicies;
         this.settingsStore = settingsStore;
         this.sessionTransport = sessionTransport;
         this.dedupWindowMs = opts?.dedupWindowMs ?? DEDUP_WINDOW_MS_DEFAULT;
         this.postCompactRestoreCooldownMs = opts?.postCompactRestoreCooldownMs ?? POST_COMPACT_RESTORE_COOLDOWN_MS_DEFAULT;
+        this.autoRetryAfterStopMs = opts?.autoRetryAfterStopMs ?? AUTO_RETRY_AFTER_STOP_MS_DEFAULT;
         this.openrigHome = opts?.openrigHome ?? defaultOpenRigHome();
         this.manualPrepWaitMs = opts?.manualPrepWaitMs ?? MANUAL_PREP_WAIT_MS_DEFAULT;
         this.now = opts?.now ?? (() => Date.now());
         this.sleep = opts?.sleep ?? (ms => new Promise(resolve => setTimeout(resolve, ms)));
         this.postCompactSendWaitMs = opts?.postCompactSendWaitMs ?? POST_COMPACT_SEND_WAIT_MS_DEFAULT;
         this.compactSendIdleWaitMs = opts?.compactSendIdleWaitMs ?? 1000;
+        this.restartRecoveryWindowMs = opts?.restartRecoveryWindowMs ?? RESTART_RECOVERY_WINDOW_MS_DEFAULT;
+        this.daemonInstance = opts?.daemonInstance ?? DAEMON_PROCESS_ID;
         this.resolveOccupantGeneration = opts?.resolveOccupantGeneration;
         this.onPostRestoreComplete = opts?.onPostRestoreComplete;
     }
@@ -307,10 +376,78 @@ export class ClaudeCompactionEnforcer {
         this.reconcilePreparations();
         return this.withDeliveryGuard(input, () => this.maybeAutoCompactUnchecked(input));
     }
-    /** True while a post-compact stage (turn boundary, restore or audit) is still owed to this seat. */
-    hasPendingPostCompactStage(sessionName) {
+    /**
+     * What this enforcer has recorded about a managed compaction of `sessionName`, for a sender's context, or null when
+     * none is under way. Read-only: it reports the enforcer's own state (the preparation attempt and the post-compact
+     * stage still owed), never whether the seat finished compacting or restoring.
+     */
+    observedCompaction(sessionName) {
+        const owed = this.pendingPostCompactRestore.get(sessionName);
+        const held = this.getOwedRestore(sessionName);
+        if (held?.held)
+            return { stage: owed === "compliance_prompt" ? "restoring" : owed === "restore_prompt" ? "compacted" : "compacting", detail: held.detail };
+        if (owed === "compliance_prompt")
+            return { stage: "restoring", detail: "mid-restore: the restore request was sent and the post-restore audit is still owed" };
+        if (owed === "restore_prompt")
+            return { stage: "compacted", detail: "compacted, with its restore not yet requested" };
+        const attempt = this.pendingPreCompactPrep.get(sessionName);
+        if (owed === "turn_boundary") {
+            return { stage: "compacting", detail: attempt?.compact === "uncertain"
+                    ? "possibly being compacted: /compact may have been submitted (its result was lost) and the post-compaction steps haven't started"
+                    : "being compacted: /compact was submitted and the post-compaction steps haven't started" };
+        }
+        if (attempt?.status === "sending" || attempt?.status === "waiting") {
+            return { stage: "preparing", detail: `preparing for a managed compaction: /compact hasn't been sent yet${attempt.supersedes
+                    ? `; it replaces a compaction from before an OpenRig restart whose restore steps may still have been owed (map ${attempt.supersedes.mapPath})` : ""}` };
+        }
+        if (attempt?.status === "compact-sent")
+            return { stage: "compacting", detail: "being compacted: /compact was submitted and the post-compaction steps haven't started" };
+        if (this.stranded.has(sessionName)) {
+            return { stage: "compacted", detail: "compacted before an OpenRig restart, with its restore steps possibly still owed: the record is too old for OpenRig to resume them" };
+        }
+        return null;
+    }
+    /** True while a post-compact stage (turn boundary, restore or audit) is still owed to this seat. Given the seat, a
+     *  restarted daemon first picks up a stage its predecessor recorded (`recoverAfterRestart`). */
+    hasPendingPostCompactStage(sessionName, seat) {
+        if (seat)
+            this.recoverSeat({ sessionName, ...seat });
         return this.pendingPostCompactRestore.has(sessionName);
     }
+    /** The first time this daemon reaches a seat (a poll, a manual request, a state read): pick up its record from before a
+     *  restart, with the policy's preparation root (`recoverAfterRestart`). */
+    recoverSeat(seat) {
+        if (seat.runtime !== "claude-code" || this.recovered.has(seat.sessionName))
+            return;
+        let preparationRoot = null;
+        try {
+            preparationRoot = this.settingsStore.resolveClaudeCompactionPolicy().preparationRoot || null;
+        }
+        catch { /* default roots */ }
+        this.recoverAfterRestart(seat, preparationRoot);
+    }
+    /** The restore step OpenRig owes this seat next, or null. After a /compact whose outcome is unknown (see
+     *  `afterUncertainCompact`) it also gives what the input box last read (`not_checked` before the first check) and
+     *  whether the step is held for it. */
+    getOwedRestore(sessionName) {
+        const stage = this.pendingPostCompactRestore.get(sessionName);
+        if (!stage)
+            return null;
+        const step = { turn_boundary: "post-compaction turn boundary", restore_prompt: "restore request", compliance_prompt: "post-restore audit" }[stage];
+        if (!this.afterUncertainCompact.has(sessionName)) {
+            return { stage, held: false, detail: `OpenRig owes this seat its ${step} next, sent on a poll once the pane is idle.` };
+        }
+        const inputBox = this.lastInputBox.get(sessionName) ?? "not_checked";
+        const held = inputBox !== "not_checked" && !INPUT_BOX_CLEAR.has(inputBox);
+        return { stage, held, inputBox, detail: held
+                ? `held: OpenRig owes this seat its restore steps after a /compact whose result was lost, and waits while its input box isn't empty (it reads ${inputBox}). The seat may have /compact text waiting, which any Enter would submit, so check the pane. A seat whose own status line keeps the box unreadable stays held.`
+                : `OpenRig owes this seat its ${step} next, after a /compact whose result was lost. Each step goes only into an empty input box, sent on a poll once the pane is idle (the box last read ${inputBox}).` };
+    }
+    /** An open record from before a restart that was too old to resume, while no later attempt has replaced it. */
+    getStrandedCompaction(sessionName) {
+        const record = this.stranded.get(sessionName);
+        return record ? strandedSummary(record) : null;
+    }
     /**
      * Drain a post-compact stage that is already pending, without a usage sample. ContextMonitor
      * calls this when the latest sample is stale or unknown. Such a sample never starts a
@@ -336,6 +473,23 @@ export class ClaudeCompactionEnforcer {
             return (await this.drainPendingStage(unsampled, policy)) ?? { triggered: false, reason: "no_pending_stage" };
         });
     }
+    terminalPolicyReason(input, actor) {
+        const nodeId = input.nodeId ?? this.sessionTransport.deliveryGuard?.maybeTarget(input.sessionName)?.nodeId;
+        if (!this.terminalPolicies || !nodeId)
+            return null;
+        try {
+            this.terminalPolicies.check(nodeId, "compaction", actor);
+            return null;
+        }
+        catch (error) {
+            return error instanceof TerminalPolicyRefusal ? "terminal_policy_refused" : actor.source === "openrig" ? null : "terminal_policy_unavailable";
+        }
+    }
+    checkAttemptPolicy(input, attempt) {
+        const reason = this.terminalPolicyReason(input, attempt.policyActor ?? { source: "openrig" });
+        if (reason)
+            throw new DeliveryGuardError(reason, "This seat's terminal policy does not allow this managed compaction. Read rig seat status <seat> to see or change the explicit choice; the existing override path is unchanged.");
+    }
     async withDeliveryGuard(input, run) {
         const runIfCurrent = () => input.isObservationCurrent && !input.isObservationCurrent()
             ? Promise.resolve({ triggered: false, reason: "stale_observation" }) : run();
@@ -357,11 +511,20 @@ export class ClaudeCompactionEnforcer {
      * is pending, so the sampled path can run its below-threshold bookkeeping.
      */
     async drainPendingStage(input, policy) {
-        // Without a usage sample nothing shows compaction has finished, and the newest hook can be the
-        // Stop from before /compact. Then only a live pane read may count as idle.
+        // A missing or still-high sample need not show that /compact has finished. The newest idle
+        // hook can predate it, so these drains require a live pane read to establish idle.
+        const pendingStage = this.pendingPostCompactRestore.get(input.sessionName);
+        const attempt = this.pendingPreCompactPrep.get(input.sessionName);
+        const isCurrent = () => this.pendingPostCompactRestore.get(input.sessionName) === pendingStage
+            && this.pendingPreCompactPrep.get(input.sessionName) === attempt;
         const sendOpts = {
+            openrigNotice: true,
+            beforeWrite: () => {
+                if (!isCurrent())
+                    throw new DeliveryGuardError("compaction_cancelled", "Managed compaction was cancelled or replaced; no further input is authorized.");
+            },
             waitForIdleMs: this.postCompactSendWaitMs,
-            ...(input.usedPercentage == null ? { readinessFromPaneOnly: true } : {}),
+            ...(input.usedPercentage == null || input.usedPercentage >= policy.thresholdPercent ? { readinessFromPaneOnly: true } : {}),
         };
         // GHOST-STAGE FIX (a) — gate the DRAIN by `enabled`. A disabled system drains NOTHING: the
         // legacy compaction-stage defect (operator-confirmed ruling 05c174e0) proved that draining a
@@ -390,14 +553,27 @@ export class ClaudeCompactionEnforcer {
                 return { triggered: false, reason: "stale_generation" };
             }
         }
-        const pendingStage = this.pendingPostCompactRestore.get(input.sessionName);
+        // After a /compact whose outcome is unknown, its text may still wait unsubmitted in the input box, and this step's Enter
+        // would submit it. So each step goes only into a box holding nothing typed (a harness suggestion isn't input); while it
+        // holds text or can't be read, the step waits for the next poll, and the notice and --state say why.
+        if (this.afterUncertainCompact.has(input.sessionName)) {
+            const box = await this.inputBoxStatus(input.sessionName);
+            if (!isCurrent())
+                return { triggered: false, reason: "preparation_stopped" };
+            this.lastInputBox.set(input.sessionName, box);
+            if (!INPUT_BOX_CLEAR.has(box))
+                return { triggered: false, reason: "input_box_not_empty" };
+        }
         if (pendingStage === "turn_boundary") {
             const boundary = await this.sessionTransport.send(input.sessionName, buildPostCompactTurnBoundaryPrompt(), sendOpts);
+            if (!isCurrent())
+                return { triggered: false, reason: "preparation_stopped" };
             if (!boundary.ok || boundary.outcome === "retained") {
                 // Busy/never-idle → no delivery, no advance; the SAME stage retries next tick.
                 return { triggered: false, reason: "send_failed" };
             }
             this.pendingPostCompactRestore.set(input.sessionName, "restore_prompt");
+            this.persistStage(input.sessionName, "restore_prompt");
             return { triggered: true };
         }
         if (pendingStage === "restore_prompt") {
@@ -415,6 +591,8 @@ export class ClaudeCompactionEnforcer {
                 postCompactInstructionFilePath: extra.filePath,
                 ignoredWrongSeatExtra: extra.ignoredWrongSeat,
             }), sendOpts);
+            if (!isCurrent())
+                return { triggered: false, reason: "preparation_stopped" };
             if (!restore.ok || restore.outcome === "retained") {
                 // Restore is exact-once + operator-authorized: if the seat is still busy
                 // (mid-compaction/boundary), do NOT advance to restore-sent on an
@@ -422,6 +600,7 @@ export class ClaudeCompactionEnforcer {
                 return { triggered: false, reason: "send_failed" };
             }
             this.pendingPostCompactRestore.set(input.sessionName, "compliance_prompt");
+            this.persistStage(input.sessionName, "compliance_prompt");
             this.restoreCarry.delete(input.sessionName);
             // OPR.0.4.3.14 — surface manual-trigger progress (no-op for auto seats).
             this.advanceManualStage(input.sessionName, "compact-sent", "restore-sent");
@@ -429,6 +608,8 @@ export class ClaudeCompactionEnforcer {
         }
         if (pendingStage === "compliance_prompt") {
             const compliance = await this.sessionTransport.send(input.sessionName, buildPostCompactCompliancePrompt(policy.postRestoreAuditInstruction), sendOpts);
+            if (!isCurrent())
+                return { triggered: false, reason: "preparation_stopped" };
             if (!compliance.ok || compliance.outcome === "retained") {
                 // Audit cannot overtake restore: only advances once the restore turn is
                 // idle and this send delivers; a busy tick retries the SAME stage.
@@ -446,13 +627,24 @@ export class ClaudeCompactionEnforcer {
                     saturationBoundPercentage: policy.thresholdPercent,
                 });
             }
+            if (!isCurrent())
+                return { triggered: false, reason: "preparation_stopped" };
             this.pendingPostCompactRestore.delete(input.sessionName);
+            this.persistStage(input.sessionName, "done");
+            this.records.delete(input.sessionName);
+            this.afterUncertainCompact.delete(input.sessionName);
+            this.lastInputBox.delete(input.sessionName);
             this.restoreCarry.delete(input.sessionName);
-            if (this.pendingPreCompactPrep.get(input.sessionName)?.status === "compact-sent")
+            // The attempt is finished, including one stopped after a lost /compact result whose restore this was.
+            const finished = this.pendingPreCompactPrep.get(input.sessionName);
+            if (finished?.status === "compact-sent" || finished?.compact === "uncertain")
                 this.pendingPreCompactPrep.delete(input.sessionName);
             this.pendingStageGeneration.delete(input.sessionName); // GHOST-STAGE (b): stage completed → drop its gen
             this.postCompactRestoreCooldownUntil.set(input.sessionName, Date.now() + this.postCompactRestoreCooldownMs);
-            this.triggeredAboveThreshold.delete(input.sessionName);
+            // A high sample may now finish the audit, but must not re-arm automatic compaction.
+            if (input.usedPercentage == null || input.usedPercentage < policy.thresholdPercent) {
+                this.triggeredAboveThreshold.delete(input.sessionName);
+            }
             // OPR.0.4.3.14 — terminal manual-trigger stage (no-op for auto seats).
             this.advanceManualStage(input.sessionName, "restore-sent", "audit-sent");
             return { triggered: true };
@@ -477,10 +669,13 @@ export class ClaudeCompactionEnforcer {
         if (!isValidThresholdPercent(policy.thresholdPercent)) {
             return { triggered: false, reason: "invalid_policy" };
         }
+        this.recoverAfterRestart(input, policy.preparationRoot || null);
+        // A trigger sample must not block work already owed to this occupant. Restore reads can
+        // themselves exceed a low threshold; keep the same stage, authorization and idle gates.
+        const drained = await this.drainPendingStage(input, policy);
+        if (drained)
+            return drained;
         if (input.usedPercentage < policy.thresholdPercent) {
-            const drained = await this.drainPendingStage(input, policy);
-            if (drained)
-                return drained;
             this.triggeredAboveThreshold.delete(input.sessionName);
             const preparation = this.pendingPreCompactPrep.get(input.sessionName);
             if (preparation?.status === "compact-sent")
@@ -489,15 +684,8 @@ export class ClaudeCompactionEnforcer {
             // deadline so a later high sample can use its map without another prep.
             return { triggered: false, reason: "below_threshold" };
         }
-        // OPR.0.4.3.14 — the `enabled` gate moved here (from the top of the method)
-        // so it guards only the auto TRIGGER (this above-threshold path). The
-        // below-threshold back-half above now drains regardless of `enabled`,
-        // because it only advances an ALREADY-INITIATED guided sequence
-        // (`pendingPostCompactRestore` is set only after a /compact was sent — by
-        // auto above OR by the manual trigger). A disabled policy therefore still
-        // never STARTS a compaction (unchanged observable auto behavior for a
-        // constant policy), while a manual trigger's restore/audit half can finish
-        // via this single shared path even when auto-compaction is disabled.
+        // No new automatic compaction while disabled. An already-owed stage above uses
+        // drainPendingStage's existing operator-initiated manual exemption.
         if (!policy.enabled) {
             return { triggered: false, reason: "disabled" };
         }
@@ -516,6 +704,13 @@ export class ClaudeCompactionEnforcer {
         if (this.triggeredAboveThreshold.has(input.sessionName)) {
             return { triggered: false, reason: "already_triggered_above_threshold" };
         }
+        const policyRefusal = this.terminalPolicyReason(input, { source: "openrig" });
+        if (policyRefusal) {
+            const existing = this.pendingPreCompactPrep.get(input.sessionName);
+            if (existing?.mode === "automatic" && existing.compact === "not_sent")
+                this.stopPreparation(input.sessionName, policyRefusal, existing);
+            return { triggered: false, reason: policyRefusal };
+        }
         // Before any preparation prompt or /compact copy: a protected seat with no recorded pane cannot take input.
         // An attempt already under way stops as not sent; none is begun.
         if (this.paneUnknownProtected(input.sessionName)) {
@@ -525,6 +720,14 @@ export class ClaudeCompactionEnforcer {
             return { triggered: false, reason: "pane_unknown_protected" };
         }
         let attempt = this.pendingPreCompactPrep.get(input.sessionName);
+        // A stopped attempt, automatic or manual, gives way to a fresh automatic one once the retry cooldown has passed. The
+        // cooldown keeps a seat that can't finish a map from getting a preparation prompt on every poll. Never retried: an
+        // explicit cancel, and an attempt whose /compact may have been submitted (its receipt was lost), which is never replayed.
+        if (attempt?.status === "stopped" && attempt.stoppedAt !== undefined && !attempt.cancelled && attempt.compact === "not_sent"
+            && this.now() - attempt.stoppedAt >= this.autoRetryAfterStopMs) {
+            this.pendingPreCompactPrep.delete(input.sessionName);
+            attempt = undefined;
+        }
         if (attempt?.mode === "manual")
             return { triggered: false, reason: "preparation_pending" };
         if (attempt?.status === "stopped")
@@ -532,7 +735,7 @@ export class ClaudeCompactionEnforcer {
         if (!attempt) {
             attempt = this.beginPreparation(input, "automatic");
             if (attempt.status === "stopped")
-                return { triggered: false, reason: "occupant_generation_unavailable" };
+                return { triggered: false, reason: attempt.reason === "preparation_directory_unavailable" ? attempt.reason : "occupant_generation_unavailable" };
         }
         if (attempt.status === "sending") {
             await this.deliverPreparation(input, attempt);
@@ -571,6 +774,10 @@ export class ClaudeCompactionEnforcer {
         return this.triggerManualCompactUnchecked(input, opts);
     }
     async triggerManualCompactUnchecked(input, opts) {
+        // The manual budget starts with the request. A request reaching a seat before the monitor's first poll after a restart
+        // finds its owed restore or open preparation first, so it neither prepares twice nor replaces the owed restore.
+        const requestedAt = this.now();
+        this.recoverSeat(input);
         this.reconcilePreparations();
         const active = this.pendingPreCompactPrep.get(input.sessionName);
         const stage = this.manualCompactionState.get(input.sessionName)?.stage;
@@ -586,9 +793,13 @@ export class ClaudeCompactionEnforcer {
         // The preparation prompt cannot be written to such a seat either, so the whole attempt is refused up front.
         if (this.paneUnknownProtected(input.sessionName))
             return this.recordManualFailure(input.sessionName, "pane_unknown_protected");
-        const attempt = this.beginPreparation(input, "manual", opts.skipMap === true);
+        const actor = opts.actor ?? { source: "caller", session: null };
+        const policyRefusal = this.terminalPolicyReason(input, actor);
+        if (policyRefusal)
+            return this.recordManualFailure(input.sessionName, policyRefusal);
+        const attempt = this.beginPreparation(input, "manual", opts.skipMap === true, actor, requestedAt);
         if (attempt.status === "stopped")
-            return this.recordManualFailure(input.sessionName, "occupant_generation_unavailable");
+            return this.recordManualFailure(input.sessionName, attempt.reason ?? "occupant_generation_unavailable");
         const failed = (reason) => {
             // A cancelled request may settle after an explicit retry. Its receipt must
             // not stop or overwrite the successor attempt's state.
@@ -634,34 +845,51 @@ export class ClaudeCompactionEnforcer {
         }
         const compact = await this.sendPreparedCompact(input, attempt, opts.skipMap === true);
         if (!compact.ok) {
-            return failed(compact.reason ?? "send_failed");
+            const outcome = failed(compact.reason ?? "send_failed");
+            // A /compact whose result was lost still owes its restore steps, and this request authorizes them.
+            if (!this.pendingPostCompactRestore.has(input.sessionName) || this.pendingPreCompactPrep.get(input.sessionName) !== attempt)
+                return outcome;
+            this.setManualStage(input.sessionName, "compact-sent", outcome.reason, opts.operatorInitiated === true);
+            return { ...outcome, restoreOwed: true };
         }
         this.setManualStage(input.sessionName, "compact-sent", undefined, opts.operatorInitiated === true);
         return { triggered: true, stage: "compact-sent" };
     }
-    beginPreparation(input, mode, skipMap = false) {
+    beginPreparation(input, mode, skipMap = false, policyActor = { source: "openrig" }, startedAt = this.now()) {
         const attemptId = randomUUID();
+        const policy = this.settingsStore.resolveClaudeCompactionPolicy();
+        const preparationRoot = policy.preparationRoot || null;
         const fallbackMapPath = path.join(this.openrigHome, "compaction", "preparation", sanitizeSessionKey(input.sessionName), attemptId, "RESTORE-MAP.md");
         const occupantGeneration = this.resolveOccupantGeneration?.(input.sessionName)
             ?? this.sessionTransport.deliveryGuard?.maybeTarget(input.sessionName)?.occupant ?? null;
         const attempt = {
-            attemptId, occupantGeneration, mode, status: "sending", delivery: "pending", compact: "not_sent", sends: 0,
-            deadlineAt: mode === "manual" ? this.now() + this.manualPrepWaitMs : null,
-            mapPath: fallbackMapPath,
+            policyActor, attemptId, occupantGeneration, mode, status: "sending", delivery: "pending", compact: "not_sent", sends: 0,
+            deadlineAt: mode === "manual" ? startedAt + this.manualPrepWaitMs : null,
+            mapPath: preparationRoot ? path.join(preparationRoot, sanitizeSessionKey(input.sessionName), attemptId, "RESTORE-MAP.md") : fallbackMapPath,
             marker: `<!-- openrig-compaction-complete ${JSON.stringify({ attemptId, session: input.sessionName, occupantGeneration })} -->`,
-            policyWasEnabled: this.settingsStore.resolveClaudeCompactionPolicy().enabled,
+            policyWasEnabled: policy.enabled,
+            preparationRoot,
             controller: new AbortController(),
-            compactInstruction: this.settingsStore.resolveClaudeCompactionPolicy().compactInstruction ?? "",
+            compactInstruction: policy.compactInstruction ?? "",
         };
+        // A stranded record this attempt replaces stays visible on the attempt, not dropped quietly.
+        const stranded = this.stranded.get(input.sessionName);
+        if (stranded)
+            attempt.supersedes = strandedSummary(stranded);
         this.pendingPreCompactPrep.set(input.sessionName, attempt);
+        this.stranded.delete(input.sessionName);
         // A map cannot satisfy an unknown occupant. Keep the failed attempt visible and
         // disarmed; explicit skip-map still bypasses only the artifact prerequisite.
         if (occupantGeneration === null && !skipMap)
             this.stopPreparation(input.sessionName, "occupant_generation_unavailable");
-        if (attempt.status !== "stopped" && input.cwd && path.isAbsolute(input.cwd)) {
-            // Keep writes inside Claude's existing edit workspace, without adding permissions.
-            // This folder holds private working context; ignore its entire contents in Git.
-            const root = path.join(input.cwd, ".openrig", "compaction");
+        if (skipMap && preparationRoot) {
+            this.startRecord(input.sessionName, attempt);
+            return attempt;
+        }
+        if (attempt.status !== "stopped" && (preparationRoot || (input.cwd && path.isAbsolute(input.cwd)))) {
+            // An explicit root can be outside a workspace denied by Claude file permissions.
+            // The daemon cannot prove those permissions; the operator grants access to this root.
+            const root = preparationRoot ?? path.join(input.cwd, ".openrig", "compaction");
             try {
                 fs.mkdirSync(root, { recursive: true });
                 const ignorePath = path.join(root, ".gitignore");
@@ -685,12 +913,17 @@ export class ClaudeCompactionEnforcer {
                         fs.closeSync(fd);
                     }
                 }
-                const parent = path.join(root, "preparation", sanitizeSessionKey(input.sessionName), attemptId);
+                const parent = path.join(preparationRoot ?? path.join(root, "preparation"), sanitizeSessionKey(input.sessionName), attemptId);
                 fs.mkdirSync(parent, { recursive: true });
                 fs.accessSync(parent, fs.constants.W_OK | fs.constants.X_OK);
                 attempt.mapPath = path.join(parent, "RESTORE-MAP.md");
             }
-            catch { /* Preserve the existing instance-home path for legacy or unwritable workspaces. */ }
+            catch {
+                // An explicit location is a permission choice: never silently move it back into
+                // the denied workspace or instance home. Keep the selected path visible in --state.
+                if (preparationRoot)
+                    this.stopPreparation(input.sessionName, "preparation_directory_unavailable");
+            }
         }
         if (attempt.status !== "stopped" && attempt.mapPath === fallbackMapPath) {
             // The cwd path already creates its parent. Prepare the legacy fallback too;
@@ -700,6 +933,8 @@ export class ClaudeCompactionEnforcer {
             }
             catch { /* Retain the existing path and deadline if the directory cannot be prepared. */ }
         }
+        if (attempt.status !== "stopped")
+            this.startRecord(input.sessionName, attempt);
         return attempt;
     }
     mapReady(attempt, publish = false) {
@@ -741,23 +976,44 @@ export class ClaudeCompactionEnforcer {
         attempt.status = "waiting";
         const policy = this.settingsStore.resolveClaudeCompactionPolicy();
         let prep;
+        let marked = false;
         try {
             const composed = composeManagedCompactCommand({ compactInstruction: attempt.compactInstruction, mapPath: attempt.mapPath });
             prep = await this.sessionTransport.send(input.sessionName, buildPreCompactPrepPrompt({
                 overflowCompactInstruction: composed.instructionInCommand ? null : attempt.compactInstruction,
                 usedPercentage: input.usedPercentage, thresholdPercent: policy.thresholdPercent,
                 preCompactInstruction: policy.preCompactInstruction, preparation: attempt, constructedAt: this.now(),
-            }));
+            }), { openrigNotice: true, beforeWrite: () => {
+                    this.reconcilePreparations();
+                    if (this.pendingPreCompactPrep.get(input.sessionName) !== attempt || attempt.controller.signal.aborted || attempt.status === "stopped")
+                        throw new DeliveryGuardError("preparation_stopped", "This compaction attempt ended before preparation input.");
+                    this.checkAttemptPolicy(input, attempt);
+                    // At the write, a retry included: from here a restart reads this prompt as possibly delivered and never resends it.
+                    if (!marked) {
+                        marked = true;
+                        this.persist(input.sessionName, attempt.attemptId, { delivery: "pending", sends: attempt.sends });
+                    }
+                } });
         }
-        catch {
-            prep = null;
+        catch (error) {
+            if (error instanceof DeliveryGuardError) {
+                const written = error.inputWritten === true;
+                const attempted = error.inputAttempted === true;
+                prep = { ok: false, sent: written, reason: error.code,
+                    inputPhase: written ? "written" : attempted ? "attempted" : "not_reached" };
+            }
+            else
+                prep = null;
         }
-        const notSent = prep?.outcome === "retained"
-            || ["target_needs_input", "session_missing", "typing_guard_enabled", "mid_work", "tmux_unavailable"].includes(prep?.reason ?? "")
-            || (prep?.sent === false && ["target_runtime_not_running", "target_runtime_unverified", "target_runtime_conflict", "transport_unavailable"].includes(prep.reason ?? ""));
+        const writeAttempted = prep?.inputPhase === "attempted" || prep?.inputPhase === "written" || prep?.sent === true;
+        // `not_reached` is a positive pre-input result: a guard refusal before any write, such as a draft hold.
+        const notSent = !writeAttempted && (prep?.outcome === "retained" || prep?.inputPhase === "not_reached"
+            || ["preparation_stopped", "terminal_policy_refused", "terminal_policy_unavailable", "target_needs_input", "session_missing", "typing_guard_enabled", "mid_work", "tmux_unavailable"].includes(prep?.reason ?? "")
+            || (prep?.sent === false && ["target_runtime_not_running", "target_runtime_unverified", "target_runtime_conflict", "transport_unavailable"].includes(prep.reason ?? "")));
         // Record this attempt's effect even if cancellation/retry happened during the await.
         // Neither a failed response nor its loss proves no paste/Enter. Never replay uncertainty.
         attempt.delivery = prep?.ok && prep.outcome !== "retained" ? "delivered" : notSent ? "not_sent" : "uncertain";
+        this.persist(input.sessionName, attempt.attemptId, { delivery: attempt.delivery, sends: attempt.sends });
         if (this.pendingPreCompactPrep.get(input.sessionName) !== attempt || attempt.controller.signal.aborted)
             return;
         if (notSent) {
@@ -768,23 +1024,43 @@ export class ClaudeCompactionEnforcer {
         }
         if (attempt.mode === "automatic")
             attempt.deadlineAt = this.now() + AUTO_PREP_WAIT_MS_DEFAULT;
+        this.persist(input.sessionName, attempt.attemptId, { deadlineAt: attempt.deadlineAt });
         this.reconcilePreparations();
     }
     async sendPreparedCompact(input, attempt, skipMap) {
         const check = () => {
             this.reconcilePreparations();
+            this.checkAttemptPolicy(input, attempt);
             if (this.pendingPreCompactPrep.get(input.sessionName) !== attempt || attempt.status !== "waiting" || attempt.controller.signal.aborted)
                 throw new DeliveryGuardError(attempt.reason ?? "preparation_stopped", "Compaction preparation ended; no further input is authorized.");
             if (!skipMap && !this.mapReady(attempt, true))
                 throw new DeliveryGuardError("preparation_incomplete", "This attempt's restore map is incomplete; /compact was not submitted.");
         };
         const composed = composeManagedCompactCommand({ compactInstruction: attempt.compactInstruction, mapPath: skipMap ? null : attempt.mapPath });
+        // Whatever the command could not carry, the restore request carries instead. An explicitly
+        // selected preparation root also keeps its exact map in that request, even when the command fit it.
+        const carry = skipMap || attempt.preparationRoot !== null || !composed.mapPathInCommand || !composed.instructionInCommand ? {
+            mapPath: !skipMap && (attempt.preparationRoot !== null || !composed.mapPathInCommand) ? attempt.mapPath : null,
+            compactInstruction: composed.instructionInCommand ? null : attempt.compactInstruction,
+            ...(skipMap ? { skipMap: { mapPath: attempt.mapPath, marker: attempt.marker } } : {}),
+        } : undefined;
+        const operatorInitiated = this.manualCompactionState.get(input.sessionName)?.operatorInitiated;
+        let marked = false;
+        // At the write, after the final checks: from here a restart treats /compact as possibly sent, and keeps what its
+        // restore request needs (the carried map and instruction, and a manual request's authority).
+        const beforeWrite = () => {
+            check();
+            if (!marked) {
+                marked = true;
+                this.persist(input.sessionName, attempt.attemptId, { compactSending: true, restoreCarry: carry, operatorInitiated });
+            }
+        };
         const send = async () => {
             check();
             // Both paths send only to an idle seat, with the same idle wait, bounded by the attempt's existing
             // deadline. (The automatic path used to send into a seat still finishing its preparation turn.)
             // Idle comes from a live pane read: the newest hook can predate the rest of the preparation turn.
-            return this.sessionTransport.send(input.sessionName, composed.command, { beforeWrite: check, ...(attempt.deadlineAt !== null ? { waitForIdleMs: Math.max(1, Math.min(this.compactSendIdleWaitMs, attempt.deadlineAt - this.now())), readinessFromPaneOnly: true } : {}) });
+            return this.sessionTransport.send(input.sessionName, composed.command, { openrigNotice: true, beforeWrite, ...(attempt.deadlineAt !== null ? { waitForIdleMs: Math.max(1, Math.min(this.compactSendIdleWaitMs, attempt.deadlineAt - this.now())), readinessFromPaneOnly: true } : {}) });
         };
         let result;
         let guardRefused = false;
@@ -807,37 +1083,60 @@ export class ClaudeCompactionEnforcer {
             // Nothing sent: a guard refusal before input, a retained send, or the transport's explicit sent:false
             // for a send that never reached its write.
             const notSent = !writeAttempted && (guardRefused || result.outcome === "retained" || result.sent === false);
+            if (notSent && marked)
+                this.persist(input.sessionName, attempt.attemptId, { compactSending: undefined });
             // Only a known pre-input idle deferral keeps the automatic attempt armed for a later poll; the transport
             // marks those `not_reached`. reconcilePreparations still ends it at the deadline or on an occupant change.
-            if (attempt.mode === "automatic" && notSent && phase === "not_reached") {
+            // A typing-guard draft hold (`draft_*`) is `not_reached` too, but it is a refusal, not an idle wait: it stops
+            // as not sent, and a fresh attempt may begin after the retry cooldown.
+            const draftHold = typeof result.reason === "string" && result.reason.startsWith("draft_");
+            if (attempt.mode === "automatic" && notSent && phase === "not_reached" && !draftHold) {
                 return { ok: false, reason: "waiting_for_idle" };
             }
             // A compact may have been sent despite a lost result. Never replay automatically.
             attempt.compact = notSent ? "not_sent" : "uncertain";
+            // It may have run, so its restore steps are owed, as after a submitted /compact; the restore request tells a seat that
+            // didn't compact to say so and skip. Not when the attempt was cancelled, stopped or replaced during the send.
+            if (!notSent && !attempt.controller.signal.aborted && this.pendingPreCompactPrep.get(input.sessionName) === attempt) {
+                this.owePostCompactRestore(input.sessionName, attempt, carry);
+                this.afterUncertainCompact.add(input.sessionName);
+                this.persist(input.sessionName, attempt.attemptId, { restoreCarry: carry, operatorInitiated, uncertainCompact: true });
+            }
             const reason = attempt.reason ?? result.reason ?? "delivery_uncertain";
             this.stopPreparation(input.sessionName, reason, attempt);
             return { ok: false, reason };
         }
         attempt.compact = "submitted_unconfirmed";
-        // Whatever the command could not carry, the restore request carries instead.
-        if (skipMap || !composed.mapPathInCommand || !composed.instructionInCommand) {
-            this.restoreCarry.set(input.sessionName, {
-                mapPath: !skipMap && !composed.mapPathInCommand ? attempt.mapPath : null,
-                compactInstruction: composed.instructionInCommand ? null : attempt.compactInstruction,
-                ...(skipMap ? { skipMap: { mapPath: attempt.mapPath, marker: attempt.marker } } : {}),
-            });
-        }
-        else
-            this.restoreCarry.delete(input.sessionName);
         if (attempt.controller.signal.aborted)
             return { ok: false, reason: attempt.reason };
         attempt.status = "compact-sent";
-        this.lastAutoCompactAt.set(input.sessionName, this.now());
-        this.triggeredAboveThreshold.add(input.sessionName);
-        this.pendingPostCompactRestore.set(input.sessionName, "turn_boundary");
-        this.pendingStageGeneration.set(input.sessionName, attempt.occupantGeneration);
+        this.owePostCompactRestore(input.sessionName, attempt, carry);
+        this.persist(input.sessionName, attempt.attemptId, { phase: "turn_boundary", restoreCarry: carry, operatorInitiated });
         return { ok: true };
     }
+    /** What the seat's input box holds now, as `rig capture --json` reads it (`empty`, `likely-suggestion`, `typed`, ...), or
+     *  why it couldn't be read. Never throws. */
+    async inputBoxStatus(sessionName) {
+        try {
+            const capture = await this.sessionTransport.capture(sessionName, { inputBox: true });
+            return capture.inputBox?.status ?? capture.reason ?? "unknown";
+        }
+        catch {
+            return "unknown";
+        }
+    }
+    /** /compact was submitted, or may have been: its restore steps are owed next, and no new automatic compaction starts
+     *  until they finish. */
+    owePostCompactRestore(sessionName, attempt, carry) {
+        if (carry)
+            this.restoreCarry.set(sessionName, carry);
+        else
+            this.restoreCarry.delete(sessionName);
+        this.lastAutoCompactAt.set(sessionName, this.now());
+        this.triggeredAboveThreshold.add(sessionName);
+        this.pendingPostCompactRestore.set(sessionName, "turn_boundary");
+        this.pendingStageGeneration.set(sessionName, attempt.occupantGeneration);
+    }
     /** The map the restore request names. With --skip-map: a map the seat completed at the attempt path
      *  anyway, or a plain statement that none was required. Nothing publishes the .tmp under --skip-map, so
      *  the final path is checked first, then the .tmp, and whichever ends with the marker is named. */
@@ -876,18 +1175,173 @@ export class ClaudeCompactionEnforcer {
                 attempt.policyWasEnabled = true;
         }
     }
+    /** Start the record for a new attempt, beside its map. */
+    startRecord(sessionName, attempt) {
+        this.records.set(sessionName, { file: path.join(path.dirname(attempt.mapPath), COMPACTION_RECORD_FILE), record: {
+                daemon: this.daemonInstance, attemptId: attempt.attemptId, session: sessionName, occupantGeneration: attempt.occupantGeneration, mode: attempt.mode,
+                phase: "preparing", delivery: attempt.delivery, deadlineAt: attempt.deadlineAt, sends: attempt.sends,
+                mapPath: attempt.mapPath, marker: attempt.marker, compactInstruction: attempt.compactInstruction,
+                preparationRoot: attempt.preparationRoot, updatedAt: this.now(),
+            } });
+        this.persist(sessionName, attempt.attemptId, {});
+    }
+    /** Record what this daemon just did for the seat's current attempt. Best-effort: a record that can't be written
+     *  leaves the attempt as it was before records existed, not picked up after a restart. */
+    persist(sessionName, attemptId, patch) {
+        const current = this.records.get(sessionName);
+        if (!current || current.record.attemptId !== attemptId)
+            return;
+        current.record = { ...current.record, ...patch, daemon: this.daemonInstance, updatedAt: this.now() };
+        const temporary = `${current.file}.${process.pid}.tmp`;
+        try {
+            fs.writeFileSync(temporary, `${JSON.stringify(current.record)}\n`, { mode: 0o600 });
+            fs.renameSync(temporary, current.file);
+        }
+        catch {
+            try {
+                fs.rmSync(temporary, { force: true });
+            }
+            catch { /* nothing to clean */ }
+        }
+    }
+    persistStage(sessionName, phase) {
+        const current = this.records.get(sessionName);
+        if (current)
+            this.persist(sessionName, current.record.attemptId, { phase });
+    }
+    /**
+     * After a daemon restart, pick up the seat's managed compaction from the record beside its newest attempt, when an
+     * earlier daemon process wrote it. This runs once per seat, and only when this daemon holds nothing for that seat.
+     * - An owed post-compact stage (turn boundary, restore, audit) is resumed, and so is the restore after a /compact that
+     *   was being sent or whose outcome was lost.
+     * - An automatic preparation is waited on rather than begun again. A prompt whose delivery wasn't recorded may have
+     *   reached the seat, so it is never sent again.
+     * - A manual preparation stops, because its caller is gone.
+     * A record of another occupant, or in any other shape (see `readCompactionRecord`), is left alone. An open post-compact
+     * record older than the recovery window isn't resumed; it reads as stranded, at the stage it owes.
+     */
+    recoverAfterRestart(input, preparationRoot) {
+        const session = input.sessionName;
+        if (input.runtime !== "claude-code" || this.recovered.has(session))
+            return;
+        this.recovered.add(session);
+        if (this.pendingPreCompactPrep.has(session) || this.pendingPostCompactRestore.has(session))
+            return;
+        const key = sanitizeSessionKey(session);
+        // The places beginPreparation puts an attempt: an explicit root, the seat's workspace, or the instance home.
+        const dirs = new Set([
+            ...(preparationRoot ? [path.join(preparationRoot, key)] : []),
+            ...(input.cwd && path.isAbsolute(input.cwd) ? [path.join(input.cwd, ".openrig", "compaction", "preparation", key)] : []),
+            path.join(this.openrigHome, "compaction", "preparation", key),
+        ]);
+        let newest = null;
+        for (const dir of dirs) {
+            let entries;
+            try {
+                entries = fs.readdirSync(dir);
+            }
+            catch {
+                continue;
+            }
+            for (const entry of entries) {
+                const file = path.join(dir, entry, COMPACTION_RECORD_FILE);
+                const record = readCompactionRecord(file);
+                if (record && record.session === session && record.attemptId === entry && (!newest || record.updatedAt > newest.record.updatedAt)) {
+                    newest = { file, record };
+                }
+            }
+        }
+        if (!newest)
+            return;
+        const { record } = newest;
+        // This process's own record (another enforcer in it) is live state, not a predecessor's.
+        if (record.daemon === this.daemonInstance || record.phase === "done" || record.phase === "ended")
+            return;
+        const live = this.resolveOccupantGeneration?.(session) ?? this.sessionTransport.deliveryGuard?.maybeTarget(session)?.occupant ?? null;
+        if (record.occupantGeneration !== null && live !== null && live !== record.occupantGeneration)
+            return;
+        const stale = this.now() - record.updatedAt > this.restartRecoveryWindowMs;
+        // A /compact whose send had begun, or whose outcome was lost, is never sent again; its restore steps are owed in case it
+        // ran, each only into an empty input box. The restore request tells a seat that didn't compact to say so and skip.
+        const phase = (record.phase === "preparing" && record.compactSending) || record.phase === "compact_uncertain" ? "turn_boundary" : record.phase;
+        const inFlight = phase !== record.phase;
+        if (phase === "preparing") {
+            if (stale)
+                return; // Its preparation deadline passed long ago; a fresh attempt may begin.
+            this.records.set(session, newest);
+            this.pendingPreCompactPrep.set(session, {
+                policyActor: { source: "openrig" }, attemptId: record.attemptId, occupantGeneration: record.occupantGeneration,
+                mapPath: record.mapPath, marker: record.marker, mode: record.mode,
+                status: record.delivery === "not_sent" ? "sending" : "waiting",
+                delivery: record.delivery === "pending" ? "uncertain" : record.delivery,
+                compact: "not_sent", sends: record.sends,
+                deadlineAt: record.deadlineAt ?? (record.delivery === "not_sent" ? null : record.updatedAt + AUTO_PREP_WAIT_MS_DEFAULT),
+                policyWasEnabled: true, preparationRoot: record.preparationRoot, controller: new AbortController(),
+                compactInstruction: record.compactInstruction,
+            });
+            if (record.mode === "manual")
+                this.stopPreparation(session, "daemon_restarted");
+            return;
+        }
+        if (stale) {
+            this.stranded.set(session, { ...record, phase });
+            return;
+        }
+        this.records.set(session, newest);
+        this.pendingPostCompactRestore.set(session, phase);
+        this.pendingStageGeneration.set(session, record.occupantGeneration);
+        if (inFlight || record.uncertainCompact) {
+            this.afterUncertainCompact.add(session);
+            this.persist(session, record.attemptId, { uncertainCompact: true });
+        }
+        if (record.restoreCarry)
+            this.restoreCarry.set(session, record.restoreCarry);
+        // As after a /compact this daemon sent: no new automatic compaction until the owed stages finish.
+        this.lastAutoCompactAt.set(session, this.now());
+        this.triggeredAboveThreshold.add(session);
+        if (record.mode === "manual") {
+            this.setManualStage(session, phase === "compliance_prompt" ? "restore-sent" : "compact-sent", undefined, record.operatorInitiated);
+        }
+    }
     stopPreparation(session, reason, expected) {
         const attempt = this.pendingPreCompactPrep.get(session);
         if ((expected && expected !== attempt) || !attempt || attempt.status === "stopped" || attempt.status === "compact-sent")
             return;
         attempt.status = "stopped";
         attempt.reason = reason;
+        attempt.stoppedAt = this.now();
         attempt.controller.abort();
+        this.persist(session, attempt.attemptId, { phase: attempt.compact === "uncertain" ? "compact_uncertain" : "ended" });
         if (attempt.mode === "manual")
             this.setManualStage(session, "skipped-or-failed", reason);
     }
     cancelPreparation(session) {
-        this.stopPreparation(session, "preparation_cancelled");
+        const attempt = this.pendingPreCompactPrep.get(session);
+        if (attempt)
+            attempt.cancelled = true;
+        if (attempt?.status === "compact-sent" || this.pendingPostCompactRestore.has(session)) {
+            // Abandon management, not the provider command: keep its unconfirmed receipt and map.
+            // Do not clear automatic dedup/re-arm state or send any input. A later explicit retry
+            // still requires a new preparation and the live-pane idle check before /compact.
+            if (attempt) {
+                attempt.status = "stopped";
+                attempt.reason = "compaction_cancelled";
+                attempt.controller.abort();
+            }
+            this.persistStage(session, "ended");
+            this.pendingPostCompactRestore.delete(session);
+            this.pendingStageGeneration.delete(session);
+            this.restoreCarry.delete(session);
+            this.afterUncertainCompact.delete(session);
+            this.lastInputBox.delete(session);
+            this.setManualStage(session, "cancelled", "compaction_cancelled");
+        }
+        else {
+            this.stopPreparation(session, "preparation_cancelled");
+            // A cancel also ends an uncertain /compact's owed restore, so a restart doesn't resume it.
+            if (attempt?.compact === "uncertain")
+                this.persistStage(session, "ended");
+        }
         return this.getPreparationState(session);
     }
     getPreparationState(session) {
@@ -895,7 +1349,7 @@ export class ClaudeCompactionEnforcer {
         const attempt = this.pendingPreCompactPrep.get(session);
         if (!attempt)
             return null;
-        const { controller: _controller, sends: _sends, policyWasEnabled: _enabled, compactInstruction: _instruction, ...state } = attempt;
+        const { controller: _controller, sends: _sends, policyWasEnabled: _enabled, preparationRoot: _preparationRoot, compactInstruction: _instruction, stoppedAt: _stoppedAt, cancelled: _cancelled, ...state } = attempt;
         return state;
     }
     /** OPR.0.4.3.14 — read the surfaced manual-trigger state for a seat (AC-3). */
@@ -912,6 +1366,11 @@ export class ClaudeCompactionEnforcer {
      */
     invalidateOccupant(sessionName) {
         this.stopPreparation(sessionName, "stale_generation");
+        this.persistStage(sessionName, "ended");
+        this.records.delete(sessionName);
+        this.stranded.delete(sessionName);
+        this.afterUncertainCompact.delete(sessionName);
+        this.lastInputBox.delete(sessionName);
         this.lastAutoCompactAt.delete(sessionName);
         this.postCompactRestoreCooldownUntil.delete(sessionName);
         this.triggeredAboveThreshold.delete(sessionName);