Merge branch 'beta' into feature/game-view-uitoolkit-screenshot-capture

Author: Scriptwonder

CLAUDE.md

@@ -140,6 +140,11 @@ Use `CommandRegistry.InvokeCommandAsync` to call other tools from within a handl
 var result = await CommandRegistry.InvokeCommandAsync("read_console", consoleParams);
 ```
 
+### Unity API Compatibility Shims
+We support a wide Unity version range (2021+ → 6.x → CoreCLR 6.8). When an API is renamed, deprecated, or removed across versions, **don't sprinkle `#if UNITY_x_y_OR_NEWER` at every call site** — add a shim in `MCPForUnity/Runtime/Helpers/Unity*Compat.cs` and route every caller through it.
+
+The catalog of active shims, the policy for when to add one, what does NOT belong in a shim, and the reflection-cache pattern all live in **`MCPForUnity/Runtime/Helpers/UnityCompatShims.cs`** — the XML doc on that empty marker class is the source of truth and ships inside the UPM package, so end-users can `F12`/Go-to-definition into it. Sources for current deprecations: Unity 6.x upgrade guides and the [CoreCLR 2026 thread](https://discussions.unity.com/t/path-to-coreclr-2026-upgrade-guide/1714279).
+
 ## Commands
 
 ### Running Tests

MCPForUnity/Editor/Helpers/EditorWindowScreenshotUtility.cs

@@ -16,7 +16,6 @@ namespace MCPForUnity.Editor.Helpers
     /// </summary>
     internal static class EditorWindowScreenshotUtility
     {
-        private const string ScreenshotsFolderName = "Screenshots";
         // Keep capture synchronous so callers can immediately return the screenshot payload.
         // The short sleep gives Unity a chance to flush repaint work before GrabPixels reads the viewport.
         private const int RepaintSettlingDelayMs = 75;
@@ -40,15 +39,16 @@ internal static class EditorWindowScreenshotUtility
         /// <param name="maxResolution">Maximum edge length for the inline image payload.</param>
         /// <param name="viewportWidth">Captured viewport width in pixels.</param>
         /// <param name="viewportHeight">Captured viewport height in pixels.</param>
-        public static ScreenshotCaptureResult CaptureSceneViewViewportToAssets(
+        public static ScreenshotCaptureResult CaptureSceneViewViewportToProject(
             SceneView sceneView,
             string fileName,
             int superSize,
             bool ensureUniqueFileName,
             bool includeImage,
             int maxResolution,
             out int viewportWidth,
-            out int viewportHeight)
+            out int viewportHeight,
+            string folderOverride = null)
         {
             if (sceneView == null)
                 throw new ArgumentNullException(nameof(sceneView));
@@ -70,7 +70,7 @@ public static ScreenshotCaptureResult CaptureSceneViewViewportToAssets(
             {
                 captured = CaptureViewRect(sceneView, viewportRectPixels);
 
-                var result = PrepareCaptureResult(fileName, effectiveSuperSize, ensureUniqueFileName);
+                var result = PrepareCaptureResult(fileName, effectiveSuperSize, ensureUniqueFileName, folderOverride);
                 byte[] png = captured.EncodeToPNG();
                 File.WriteAllBytes(result.FullPath, png);
 
@@ -97,7 +97,7 @@ public static ScreenshotCaptureResult CaptureSceneViewViewportToAssets(
 
                     return new ScreenshotCaptureResult(
                         result.FullPath,
-                        result.AssetsRelativePath,
+                        result.ProjectRelativePath,
                         result.SuperSize,
                         false,
                         imageBase64,
@@ -317,11 +317,11 @@ private static void FlipTextureVertically(Texture2D texture)
             texture.Apply();
         }
 
-        private static ScreenshotCaptureResult PrepareCaptureResult(string fileName, int superSize, bool ensureUniqueFileName)
+        private static ScreenshotCaptureResult PrepareCaptureResult(string fileName, int superSize, bool ensureUniqueFileName, string folderOverride)
         {
             int size = Mathf.Max(1, superSize);
             string resolvedName = BuildFileName(fileName);
-            string folder = Path.Combine(Application.dataPath, ScreenshotsFolderName);
+            string folder = ScreenshotUtility.ResolveFolderAbsolute(folderOverride);
             Directory.CreateDirectory(folder);
 
             string fullPath = Path.Combine(folder, resolvedName);
@@ -331,8 +331,12 @@ private static ScreenshotCaptureResult PrepareCaptureResult(string fileName, int
             }
 
             string normalizedFullPath = fullPath.Replace('\\', '/');
-            string assetsRelativePath = "Assets/" + normalizedFullPath.Substring(Application.dataPath.Length).TrimStart('/');
-            return new ScreenshotCaptureResult(normalizedFullPath, assetsRelativePath, size, false);
+            string projectRoot = Path.GetFullPath(Path.Combine(Application.dataPath, "..")).Replace('\\', '/');
+            string normalizedRoot = projectRoot.EndsWith("/") ? projectRoot : projectRoot + "/";
+            string projectRelativePath = normalizedFullPath.StartsWith(normalizedRoot, StringComparison.OrdinalIgnoreCase)
+                ? normalizedFullPath.Substring(normalizedRoot.Length)
+                : normalizedFullPath;
+            return new ScreenshotCaptureResult(normalizedFullPath, projectRelativePath, size, false);
         }
 
         private static string BuildFileName(string fileName)

MCPForUnity/Editor/Helpers/ScreenshotPreferences.cs

@@ -0,0 +1,49 @@
+using MCPForUnity.Runtime.Helpers;
+using UnityEditor;
+
+namespace MCPForUnity.Editor.Helpers
+{
+    /// <summary>
+    /// Per-user EditorPrefs override for the default screenshot output folder.
+    /// Resolution priority used by callers:
+    ///   1. Per-call <c>output_folder</c> tool parameter
+    ///   2. <see cref="DefaultFolder"/> (this preference)
+    ///   3. <see cref="ScreenshotUtility.DefaultFolder"/> built-in fallback
+    /// </summary>
+    public static class ScreenshotPreferences
+    {
+        public const string EditorPrefsKey = "MCPForUnity_ScreenshotsFolder";
+
+        /// <summary>
+        /// User-configured default folder, or empty string when unset.
+        /// Stored as a project-relative path (e.g. "Assets/Screenshots", "Captures").
+        /// </summary>
+        public static string DefaultFolder
+        {
+            get => EditorPrefs.GetString(EditorPrefsKey, string.Empty);
+            set
+            {
+                if (string.IsNullOrWhiteSpace(value))
+                {
+                    EditorPrefs.DeleteKey(EditorPrefsKey);
+                }
+                else
+                {
+                    EditorPrefs.SetString(EditorPrefsKey, value.Trim());
+                }
+            }
+        }
+
+        /// <summary>
+        /// Resolves the effective folder: caller override → user pref → built-in default.
+        /// Returns a project-relative path string suitable for <see cref="ScreenshotUtility.ResolveFolderAbsolute"/>.
+        /// </summary>
+        public static string Resolve(string callerOverride)
+        {
+            if (!string.IsNullOrWhiteSpace(callerOverride)) return callerOverride.Trim();
+            string pref = DefaultFolder;
+            if (!string.IsNullOrWhiteSpace(pref)) return pref;
+            return ScreenshotUtility.DefaultFolder;
+        }
+    }
+}

MCPForUnity/Editor/Helpers/ScreenshotPreferences.cs.meta

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using MCPForUnity.Runtime.Helpers;
 using UnityEngine;
 #if UNITY_EDITOR
 using UnityEditor;
@@ -150,7 +151,7 @@ private static void Cache(Type t)
         private static List<Type> FindCandidates(string query, Type requiredBaseType)
         {
             bool isShort = !query.Contains('.');
-            var loaded = AppDomain.CurrentDomain.GetAssemblies();
+            var loaded = UnityAssembliesCompat.GetLoadedAssemblies();
 
 #if UNITY_EDITOR
             // Names of Player (runtime) script assemblies

MCPForUnity/Editor/Helpers/UnityTypeResolver.cs

@@ -40,6 +40,7 @@ internal sealed class TestJob
         public List<TestJobFailure> FailuresSoFar { get; set; }
         public string Error { get; set; }
         public TestRunResult Result { get; set; }
+        public long InitTimeoutMs { get; set; }
     }
 
     /// <summary>
@@ -50,7 +51,8 @@ internal static class TestJobManager
         // Keep this small to avoid ballooning payloads during polling.
         private const int FailureCap = 25;
         private const long StuckThresholdMs = 60_000;
-        private const long InitializationTimeoutMs = 15_000; // 15 seconds to call OnRunStarted, else fail
+        private const long DefaultInitializationTimeoutMs = 15_000; // 15 seconds default; override per-job via run_tests init_timeout param
+        private const long MaxInitializationTimeoutMs = 600_000; // 10 minutes hard cap
         private const int MaxJobsToKeep = 10;
         private const long MinPersistIntervalMs = 1000; // Throttle persistence to reduce overhead
 
@@ -139,6 +141,7 @@ private sealed class PersistedJob
             public long? last_finished_unix_ms { get; set; }
             public List<TestJobFailure> failures_so_far { get; set; }
             public string error { get; set; }
+            public long init_timeout_ms { get; set; }
         }
 
         private static TestJobStatus ParseStatus(string status)
@@ -201,6 +204,7 @@ private static void TryRestoreFromSessionState()
                             LastFinishedUnixMs = pj.last_finished_unix_ms,
                             FailuresSoFar = pj.failures_so_far ?? new List<TestJobFailure>(),
                             Error = pj.error,
+                            InitTimeoutMs = pj.init_timeout_ms,
                             // Intentionally not persisted to avoid ballooning SessionState.
                             Result = null
                         };
@@ -273,7 +277,8 @@ private static void PersistToSessionState(bool force = false)
                             last_finished_test_full_name = j.LastFinishedTestFullName,
                             last_finished_unix_ms = j.LastFinishedUnixMs,
                             failures_so_far = (j.FailuresSoFar ?? new List<TestJobFailure>()).Take(FailureCap).ToList(),
-                            error = j.Error
+                            error = j.Error,
+                            init_timeout_ms = j.InitTimeoutMs
                         })
                         .ToList();
 
@@ -294,8 +299,12 @@ private static void PersistToSessionState(bool force = false)
             }
         }
 
-        public static string StartJob(TestMode mode, TestFilterOptions filterOptions = null)
+        public static string StartJob(TestMode mode, TestFilterOptions filterOptions = null, long initTimeoutMs = 0)
         {
+            // Clamp to valid range: non-positive values mean "use default", cap at 10 minutes
+            if (initTimeoutMs < 0) initTimeoutMs = 0;
+            if (initTimeoutMs > MaxInitializationTimeoutMs) initTimeoutMs = MaxInitializationTimeoutMs;
+
             string jobId = Guid.NewGuid().ToString("N");
             long started = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
             string modeStr = mode.ToString();
@@ -316,7 +325,8 @@ public static string StartJob(TestMode mode, TestFilterOptions filterOptions = n
                 LastFinishedUnixMs = null,
                 FailuresSoFar = new List<TestJobFailure>(),
                 Error = null,
-                Result = null
+                Result = null,
+                InitTimeoutMs = initTimeoutMs
             };
 
             // Single lock scope for check-and-set to avoid TOCTOU race
@@ -491,9 +501,10 @@ internal static TestJob GetJob(string jobId)
                 if (job.Status == TestJobStatus.Running && job.TotalTests == null)
                 {
                     long now = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-                    if (!EditorApplication.isCompiling && !EditorApplication.isUpdating && now - job.StartedUnixMs > InitializationTimeoutMs)
+                    long initTimeout = job.InitTimeoutMs > 0 ? job.InitTimeoutMs : DefaultInitializationTimeoutMs;
+                    if (!EditorApplication.isCompiling && !EditorApplication.isUpdating && now - job.StartedUnixMs > initTimeout)
                     {
-                        McpLog.Warn($"[TestJobManager] Job {jobId} failed to initialize within {InitializationTimeoutMs}ms, auto-failing");
+                        McpLog.Warn($"[TestJobManager] Job {jobId} failed to initialize within {initTimeout}ms, auto-failing");
                         job.Status = TestJobStatus.Failed;
                         job.Error = "Test job failed to initialize (tests did not start within timeout)";
                         job.FinishedUnixMs = now;

MCPForUnity/Editor/Services/TestJobManager.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using Newtonsoft.Json.Linq;
 using MCPForUnity.Editor.Helpers;
+using MCPForUnity.Runtime.Helpers;
 using UnityEditor;
 using UnityEngine;
 
@@ -491,7 +492,7 @@ private static Type ResolveType(string typeName)
             if (type != null) return type;
 
             // Fallback: search all loaded assemblies
-            foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+            foreach (var assembly in UnityAssembliesCompat.GetLoadedAssemblies())
             {
                 type = assembly.GetType(typeName);
                 if (type != null) return type;

MCPForUnity/Editor/Tools/Animation/ClipCreate.cs

@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using MCPForUnity.Editor.Helpers;
 using MCPForUnity.Editor.Resources;
+using MCPForUnity.Runtime.Helpers;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -59,7 +60,7 @@ private static void AutoDiscoverCommands()
         {
             try
             {
-                var allTypes = AppDomain.CurrentDomain.GetAssemblies()
+                var allTypes = UnityAssembliesCompat.GetLoadedAssemblies()
                     .Where(a => !a.IsDynamic)
                     .SelectMany(a =>
                     {

MCPForUnity/Editor/Tools/CommandRegistry.cs

@@ -6,6 +6,7 @@
 using System.Reflection;
 using System.Text;
 using MCPForUnity.Editor.Helpers;
+using MCPForUnity.Runtime.Helpers;
 using Microsoft.CSharp;
 using Newtonsoft.Json.Linq;
 using UnityEngine;
@@ -360,7 +361,7 @@ private static string[] ResolveAssemblyPaths()
         {
             var paths = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
-            foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+            foreach (var assembly in UnityAssembliesCompat.GetLoadedAssemblies())
             {
                 try
                 {