@alpsckr/unitycli 0.4.3 → 0.4.4

package/unitypkg/Editor/Tools/physics/raycast.cs

@@ -37,11 +37,15 @@ namespace UnityCli
         {
             Name = "physics.raycast",
             Summary = "Cast a 3D or 2D ray and return the first hit, or all hits with all=true.",
-            Description = "Cast a ray from origin along direction up to distance. mode=3d (default) or 2d. all=true returns all hits sorted by distance. layerMask defaults to DefaultRaycastLayers.",
+            Description = "Cast a ray from origin along direction up to distance in Edit or Play mode. mode=3d (default) or 2d. all=false returns at most the nearest hit; all=true returns every hit sorted by distance. layerMask defaults to DefaultRaycastLayers. The result always includes the normalized query, hit flag, hitCount, and hits.",
             Group = "physics",DestructiveHint = false,
             Target = "editor", PlayModeSupport = "supported",
             DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000,
-            Examples = new[] { new ToolExample { Description = "3D raycast forward", Input = new Request { OriginY = 1f, DirectionZ = 1f } } }
+            Examples = new[]
+            {
+                new ToolExample { Description = "Return the nearest 3D hit", Input = new Request { OriginY = 1f, DirectionZ = 1f } },
+                new ToolExample { Description = "Return all 3D hits", Input = new Request { OriginY = 1f, DirectionZ = 1f, All = true } }
+            }
         };
 
         public System.Threading.Tasks.ValueTask<Result> ExecuteAsync(Request request, UnityCliProjectToolContext ctx, System.Threading.CancellationToken ct = default)
@@ -58,7 +62,14 @@ namespace UnityCli
                     var hits = Physics2D.RaycastAll(origin, direction, distance, layerMask);
                     var hitList = new List<RaycastHitInfo>();
                     foreach (var h in hits) hitList.Add(PhysicsToolSupport.BuildRaycast2DHit(h));
-                    return new System.Threading.Tasks.ValueTask<Result>(new Result { Query = PhysicsToolSupport.BuildRaycast2DQuery(origin, direction, distance, layerMask), HitCount = hits.Length, Hits = hitList });
+                    return new System.Threading.Tasks.ValueTask<Result>(new Result
+                    {
+                        Query = PhysicsToolSupport.BuildRaycast2DQuery(origin, direction, distance, layerMask),
+                        Hit = hits.Length > 0,
+                        HitCount = hits.Length,
+                        Hits = hitList,
+                        NextActions = hits.Length > 0 ? new List<string>() : new List<string> { "No Physics2D collider matched the ray; adjust origin, direction, distance, or layerMask." }
+                    });
                 }
                 var hit = Physics2D.Raycast(origin, direction, distance, layerMask);
                 var list = new List<RaycastHitInfo>();
@@ -67,7 +78,7 @@ namespace UnityCli
                 {
                     Query = PhysicsToolSupport.BuildRaycast2DQuery(origin, direction, distance, layerMask),
                     Hit = hit.collider != null, HitCount = hit.collider != null ? 1 : 0, Hits = list,
-                    NextActions = hit.collider != null ? new List<string>() : new List<string> { "No Physics collider matched the ray); adjust origin, direction, distance or layer mask." }
+                    NextActions = hit.collider != null ? new List<string>() : new List<string> { "No Physics2D collider matched the ray; adjust origin, direction, distance, or layerMask." }
                 });
             }
             var origin3d = new Vector3(request.OriginX, request.OriginY, request.OriginZ);
@@ -78,7 +89,14 @@ namespace UnityCli
                 Array.Sort(hits, (a, b) => a.distance.CompareTo(b.distance));
                 var hitList = new List<RaycastHitInfo>();
                 foreach (var h in hits) hitList.Add(PhysicsToolSupport.BuildRaycast3DHit(h));
-                return new System.Threading.Tasks.ValueTask<Result>(new Result { Query = PhysicsToolSupport.BuildRaycast3DQuery(origin3d, direction3d, distance, layerMask), HitCount = hits.Length, Hits = hitList });
+                return new System.Threading.Tasks.ValueTask<Result>(new Result
+                {
+                    Query = PhysicsToolSupport.BuildRaycast3DQuery(origin3d, direction3d, distance, layerMask),
+                    Hit = hits.Length > 0,
+                    HitCount = hits.Length,
+                    Hits = hitList,
+                    NextActions = hits.Length > 0 ? new List<string>() : new List<string> { "No Physics collider matched the ray; adjust origin, direction, distance, or layerMask." }
+                });
             }
             RaycastHit hit3d;
             var didHit = Physics.Raycast(origin3d, direction3d, out hit3d, distance, layerMask);
@@ -88,7 +106,7 @@ namespace UnityCli
             {
                 Query = PhysicsToolSupport.BuildRaycast3DQuery(origin3d, direction3d, distance, layerMask),
                 Hit = didHit, HitCount = didHit ? 1 : 0, Hits = list3d,
-                NextActions = didHit ? new List<string>() : new List<string> { "No Physics collider matched the ray); adjust origin, direction, distance or layer mask." }
+                NextActions = didHit ? new List<string>() : new List<string> { "No Physics collider matched the ray; adjust origin, direction, distance, or layerMask." }
             });
         }
     }

package/unitypkg/Editor/Tools/prefab/stage.cs

@@ -26,7 +26,7 @@ namespace UnityCli.Tools.Prefab
         {
             Name = "prefab.stage", Summary = "Read current Prefab editing stage state: whether a prefab is being edited, its path, and dirty status.",
             Description = "Read current Prefab editing stage state: whether a prefab is being edited, its path, and dirty status. This observes Prefab Stage only and does not open, save, close, or modify it.",
-            DestructiveHint = false,
+            DestructiveHint = false,
             Group = "prefab",
             Target = "editor",
             PlayModeSupport = "supported",

package/unitypkg/Editor/Tools/profiler/ProfilerFrameDebuggerSupport.cs

@@ -1,15 +1,12 @@
 #if UNITY_EDITOR
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Reflection;
-using UnityEditor;
-using UnityEngine;
-using UnityEngine.Profiling;
+using System.Threading;
 
 namespace UnityCli
 {
+    /// <summary>Frame Debugger 的集中反射边界；读取调用显式消费调用方请求预算。</summary>
     internal static class FrameDebuggerReflection
     {
         public static readonly Type UtilityType = ProfilerToolSupport.FindType("UnityEditorInternal.FrameDebuggerInternal.FrameDebuggerUtility, UnityEditor");
@@ -17,52 +14,128 @@ namespace UnityCli
         public static readonly PropertyInfo EventCountProp = UtilityType?.GetProperty("count", BindingFlags.Public | BindingFlags.Static);
         public static readonly PropertyInfo EnabledProp = StateType?.GetProperty("enabled", BindingFlags.Public | BindingFlags.Static);
         public static readonly MethodInfo EnableMethod = UtilityType?.GetMethod("SetEnabled", BindingFlags.Public | BindingFlags.Static, null, new[] { typeof(bool), typeof(int) }, null);
-        public static readonly MethodInfo GetEventsMethod = UtilityType?.GetMethod("GetFrameEvents", BindingFlags.Public | BindingFlags.Static);
         public static readonly MethodInfo EventNameMethod = UtilityType?.GetMethod("GetFrameEventInfoName", BindingFlags.Public | BindingFlags.Static);
         public static readonly Type EventDataType = ProfilerToolSupport.FindType("UnityEditorInternal.FrameDebuggerInternal.FrameDebuggerEventData, UnityEditor");
         public static readonly MethodInfo GetEventDataMethod = EventDataType == null
             ? null
-            : UtilityType?.GetMethod("GetFrameEventData", BindingFlags.Public | BindingFlags.Static, null, new[] { typeof(int), EventDataType }, null);
+            : UtilityType?.GetMethod("GetFrameEventData", BindingFlags.Public | BindingFlags.Static, null, new[] { typeof(int), EventDataType.MakeByRefType() }, null)
+                ?? UtilityType?.GetMethod("GetFrameEventData", BindingFlags.Public | BindingFlags.Static, null, new[] { typeof(int), EventDataType }, null);
+        private static long captureGeneration = 1L;
 
-        public static bool Available => UtilityType != null && StateType != null && EventCountProp != null && EnabledProp != null && EnableMethod != null;
+        internal static bool? AvailableOverrideForTests;
+        internal static Func<bool> EnabledOverrideForTests;
+        internal static Action<bool> SetEnabledOverrideForTests;
+        internal static Func<int> EventCountOverrideForTests;
+        internal static Func<int, string> EventNameOverrideForTests;
+        internal static Func<int, object> EventDataOverrideForTests;
+        internal static Func<string> GenerationOverrideForTests;
+
+        public static bool Available => AvailableOverrideForTests ?? (UtilityType != null && StateType != null && EventCountProp != null && EnabledProp != null && EnableMethod != null);
 
-        // Unity 2022.3 的 SetEnabled(bool,int) 需要显式绑定本地 Editor profiler id=0。
         public static void SetEnabled(bool value)
         {
-            EnableMethod.Invoke(null, new object[] { value, 0 });
+            var overrideAction = SetEnabledOverrideForTests;
+            if (overrideAction != null) overrideAction(value);
+            else EnableMethod.Invoke(null, new object[] { value, 0 });
+            Interlocked.Increment(ref captureGeneration);
         }
 
         public static bool GetEnabled()
         {
             try
             {
+                var overrideGetter = EnabledOverrideForTests;
+                if (overrideGetter != null) return overrideGetter();
                 if (EnabledProp != null) return (bool)EnabledProp.GetValue(null, null);
                 throw new MissingMemberException("Frame Debugger enabled readback is unavailable.");
             }
             catch (Exception exception) { throw new InvalidOperationException("Frame Debugger enabled getter failed.", exception); }
         }
 
-        public static int GetEventCount()
+        public static int GetEventCount(UnityCliRequestBudget budget)
         {
-            try { return (int)EventCountProp.GetValue(null); }
+            if (!budget.TryConsumeGetter() || !budget.TryConsumeReflectionCall()) throw new UnityCliRequestBudgetExceededException(budget.ExhaustedDimension);
+            var overrideGetter = EventCountOverrideForTests;
+            if (overrideGetter != null) return overrideGetter();
+            try { return Convert.ToInt32(EventCountProp.GetValue(null, null), CultureInfo.InvariantCulture); }
             catch { return 0; }
         }
 
-        // 反射读取 Frame Debugger 事件对象的字段/属性值(字符串化);不可用返回 null
-        public static string ReadField(object obj, string fieldName)
+        public static string EventName(int index, UnityCliRequestBudget budget)
+        {
+            if (!budget.TryConsumeReflectionCall()) throw new UnityCliRequestBudgetExceededException(budget.ExhaustedDimension);
+            var overrideGetter = EventNameOverrideForTests;
+            if (overrideGetter != null) return overrideGetter(index);
+            if (EventNameMethod == null) return null;
+            try { return EventNameMethod.Invoke(null, new object[] { index }) as string; }
+            catch { return null; }
+        }
+
+        public static object EventData(int index, UnityCliRequestBudget budget)
         {
+            if (!budget.TryConsumeReflectionCall()) throw new UnityCliRequestBudgetExceededException(budget.ExhaustedDimension);
+            var overrideGetter = EventDataOverrideForTests;
+            if (overrideGetter != null) return overrideGetter(index);
+            if (GetEventDataMethod == null || EventDataType == null) return null;
             try
             {
-                var type = obj.GetType();
-                var field = type.GetField(fieldName, BindingFlags.Public | BindingFlags.Instance)
-                         ?? type.GetField(fieldName, BindingFlags.NonPublic | BindingFlags.Instance);
-                var prop = type.GetProperty(fieldName, BindingFlags.Public | BindingFlags.Instance)
-                        ?? type.GetProperty(fieldName, BindingFlags.NonPublic | BindingFlags.Instance);
-                object val = field != null ? field.GetValue(obj) : prop != null ? prop.GetValue(obj) : null;
-                return val != null ? val.ToString() : null;
+                var value = Activator.CreateInstance(EventDataType);
+                var args = new object[] { index, value };
+                var ok = GetEventDataMethod.Invoke(null, args);
+                return ok is true ? args[1] : null;
             }
             catch { return null; }
         }
+
+        /// <summary>用有界常量工作量绑定当前捕获；CLI 切换、listener、数量或首尾事件变化都会使旧游标失效。</summary>
+        internal static string CaptureGeneration(int eventCount, UnityCliRequestBudget budget)
+        {
+            string sourceIdentity;
+            var overrideGetter = GenerationOverrideForTests;
+            if (overrideGetter != null) sourceIdentity = overrideGetter();
+            else
+            {
+                if (!budget.TryConsumeGetter() || !budget.TryConsumeReflectionCall()) throw new UnityCliRequestBudgetExceededException(budget.ExhaustedDimension);
+                var enabled = GetEnabled();
+                var first = eventCount > 0 ? EventName(0, budget) : string.Empty;
+                var last = eventCount > 1 ? EventName(eventCount - 1, budget) : first;
+                sourceIdentity = enabled.ToString(CultureInfo.InvariantCulture) + "\0" + eventCount.ToString(CultureInfo.InvariantCulture)
+                    + "\0" + first + "\0" + last + "\0" + Interlocked.Read(ref captureGeneration).ToString(CultureInfo.InvariantCulture);
+            }
+            return UnityCliContinuationToken.Fingerprint(
+                UnityCliReadGeneration.Session("profiler.frame-debugger.events") + "\0" + eventCount.ToString(CultureInfo.InvariantCulture)
+                + "\0" + Interlocked.Read(ref captureGeneration).ToString(CultureInfo.InvariantCulture) + "\0" + sourceIdentity);
+        }
+
+        internal static void ResetTestOverrides()
+        {
+            AvailableOverrideForTests = null;
+            EnabledOverrideForTests = null;
+            SetEnabledOverrideForTests = null;
+            EventCountOverrideForTests = null;
+            EventNameOverrideForTests = null;
+            EventDataOverrideForTests = null;
+            GenerationOverrideForTests = null;
+            Interlocked.Increment(ref captureGeneration);
+        }
+
+        public static string ReadField(object value, string fieldName, UnityCliRequestBudget budget)
+        {
+            if (value == null) return null;
+            var type = value.GetType();
+            if (!budget.TryConsumeReflectionCall()) throw new UnityCliRequestBudgetExceededException(budget.ExhaustedDimension);
+            var field = type.GetField(fieldName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+            if (field != null)
+            {
+                if (!budget.TryConsumeGetter() || !budget.TryConsumeReflectionCall()) throw new UnityCliRequestBudgetExceededException(budget.ExhaustedDimension);
+                try { var result = field.GetValue(value); return result == null ? null : Convert.ToString(result, CultureInfo.InvariantCulture); } catch { return null; }
+            }
+            if (!budget.TryConsumeReflectionCall()) throw new UnityCliRequestBudgetExceededException(budget.ExhaustedDimension);
+            var property = type.GetProperty(fieldName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+            if (property == null) return null;
+            if (!budget.TryConsumeGetter() || !budget.TryConsumeReflectionCall()) throw new UnityCliRequestBudgetExceededException(budget.ExhaustedDimension);
+            try { var result = property.GetValue(value, null); return result == null ? null : Convert.ToString(result, CultureInfo.InvariantCulture); } catch { return null; }
+        }
     }
 }
 #endif