Merge pull request #1008 from CoplayDev/release/v9.6.4

chore: bump version to 9.6.4

Author: github-actions[bot]

.claude/skills/unity-mcp-skill/references/tools-reference.md

@@ -70,7 +70,7 @@ from services.registry import mcp_for_unity_tool
 
 @mcp_for_unity_tool(
     description="Does something in Unity.",
-    group="core",  # core (default), vfx, animation, ui, scripting_ext, testing, probuilder
+    group="core",  # core (default), vfx, animation, ui, scripting_ext, testing, probuilder, profiling, docs
 )
 async def manage_something(
     ctx: Context,

CLAUDE.md

@@ -127,7 +127,7 @@ public static string GetMcpPackageRootPath()
 
                 // Script is at: {packageRoot}/Editor/Helpers/AssetPathUtility.cs
                 // Extract {packageRoot}
-                int editorIndex = scriptPath.IndexOf("/Editor/", StringComparison.Ordinal);
+                int editorIndex = scriptPath.LastIndexOf("/Editor/", StringComparison.Ordinal);
 
                 if (editorIndex >= 0)
                 {

MCPForUnity/Editor/Helpers/AssetPathUtility.cs

@@ -10,8 +10,9 @@ namespace MCPForUnity.Editor.Helpers
 {
     internal static class McpLogRecord
     {
-        private static readonly string LogPath = Path.Combine(Application.dataPath, "mcp.log");
-        private static readonly string ErrorLogPath = Path.Combine(Application.dataPath, "mcpError.log");
+        private static readonly string LogDir = Path.Combine(Application.dataPath, "UnityMCP", "Log");
+        private static readonly string LogPath = Path.Combine(LogDir, "mcp.log");
+        private static readonly string ErrorLogPath = Path.Combine(LogDir, "mcpError.log");
         private const long MaxLogSizeBytes = 1024 * 1024; // 1 MB
         private static bool _sessionStarted;
         private static readonly object _logLock = new();
@@ -79,6 +80,7 @@ internal static void Log(string commandType, JObject parameters, string type, st
 
         private static void RotateAndAppend(string path, string line)
         {
+            Directory.CreateDirectory(LogDir);
             RotateIfNeeded(path);
             File.AppendAllText(path, line + Environment.NewLine);
         }

MCPForUnity/Editor/Helpers/McpLogRecord.cs

@@ -12,6 +12,29 @@ public interface IPackageUpdateService
         /// <returns>Update check result containing availability and latest version info</returns>
         UpdateCheckResult CheckForUpdate(string currentVersion);
 
+        /// <summary>
+        /// Returns a cached update result if one exists for today, or null if a network fetch is needed.
+        /// Main-thread only (reads EditorPrefs).
+        /// </summary>
+        UpdateCheckResult TryGetCachedResult(string currentVersion);
+
+        /// <summary>
+        /// Performs only the network fetch and version comparison (no EditorPrefs access).
+        /// Safe to call from a background thread.
+        /// </summary>
+        UpdateCheckResult FetchAndCompare(string currentVersion);
+
+        /// <summary>
+        /// Performs only the network fetch and version comparison using pre-computed installation info.
+        /// Use this overload when calling from a background thread to avoid main-thread-only API calls.
+        /// </summary>
+        UpdateCheckResult FetchAndCompare(string currentVersion, bool isGitInstallation, string gitBranch);
+
+        /// <summary>
+        /// Caches a successful fetch result in EditorPrefs. Must be called from the main thread.
+        /// </summary>
+        void CacheFetchResult(string currentVersion, string fetchedVersion);
+
         /// <summary>
         /// Compares two version strings to determine if the first is newer than the second
         /// </summary>
@@ -26,6 +49,12 @@ public interface IPackageUpdateService
         /// <returns>True if installed via Git, false if Asset Store or unknown</returns>
         bool IsGitInstallation();
 
+        /// <summary>
+        /// Determines the Git branch to check for updates (e.g. "main" or "beta").
+        /// Must be called from the main thread (uses Unity PackageManager APIs).
+        /// </summary>
+        string GetGitUpdateBranch(string currentVersion);
+
         /// <summary>
         /// Clears the cached update check data, forcing a fresh check on next request
         /// </summary>

MCPForUnity/Editor/Services/IPackageUpdateService.cs

@@ -14,6 +14,7 @@ namespace MCPForUnity.Editor.Services
     /// </summary>
     public class PackageUpdateService : IPackageUpdateService
     {
+        private const int DefaultRequestTimeoutMs = 3000;
         private const string LastCheckDateKey = EditorPrefKeys.LastUpdateCheck;
         private const string CachedVersionKey = EditorPrefKeys.LatestKnownVersion;
         private const string LastBetaCheckDateKey = EditorPrefKeys.LastUpdateCheck + ".beta";
@@ -81,6 +82,93 @@ public UpdateCheckResult CheckForUpdate(string currentVersion)
             };
         }
 
+        /// <inheritdoc/>
+        public UpdateCheckResult TryGetCachedResult(string currentVersion)
+        {
+            bool isGitInstallation = IsGitInstallation();
+            string gitBranch = isGitInstallation ? GetGitUpdateBranch(currentVersion) : "main";
+            bool useBetaChannel = isGitInstallation && string.Equals(gitBranch, "beta", StringComparison.OrdinalIgnoreCase);
+
+            string lastCheckKey = isGitInstallation
+                ? (useBetaChannel ? LastBetaCheckDateKey : LastCheckDateKey)
+                : LastAssetStoreCheckDateKey;
+            string cachedVersionKey = isGitInstallation
+                ? (useBetaChannel ? CachedBetaVersionKey : CachedVersionKey)
+                : CachedAssetStoreVersionKey;
+
+            string lastCheckDate = EditorPrefs.GetString(lastCheckKey, "");
+            string cachedLatestVersion = EditorPrefs.GetString(cachedVersionKey, "");
+
+            if (lastCheckDate == DateTime.Now.ToString("yyyy-MM-dd") && !string.IsNullOrEmpty(cachedLatestVersion))
+            {
+                return new UpdateCheckResult
+                {
+                    CheckSucceeded = true,
+                    LatestVersion = cachedLatestVersion,
+                    UpdateAvailable = IsNewerVersion(cachedLatestVersion, currentVersion),
+                    Message = "Using cached version check"
+                };
+            }
+
+            return null;
+        }
+
+        /// <inheritdoc/>
+        public UpdateCheckResult FetchAndCompare(string currentVersion)
+        {
+            bool isGitInstallation = IsGitInstallation();
+            string gitBranch = isGitInstallation ? GetGitUpdateBranch(currentVersion) : "main";
+            return FetchAndCompare(currentVersion, isGitInstallation, gitBranch);
+        }
+
+        /// <inheritdoc/>
+        public UpdateCheckResult FetchAndCompare(string currentVersion, bool isGitInstallation, string gitBranch)
+        {
+            string latestVersion = isGitInstallation
+                ? FetchLatestVersionFromGitHub(gitBranch)
+                : FetchLatestVersionFromAssetStoreJson();
+
+            if (!string.IsNullOrEmpty(latestVersion))
+            {
+                return new UpdateCheckResult
+                {
+                    CheckSucceeded = true,
+                    LatestVersion = latestVersion,
+                    UpdateAvailable = IsNewerVersion(latestVersion, currentVersion),
+                    Message = "Successfully checked for updates"
+                };
+            }
+
+            return new UpdateCheckResult
+            {
+                CheckSucceeded = false,
+                UpdateAvailable = false,
+                Message = isGitInstallation
+                    ? "Failed to check for updates (network issue or offline)"
+                    : "Failed to check for Asset Store updates (network issue or offline)"
+            };
+        }
+
+        /// <inheritdoc/>
+        public void CacheFetchResult(string currentVersion, string fetchedVersion)
+        {
+            if (string.IsNullOrEmpty(fetchedVersion)) return;
+
+            bool isGitInstallation = IsGitInstallation();
+            string gitBranch = isGitInstallation ? GetGitUpdateBranch(currentVersion) : "main";
+            bool useBetaChannel = isGitInstallation && string.Equals(gitBranch, "beta", StringComparison.OrdinalIgnoreCase);
+
+            string lastCheckKey = isGitInstallation
+                ? (useBetaChannel ? LastBetaCheckDateKey : LastCheckDateKey)
+                : LastAssetStoreCheckDateKey;
+            string cachedVersionKey = isGitInstallation
+                ? (useBetaChannel ? CachedBetaVersionKey : CachedVersionKey)
+                : CachedAssetStoreVersionKey;
+
+            EditorPrefs.SetString(lastCheckKey, DateTime.Now.ToString("yyyy-MM-dd"));
+            EditorPrefs.SetString(cachedVersionKey, fetchedVersion);
+        }
+
         /// <inheritdoc/>
         public bool IsNewerVersion(string version1, string version2)
         {
@@ -196,7 +284,8 @@ private static bool IsPreReleaseVersion(string version)
             return version.IndexOf('-', StringComparison.Ordinal) >= 0;
         }
 
-        private static string GetGitUpdateBranch(string currentVersion)
+        /// <inheritdoc/>
+        public string GetGitUpdateBranch(string currentVersion)
         {
             try
             {
@@ -265,7 +354,7 @@ protected virtual string FetchLatestVersionFromGitHub(string branch)
                 // - More reliable - doesn't require releases to be published
                 // - Direct source of truth from the main branch
 
-                using (var client = new WebClient())
+                using (var client = CreateWebClient())
                 {
                     client.Headers.Add("User-Agent", "Unity-MCPForUnity-UpdateChecker");
                     string packageJsonUrl = string.Equals(branch, "beta", StringComparison.OrdinalIgnoreCase)
@@ -304,7 +393,7 @@ protected virtual string FetchLatestVersionFromAssetStoreJson()
         {
             try
             {
-                using (var client = new WebClient())
+                using (var client = CreateWebClient())
                 {
                     client.Headers.Add("User-Agent", "Unity-MCPForUnity-AssetStoreUpdateChecker");
                     string jsonContent = client.DownloadString(AssetStoreVersionUrl);
@@ -322,5 +411,41 @@ protected virtual string FetchLatestVersionFromAssetStoreJson()
                 return null;
             }
         }
+
+        protected virtual WebClient CreateWebClient()
+        {
+            return new TimeoutWebClient(GetRequestTimeoutMs());
+        }
+
+        protected virtual int GetRequestTimeoutMs()
+        {
+            return DefaultRequestTimeoutMs;
+        }
+
+        private sealed class TimeoutWebClient : WebClient
+        {
+            private readonly int _timeoutMs;
+
+            public TimeoutWebClient(int timeoutMs)
+            {
+                _timeoutMs = timeoutMs;
+            }
+
+            protected override WebRequest GetWebRequest(Uri address)
+            {
+                var request = base.GetWebRequest(address);
+                if (request != null)
+                {
+                    request.Timeout = _timeoutMs;
+
+                    if (request is HttpWebRequest httpRequest)
+                    {
+                        httpRequest.ReadWriteTimeout = _timeoutMs;
+                    }
+                }
+
+                return request;
+            }
+        }
     }
 }

MCPForUnity/Editor/Services/PackageUpdateService.cs

@@ -70,14 +70,13 @@ public System.Diagnostics.ProcessStartInfo CreateTerminalProcessStartInfo(string
                 CreateNoWindow = true
             };
 #else
-            // Linux: Try common terminal emulators
-            // We use bash -c to execute the command, so we must properly quote/escape for bash
-            // Escape single quotes for the inner bash string
-            string escapedCommandLinux = command.Replace("'", "'\\''");
-            // Wrap the command in single quotes for bash -c
-            string script = $"'{escapedCommandLinux}; exec bash'";
-            // Escape double quotes for the outer Process argument string
-            string escapedScriptForArg = script.Replace("\"", "\\\"");
+            // Linux: Try common terminal emulators.
+            // ProcessStartInfo passes the argument string directly to the terminal, so we only
+            // need to escape for the double-quoted bash -c payload — no inner single quotes.
+            string script = $"{command}; exec bash";
+            string escapedScriptForArg = script
+                .Replace("\\", "\\\\")
+                .Replace("\"", "\\\"");
             string bashCmdArgs = $"bash -c \"{escapedScriptForArg}\"";
 
             string[] terminals = { "gnome-terminal", "xterm", "konsole", "xfce4-terminal" };

MCPForUnity/Editor/Services/Server/TerminalLauncher.cs

@@ -111,7 +111,7 @@ private static void RunBuildCore(BuildJob job, Func<BuildReport> buildFunc)
                 else
                 {
                     job.State = BuildJobState.Failed;
-#if UNITY_2022_3_OR_NEWER
+#if UNITY_2023_1_OR_NEWER
                     job.ErrorMessage = report.SummarizeErrors();
 #else
                     job.ErrorMessage = $"Build failed with result: {summary.result}";

MCPForUnity/Editor/Tools/Build/BuildRunner.cs

@@ -8,6 +8,7 @@
 using Unity.Profiling;
 using Unity.Profiling.LowLevel.Unsafe;
 using UnityEngine.Profiling;
+using UProfiler = UnityEngine.Profiling.Profiler;
 
 namespace MCPForUnity.Editor.Tools.Graphics
 {
@@ -126,12 +127,12 @@ internal static object GetMemory(JObject @params)
         {
             var data = new Dictionary<string, object>
             {
-                ["totalAllocatedMB"] = Math.Round(Profiler.GetTotalAllocatedMemoryLong() / (1024.0 * 1024.0), 2),
-                ["totalReservedMB"] = Math.Round(Profiler.GetTotalReservedMemoryLong() / (1024.0 * 1024.0), 2),
-                ["totalUnusedReservedMB"] = Math.Round(Profiler.GetTotalUnusedReservedMemoryLong() / (1024.0 * 1024.0), 2),
-                ["monoUsedMB"] = Math.Round(Profiler.GetMonoUsedSizeLong() / (1024.0 * 1024.0), 2),
-                ["monoHeapMB"] = Math.Round(Profiler.GetMonoHeapSizeLong() / (1024.0 * 1024.0), 2),
-                ["graphicsDriverMB"] = Math.Round(Profiler.GetAllocatedMemoryForGraphicsDriver() / (1024.0 * 1024.0), 2),
+                ["totalAllocatedMB"] = Math.Round(UProfiler.GetTotalAllocatedMemoryLong() / (1024.0 * 1024.0), 2),
+                ["totalReservedMB"] = Math.Round(UProfiler.GetTotalReservedMemoryLong() / (1024.0 * 1024.0), 2),
+                ["totalUnusedReservedMB"] = Math.Round(UProfiler.GetTotalUnusedReservedMemoryLong() / (1024.0 * 1024.0), 2),
+                ["monoUsedMB"] = Math.Round(UProfiler.GetMonoUsedSizeLong() / (1024.0 * 1024.0), 2),
+                ["monoHeapMB"] = Math.Round(UProfiler.GetMonoHeapSizeLong() / (1024.0 * 1024.0), 2),
+                ["graphicsDriverMB"] = Math.Round(UProfiler.GetAllocatedMemoryForGraphicsDriver() / (1024.0 * 1024.0), 2),
             };
 
             return new