@alpsckr/unitycli 0.4.3 → 0.4.4

package/unitypkg/Tests/Editor/UnityCliAdmissionCoordinatorIntegrationTests.cs

@@ -0,0 +1,1329 @@
+#if UNITY_EDITOR
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using NUnit.Framework;
+using UnityEditor;
+using UnityEngine;
+using UnityCli.Protocol;
+
+namespace UnityCli.Tests
+{
+    public sealed class UnityCliAdmissionCoordinatorIntegrationTests
+    {
+        private const string InstanceId = "test-instance";
+        private const string Fingerprint = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+        private string identityPrefix;
+        private BridgeQueueState queueState;
+        private long monotonicNowMs;
+
+        [SetUp]
+        public void SetUp()
+        {
+            identityPrefix = "admission-" + Guid.NewGuid().ToString("N") + "-";
+            monotonicNowMs = 1000L;
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            if (queueState != null) queueState.AssertEmptyForTests();
+        }
+
+        [Test]
+        public void DirectTerminalRootClearFaultReplaysCleanupUntilAllRecoveryStateIsGone()
+        {
+            var requestId = Unique("direct-root-clear");
+            var digest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(requestId), InstanceId);
+            var pool = CreatePool("direct-root-clear-session");
+            Consume(pool, requestId, digest, TestDeadline());
+            bool acquired;
+            Assert.That(queueState.TryAcquireLease(requestId, digest, out acquired), Is.True);
+            Assert.That(acquired, Is.True);
+            queueState.SaveOperation("direct-mutation", new Dictionary<string, object>
+            {
+                { "requestId", requestId }, { "requestDigest", digest }, { "toolName", "editor.play" },
+                { "editorSessionId", UnityCliBridge.EditorSessionId() }, { "phase", "effect_started" }
+            });
+            stateHookClearDirectRootOnce();
+
+            var terminal = UnityCliBridge.PublishDirectMutationTerminalForTests(queueState, requestId, digest,
+                UnityCliSerializer.Serialize(ProtocolEnvelopeFactory.Success(requestId, new Dictionary<string, object> { { "changed", true } })));
+
+            Assert.That(terminal, Does.Contain("\"changed\":true"));
+            Assert.That(queueState.OperationExists("direct-mutation"), Is.True);
+            Assert.That(queueState.OperationExists("direct-mutation-terminal-cleanup"), Is.True);
+            var directMarker = queueState.LoadOperation("direct-mutation-terminal-cleanup");
+            Assert.That(directMarker["requestId"], Is.EqualTo(requestId));
+            Assert.That(directMarker["requestDigest"], Is.EqualTo(digest));
+            Assert.That(directMarker["admissionRequestDigest"], Is.EqualTo(digest));
+            Assert.That(pool.Capture().Active, Is.EqualTo(1));
+            Assert.That(queueState.TryIsLeaseOwned(requestId, digest, out var owned), Is.True);
+            Assert.That(owned, Is.True);
+
+            var replay = UnityCliBridge.RecoverPublishedDirectMutationForTests(queueState, requestId, digest);
+            Assert.That(replay, Is.EqualTo(terminal));
+            Assert.That(queueState.OperationExists("direct-mutation"), Is.False);
+            Assert.That(queueState.OperationExists("direct-mutation-terminal-cleanup"), Is.False);
+            Assert.That(queueState.OperationExists("direct-mutation-admission-owner"), Is.False);
+            Assert.That(pool.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.TryIsLeaseOwned(requestId, digest, out owned), Is.True);
+            Assert.That(owned, Is.False);
+        }
+
+        [Test]
+        public void ReloadedAcceptedDirectMutationWithoutLeaseSettlesEffectBeforeAndReplaysWithoutEffect()
+        {
+            var requestId = Unique("direct-accepted-reload");
+            var digest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(requestId), InstanceId);
+            var pool = CreatePool("direct-accepted-reload-session");
+            Consume(pool, requestId, digest, TestDeadline());
+            queueState.SaveOperation("direct-mutation", new Dictionary<string, object>
+            {
+                { "requestId", requestId }, { "requestDigest", digest }, { "toolName", "editor.play" },
+                { "editorSessionId", UnityCliBridge.EditorSessionId() }, { "phase", "accepted_before_effect" }
+            });
+
+            var outcome = UnityCliBridge.UnityCliSessionMutationLease.InitializeRecoveryOrderForTests(queueState);
+            var replay = UnityCliBridge.RecoverPublishedDirectMutationForTests(queueState, requestId, digest);
+
+            Assert.That(outcome, Is.EqualTo("SettledEffectBefore"));
+            Assert.That(replay, Does.Contain("E_EXECUTION_TIMEOUT"));
+            Assert.That(replay, Does.Contain("no effect was executed"));
+            Assert.That(pool.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.OperationExists("direct-mutation"), Is.False);
+            Assert.That(queueState.OperationExists("direct-mutation-terminal-cleanup"), Is.False);
+            Assert.That(queueState.OperationExists("direct-mutation-admission-owner"), Is.False);
+            Assert.That(queueState.PendingCompletionIntentCount, Is.EqualTo(0));
+            Assert.That(UnityCliBridge.ActiveRequestWorkCountForTests(queueState), Is.EqualTo(0));
+            Assert.That(queueState.TryIsLeaseOwned(requestId, digest, out var owned), Is.True);
+            Assert.That(owned, Is.False);
+        }
+
+        [Test]
+        public void CleanupPendingAcceptedDirectMutationReleasesOldLeaseThenPublishesTerminalBeforeCleanup()
+        {
+            var requestId = Unique("direct-cleanup-pending");
+            var digest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(requestId), InstanceId);
+            var pool = CreatePool("direct-cleanup-pending-session");
+            Consume(pool, requestId, digest, TestDeadline());
+            queueState.SaveOperation("direct-mutation", Root(requestId, digest, "accepted_before_effect"));
+            Assert.That(queueState.TryAcquireLease(requestId, digest, out var acquired), Is.True);
+            Assert.That(acquired, Is.True);
+            var order = new List<string>();
+            queueState.TestHooks.ExpectOnce("before-terminal-store:direct-mutation", () =>
+            {
+                Assert.That(queueState.TryIsLeaseOwned(requestId, digest, out var owned), Is.True);
+                Assert.That(owned, Is.False);
+                order.Add("terminal");
+            });
+            queueState.TestHooks.ExpectOnce("before-operation-clear:direct-mutation", () =>
+            {
+                Assert.That(queueState.TryGetTerminal("direct-mutation", requestId, digest, out var terminal), Is.True);
+                Assert.That(UnityCliSerializer.Serialize(terminal), Does.Contain("no effect was executed"));
+                order.Add("root-cleanup");
+            });
+
+            var outcome = UnityCliBridge.UnityCliSessionMutationLease.InitializeRecoveryOrderForTests(queueState, true);
+
+            Assert.That(outcome, Is.EqualTo("SettledEffectBefore"));
+            Assert.That(order, Is.EqualTo(new[] { "terminal", "root-cleanup" }));
+            Assert.That(pool.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.OperationExists("direct-mutation"), Is.False);
+            Assert.That(queueState.OperationExists("direct-mutation-terminal-cleanup"), Is.False);
+            Assert.That(queueState.TryIsLeaseOwned(requestId, digest, out var finalOwned), Is.True);
+            Assert.That(finalOwned, Is.False);
+        }
+
+        [Test]
+        public void ReloadedAcceptedDirectMutationWaitsForExactLeaseAndBlocksMismatch()
+        {
+            var requestId = Unique("direct-accepted-owned");
+            var digest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(requestId), InstanceId);
+            var pool = CreatePool("direct-accepted-owned-session");
+            Consume(pool, requestId, digest, TestDeadline());
+            queueState.SaveOperation("direct-mutation", Root(requestId, digest, "accepted_before_effect"));
+            Assert.That(queueState.TryAcquireLease(requestId, digest, out var acquired), Is.True);
+            Assert.That(acquired, Is.True);
+            Assert.That(UnityCliBridge.UnityCliSessionMutationLease.InitializeRecoveryOrderForTests(queueState), Is.EqualTo("WaitingExactOwner"));
+            Assert.That(pool.Capture().Active, Is.EqualTo(1));
+            Assert.That(queueState.OperationExists("direct-mutation"), Is.True);
+            Assert.That(queueState.OperationExists("direct-mutation-terminal-cleanup"), Is.False);
+            Assert.That(queueState.OperationExists("direct-mutation-admission-owner"), Is.False);
+            Assert.That(queueState.TryGetTerminal("direct-mutation", requestId, digest, out var terminal), Is.False);
+            Assert.That(queueState.TryIsLeaseOwned(requestId, digest, out var exactOwned), Is.True);
+            Assert.That(exactOwned, Is.True);
+            queueState.ReleaseLease(requestId, digest);
+            var otherRequestId = Unique("direct-other-owner");
+            var otherDigest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(otherRequestId), InstanceId);
+            Assert.That(queueState.TryAcquireLease(otherRequestId, otherDigest, out acquired), Is.True);
+            Assert.That(acquired, Is.True);
+            Assert.That(UnityCliBridge.UnityCliSessionMutationLease.InitializeRecoveryOrderForTests(queueState), Is.EqualTo("IdentityBlocked"));
+            Assert.That(pool.Capture().Active, Is.EqualTo(1));
+            Assert.That(queueState.OperationExists("direct-mutation"), Is.True);
+            queueState.ReleaseLease(otherRequestId, otherDigest);
+            queueState.ClearOperation("direct-mutation");
+            pool.Reset();
+        }
+
+        [TestCase("editor.play", false, true)]
+        [TestCase("editor.stop", true, false)]
+        public void ReloadedPlayModeRootFreezesTypedSuccessAfterStableTargetIsObserved(string toolName, bool before, bool targetPlaying)
+        {
+            var requestId = Unique("playmode-success");
+            var digest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(requestId), InstanceId);
+            var pool = CreatePool("playmode-success-session");
+            Consume(pool, requestId, digest, TestDeadline());
+            queueState.SaveOperation("direct-mutation", PlayModeRoot(requestId, digest, toolName, before, DateTimeOffset.UtcNow.AddMinutes(1)));
+            Assert.That(queueState.TryAcquireLease(requestId, digest, out var acquired), Is.True);
+            Assert.That(acquired, Is.True);
+
+            var finalized = UnityCliBridge.TryFinalizeRecoveredPlayModeRootForTests(
+                queueState, requestId, digest, targetPlaying, false, false, DateTimeOffset.UtcNow);
+
+            Assert.That(finalized, Is.True);
+            Assert.That(queueState.TryGetTerminal("direct-mutation", requestId, digest, out var terminal), Is.True);
+            var serialized = UnityCliSerializer.Serialize(terminal);
+            Assert.That(serialized, Does.Contain("\"ok\":true"));
+            Assert.That(serialized, Does.Contain("\"changed\":true"));
+            Assert.That(serialized, Does.Contain("\"isPlaying\":" + targetPlaying.ToString().ToLowerInvariant()));
+            Assert.That(queueState.OperationExists("direct-mutation"), Is.False);
+            Assert.That(pool.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.TryIsLeaseOwned(requestId, digest, out var owned), Is.True);
+            Assert.That(owned, Is.False);
+        }
+
+        [Test]
+        public void ReloadedPlayModeRootRetainsExactOwnerWhileTransitionIsActive()
+        {
+            var requestId = Unique("playmode-changing");
+            var digest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(requestId), InstanceId);
+            var pool = CreatePool("playmode-changing-session");
+            Consume(pool, requestId, digest, TestDeadline());
+            queueState.SaveOperation("direct-mutation", PlayModeRoot(requestId, digest, "editor.play", false, DateTimeOffset.UtcNow.AddMinutes(1)));
+            Assert.That(queueState.TryAcquireLease(requestId, digest, out var acquired), Is.True);
+            Assert.That(acquired, Is.True);
+
+            var finalized = UnityCliBridge.TryFinalizeRecoveredPlayModeRootForTests(
+                queueState, requestId, digest, false, false, true, DateTimeOffset.UtcNow);
+
+            Assert.That(finalized, Is.False);
+            Assert.That(queueState.OperationExists("direct-mutation"), Is.True);
+            Assert.That(queueState.TryGetTerminal("direct-mutation", requestId, digest, out var terminal), Is.False);
+            Assert.That(pool.Capture().Active, Is.EqualTo(1));
+            Assert.That(queueState.TryIsLeaseOwned(requestId, digest, out var owned), Is.True);
+            Assert.That(owned, Is.True);
+            queueState.ClearOperation("direct-mutation");
+            queueState.ReleaseLease(requestId, digest);
+            pool.Reset();
+        }
+
+        [Test]
+        public void ReloadedPlayModeRootFreezesDomainErrorAtImmutableDeadline()
+        {
+            var requestId = Unique("playmode-deadline");
+            var digest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(requestId), InstanceId);
+            var pool = CreatePool("playmode-deadline-session");
+            Consume(pool, requestId, digest, TestDeadline());
+            var deadline = DateTimeOffset.UtcNow.AddSeconds(-1);
+            queueState.SaveOperation("direct-mutation", PlayModeRoot(requestId, digest, "editor.play", false, deadline));
+            Assert.That(queueState.TryAcquireLease(requestId, digest, out var acquired), Is.True);
+            Assert.That(acquired, Is.True);
+
+            var finalized = UnityCliBridge.TryFinalizeRecoveredPlayModeRootForTests(
+                queueState, requestId, digest, false, false, false, deadline.AddSeconds(1));
+
+            Assert.That(finalized, Is.True);
+            Assert.That(queueState.TryGetTerminal("direct-mutation", requestId, digest, out var terminal), Is.True);
+            var serialized = UnityCliSerializer.Serialize(terminal);
+            Assert.That(serialized, Does.Contain("E_PLAY_MODE_TERMINAL_NOT_OBSERVED"));
+            Assert.That(serialized, Does.Not.Contain("outcome is unknown"));
+            Assert.That(queueState.OperationExists("direct-mutation"), Is.False);
+            Assert.That(pool.Capture().Active, Is.EqualTo(0));
+        }
+
+        [Test]
+        public void ReloadedGenericDirectMutationIsNotFinalizedFromPlayModeState()
+        {
+            var requestId = Unique("generic-effect");
+            var digest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(requestId), InstanceId);
+            var pool = CreatePool("generic-effect-session");
+            Consume(pool, requestId, digest, TestDeadline());
+            queueState.SaveOperation("direct-mutation", PlayModeRoot(requestId, digest, "asset.delete", false, DateTimeOffset.UtcNow.AddMinutes(1)));
+            Assert.That(queueState.TryAcquireLease(requestId, digest, out var acquired), Is.True);
+            Assert.That(acquired, Is.True);
+
+            var finalized = UnityCliBridge.TryFinalizeRecoveredPlayModeRootForTests(
+                queueState, requestId, digest, true, false, false, DateTimeOffset.UtcNow);
+
+            Assert.That(finalized, Is.False);
+            Assert.That(queueState.OperationExists("direct-mutation"), Is.True);
+            Assert.That(queueState.TryGetTerminal("direct-mutation", requestId, digest, out var terminal), Is.False);
+            queueState.ClearOperation("direct-mutation");
+            queueState.ReleaseLease(requestId, digest);
+            pool.Reset();
+        }
+
+        [Test]
+        public void ReloadTickScheduleUsesMonotonicTimeAcrossUtcRollback()
+        {
+            var monotonic = 5000L;
+            var utcNow = DateTimeOffset.UtcNow;
+            var schedule = new UnityCliReloadTickSchedule(() => monotonic, () => utcNow);
+
+            Assert.That(schedule.TryEnter(), Is.True);
+            utcNow = utcNow.AddHours(-8);
+            monotonic += 99L;
+            Assert.That(schedule.TryEnter(), Is.False);
+            monotonic += 1L;
+            Assert.That(schedule.TryEnter(), Is.True);
+            Assert.That(schedule.UtcNow, Is.EqualTo(utcNow));
+        }
+
+        [Test]
+        public void FirstCancelTransferPublishesCompleteDispatchedMarkerAndRetryAllowsContinuationProgress()
+        {
+            var parentRequestId = Unique("first-transfer-parent");
+            var parentDigest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(parentRequestId), InstanceId);
+            var cancelRequestId = Unique("first-transfer-cancel");
+            var cancelRequest = Request(cancelRequestId, "internal.test.run.cancel", new Dictionary<string, object>
+            {
+                { "expectedEditorSessionId", UnityCliBridge.EditorSessionId() }
+            });
+            var cancelRaw = RequestBytes(cancelRequest);
+            var cancelDigest = UnityCliRequestDigest.Compute(cancelRaw, InstanceId);
+            var runId = Guid.NewGuid().ToString();
+            var deadline = Deadline(cancelRequest);
+            var pool = CreatePool("first-cancel-transfer-session");
+            var grant = pool.Acquire(cancelRequestId, Fingerprint, queueState.ListenerId, queueState.ListenerGeneration);
+            Assert.That(grant.Outcome, Is.EqualTo(UnityCliAdmissionPool.AcquireOutcome.Granted));
+            queueState.SaveOperation("test-run", new Dictionary<string, object>
+            {
+                { "requestId", parentRequestId }, { "requestDigest", parentDigest },
+                { "editorSessionId", UnityCliBridge.EditorSessionId() },
+                { "absoluteDeadlineUtc", DateTimeOffset.FromUnixTimeMilliseconds(deadline).ToString("O") },
+                { "testOperation", new Dictionary<string, object>
+                    {
+                        { "phase", "running" }, { "runId", runId }, { "cancelRunId", runId },
+                        { "cancelRequestId", cancelRequestId }, { "cancelRequestDigest", cancelDigest },
+                        { "cancelRootRequestDigest", parentDigest }, { "cancelEffectState", "dispatched" },
+                        { "cancelRequested", true }, { "cancelNeedsContinuation", true }
+                    }
+                }
+            });
+            Assert.That(queueState.TryAcquireLease(parentRequestId, parentDigest, out var acquired), Is.True);
+            Assert.That(acquired, Is.True);
+            bool created;
+            var item = Enqueue(cancelRequest, cancelRaw, pool, out created);
+            Assert.That(created, Is.True);
+            var response = UnityCliSerializer.Serialize(ProtocolEnvelopeFactory.Success(cancelRequestId, new Dictionary<string, object>
+            {
+                { "terminal", false }, { "accepted", true }, { "rootRequestId", parentRequestId },
+                { "rootRequestDigest", parentDigest }, { "runId", runId }
+            }));
+
+            Assert.That(UnityCliBridge.CompleteWorkItemForTests(item, response), Is.True);
+
+            var marker = queueState.LoadOperation("test-cancel-admission-owner");
+            Assert.That(marker["rootRequestId"], Is.EqualTo(parentRequestId));
+            Assert.That(marker["rootRequestDigest"], Is.EqualTo(parentDigest));
+            Assert.That(marker["runId"], Is.EqualTo(runId));
+            Assert.That(marker["cancelRequestId"], Is.EqualTo(cancelRequestId));
+            Assert.That(marker["cancelRequestDigest"], Is.EqualTo(cancelDigest));
+            Assert.That(marker["cancelContinuationState"], Is.EqualTo("dispatched"));
+            Assert.That(marker["parentRepairEffectState"], Is.EqualTo("dispatched"));
+            Assert.That(marker["parentRepairPending"], Is.EqualTo(false));
+            Assert.That(marker.ContainsKey("cancelTerminalEnvelope"), Is.False);
+            Assert.That(pool.Capture().Records.Single().OwnerState, Is.EqualTo(UnityCliAdmissionPool.AdmissionOwnerState.Continuation));
+            var admissionSessionId = pool.Capture().Records.Single().SessionId;
+            pool.Reset();
+            pool = new UnityCliAdmissionPool(InstanceId, admissionSessionId, 4, 1);
+            queueState.AdmissionPool = pool;
+            Assert.That(UnityCliBridge.UnityCliTestRunCoordinator.RetryCancelAdmissionOwnerMarkerForTests(queueState), Is.False);
+            Assert.That(pool.Capture().Records.Single().OwnerState, Is.EqualTo(UnityCliAdmissionPool.AdmissionOwnerState.Continuation));
+            Assert.That(pool.Capture().RecoveryBlocked, Is.False);
+            Assert.That(queueState.TryGetTerminal("test-cancel", cancelRequestId, cancelDigest, out var missingTerminal), Is.False);
+
+            Assert.That(UnityCliBridge.UnityCliTestRunCoordinator.FinalizeCancelTerminalForTests(queueState,
+                parentRequestId, parentDigest, runId, cancelRequestId, cancelDigest,
+                ProtocolEnvelopeFactory.Success(cancelRequestId, new Dictionary<string, object> { { "cancelled", true } }), "cancelled"), Is.True);
+            Assert.That(pool.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.OperationExists("test-cancel-admission-owner"), Is.False);
+            queueState.ClearOperation("test-run");
+            queueState.ReleaseLease(parentRequestId, parentDigest);
+        }
+
+        [Test]
+        public void CancelContinuationCompletesExactCancelOwnerWithoutIllegalTerminalTransfer()
+        {
+            var parentRequestId = Unique("test-parent");
+            var parentDigest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(parentRequestId), InstanceId);
+            var cancelRequestId = Unique("test-cancel");
+            var cancelDigest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(cancelRequestId), InstanceId);
+            var runId = Guid.NewGuid().ToString();
+            var deadline = TestDeadline();
+            var pool = CreatePool("cancel-continuation-session");
+            var cancelOwner = Consume(pool, cancelRequestId, cancelDigest, deadline);
+            queueState.SaveOperation("test-run", new Dictionary<string, object>
+            {
+                { "requestId", parentRequestId }, { "requestDigest", parentDigest },
+                { "editorSessionId", UnityCliBridge.EditorSessionId() },
+                { "absoluteDeadlineUtc", DateTimeOffset.FromUnixTimeMilliseconds(deadline).ToString("O") },
+                { "testOperation", new Dictionary<string, object>
+                    {
+                        { "phase", "running" }, { "runId", runId }, { "cancelRunId", runId },
+                        { "cancelRequestId", cancelRequestId }, { "cancelRequestDigest", cancelDigest },
+                        { "cancelRootRequestDigest", parentDigest }, { "cancelEffectState", "dispatched" },
+                        { "cancelRequested", true }, { "cancelNeedsContinuation", true }
+                    }
+                }
+            });
+            bool acquired;
+            Assert.That(queueState.TryAcquireLease(parentRequestId, parentDigest, out acquired), Is.True);
+            Assert.That(acquired, Is.True);
+            cancelOwner.TopRequestDigest = parentDigest;
+            UnityCliBridge.PersistAdmissionOwnerTransfer(queueState, "test-cancel-admission-owner", new Dictionary<string, object>
+            {
+                { "requestId", cancelRequestId }, { "requestDigest", parentDigest },
+                { "rootRequestId", parentRequestId }, { "rootRequestDigest", parentDigest },
+                { "runId", runId }, { "editorSessionId", UnityCliBridge.EditorSessionId() },
+                { "cancelRequestId", cancelRequestId }, { "cancelRequestDigest", cancelDigest },
+                { "cancelContinuationState", "dispatched" },
+                { "parentRepairEffectState", "dispatched" }, { "parentRepairPending", false }
+            }, cancelOwner, UnityCliAdmissionPool.AdmissionOwnerState.Continuation);
+
+            queueState.TestHooks.ExpectOnce("before-state-clear-markers", () =>
+            {
+                throw new IOException("injected cancel marker clear fault");
+            });
+            var result = UnityCliBridge.UnityCliTestRunCoordinator.FinalizeCancelTerminalForTests(queueState,
+                parentRequestId, parentDigest, runId, cancelRequestId, cancelDigest,
+                ProtocolEnvelopeFactory.Success(cancelRequestId, new Dictionary<string, object> { { "cancelled", true } }), "cancelled");
+
+            Assert.That(result, Is.False);
+            Assert.That(pool.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.OperationExists("test-cancel-admission-owner"), Is.True);
+            var cancelMarker = queueState.LoadOperation("test-cancel-admission-owner");
+            Assert.That(cancelMarker["requestId"], Is.EqualTo(cancelRequestId));
+            Assert.That(cancelMarker["requestDigest"], Is.EqualTo(parentDigest));
+            Assert.That(cancelMarker["admissionRequestDigest"], Is.EqualTo(cancelDigest));
+            Assert.That(cancelMarker["rootRequestDigest"], Is.EqualTo(parentDigest));
+            Assert.That(cancelMarker["admissionOwnerState"], Is.EqualTo((long)UnityCliAdmissionPool.AdmissionOwnerState.WorkItem));
+            Assert.That(cancelMarker["admissionIntendedOwnerState"], Is.EqualTo((long)UnityCliAdmissionPool.AdmissionOwnerState.Continuation));
+            var completionOwner = UnityCliBridge.ReadAdmissionOwnerFields(cancelMarker, cancelRequestId);
+            completionOwner.TopRequestDigest = parentDigest;
+            Assert.That(stateHasCompletionIntent(completionOwner), Is.True);
+            Assert.That(UnityCliBridge.UnityCliTestRunCoordinator.RetryCancelAdmissionOwnerMarkerForTests(queueState), Is.False);
+            Assert.That(queueState.OperationExists("test-cancel-admission-owner"), Is.False);
+            Assert.That(queueState.OperationExists("test-run"), Is.True);
+            Assert.That(queueState.TryIsLeaseOwned(parentRequestId, parentDigest, out var parentOwned), Is.True);
+            Assert.That(parentOwned, Is.True);
+            Assert.That(queueState.TryGetTerminal("test-cancel", cancelRequestId, cancelDigest, out var exactTerminal), Is.True);
+            Assert.That(queueState.TryGetTerminalBySelector("test-cancel", cancelRequestId, parentDigest, out var selectedTerminal), Is.True);
+            Assert.That(UnityCliSerializer.Serialize(exactTerminal), Is.EqualTo(UnityCliSerializer.Serialize(selectedTerminal)));
+            Assert.That(pool.Capture().RecoveryBlocked, Is.False);
+            queueState.ClearOperation("test-run");
+            queueState.ReleaseLease(parentRequestId, parentDigest);
+        }
+
+        [Test]
+        public void CancelParentSaveFaultRetainsOwnerUntilRetryRepairsExactRoot()
+        {
+            var parentRequestId = Unique("save-fault-parent");
+            var parentDigest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(parentRequestId), InstanceId);
+            var cancelRequestId = Unique("save-fault-cancel");
+            var cancelDigest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(cancelRequestId), InstanceId);
+            var runId = Guid.NewGuid().ToString();
+            var deadline = TestDeadline();
+            var pool = CreatePool("cancel-save-fault-session");
+            var parentOwner = Consume(pool, parentRequestId, parentDigest, deadline);
+            UnityCliBridge.PersistAdmissionOwnerTransfer(queueState, "test-run-admission-owner", new Dictionary<string, object>
+            {
+                { "requestId", parentRequestId }, { "requestDigest", parentDigest },
+                { "editorSessionId", UnityCliBridge.EditorSessionId() }
+            }, parentOwner, UnityCliAdmissionPool.AdmissionOwnerState.Coordinator);
+            Consume(pool, cancelRequestId, cancelDigest, deadline);
+            queueState.SaveOperation("test-run", new Dictionary<string, object>
+            {
+                { "requestId", parentRequestId }, { "requestDigest", parentDigest },
+                { "editorSessionId", UnityCliBridge.EditorSessionId() },
+                { "absoluteDeadlineUtc", DateTimeOffset.FromUnixTimeMilliseconds(deadline).ToString("O") },
+                { "testOperation", new Dictionary<string, object>
+                    {
+                        { "phase", "running" }, { "runId", runId }, { "cancelRunId", runId },
+                        { "cancelRequestId", cancelRequestId }, { "cancelRequestDigest", cancelDigest },
+                        { "cancelRootRequestDigest", parentDigest }, { "cancelEffectState", "dispatching" },
+                        { "cancelRequested", true }
+                    }
+                }
+            });
+            Assert.That(queueState.TryAcquireLease(parentRequestId, parentDigest, out var acquired), Is.True);
+            Assert.That(acquired, Is.True);
+            queueState.TestHooks.ExpectOnce("before-operation-save:test-run", () => { throw new IOException("injected parent save fault"); });
+
+            var result = UnityCliBridge.UnityCliTestRunCoordinator.FinalizeCancelTerminalForTests(queueState,
+                parentRequestId, parentDigest, runId, cancelRequestId, cancelDigest,
+                ProtocolEnvelopeFactory.Success(cancelRequestId, new Dictionary<string, object> { { "cancelled", true } }), "cancelled");
+
+            Assert.That(result, Is.False);
+            Assert.That(pool.Capture().Active, Is.EqualTo(2));
+            var retained = queueState.LoadOperation("test-cancel-admission-owner");
+            Assert.That(retained["parentRepairEffectState"], Is.EqualTo("cancelled"));
+            Assert.That(retained["parentRepairPending"], Is.EqualTo(true));
+            var staleRoot = queueState.LoadOperation("test-run");
+            var staleOperation = (Dictionary<string, object>)staleRoot["testOperation"];
+            Assert.That(staleOperation["cancelEffectState"], Is.EqualTo("dispatching"));
+
+            Assert.That(UnityCliBridge.UnityCliTestRunCoordinator.RetryCancelAdmissionOwnerMarkerForTests(queueState), Is.False);
+            Assert.That(UnityCliBridge.UnityCliTestRunCoordinator.RetryCancelAdmissionOwnerMarkerForTests(queueState), Is.False);
+
+            Assert.That(pool.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.OperationExists("test-cancel-admission-owner"), Is.False);
+            Assert.That(queueState.OperationExists("test-run-admission-owner"), Is.False);
+            Assert.That(queueState.OperationExists("test-run"), Is.False);
+            Assert.That(queueState.OperationExists("test-run-terminal-cleanup"), Is.False);
+            Assert.That(queueState.TryGetTerminal("test-run", parentRequestId, parentDigest, out var parentTerminal), Is.True);
+            Assert.That(UnityCliSerializer.Serialize(parentTerminal), Does.Contain("E_TEST_RUN_CANCELLED"));
+            Assert.That(queueState.TryIsLeaseOwned(parentRequestId, parentDigest, out var parentOwned), Is.True);
+            Assert.That(parentOwned, Is.False);
+        }
+
+        [Test]
+        public void ParentTerminalFirstWriteFailureRetriesFinishBeforeChildOwnerCleanup()
+        {
+            var parentRequestId = Unique("parent-terminal-fault");
+            var parentDigest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(parentRequestId), InstanceId);
+            var cancelRequestId = Unique("parent-terminal-cancel");
+            var cancelDigest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(cancelRequestId), InstanceId);
+            var runId = Guid.NewGuid().ToString();
+            var deadline = TestDeadline();
+            var pool = CreatePool("parent-terminal-fault-session");
+            var parentOwner = Consume(pool, parentRequestId, parentDigest, deadline);
+            UnityCliBridge.PersistAdmissionOwnerTransfer(queueState, "test-run-admission-owner", new Dictionary<string, object>
+            {
+                { "requestId", parentRequestId }, { "requestDigest", parentDigest },
+                { "editorSessionId", UnityCliBridge.EditorSessionId() }
+            }, parentOwner, UnityCliAdmissionPool.AdmissionOwnerState.Coordinator);
+            Consume(pool, cancelRequestId, cancelDigest, deadline);
+            queueState.SaveOperation("test-run", new Dictionary<string, object>
+            {
+                { "requestId", parentRequestId }, { "requestDigest", parentDigest },
+                { "editorSessionId", UnityCliBridge.EditorSessionId() },
+                { "absoluteDeadlineUtc", DateTimeOffset.FromUnixTimeMilliseconds(deadline).ToString("O") },
+                { "testOperation", new Dictionary<string, object>
+                    {
+                        { "phase", "running" }, { "runId", runId }, { "cancelRunId", runId },
+                        { "cancelRequestId", cancelRequestId }, { "cancelRequestDigest", cancelDigest },
+                        { "cancelRootRequestDigest", parentDigest }, { "cancelEffectState", "dispatching" },
+                        { "cancelRequested", true }
+                    }
+                }
+            });
+            Assert.That(queueState.TryAcquireLease(parentRequestId, parentDigest, out var acquired), Is.True);
+            Assert.That(acquired, Is.True);
+            queueState.TestHooks.ExpectOnce("before-operation-save:test-cancel-admission-owner", () =>
+            {
+                Assert.That(queueState.OperationExists("test-run"), Is.True);
+                Assert.That(queueState.TryGetTerminal("test-run", parentRequestId, parentDigest, out var parentBeforeMarker), Is.False);
+            });
+            queueState.TestHooks.ExpectOnce("before-terminal-store:test-run", () => { throw new IOException("injected parent terminal fault"); });
+
+            var finalized = UnityCliBridge.UnityCliTestRunCoordinator.FinalizeCancelTerminalForTests(queueState,
+                parentRequestId, parentDigest, runId, cancelRequestId, cancelDigest,
+                ProtocolEnvelopeFactory.Success(cancelRequestId, new Dictionary<string, object> { { "cancelled", true } }), "cancelled");
+
+            Assert.That(finalized, Is.False);
+            Assert.That(queueState.TryGetTerminal("test-cancel", cancelRequestId, cancelDigest, out var cancelTerminal), Is.True);
+            Assert.That(queueState.TryGetTerminal("test-run", parentRequestId, parentDigest, out var missingParentTerminal), Is.False);
+            var retainedRoot = queueState.LoadOperation("test-run");
+            var retainedOperation = (Dictionary<string, object>)retainedRoot["testOperation"];
+            Assert.That(retainedOperation["cancelEffectState"], Is.EqualTo("cancelled"));
+            Assert.That(retainedOperation.ContainsKey("cancelTerminalEnvelope"), Is.True);
+            Assert.That(queueState.OperationExists("test-cancel-admission-owner"), Is.True);
+            Assert.That(pool.Capture().Active, Is.EqualTo(2));
+
+            Assert.That(UnityCliBridge.UnityCliTestRunCoordinator.RetryCancelAdmissionOwnerMarkerForTests(queueState), Is.False);
+
+            Assert.That(queueState.TryGetTerminal("test-run", parentRequestId, parentDigest, out var parentTerminal), Is.True);
+            Assert.That(UnityCliSerializer.Serialize(parentTerminal), Does.Contain("E_TEST_RUN_CANCELLED"));
+            Assert.That(pool.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.OperationExists("test-cancel-admission-owner"), Is.False);
+            Assert.That(queueState.OperationExists("test-run-admission-owner"), Is.False);
+            Assert.That(queueState.OperationExists("test-run"), Is.False);
+            Assert.That(queueState.TryIsLeaseOwned(parentRequestId, parentDigest, out var owned), Is.True);
+            Assert.That(owned, Is.False);
+        }
+
+        [Test]
+        public void CancelOutcomeUnknownDualPersistenceFaultFreezesWorkItemUntilParentFirstRepair()
+        {
+            var parentRequestId = Unique("dual-fault-parent");
+            var parentDigest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(parentRequestId), InstanceId);
+            var cancelRequestId = Unique("dual-fault-cancel");
+            var cancelRequest = Request(cancelRequestId, "internal.test.run.cancel", new Dictionary<string, object>
+            {
+                { "expectedEditorSessionId", UnityCliBridge.EditorSessionId() }
+            });
+            var cancelRaw = RequestBytes(cancelRequest);
+            var cancelDigest = UnityCliRequestDigest.Compute(cancelRaw, InstanceId);
+            var runId = Guid.NewGuid().ToString();
+            var deadline = Deadline(cancelRequest);
+            var pool = CreatePool("cancel-dual-fault-session");
+            var parentOwner = Consume(pool, parentRequestId, parentDigest, deadline);
+            UnityCliBridge.PersistAdmissionOwnerTransfer(queueState, "test-run-admission-owner", new Dictionary<string, object>
+            {
+                { "requestId", parentRequestId }, { "requestDigest", parentDigest },
+                { "editorSessionId", UnityCliBridge.EditorSessionId() }
+            }, parentOwner, UnityCliAdmissionPool.AdmissionOwnerState.Coordinator);
+            Consume(pool, cancelRequestId, cancelDigest, deadline);
+            queueState.SaveOperation("test-run", new Dictionary<string, object>
+            {
+                { "requestId", parentRequestId }, { "requestDigest", parentDigest },
+                { "editorSessionId", UnityCliBridge.EditorSessionId() },
+                { "absoluteDeadlineUtc", DateTimeOffset.FromUnixTimeMilliseconds(deadline).ToString("O") },
+                { "testOperation", new Dictionary<string, object>
+                    {
+                        { "phase", "running" }, { "runId", runId }, { "cancelRunId", runId },
+                        { "cancelRequestId", cancelRequestId }, { "cancelRequestDigest", cancelDigest },
+                        { "cancelRootRequestDigest", parentDigest }, { "cancelEffectState", "dispatching" },
+                        { "cancelRequested", true }
+                    }
+                }
+            });
+            Assert.That(queueState.TryAcquireLease(parentRequestId, parentDigest, out var acquired), Is.True);
+            Assert.That(acquired, Is.True);
+            bool created;
+            var item = Enqueue(cancelRequest, cancelRaw, pool, out created);
+            Assert.That(created, Is.True);
+            queueState.TestHooks.ExpectOnce("before-terminal-store:test-cancel", () => { throw new IOException("injected cancel terminal fault"); });
+            queueState.TestHooks.ExpectOnce("before-operation-save:test-cancel-admission-owner", () => { throw new IOException("injected cancel recovery marker fault"); });
+
+            var finalized = UnityCliBridge.UnityCliTestRunCoordinator.FinalizeCancelTerminalForTests(queueState,
+                parentRequestId, parentDigest, runId, cancelRequestId, cancelDigest,
+                ProtocolEnvelopeFactory.Error(cancelRequestId, "E_EXECUTION_TIMEOUT", "Cancellation outcome is unknown."), "outcome_unknown");
+
+            Assert.That(finalized, Is.False);
+            Assert.That(queueState.OperationExists("test-cancel-admission-owner"), Is.False);
+            Assert.That(pool.Capture().Records.Single(record => record.RequestId == cancelRequestId).OwnerState,
+                Is.EqualTo(UnityCliAdmissionPool.AdmissionOwnerState.WorkItem));
+            var remainingMarkerFaults = 2;
+            Action markerFault = null;
+            markerFault = () =>
+            {
+                remainingMarkerFaults--;
+                if (remainingMarkerFaults > 0)
+                    queueState.TestHooks.ExpectOnce("before-operation-save:test-cancel-admission-owner", markerFault);
+                throw new IOException("injected outer settlement marker fault");
+            };
+            queueState.TestHooks.ExpectOnce("before-operation-save:test-cancel-admission-owner", markerFault);
+            Assert.That(UnityCliBridge.CompleteWorkItemForTests(item,
+                UnityCliSerializer.Serialize(ProtocolEnvelopeFactory.Error(cancelRequestId, "E_EXECUTION_TIMEOUT", "Cancellation outcome is unknown."))), Is.False);
+            Assert.That(item.Completed.IsSet, Is.False);
+            Assert.That(queueState.PendingSettlementWork, Does.Contain(item));
+            Assert.That(pool.Capture().Records.Single(record => record.RequestId == cancelRequestId).OwnerState,
+                Is.EqualTo(UnityCliAdmissionPool.AdmissionOwnerState.WorkItem));
+
+            monotonicNowMs += 100L;
+            UnityCliBridge.RetryPendingWorkItemSettlementsForTests(queueState);
+            Assert.That(item.Completed.IsSet, Is.True);
+            Assert.That(pool.Capture().Records.Single(record => record.RequestId == cancelRequestId).OwnerState,
+                Is.EqualTo(UnityCliAdmissionPool.AdmissionOwnerState.Recovery));
+            var rebuilt = queueState.LoadOperation("test-cancel-admission-owner");
+            Assert.That(rebuilt["cancelContinuationState"], Is.EqualTo("continuation_pending"));
+            Assert.That(rebuilt["parentRepairEffectState"], Is.EqualTo("outcome_unknown"));
+            Assert.That(rebuilt["parentRepairPending"], Is.EqualTo(true));
+            Assert.That(rebuilt.ContainsKey("cancelTerminalEnvelope"), Is.True);
+            Assert.That(UnityCliBridge.UnityCliTestRunCoordinator.RetryCancelAdmissionOwnerMarkerForTests(queueState), Is.False);
+            Assert.That(queueState.TryGetTerminal("test-cancel", cancelRequestId, cancelDigest, out var rebuiltCancelTerminal), Is.True);
+            Assert.That(UnityCliSerializer.Serialize(rebuiltCancelTerminal), Does.Contain("Cancellation outcome is unknown"));
+            Assert.That(queueState.TryGetTerminal("test-run", parentRequestId, parentDigest, out var parentTerminal), Is.True);
+            Assert.That(UnityCliSerializer.Serialize(parentTerminal), Does.Contain("E_EXECUTION_TIMEOUT"));
+            Assert.That(pool.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.OperationExists("test-cancel-admission-owner"), Is.False);
+            Assert.That(queueState.OperationExists("test-run-admission-owner"), Is.False);
+            Assert.That(queueState.TryIsLeaseOwned(parentRequestId, parentDigest, out var parentOwned), Is.True);
+            Assert.That(parentOwned, Is.False);
+        }
+
+        [Test]
+        public void DeletedParentRootFallbackUsesFrozenCandidateAndExactTerminalsAfterFirstMarkerFault()
+        {
+            var parentRequestId = Unique("deleted-parent");
+            var parentDigest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(parentRequestId), InstanceId);
+            var cancelRequestId = Unique("deleted-parent-cancel");
+            var cancelRequest = Request(cancelRequestId, "internal.test.run.cancel", new Dictionary<string, object>
+            {
+                { "expectedEditorSessionId", UnityCliBridge.EditorSessionId() }
+            });
+            var cancelRaw = RequestBytes(cancelRequest);
+            var cancelDigest = UnityCliRequestDigest.Compute(cancelRaw, InstanceId);
+            var runId = Guid.NewGuid().ToString();
+            var pool = CreatePool("deleted-parent-fallback-session");
+            Consume(pool, cancelRequestId, cancelDigest, Deadline(cancelRequest));
+            bool created;
+            var item = Enqueue(cancelRequest, cancelRaw, pool, out created);
+            Assert.That(created, Is.True);
+            var childTerminal = ProtocolEnvelopeFactory.Success(cancelRequestId,
+                new Dictionary<string, object> { { "cancelled", true } });
+            var parentTerminal = ProtocolEnvelopeFactory.Error(parentRequestId, "E_TEST_RUN_CANCELLED",
+                "The exact tracked Unity test run was cancelled.");
+            item.FreezeCancelRecoveryCandidate(parentRequestId, parentDigest, runId, "cancelled", childTerminal);
+            queueState.StoreTerminalFirst("test-cancel", cancelRequestId, cancelDigest, parentDigest, childTerminal);
+            queueState.StoreTerminalFirst("test-run", parentRequestId, parentDigest, parentTerminal);
+            Assert.That(queueState.OperationExists("test-run"), Is.False);
+            Assert.That(queueState.TryIsLeaseOwned(parentRequestId, parentDigest, out var parentOwned), Is.True);
+            Assert.That(parentOwned, Is.False);
+            queueState.TestHooks.ExpectOnce("before-operation-save:test-cancel-admission-owner", () =>
+            {
+                throw new IOException("injected first child marker save fault after parent cleanup");
+            });
+
+            Assert.That(UnityCliBridge.CompleteWorkItemForTests(item,
+                UnityCliSerializer.Serialize(ProtocolEnvelopeFactory.Error(cancelRequestId, "E_EXECUTION_TIMEOUT",
+                    "Cancellation completed but queue settlement is pending."))), Is.False);
+            Assert.That(item.Completed.IsSet, Is.False);
+            Assert.That(queueState.OperationExists("test-cancel-admission-owner"), Is.False);
+            Assert.That(pool.Capture().Records.Single().OwnerState,
+                Is.EqualTo(UnityCliAdmissionPool.AdmissionOwnerState.WorkItem));
+
+            monotonicNowMs += 100L;
+            UnityCliBridge.RetryPendingWorkItemSettlementsForTests(queueState);
+
+            Assert.That(item.Completed.IsSet, Is.True);
+            var rebuilt = queueState.LoadOperation("test-cancel-admission-owner");
+            Assert.That(rebuilt["rootRequestId"], Is.EqualTo(parentRequestId));
+            Assert.That(rebuilt["rootRequestDigest"], Is.EqualTo(parentDigest));
+            Assert.That(rebuilt["runId"], Is.EqualTo(runId));
+            Assert.That(rebuilt["cancelContinuationState"], Is.EqualTo("continuation_pending"));
+            Assert.That(rebuilt["parentRepairEffectState"], Is.EqualTo("cancelled"));
+            Assert.That(pool.Capture().Records.Single().OwnerState,
+                Is.EqualTo(UnityCliAdmissionPool.AdmissionOwnerState.Recovery));
+            Assert.That(UnityCliBridge.UnityCliTestRunCoordinator.RetryCancelAdmissionOwnerMarkerForTests(queueState), Is.False);
+            Assert.That(pool.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.OperationExists("test-cancel-admission-owner"), Is.False);
+            Assert.That(queueState.OperationExists("test-run"), Is.False);
+        }
+
+        [Test]
+        public void CancelMarkerReloadRestoresExactPoolOwnerBeforeDedicatedCleanup()
+        {
+            var parentRequestId = Unique("reload-parent");
+            var parentDigest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(parentRequestId), InstanceId);
+            var cancelRequestId = Unique("reload-cancel");
+            var cancelDigest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(cancelRequestId), InstanceId);
+            var runId = Guid.NewGuid().ToString();
+            var deadline = TestDeadline();
+            var original = CreatePool("cancel-reload-session");
+            var owner = Consume(original, cancelRequestId, cancelDigest, deadline);
+            queueState.SaveOperation("test-run", new Dictionary<string, object>
+            {
+                { "requestId", parentRequestId }, { "requestDigest", parentDigest },
+                { "editorSessionId", UnityCliBridge.EditorSessionId() },
+                { "absoluteDeadlineUtc", DateTimeOffset.FromUnixTimeMilliseconds(deadline).ToString("O") },
+                { "testOperation", new Dictionary<string, object>
+                    {
+                        { "phase", "running" }, { "runId", runId }, { "cancelRunId", runId },
+                        { "cancelRequestId", cancelRequestId }, { "cancelRequestDigest", cancelDigest },
+                        { "cancelRootRequestDigest", parentDigest }, { "cancelEffectState", "dispatched" },
+                        { "cancelRequested", true }, { "cancelNeedsContinuation", true }
+                    }
+                }
+            });
+            Assert.That(queueState.TryAcquireLease(parentRequestId, parentDigest, out var parentAcquired), Is.True);
+            Assert.That(parentAcquired, Is.True);
+            owner.TopRequestDigest = parentDigest;
+            UnityCliBridge.PersistAdmissionOwnerTransfer(queueState, "test-cancel-admission-owner", new Dictionary<string, object>
+            {
+                { "requestId", cancelRequestId }, { "requestDigest", parentDigest },
+                { "rootRequestId", parentRequestId }, { "rootRequestDigest", parentDigest },
+                { "runId", runId }, { "editorSessionId", UnityCliBridge.EditorSessionId() },
+                { "cancelRequestId", cancelRequestId }, { "cancelRequestDigest", cancelDigest },
+                { "cancelContinuationState", "continuation_pending" },
+                { "cancelTerminalEnvelope", ProtocolEnvelopeFactory.Success(cancelRequestId, new Dictionary<string, object> { { "cancelled", true } }) },
+                { "parentRepairEffectState", "cancelled" }, { "parentRepairPending", true }
+            }, owner, UnityCliAdmissionPool.AdmissionOwnerState.Continuation);
+            queueState.StoreTerminalFirst("test-cancel", cancelRequestId, cancelDigest, parentDigest,
+                ProtocolEnvelopeFactory.Success(cancelRequestId, new Dictionary<string, object> { { "cancelled", true } }));
+            var validCancelMarker = queueState.LoadOperation("test-cancel-admission-owner");
+            var mismatchedCancelMarker = new Dictionary<string, object>(validCancelMarker)
+            {
+                ["rootRequestDigest"] = new string('b', 64)
+            };
+            queueState.SaveOperation("test-cancel-admission-owner", mismatchedCancelMarker);
+            var restoredSessionId = original.Capture().Records.Single().SessionId;
+            original.Reset();
+            queueState.AdmissionPool = new UnityCliAdmissionPool(InstanceId, restoredSessionId, 4, 1);
+            Assert.That(UnityCliBridge.UnityCliTestRunCoordinator.RetryCancelAdmissionOwnerMarkerForTests(queueState), Is.True);
+            Assert.That(queueState.AdmissionPool.Capture().RecoveryBlocked, Is.False);
+            queueState.SaveOperation("test-cancel-admission-owner", validCancelMarker);
+
+            Assert.That(UnityCliBridge.UnityCliTestRunCoordinator.RetryCancelAdmissionOwnerMarkerForTests(queueState), Is.False);
+            Assert.That(queueState.AdmissionPool.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.AdmissionPool.Capture().RecoveryBlocked, Is.False);
+            Assert.That(queueState.OperationExists("test-cancel-admission-owner"), Is.False);
+            Assert.That(queueState.OperationExists("test-run"), Is.True);
+            Assert.That(queueState.TryIsLeaseOwned(parentRequestId, parentDigest, out var parentOwned), Is.True);
+            Assert.That(parentOwned, Is.True);
+            queueState.ClearOperation("test-run");
+            queueState.ReleaseLease(parentRequestId, parentDigest);
+        }
+
+        [Test]
+        public void DedicatedCancelMarkerRequiresCompleteCancelParentAndAdmissionIdentity()
+        {
+            var parentRequestId = Unique("identity-parent");
+            var parentDigest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(parentRequestId), InstanceId);
+            var cancelRequestId = Unique("identity-cancel");
+            var cancelDigest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(cancelRequestId), InstanceId);
+            var runId = Guid.NewGuid().ToString();
+            var deadline = TestDeadline();
+            var pool = CreatePool("cancel-identity-session");
+            var owner = Consume(pool, cancelRequestId, cancelDigest, deadline);
+            queueState.SaveOperation("test-run", new Dictionary<string, object>
+            {
+                { "requestId", parentRequestId }, { "requestDigest", parentDigest },
+                { "editorSessionId", UnityCliBridge.EditorSessionId() },
+                { "absoluteDeadlineUtc", DateTimeOffset.FromUnixTimeMilliseconds(deadline).ToString("O") },
+                { "testOperation", new Dictionary<string, object>
+                    {
+                        { "phase", "running" }, { "runId", runId }, { "cancelRunId", runId },
+                        { "cancelRequestId", cancelRequestId }, { "cancelRequestDigest", cancelDigest },
+                        { "cancelRootRequestDigest", parentDigest }, { "cancelEffectState", "dispatched" },
+                        { "cancelRequested", true }, { "cancelNeedsContinuation", true }
+                    }
+                }
+            });
+            Assert.That(queueState.TryAcquireLease(parentRequestId, parentDigest, out var acquired), Is.True);
+            Assert.That(acquired, Is.True);
+            owner.TopRequestDigest = parentDigest;
+            UnityCliBridge.PersistAdmissionOwnerTransfer(queueState, "test-cancel-admission-owner", new Dictionary<string, object>
+            {
+                { "requestId", cancelRequestId }, { "requestDigest", parentDigest },
+                { "rootRequestId", parentRequestId }, { "rootRequestDigest", parentDigest },
+                { "runId", runId }, { "editorSessionId", UnityCliBridge.EditorSessionId() },
+                { "cancelRequestId", cancelRequestId }, { "cancelRequestDigest", cancelDigest },
+                { "cancelContinuationState", "dispatched" },
+                { "parentRepairEffectState", "dispatched" }, { "parentRepairPending", false }
+            }, owner, UnityCliAdmissionPool.AdmissionOwnerState.Continuation);
+            var record = pool.Capture().Records.Single();
+            var valid = queueState.LoadOperation("test-cancel-admission-owner");
+            Assert.That(UnityCliBridge.DedicatedCancelMarkerOwnershipForTests(queueState, record), Is.EqualTo("ExactOwner"));
+
+            var wrongDigest = new Dictionary<string, object>(valid) { ["admissionRequestDigest"] = new string('b', 64) };
+            queueState.SaveOperation("test-cancel-admission-owner", wrongDigest);
+            Assert.That(UnityCliBridge.DedicatedCancelMarkerOwnershipForTests(queueState, record), Is.EqualTo("Blocked"));
+            var wrongToken = new Dictionary<string, object>(valid) { ["admissionToken"] = new string('c', 64) };
+            queueState.SaveOperation("test-cancel-admission-owner", wrongToken);
+            Assert.That(UnityCliBridge.DedicatedCancelMarkerOwnershipForTests(queueState, record), Is.EqualTo("Blocked"));
+            var wrongRoot = new Dictionary<string, object>(valid) { ["rootRequestDigest"] = new string('d', 64) };
+            queueState.SaveOperation("test-cancel-admission-owner", wrongRoot);
+            Assert.That(UnityCliBridge.DedicatedCancelMarkerOwnershipForTests(queueState, record), Is.EqualTo("Blocked"));
+            foreach (var mismatch in new[]
+            {
+                new KeyValuePair<string, object>("admissionSessionId", "other-session"),
+                new KeyValuePair<string, object>("admissionListenerId", "other-listener"),
+                new KeyValuePair<string, object>("admissionListenerGeneration", (long)99),
+                new KeyValuePair<string, object>("admissionExecutionDeadlineMs", deadline + 1L),
+                new KeyValuePair<string, object>("runId", Guid.NewGuid().ToString())
+            })
+            {
+                var changed = new Dictionary<string, object>(valid) { [mismatch.Key] = mismatch.Value };
+                queueState.SaveOperation("test-cancel-admission-owner", changed);
+                Assert.That(UnityCliBridge.DedicatedCancelMarkerOwnershipForTests(queueState, record), Is.EqualTo("Blocked"), mismatch.Key);
+                Assert.That(pool.Capture().Active, Is.EqualTo(1), mismatch.Key);
+            }
+
+            queueState.ClearOperation("test-cancel-admission-owner");
+            queueState.ClearOperation("test-run");
+            queueState.ReleaseLease(parentRequestId, parentDigest);
+            pool.Reset();
+        }
+
+        private bool stateHasCompletionIntent(UnityCliBridge.AdmissionOwnerIdentity owner)
+        {
+            return queueState != null && queueState.HasIntent(owner);
+        }
+
+        private void stateHookClearDirectRootOnce()
+        {
+            queueState.TestHooks.ExpectOnce("before-operation-clear:direct-mutation", () =>
+            {
+                throw new IOException("injected direct root clear fault");
+            });
+        }
+
+        [Test]
+        public void BuildArtifactFaultRunsRealExecuteAndExactQueueSettlement()
+        {
+            var request = BuildRequest(Unique("build-artifact-fault"));
+            var raw = RequestBytes(request);
+            var digest = UnityCliRequestDigest.Compute(raw, request.InstanceId);
+            var deadline = Deadline(request);
+            var pool = CreatePool("build-artifact-session");
+            Consume(pool, request.RequestId, digest, deadline);
+            bool created;
+            var item = Enqueue(request, raw, pool, out created);
+            Assert.That(created, Is.True);
+            var dependencies = BuildDependencies(prepared => new UnityCliBridge.UnityCliLiveBuildCoordinator.BuildEffectResult
+            {
+                Result = "Succeeded",
+                Artifact = new Dictionary<string, object>
+                {
+                    { "exists", false }, { "fileCount", (long)0 }, { "size", (long)0 },
+                    { "hash", null }, { "treeHash", null }
+                }
+            });
+
+            var response = UnityCliBridge.UnityCliLiveBuildCoordinator.Execute(queueState, request, raw, () => true, CancellationToken.None, dependencies).GetAwaiter().GetResult();
+
+            Assert.That(response, Does.Contain("E_BUILD_ARTIFACT_MISSING"));
+            Assert.That(response, Does.Contain("terminal"));
+            object terminal;
+            Assert.That(queueState.TryGetTerminal("build", request.RequestId, digest, out terminal), Is.True);
+            Assert.That(UnityCliSerializer.Serialize(terminal), Does.Contain("E_BUILD_ARTIFACT_MISSING"));
+            Assert.That(pool.Capture().Active, Is.EqualTo(1));
+            Assert.That(UnityCliBridge.CompleteWorkItemForTests(item, response), Is.True);
+            UnityCliBridge.UnityCliLiveBuildCoordinator.Tick(queueState);
+            AssertBuildSettled(pool, request.RequestId, digest);
+        }
+
+        [TestCase("root-read")]
+        [TestCase("terminal-store")]
+        public void BuildPostRootFaultKeepsFrozenRecoveryUntilTickConverges(string fault)
+        {
+            var request = BuildRequest(Unique("build-post-root-" + fault));
+            var raw = RequestBytes(request);
+            var digest = UnityCliRequestDigest.Compute(raw, request.InstanceId);
+            var pool = CreatePool("build-recovery-session");
+            Consume(pool, request.RequestId, digest, Deadline(request));
+            bool created;
+            var item = Enqueue(request, raw, pool, out created);
+            Assert.That(created, Is.True);
+            var dependencies = BuildDependencies(prepared => { throw new UnityCliBridge.BridgeCommandException("E_BUILD_EFFECT_TEST_FAULT", "Injected build effect fault."); });
+            dependencies.Boundary.ExpectOnce(fault == "root-read" ? "before-build-terminal-root-read" : "before-build-terminal-store",
+                () => { throw new IOException(fault == "root-read" ? "injected active root read fault" : "injected terminal store fault"); });
+
+            var response = UnityCliBridge.UnityCliLiveBuildCoordinator.Execute(queueState, request, raw, () => true, CancellationToken.None, dependencies).GetAwaiter().GetResult();
+
+            Assert.That(response, Does.Contain("E_EXECUTION_TIMEOUT"));
+            dependencies.Boundary.AssertDrained();
+            Assert.That(pool.Capture().Records.Any(record => record.RequestId == request.RequestId
+                && (record.OwnerState == UnityCliAdmissionPool.AdmissionOwnerState.Recovery
+                    || record.OwnerState == UnityCliAdmissionPool.AdmissionOwnerState.TerminalCleanup)), Is.True);
+            Assert.That(UnityCliBridge.CompleteWorkItemForTests(item, response), Is.True);
+            UnityCliBridge.UnityCliLiveBuildCoordinator.Tick(queueState);
+
+            object terminal;
+            Assert.That(queueState.TryGetTerminal("build", request.RequestId, digest, out terminal), Is.True);
+            Assert.That(UnityCliSerializer.Serialize(terminal), Does.Contain("E_EXECUTION_TIMEOUT"));
+            AssertBuildSettled(pool, request.RequestId, digest);
+        }
+
+        [Test]
+        public void MissingBuildRootTerminalFaultRetainsRecoveryOwnerUntilRetry()
+        {
+            var requestId = Unique("missing-build-root");
+            var digest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(requestId), InstanceId);
+            var pool = CreatePool("missing-build-root-session");
+            var owner = Consume(pool, requestId, digest, TestDeadline());
+            owner.TopRequestDigest = digest;
+            UnityCliBridge.PersistAdmissionOwnerTransfer(queueState, "build-admission-owner", new Dictionary<string, object>
+            {
+                { "requestId", requestId }, { "requestDigest", digest }, { "editorSessionId", UnityCliBridge.EditorSessionId() }
+            }, owner, UnityCliAdmissionPool.AdmissionOwnerState.Recovery);
+            queueState.TestHooks.ExpectOnce("before-terminal-store:build", () => { throw new IOException("injected build recovery terminal fault"); });
+
+            UnityCliBridge.UnityCliLiveBuildCoordinator.Tick(queueState);
+            Assert.That(queueState.TryGetTerminal("build", requestId, digest, out var missing), Is.False);
+            Assert.That(queueState.OperationExists("build-admission-owner"), Is.True);
+            Assert.That(pool.Capture().Active, Is.EqualTo(1));
+
+            UnityCliBridge.UnityCliLiveBuildCoordinator.Tick(queueState);
+            Assert.That(queueState.TryGetTerminal("build", requestId, digest, out var terminal), Is.True);
+            Assert.That(UnityCliSerializer.Serialize(terminal), Does.Contain("E_EXECUTION_TIMEOUT"));
+            Assert.That(pool.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.OperationExists("build-admission-owner"), Is.False);
+            Assert.That(queueState.OperationExists("build-terminal-cleanup"), Is.False);
+        }
+
+        [Test]
+        public void MissingReloadRootPublishesExactTimeoutBeforeOwnerCleanup()
+        {
+            var requestId = Unique("missing-reload-root");
+            var digest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(requestId), InstanceId);
+            var pool = CreatePool("missing-reload-root-session");
+            var owner = Consume(pool, requestId, digest, TestDeadline());
+            owner.TopRequestDigest = digest;
+            UnityCliBridge.PersistAdmissionOwnerTransfer(queueState, "refresh-admission-owner", new Dictionary<string, object>
+            {
+                { "requestId", requestId }, { "requestDigest", digest }, { "editorSessionId", UnityCliBridge.EditorSessionId() }
+            }, owner, UnityCliAdmissionPool.AdmissionOwnerState.Recovery);
+
+            Assert.That(UnityCliBridge.UnityCliReloadOperation.RetryAdmissionOwnerRecoveryMarkerForTests(queueState, "refresh", "Refresh"), Is.True);
+
+            Assert.That(queueState.TryGetTerminal("refresh", requestId, digest, out var terminal), Is.True);
+            Assert.That(UnityCliSerializer.Serialize(terminal), Does.Contain("E_EXECUTION_TIMEOUT"));
+            Assert.That(pool.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.OperationExists("refresh-admission-owner"), Is.False);
+            Assert.That(queueState.OperationExists("refresh-terminal-cleanup"), Is.False);
+        }
+
+        [Test]
+        public void MissingReloadRootTerminalFaultRetainsMarkerUntilExactRetry()
+        {
+            var requestId = Unique("missing-reload-terminal-fault");
+            var digest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(requestId), InstanceId);
+            var pool = CreatePool("missing-reload-terminal-fault-session");
+            var owner = Consume(pool, requestId, digest, TestDeadline());
+            owner.TopRequestDigest = digest;
+            UnityCliBridge.PersistAdmissionOwnerTransfer(queueState, "refresh-admission-owner", new Dictionary<string, object>
+            {
+                { "requestId", requestId }, { "requestDigest", digest }, { "editorSessionId", UnityCliBridge.EditorSessionId() }
+            }, owner, UnityCliAdmissionPool.AdmissionOwnerState.Recovery);
+            queueState.TestHooks.ExpectOnce("before-terminal-store:refresh", () => { throw new IOException("injected recovery terminal fault"); });
+
+            Assert.That(UnityCliBridge.UnityCliReloadOperation.RetryAdmissionOwnerRecoveryMarkerForTests(queueState, "refresh", "Refresh"), Is.True);
+            Assert.That(queueState.TryGetTerminal("refresh", requestId, digest, out var missing), Is.False);
+            Assert.That(queueState.OperationExists("refresh-admission-owner"), Is.True);
+            Assert.That(pool.Capture().Active, Is.EqualTo(1));
+
+            Assert.That(UnityCliBridge.UnityCliReloadOperation.RetryAdmissionOwnerRecoveryMarkerForTests(queueState, "refresh", "Refresh"), Is.True);
+            Assert.That(queueState.TryGetTerminal("refresh", requestId, digest, out var terminal), Is.True);
+            Assert.That(UnityCliSerializer.Serialize(terminal), Does.Contain("E_EXECUTION_TIMEOUT"));
+            Assert.That(pool.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.OperationExists("refresh-admission-owner"), Is.False);
+        }
+
+        [Test]
+        public void NewPoolAndNewStoreRestoreExactCommittedTransferFromMarker()
+        {
+            var requestId = Unique("new-pool-new-store");
+            var digest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(requestId), InstanceId);
+            var original = CreatePool("new-pool-new-store-session");
+            var owner = Consume(original, requestId, digest, TestDeadline());
+            UnityCliBridge.PersistAdmissionOwnerTransfer(queueState, "build-admission-owner", new Dictionary<string, object>
+            {
+                { "requestId", requestId }, { "requestDigest", digest }, { "editorSessionId", UnityCliBridge.EditorSessionId() }
+            }, owner, UnityCliAdmissionPool.AdmissionOwnerState.Recovery);
+            var marker = queueState.LoadOperation("build-admission-owner");
+            var sessionId = original.Capture().Records.Single().SessionId;
+            queueState.ClearOperation("build-admission-owner");
+            original.Reset();
+            var restored = new UnityCliAdmissionPool(InstanceId, sessionId, 4, 1);
+            queueState = UnityCliBridge.CreateQueueStateForTests(restored, () => monotonicNowMs);
+            queueState.SaveOperation("build-admission-owner", marker);
+            queueState.SaveOperation("build", Root(requestId, digest, "terminal_pending"));
+            Assert.That(queueState.TryAcquireLease(requestId, digest, out var acquired), Is.True);
+            Assert.That(acquired, Is.True);
+
+            var reconciled = UnityCliBridge.ReconcileAdmissionTransferForLiveMarker(queueState, "build-admission-owner", marker, requestId, digest);
+
+            Assert.That(reconciled.OwnerState, Is.EqualTo(UnityCliAdmissionPool.AdmissionOwnerState.Recovery));
+            Assert.That(restored.Capture().Active, Is.EqualTo(1));
+            queueState.StoreTerminalFirst("build", requestId, digest,
+                ProtocolEnvelopeFactory.Error(requestId, "E_EXECUTION_TIMEOUT", "New store recovery terminal."));
+            UnityCliActiveOperation.BeginExactTerminalCleanup("build", requestId, digest, queueState);
+            Assert.That(restored.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.OperationExists("build-admission-owner"), Is.False);
+            Assert.That(queueState.OperationExists("build"), Is.False);
+            Assert.That(queueState.TryIsLeaseOwned(requestId, digest, out var owned), Is.True);
+            Assert.That(owned, Is.False);
+        }
+
+        [TestCase(false, 0)]
+        [TestCase(false, 1)]
+        [TestCase(false, 2)]
+        [TestCase(true, 1)]
+        [TestCase(true, 2)]
+        public void TransferMarkerAndReloadedPoolWindowsConvergeExactly(bool markerCommitted, int poolWindow)
+        {
+            var requestId = Unique("transfer-reload-window");
+            var digest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(requestId), InstanceId);
+            var original = CreatePool("transfer-reload-window-session");
+            var owner = Consume(original, requestId, digest, TestDeadline());
+            UnityCliBridge.PersistAdmissionOwnerTransfer(queueState, "build-admission-owner", new Dictionary<string, object>
+            {
+                { "requestId", requestId }, { "requestDigest", digest }, { "editorSessionId", UnityCliBridge.EditorSessionId() }
+            }, owner, UnityCliAdmissionPool.AdmissionOwnerState.Recovery);
+            var marker = queueState.LoadOperation("build-admission-owner");
+            marker["admissionTransferCommitted"] = markerCommitted;
+            queueState.SaveOperation("build-admission-owner", marker);
+            var source = UnityCliAdmissionPool.CreateConsumedIdentity(
+                requestId,
+                marker["admissionRootFingerprint"] as string,
+                marker["admissionRequestDigest"] as string,
+                marker["admissionToken"] as string,
+                marker["admissionSessionId"] as string,
+                UnityCliAdmissionPool.AdmissionOwnerState.WorkItem,
+                marker["admissionListenerId"] as string,
+                (long)marker["admissionListenerGeneration"],
+                (long)marker["admissionExecutionDeadlineMs"]);
+            var restored = new UnityCliAdmissionPool(InstanceId, source.SessionId, 4, 1);
+            if (poolWindow == 0)
+                Assert.That(restored.RestoreConsumed(source, UnityCliAdmissionPool.AdmissionOwnerState.WorkItem, true), Is.True);
+            else if (poolWindow == 1)
+                Assert.That(restored.RestoreConsumed(source, UnityCliAdmissionPool.AdmissionOwnerState.Recovery, false), Is.True);
+            else
+            {
+                var intended = UnityCliAdmissionPool.CreateConsumedIdentity(
+                    source.RequestId, source.RootFingerprint, source.RequestDigest, source.Token, source.SessionId,
+                    UnityCliAdmissionPool.AdmissionOwnerState.Recovery, source.ListenerId, source.ListenerGeneration, source.ExecutionDeadlineMs);
+                Assert.That(restored.RestoreConsumed(intended, UnityCliAdmissionPool.AdmissionOwnerState.Recovery, true), Is.True);
+            }
+            original.Reset();
+            queueState.AdmissionPool = restored;
+
+            var reconciled = UnityCliBridge.ReconcileAdmissionTransferForLiveMarker(queueState, "build-admission-owner", marker, requestId, digest);
+
+            Assert.That(reconciled.OwnerState, Is.EqualTo(UnityCliAdmissionPool.AdmissionOwnerState.Recovery));
+            var record = restored.Capture().Records.Single();
+            Assert.That(record.OwnerState, Is.EqualTo(UnityCliAdmissionPool.AdmissionOwnerState.Recovery));
+            Assert.That(record.IntendedOwnerState, Is.EqualTo(UnityCliAdmissionPool.AdmissionOwnerState.Recovery));
+            Assert.That(record.TransferCommitted, Is.True);
+            Assert.That(queueState.LoadOperation("build-admission-owner")["admissionTransferCommitted"], Is.EqualTo(true));
+            queueState.StoreTerminalFirst("build", requestId, digest,
+                ProtocolEnvelopeFactory.Error(requestId, "E_EXECUTION_TIMEOUT", "Transfer reload test terminal."));
+            UnityCliActiveOperation.BeginExactTerminalCleanup("build", requestId, digest, queueState);
+            Assert.That(restored.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.OperationExists("build-admission-owner"), Is.False);
+        }
+
+        [TestCase(true, true)]
+        [TestCase(false, true)]
+        [TestCase(false, false)]
+        public void CleanupMarkerReconcilesRootLeaseWindowsWithoutGlobalState(bool rootExists, bool leaseOwned)
+        {
+            var requestId = Unique("marker-window");
+            var digest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(requestId), InstanceId);
+            var original = CreatePool("marker-window-session");
+            var owner = Consume(original, requestId, digest, TestDeadline());
+            if (leaseOwned)
+            {
+                bool acquired;
+                Assert.That(queueState.TryAcquireLease(requestId, digest, out acquired), Is.True);
+                Assert.That(acquired, Is.True);
+            }
+            if (rootExists) queueState.SaveOperation("build", Root(requestId, digest, "terminal_pending"));
+            var marker = new Dictionary<string, object>
+            {
+                { "requestId", requestId }, { "requestDigest", digest },
+                { "editorSessionId", UnityCliBridge.EditorSessionId() }, { "completeAdmission", true }
+            };
+            UnityCliBridge.PersistAdmissionOwnerTransfer(queueState, "build-terminal-cleanup", marker, owner, UnityCliAdmissionPool.AdmissionOwnerState.TerminalCleanup);
+            queueState.StoreTerminalFirst("build", requestId, digest,
+                ProtocolEnvelopeFactory.Error(requestId, "E_EXECUTION_TIMEOUT", "Cleanup window test terminal."));
+            var sessionId = original.Capture().Records.Single().SessionId;
+            original.Reset();
+            queueState.AdmissionPool = new UnityCliAdmissionPool(InstanceId, sessionId, 4, 1);
+
+            Assert.That(UnityCliActiveOperation.RetryExactTerminalCleanup("build", queueState), Is.False);
+            Assert.That(queueState.AdmissionPool.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.OperationExists("build-terminal-cleanup"), Is.False);
+            Assert.That(queueState.OperationExists("build"), Is.False);
+            Assert.That(queueState.TryIsLeaseOwned(requestId, digest, out var owned), Is.True);
+            Assert.That(owned, Is.False);
+        }
+
+        [Test]
+        public void ReconciledMarkerRefreshesRecoveredListenerBinding()
+        {
+            var requestId = Unique("marker-listener-rebind");
+            var digest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(requestId), InstanceId);
+            var deadline = TestDeadline();
+            var pool = CreatePool("marker-listener-session");
+            var owner = Consume(pool, requestId, digest, deadline);
+            var marker = new Dictionary<string, object>
+            {
+                { "requestId", requestId }, { "requestDigest", digest }, { "editorSessionId", UnityCliBridge.EditorSessionId() }
+            };
+            UnityCliBridge.PersistAdmissionOwnerTransfer(queueState, "build-admission-owner", marker, owner, UnityCliAdmissionPool.AdmissionOwnerState.Coordinator);
+            Assert.That(pool.RecoverConsumed(requestId, Fingerprint, digest, "listener-after-reload", 2, deadline), Is.True);
+            var loaded = queueState.LoadOperation("build-admission-owner");
+
+            var reconciled = UnityCliBridge.ReconcileAdmissionTransferForLiveMarker(queueState, "build-admission-owner", loaded, requestId, digest);
+
+            Assert.That(reconciled.ListenerId, Is.EqualTo("listener-after-reload"));
+            Assert.That(reconciled.ListenerGeneration, Is.EqualTo(2));
+            var refreshed = queueState.LoadOperation("build-admission-owner");
+            Assert.That(refreshed["admissionListenerId"], Is.EqualTo("listener-after-reload"));
+            Assert.That(refreshed["admissionListenerGeneration"], Is.EqualTo((long)2));
+            queueState.ClearOperation("build-admission-owner");
+            var cleanupOwner = UnityCliBridge.CaptureAdmissionOwner(queueState, requestId, digest);
+            cleanupOwner = UnityCliBridge.PersistAdmissionOwnerTransfer(queueState, "build-terminal-cleanup", new Dictionary<string, object>
+            {
+                { "requestId", requestId }, { "requestDigest", digest },
+                { "editorSessionId", UnityCliBridge.EditorSessionId() }, { "completeAdmission", true }
+            }, cleanupOwner, UnityCliAdmissionPool.AdmissionOwnerState.TerminalCleanup);
+            Assert.That(UnityCliBridge.CompleteAdmissionRoot(queueState, cleanupOwner), Is.True);
+            queueState.ClearOperation("build-terminal-cleanup");
+        }
+
+        [Test]
+        public void CleanupMarkerIdentityMismatchBlocksWithoutClearingMarker()
+        {
+            var requestId = Unique("marker-identity-mismatch");
+            var digest = UnityCliRequestDigest.Compute(Encoding.UTF8.GetBytes(requestId), InstanceId);
+            var deadline = TestDeadline();
+            var original = CreatePool("marker-mismatch-session");
+            var owner = Consume(original, requestId, digest, deadline);
+            var marker = new Dictionary<string, object>
+            {
+                { "requestId", requestId }, { "requestDigest", digest },
+                { "editorSessionId", UnityCliBridge.EditorSessionId() }, { "completeAdmission", true }
+            };
+            UnityCliBridge.PersistAdmissionOwnerTransfer(queueState, "build-terminal-cleanup", marker, owner, UnityCliAdmissionPool.AdmissionOwnerState.TerminalCleanup);
+            var restored = new UnityCliAdmissionPool(InstanceId, original.Capture().Records.Single().SessionId, 4, 1);
+            queueState.AdmissionPool = restored;
+            var otherFingerprint = new string('d', 64);
+            var grant = restored.Acquire(requestId, otherFingerprint, queueState.ListenerId, queueState.ListenerGeneration);
+            restored.AuthorizeAndCapture(requestId, otherFingerprint, digest, grant.Token, queueState.ListenerId, queueState.ListenerGeneration, deadline);
+            var loaded = queueState.LoadOperation("build-terminal-cleanup");
+
+            Assert.Throws<UnityCliBridge.BridgeCommandException>(() => UnityCliBridge.ReconcileAdmissionTransferForLiveMarker(queueState, "build-terminal-cleanup", loaded, requestId, digest));
+            Assert.That(restored.Capture().RecoveryBlocked, Is.True);
+            Assert.That(queueState.OperationExists("build-terminal-cleanup"), Is.True);
+            queueState.ClearOperation("build-terminal-cleanup");
+            restored.Reset();
+        }
+
+        private UnityCliAdmissionPool CreatePool(string suffix)
+        {
+            var pool = new UnityCliAdmissionPool(InstanceId, Unique(suffix), 4, 1);
+            queueState = UnityCliBridge.CreateQueueStateForTests(pool, () => monotonicNowMs);
+            return pool;
+        }
+
+        private UnityCliBridge.AdmissionOwnerIdentity Consume(UnityCliAdmissionPool pool, string requestId, string digest, long deadline)
+        {
+            var grant = pool.Acquire(requestId, Fingerprint, queueState.ListenerId, queueState.ListenerGeneration);
+            Assert.That(grant.Outcome, Is.EqualTo(UnityCliAdmissionPool.AcquireOutcome.Granted));
+            var result = pool.AuthorizeAndCapture(requestId, Fingerprint, digest, grant.Token, queueState.ListenerId, queueState.ListenerGeneration, deadline);
+            Assert.That(result.Outcome, Is.EqualTo(UnityCliAdmissionPool.AuthorizeOutcome.Authorized));
+            return UnityCliBridge.CaptureAdmissionOwner(queueState, requestId, digest);
+        }
+
+        private UnityCliBridge.BridgeWorkItem Enqueue(BridgeRequest request, byte[] raw, UnityCliAdmissionPool pool, out bool created)
+        {
+            var record = pool.Capture().Records.First(value => value.RequestId == request.RequestId);
+            var reservation = new UnityCliBridge.AdmissionQueueReservation
+            {
+                RequestId = request.RequestId,
+                RequestDigest = UnityCliRequestDigest.Compute(raw, request.InstanceId),
+                RootFingerprint = Fingerprint,
+                Token = record.Token,
+                ExecutionDeadlineMs = Deadline(request),
+                HasAdmissionHeaders = true,
+                IsBypass = false
+            };
+            int depth;
+            return UnityCliBridge.EnqueuePreparedForTests(request, raw, reservation, queueState, out created, out depth);
+        }
+
+        private BridgeRequest BuildRequest(string requestId)
+        {
+            return Request(requestId, "internal.build.run.start", new Dictionary<string, object>
+            {
+                { "expectedEditorSessionId", UnityCliBridge.EditorSessionId() },
+                { "targets", new List<object>
+                    {
+                        new Dictionary<string, object>
+                        {
+                            { "target", "StandaloneWindows64" }, { "outputPath", "Builds/test-player.exe" }
+                        }
+                    }
+                }
+            });
+        }
+
+        private static UnityCliBridge.UnityCliLiveBuildCoordinator.BuildExecutionDependencies BuildDependencies(Func<UnityCliBridge.UnityCliLiveBuildCoordinator.Prepared, UnityCliBridge.UnityCliLiveBuildCoordinator.BuildEffectResult> effect)
+        {
+            return new UnityCliBridge.UnityCliLiveBuildCoordinator.BuildExecutionDependencies(true)
+            {
+                PrepareTarget = (target, outputPath, options) => new UnityCliBridge.UnityCliLiveBuildCoordinator.Prepared
+                {
+                    Target = BuildTarget.StandaloneWindows64,
+                    TargetName = target,
+                    OutputPath = Application.dataPath,
+                    PublicOutputPath = outputPath,
+                    Scenes = new string[0],
+                    Options = BuildOptions.None
+                },
+                RunEffect = effect
+            };
+        }
+
+        private void AssertBuildSettled(UnityCliAdmissionPool pool, string requestId, string digest)
+        {
+            Assert.That(pool.Capture().Active, Is.EqualTo(0));
+            Assert.That(queueState.OperationExists("build"), Is.False);
+            Assert.That(queueState.OperationExists("build-terminal-cleanup"), Is.False);
+            Assert.That(queueState.OperationExists("build-admission-owner"), Is.False);
+            Assert.That(queueState.TryIsLeaseOwned(requestId, digest, out var owned), Is.True);
+            Assert.That(owned, Is.False);
+            Assert.That(UnityCliBridge.ActiveRequestWorkCountForTests(queueState), Is.EqualTo(0));
+        }
+
+        private static BridgeRequest Request(string requestId, string command, Dictionary<string, object> input)
+        {
+            return new BridgeRequest
+            {
+                ProtocolVersion = 2,
+                InstanceId = InstanceId,
+                Command = command,
+                RequestId = requestId,
+                Input = input,
+                Execution = new BridgeExecution
+                {
+                    AbsoluteDeadlineUtc = DateTimeOffset.UtcNow.AddMinutes(1).ToString("O"),
+                    CompletionContractVersion = 1,
+                    RequestDigestVersion = 1
+                }
+            };
+        }
+
+        private static byte[] RequestBytes(BridgeRequest request)
+        {
+            return Encoding.UTF8.GetBytes(UnityCliSerializer.Serialize(request));
+        }
+
+        private static long Deadline(BridgeRequest request)
+        {
+            return DateTimeOffset.Parse(request.Execution.AbsoluteDeadlineUtc).ToUnixTimeMilliseconds();
+        }
+
+        private static Dictionary<string, object> Root(string requestId, string digest, string phase)
+        {
+            return new Dictionary<string, object>
+            {
+                { "requestId", requestId }, { "requestDigest", digest }, { "toolName", "editor.play" },
+                { "editorSessionId", UnityCliBridge.EditorSessionId() }, { "phase", phase }
+            };
+        }
+
+        private static Dictionary<string, object> PlayModeRoot(
+            string requestId, string digest, string toolName, bool before, DateTimeOffset deadline)
+        {
+            return new Dictionary<string, object>
+            {
+                { "requestId", requestId }, { "requestDigest", digest }, { "toolName", toolName },
+                { "editorSessionId", UnityCliBridge.EditorSessionId() },
+                { "absoluteDeadlineUtc", deadline.ToString("O") }, { "playModeWasPlaying", before },
+                { "phase", "effect_started" }
+            };
+        }
+
+        private static long TestDeadline()
+        {
+            return DateTimeOffset.UtcNow.AddMinutes(1).ToUnixTimeMilliseconds();
+        }
+
+        private string Unique(string suffix)
+        {
+            return identityPrefix + suffix;
+        }
+    }
+}
+#endif