Merge remote-tracking branch 'upstream/main'

Author: Saqoosha

Editor/Services/ITestRunnerService.cs

@@ -22,8 +22,9 @@ public interface ITestRunnerService
         /// </summary>
         /// <param name="testMode">The test mode to run (EditMode or PlayMode).</param>
         /// <param name="returnOnlyFailures">If true, only failed test results are included in the output.</param>
+        /// <param name="returnWithLogs">If true, all logs are included in the output.</param>
         /// <param name="testFilter">A filter string to select specific tests to run.</param>
         /// <returns>Task that resolves with test results when tests are complete</returns>
-        Task<JObject> ExecuteTestsAsync(TestMode testMode, bool returnOnlyFailures, string testFilter);
+        Task<JObject> ExecuteTestsAsync(TestMode testMode, bool returnOnlyFailures, bool returnWithLogs, string testFilter);
     }
-}
+}

Editor/Services/TestRunnerService.cs

@@ -21,6 +21,7 @@ public class TestRunnerService : ITestRunnerService, ICallbacks
         private readonly TestRunnerApi _testRunnerApi;
         private TaskCompletionSource<JObject> _tcs;
         private bool _returnOnlyFailures;
+        private bool _returnWithLogs;
         private List<ITestResultAdaptor> _results;
 
         /// <summary>
@@ -77,13 +78,15 @@ public async Task<List<ITestAdaptor>> GetAllTestsAsync(string testModeFilter = "
         /// </summary>
         /// <param name="testMode">The test mode to run (EditMode or PlayMode).</param>
         /// <param name="returnOnlyFailures">If true, only failed test results are included in the output.</param>
+        /// <param name="returnWithLogs">If true, all logs are included in the output.</param>
         /// <param name="testFilter">A filter string to select specific tests to run.</param>
         /// <returns>Task that resolves with test results when tests are complete</returns>
-        public async Task<JObject> ExecuteTestsAsync(TestMode testMode, bool returnOnlyFailures, string testFilter = "")
+        public async Task<JObject> ExecuteTestsAsync(TestMode testMode, bool returnOnlyFailures, bool returnWithLogs, string testFilter = "")
         {
             _tcs = new TaskCompletionSource<JObject>();
             _results = new List<ITestResultAdaptor>();
             _returnOnlyFailures = returnOnlyFailures;
+            _returnWithLogs = returnWithLogs;
             var filter = new Filter { testMode = testMode };
 
             if (!string.IsNullOrEmpty(testFilter))
@@ -191,30 +194,30 @@ private async Task<JObject> WaitForCompletionAsync(int timeoutSeconds)
 
         private JObject BuildResultJson(List<ITestResultAdaptor> results, ITestResultAdaptor result)
         {
-            int pass = results.Count(r => r.ResultState == "Passed");
-            int fail = results.Count(r => r.ResultState == "Failed");
-            int skip = results.Count(r => r.ResultState == "Skipped");
-
             var arr = new JArray(results
+                .Where(r => !r.HasChildren)
                 .Where(r => !_returnOnlyFailures || r.ResultState == "Failed")
                 .Select(r => new JObject {
                     ["name"]      = r.Name,
                     ["fullName"]  = r.FullName,
                     ["state"]     = r.ResultState,
                     ["message"]   = r.Message,
-                    ["duration"]  = r.Duration
+                    ["duration"]  = r.Duration,
+                    ["logs"]      = _returnWithLogs ? r.Output : null,
+                    ["stackTrace"] = r.StackTrace
                 }));
 
+            int testCount = result.PassCount + result.SkipCount + result.FailCount;
             return new JObject { 
                 ["success"]           = true,
                 ["type"]              = "text",
-                ["message"]           = $"{result.Test.Name} test run completed: {pass}/{results.Count} passed - {fail}/{results.Count} failed - {skip}/{results.Count} skipped",
+                ["message"]           = $"{result.Test.Name} test run completed: {result.PassCount}/{testCount} passed - {result.FailCount}/{testCount} failed - {result.SkipCount}/{testCount} skipped",
                 ["resultState"]       = result.ResultState,
                 ["durationSeconds"]   = result.Duration,
-                ["testCount"]         = results.Count,
-                ["passCount"]         = pass,
-                ["failCount"]         = fail,
-                ["skipCount"]         = skip,
+                ["testCount"]         = testCount,
+                ["passCount"]         = result.PassCount,
+                ["failCount"]         = result.FailCount,
+                ["skipCount"]         = result.SkipCount,
                 ["results"]           = arr
             };
         }

Editor/Tools/RunTestsTool.cs

@@ -37,6 +37,7 @@ public override async void ExecuteAsync(JObject parameters, TaskCompletionSource
             string testModeStr = parameters?["testMode"]?.ToObject<string>() ?? "EditMode";
             string testFilter = parameters?["testFilter"]?.ToObject<string>(); // Optional
             bool returnOnlyFailures = parameters?["returnOnlyFailures"]?.ToObject<bool>() ?? false; // Optional
+            bool returnWithLogs = parameters?["returnWithLogs"]?.ToObject<bool>() ?? false; // Optional
 
             TestMode testMode = TestMode.EditMode;
 
@@ -48,7 +49,7 @@ public override async void ExecuteAsync(JObject parameters, TaskCompletionSource
             McpLogger.LogInfo($"Executing RunTestsTool: Mode={testMode}, Filter={testFilter ?? "(none)"}");
 
             // Call the service to run tests
-            JObject result = await _testRunnerService.ExecuteTestsAsync(testMode, returnOnlyFailures, testFilter);
+            JObject result = await _testRunnerService.ExecuteTestsAsync(testMode, returnOnlyFailures, returnWithLogs, testFilter);
             tcs.SetResult(result);
         }
     }

Editor/UnityBridge/McpUnityEditorWindow.cs

@@ -22,6 +22,7 @@ public class McpUnityEditorWindow : EditorWindow
         private string _mcpConfigJson = "";
         private bool _tabsIndentationJson = false;
         private Vector2 _helpTabScrollPosition = Vector2.zero;
+        private Vector2 _serverTabScrollPosition = Vector2.zero;
 
         [MenuItem("Tools/MCP Unity/Server Window", false, 1)]
         public static void ShowWindow()
@@ -66,6 +67,7 @@ private void OnGUI()
 
         private void DrawServerTab()
         {
+            _serverTabScrollPosition = EditorGUILayout.BeginScrollView(_serverTabScrollPosition);
             EditorGUILayout.BeginVertical("box");
 
             // Server status
@@ -299,15 +301,20 @@ private void DrawServerTab()
                 }
             }
 
-            EditorGUILayout.EndVertical();
-            
+            EditorGUILayout.Separator();
+            EditorGUILayout.Separator();
+
             EditorGUILayout.Space(); 
 
             // Force Install Server button
             if (GUILayout.Button("Force Install Server", GUILayout.Height(30)))
             {
                 McpUnityServer.Instance.InstallServer();
+                McpLogger.LogInfo("MCP Unity Server installed successfully.");
             }
+            
+            EditorGUILayout.EndVertical();
+            EditorGUILayout.EndScrollView();
         }
 
         private void DrawHelpTab()

Editor/UnityBridge/McpUnitySettings.cs

@@ -25,7 +25,7 @@ public enum ConsoleLogServiceType
     public class McpUnitySettings
     {
         // Constants
-        public const string ServerVersion = "1.0.0";
+        public const string ServerVersion = "1.1.1";
         public const string PackageName = "com.gamelovers.mcp-unity";
         public const int RequestTimeoutMinimum = 10;
 
@@ -73,7 +73,6 @@ public static McpUnitySettings Instance
         private McpUnitySettings() 
         { 
             LoadSettings();
-            VsCodeWorkspaceUtils.AddPackageCacheToWorkspace();
         }
 
         /// <summary>

Editor/Utils/McpUtils.cs

@@ -73,7 +73,9 @@ public static string GetServerPath()
 
             if (packageInfo != null && !string.IsNullOrEmpty(packageInfo.resolvedPath))
             {
-                return Path.Combine(packageInfo.resolvedPath, "Server~");
+                string serverPath = Path.Combine(packageInfo.resolvedPath, "Server~");
+
+                return CleanPathPrefix(serverPath);
             }
 
             var assets = AssetDatabase.FindAssets("tsconfig");
@@ -82,18 +84,20 @@ public static string GetServerPath()
             {
                 // Convert relative path to absolute path
                 var relativePath = AssetDatabase.GUIDToAssetPath(assets[0]);
-                return Path.GetFullPath(Path.Combine(Application.dataPath, "..", relativePath));
+                string fullPath = Path.GetFullPath(Path.Combine(Application.dataPath, "..", relativePath));
+
+                return CleanPathPrefix(fullPath);
             }
             if (assets.Length > 0)
             {
                 foreach (var assetJson in assets)
                 {
                     string relativePath = AssetDatabase.GUIDToAssetPath(assetJson);
                     string fullPath = Path.GetFullPath(Path.Combine(Application.dataPath, "..", relativePath));
-                    
+
                     if(Path.GetFileName(Path.GetDirectoryName(fullPath)) == "Server~")
                     {
-                        return Path.GetDirectoryName(fullPath);
+                        return CleanPathPrefix(Path.GetDirectoryName(fullPath));
                     }
                 }
             }
@@ -106,6 +110,20 @@ public static string GetServerPath()
             return errorString;
         }
 
+        /// <summary>
+        /// Cleans the path prefix by removing a leading "~" character if present on macOS.
+        /// </summary>
+        /// <param name="path">The path to clean.</param>
+        /// <returns>The cleaned path.</returns>
+        private static string CleanPathPrefix(string path)
+        {
+            if (path.StartsWith("~"))
+            {
+                return path.Substring(1);
+            }
+            return path;
+        }
+
         /// <summary>
         /// Adds the MCP configuration to the Windsurf MCP config file
         /// </summary>