@alpsckr/unitycli 0.4.3 → 0.4.4

package/unitypkg/Editor/Infrastructure/UnityCliActiveOperation.cs

@@ -52,48 +52,68 @@ namespace UnityCli
             catch (DirectoryNotFoundException) { return false; }
         }
 
-        /// <summary>terminal已durable后先写exact cleanup marker，再清active root并重试释放lease。</summary>
-        internal static void BeginExactTerminalCleanup(string scope, string requestId, string requestDigest, bool completeAdmission = true)
+        /// <summary>terminal已durable后以三段式transfer取得TerminalCleanup owner，再清root与lease。</summary>
+        internal static void BeginExactTerminalCleanup(string scope, string requestId, string requestDigest, bool completeAdmission = true, Action<string> cleanupBoundary = null)
+        {
+            BeginExactTerminalCleanup(scope, requestId, requestDigest, null, completeAdmission, cleanupBoundary);
+        }
+
+        internal static void BeginExactTerminalCleanup(string scope, string requestId, string requestDigest, BridgeQueueState state, bool completeAdmission = true, Action<string> cleanupBoundary = null)
         {
             ValidateTerminalIdentity(scope, requestId, requestDigest);
             var cleanupScope = scope + "-terminal-cleanup";
-            var existing = Load(cleanupScope);
+            var existing = LoadForState(state, cleanupScope);
             if (existing != null && (!string.Equals(Text(existing, "requestId"), requestId, StringComparison.Ordinal)
                 || !string.Equals(Text(existing, "requestDigest"), requestDigest, StringComparison.Ordinal)))
             {
-                if (RetryExactTerminalCleanup(scope)) return;
+                if (RetryExactTerminalCleanup(scope, state, cleanupBoundary)) return;
                 existing = null;
             }
             if (existing == null)
             {
-                var marker = new Dictionary<string, object>
+                existing = new Dictionary<string, object>
                 {
                     { "requestId", requestId }, { "requestDigest", requestDigest },
                     { "editorSessionId", UnityCliBridge.EditorSessionId() }, { "completeAdmission", completeAdmission }
                 };
-                UnityCliBridge.AddAdmissionOwnerFields(marker, requestId, completeAdmission ? UnityCliAdmissionPool.AdmissionOwnerKind.Coordinator : UnityCliAdmissionPool.AdmissionOwnerKind.WorkItem);
-                Save(cleanupScope, marker);
+                if (completeAdmission)
+                {
+                    var owner = state == null ? UnityCliBridge.CaptureAdmissionOwner(requestId, requestDigest) : UnityCliBridge.CaptureAdmissionOwner(state, requestId, requestDigest);
+                    if (state == null) UnityCliBridge.PersistAdmissionOwnerTransfer(cleanupScope, existing, owner, UnityCliAdmissionPool.AdmissionOwnerState.TerminalCleanup);
+                    else UnityCliBridge.PersistAdmissionOwnerTransfer(state, cleanupScope, existing, owner, UnityCliAdmissionPool.AdmissionOwnerState.TerminalCleanup);
+                }
+                else SaveForState(state, cleanupScope, existing);
             }
             else if (completeAdmission)
             {
                 object current;
                 if (!existing.TryGetValue("completeAdmission", out current) || !(current is bool)) return;
-                if (!(bool)current)
+                var owner = state == null ? UnityCliBridge.CaptureAdmissionOwner(requestId, requestDigest) : UnityCliBridge.CaptureAdmissionOwner(state, requestId, requestDigest);
+                existing["completeAdmission"] = true;
+                if (owner.OwnerState != UnityCliAdmissionPool.AdmissionOwnerState.TerminalCleanup)
+                {
+                    if (state == null) UnityCliBridge.PersistAdmissionOwnerTransfer(cleanupScope, existing, owner, UnityCliAdmissionPool.AdmissionOwnerState.TerminalCleanup);
+                    else UnityCliBridge.PersistAdmissionOwnerTransfer(state, cleanupScope, existing, owner, UnityCliAdmissionPool.AdmissionOwnerState.TerminalCleanup);
+                }
+                else
                 {
-                    var owner = UnityCliBridge.ReadAdmissionOwnerFields(existing, requestId);
-                    UnityCliBridge.AddAdmissionOwnerFields(existing, owner, UnityCliAdmissionPool.AdmissionOwnerKind.Coordinator);
-                    existing["completeAdmission"] = true;
-                    Save(cleanupScope, existing);
+                    existing["admissionTransferCommitted"] = true;
+                    SaveForState(state, cleanupScope, existing);
                 }
             }
-            RetryExactTerminalCleanup(scope);
+            RetryExactTerminalCleanup(scope, state, cleanupBoundary);
         }
 
         /// <summary>只有确认exact owner已不存在才删除cleanup marker；读取不确定时保持原状。</summary>
-        internal static bool RetryExactTerminalCleanup(string scope)
+        internal static bool RetryExactTerminalCleanup(string scope, Action<string> cleanupBoundary = null)
+        {
+            return RetryExactTerminalCleanup(scope, null, cleanupBoundary);
+        }
+
+        internal static bool RetryExactTerminalCleanup(string scope, BridgeQueueState state, Action<string> cleanupBoundary = null)
         {
             var cleanupScope = scope + "-terminal-cleanup";
-            var marker = Load(cleanupScope);
+            var marker = LoadForState(state, cleanupScope);
             if (marker == null) return false;
             var requestId = Text(marker, "requestId");
             var requestDigest = Text(marker, "requestDigest");
@@ -101,37 +121,79 @@ namespace UnityCli
             object completeAdmissionValue;
             if (!marker.TryGetValue("completeAdmission", out completeAdmissionValue) || !(completeAdmissionValue is bool)) return true;
             var completeAdmission = (bool)completeAdmissionValue;
-            var admissionOwner = UnityCliBridge.ReadAdmissionOwnerFields(marker, requestId);
             ValidateTerminalIdentity(scope, requestId, requestDigest);
             if (!string.Equals(editorSessionId, UnityCliBridge.EditorSessionId(), StringComparison.Ordinal))
             {
-                Clear(cleanupScope);
+                ClearForTerminalCleanup(state, cleanupScope, cleanupBoundary);
                 return false;
             }
+            UnityCliBridge.AdmissionOwnerIdentity admissionOwner = null;
+            if (completeAdmission)
+            {
+                try { admissionOwner = state == null ? UnityCliBridge.ReconcileAdmissionTransferForLiveMarker(cleanupScope, marker, requestId, requestDigest) : UnityCliBridge.ReconcileAdmissionTransferForLiveMarker(state, cleanupScope, marker, requestId, requestDigest); }
+                catch { return true; }
+                if (admissionOwner == null) return false;
+            }
             Dictionary<string, object> active;
-            try { active = Load(scope); }
+            try { active = LoadForState(state, scope); }
             catch
             {
                 bool markerOwnsLease;
-                if (!UnityCliBridge.UnityCliSessionMutationLease.TryIsOwnedBy(requestId, requestDigest, out markerOwnsLease)) return true;
-                if (!markerOwnsLease) { Clear(cleanupScope); return false; }
-                try { Clear(scope); active = null; }
+                if (!TryIsLeaseOwnedForState(state, requestId, requestDigest, out markerOwnsLease)) return true;
+                if (!markerOwnsLease)
+                {
+                    if (completeAdmission && !(state == null ? UnityCliBridge.CompleteAdmissionRoot(admissionOwner) : UnityCliBridge.CompleteAdmissionRoot(state, admissionOwner))) return true;
+                    ClearForTerminalCleanup(state, cleanupScope, cleanupBoundary);
+                    return false;
+                }
+                try { ClearForTerminalCleanup(state, scope, cleanupBoundary); active = null; }
                 catch { return true; }
             }
             if (active != null && string.Equals(Text(active, "requestId"), requestId, StringComparison.Ordinal)
                 && string.Equals(Text(active, "requestDigest"), requestDigest, StringComparison.Ordinal))
             {
-                try { Clear(scope); }
+                try { ClearForTerminalCleanup(state, scope, cleanupBoundary); }
                 catch { return true; }
             }
-            UnityCliBridge.UnityCliSessionMutationLease.Release(requestId, requestDigest);
+            ReleaseLeaseForState(state, requestId, requestDigest);
             bool isOwned;
-            if (!UnityCliBridge.UnityCliSessionMutationLease.TryIsOwnedBy(requestId, requestDigest, out isOwned) || isOwned) return true;
-            if (completeAdmission && !UnityCliBridge.CompleteAdmissionRoot(admissionOwner)) return true;
-            Clear(cleanupScope);
+            if (!TryIsLeaseOwnedForState(state, requestId, requestDigest, out isOwned) || isOwned) return true;
+            if (completeAdmission && !(state == null ? UnityCliBridge.CompleteAdmissionRoot(admissionOwner) : UnityCliBridge.CompleteAdmissionRoot(state, admissionOwner))) return true;
+            ClearForTerminalCleanup(state, cleanupScope, cleanupBoundary);
             return false;
         }
 
+        private static Dictionary<string, object> LoadForState(BridgeQueueState state, string scope)
+        {
+            return state == null ? Load(scope) : state.LoadOperation(scope);
+        }
+
+        private static void SaveForState(BridgeQueueState state, string scope, Dictionary<string, object> value)
+        {
+            if (state == null) Save(scope, value);
+            else state.SaveOperation(scope, value);
+        }
+
+        private static void ClearForTerminalCleanup(BridgeQueueState state, string scope, Action<string> cleanupBoundary)
+        {
+            if (cleanupBoundary != null) cleanupBoundary(scope);
+            if (state == null) Clear(scope);
+            else state.ClearOperation(scope);
+        }
+
+        private static bool TryIsLeaseOwnedForState(BridgeQueueState state, string requestId, string requestDigest, out bool isOwned)
+        {
+            return state == null
+                ? UnityCliBridge.UnityCliSessionMutationLease.TryIsOwnedBy(requestId, requestDigest, out isOwned)
+                : state.TryIsLeaseOwned(requestId, requestDigest, out isOwned);
+        }
+
+        private static void ReleaseLeaseForState(BridgeQueueState state, string requestId, string requestDigest)
+        {
+            if (state == null) UnityCliBridge.UnityCliSessionMutationLease.Release(requestId, requestDigest);
+            else state.ReleaseLease(requestId, requestDigest);
+        }
+
         private const int MaxTerminalCacheBytes = 8 * 1024 * 1024;
         private const int MaxTerminalEntryBytes = 2 * 1024 * 1024;
         private const int MaxRetiredTerminalIdentities = 4096;
@@ -173,6 +235,32 @@ namespace UnityCli
             return false;
         }
 
+        /// <summary>公开status仅凭root requestId定位exact terminal，digest只在Bridge内部读取和校验。</summary>
+        internal static bool TryGetTerminalByRequestId(string scope, string requestId, out string requestDigest, out string statusDomain, out object envelope)
+        {
+            requestDigest = null;
+            statusDomain = null;
+            envelope = null;
+            ValidateRequestId(scope, requestId);
+            var cache = LoadTerminalCache();
+            foreach (var entry in cache.Entries)
+            {
+                if (!string.Equals(Text(entry, "scope"), scope, StringComparison.Ordinal)
+                    || !string.Equals(Text(entry, "requestId"), requestId, StringComparison.Ordinal)) continue;
+                var storedDigest = Text(entry, "requestDigest");
+                ValidateTerminalIdentity(scope, requestId, storedDigest);
+                object stored;
+                if (!entry.TryGetValue("envelope", out stored) || stored == null)
+                    throw new BridgeCommandException("E_EXECUTION_TIMEOUT", "Durable terminal cache entry is incomplete; outcome is unknown.");
+                requestDigest = storedDigest;
+                statusDomain = Text(entry, "statusDomain");
+                envelope = stored;
+                return true;
+            }
+            RejectRetiredTerminal(cache.RetiredIdentities, scope, requestId);
+            return false;
+        }
+
         /// <summary>按业务selector读取terminal，仅用于start响应丢失且调用方尚未取得root digest的恢复。</summary>
         internal static bool TryGetTerminalBySelector(string scope, string requestId, string selectorDigest, out object envelope)
         {
@@ -202,8 +290,16 @@ namespace UnityCli
 
         /// <summary>first-terminal-wins；固定cache按100条与8MiB双重上限保留当前session最新identity。</summary>
         internal static object StoreTerminalFirst(string scope, string requestId, string requestDigest, string selectorDigest, object envelope)
+        {
+            return StoreTerminalFirst(scope, requestId, requestDigest, selectorDigest, null, envelope);
+        }
+
+        /// <summary>statusDomain只供固定域status校验，绝不参与公开输入或exact replay identity。</summary>
+        internal static object StoreTerminalFirst(string scope, string requestId, string requestDigest, string selectorDigest, string statusDomain, object envelope)
         {
             ValidateTerminalIdentity(scope, requestId, requestDigest);
+            if (statusDomain != null && (string.IsNullOrWhiteSpace(statusDomain) || statusDomain.Length > 80))
+                throw new BridgeCommandException("E_EXECUTION_FAILED", "Durable terminal status domain is invalid.");
             if (!string.IsNullOrEmpty(selectorDigest)) ValidateTerminalIdentity(scope, requestId, selectorDigest);
             if (envelope == null) throw new ArgumentNullException("envelope");
             var cache = LoadTerminalCache();
@@ -212,7 +308,8 @@ namespace UnityCli
                 if (!string.Equals(Text(entry, "scope"), scope, StringComparison.Ordinal)
                     || !string.Equals(Text(entry, "requestId"), requestId, StringComparison.Ordinal)) continue;
                 if (!string.Equals(Text(entry, "requestDigest"), requestDigest, StringComparison.Ordinal)
-                    || (!string.IsNullOrEmpty(selectorDigest) && !string.Equals(Text(entry, "selectorDigest"), selectorDigest, StringComparison.Ordinal)))
+                    || (!string.IsNullOrEmpty(selectorDigest) && !string.Equals(Text(entry, "selectorDigest"), selectorDigest, StringComparison.Ordinal))
+                    || (!string.IsNullOrEmpty(statusDomain) && !string.Equals(Text(entry, "statusDomain"), statusDomain, StringComparison.Ordinal)))
                     throw new BridgeCommandException("E_REQUEST_ID_REUSED", "Terminal requestId was reused with different input.");
                 object stored;
                 if (!entry.TryGetValue("envelope", out stored) || stored == null)
@@ -228,6 +325,7 @@ namespace UnityCli
                 { "storedAt", DateTimeOffset.UtcNow.ToString("O", CultureInfo.InvariantCulture) }, { "envelope", envelope }
             };
             if (!string.IsNullOrEmpty(selectorDigest)) added["selectorDigest"] = selectorDigest;
+            if (!string.IsNullOrEmpty(statusDomain)) added["statusDomain"] = statusDomain;
             if (Encoding.UTF8.GetByteCount(UnityCliSerializer.Serialize(added)) > MaxTerminalEntryBytes)
                 throw new BridgeCommandException("E_EXECUTION_TIMEOUT", "Durable terminal envelope exceeds its fixed size limit; outcome is unknown.");
             cache.Entries.Add(added);
@@ -299,6 +397,10 @@ namespace UnityCli
                         throw new InvalidDataException("Durable terminal cache contains a duplicate or retired request identity.");
                     object selectorValue;
                     if (entry.TryGetValue("selectorDigest", out selectorValue)) ValidateTerminalIdentity(scope, requestId, selectorValue as string);
+                    object statusDomainValue;
+                    if (entry.TryGetValue("statusDomain", out statusDomainValue)
+                        && (!(statusDomainValue is string) || string.IsNullOrWhiteSpace((string)statusDomainValue) || ((string)statusDomainValue).Length > 80))
+                        throw new InvalidDataException("Durable terminal status domain is invalid.");
                     object envelopeValue;
                     var envelope = entry.TryGetValue("envelope", out envelopeValue) ? envelopeValue as Dictionary<string, object> : null;
                     object envelopeRequestId;
@@ -351,10 +453,17 @@ namespace UnityCli
                 return string.Concat(Array.ConvertAll(sha.ComputeHash(Encoding.UTF8.GetBytes(scope + "\0" + requestId)), value => value.ToString("x2")));
         }
 
-        private static void ValidateTerminalIdentity(string scope, string requestId, string requestDigest)
+        private static void ValidateRequestId(string scope, string requestId)
         {
             ActiveOperationPath(scope);
-            if (string.IsNullOrWhiteSpace(requestId) || requestId.Length > 200 || string.IsNullOrWhiteSpace(requestDigest) || requestDigest.Length != 64)
+            if (string.IsNullOrWhiteSpace(requestId) || requestId.Length > 200)
+                throw new BridgeCommandException("E_EXECUTION_FAILED", "Durable terminal identity is invalid.");
+        }
+
+        private static void ValidateTerminalIdentity(string scope, string requestId, string requestDigest)
+        {
+            ValidateRequestId(scope, requestId);
+            if (string.IsNullOrWhiteSpace(requestDigest) || requestDigest.Length != 64)
                 throw new BridgeCommandException("E_EXECUTION_FAILED", "Durable terminal identity is invalid.");
             foreach (var character in requestDigest)
                 if (!Uri.IsHexDigit(character)) throw new BridgeCommandException("E_EXECUTION_FAILED", "Durable terminal identity is invalid.");