Merge branch 'main' of https://github.com/CoderGamester/mcp-unity

# Conflicts:
#	Editor/Services/TestRunnerService.cs

Author: CoderGamester

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))
@@ -142,6 +145,9 @@ private void CollectTestItems(ITestAdaptor testAdaptor, List<ITestAdaptor> tests
         /// </summary>
         public void RunStarted(ITestAdaptor testsToRun)
         {
+            if (_tcs == null)
+                return;
+            
             McpLogger.LogInfo($"Test run started: {testsToRun?.Name}");
         }
 
@@ -158,17 +164,23 @@ public void TestStarted(ITestAdaptor test)
         /// </summary>
         public void TestFinished(ITestResultAdaptor result)
         {
-            if (result != null)  // Add null check
-                _results.Add(result);
+            if (_tcs == null)
+                return;
+            
+            _results.Add(result);
         }
 
         /// <summary>
         /// Called when the test run finishes.
         /// </summary>
         public void RunFinished(ITestResultAdaptor result)
         {
+            if (_tcs == null)
+                return;
+            
             var summary = BuildResultJson(_results, result);
-            _tcs?.TrySetResult(summary);
+            _tcs.TrySetResult(summary);
+            _tcs = null;
         }
 
         #endregion
@@ -192,32 +204,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");
-            string state = result != null ? result.ResultState : "Unknown";
-            double duration = result != null ? result.Duration : -1;
-
             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",
-                ["resultState"]       = state,
-                ["durationSeconds"]   = duration,
+                ["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,
+                ["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);
         }
     }

Server~/build/tools/runTestsTool.js

@@ -5,8 +5,9 @@ const toolName = 'run_tests';
 const toolDescription = 'Runs Unity\'s Test Runner tests';
 const paramsSchema = z.object({
     testMode: z.string().optional().default('EditMode').describe('The test mode to run (EditMode or PlayMode) - defaults to EditMode (optional)'),
-    testFilter: z.string().optional().default('').describe('The specific test filter to run (e.g. specific test name or namespace) (optional)'),
-    returnOnlyFailures: z.boolean().optional().default(true).describe('Whether to show only failed tests in the results (optional)')
+    testFilter: z.string().optional().default('').describe('The specific test filter to run (e.g. specific test name or class name, must include namespace) (optional)'),
+    returnOnlyFailures: z.boolean().optional().default(true).describe('Whether to show only failed tests in the results (optional)'),
+    returnWithLogs: z.boolean().optional().default(false).describe('Whether to return the test logs in the results (optional)')
 });
 /**
  * Creates and registers the Run Tests tool with the MCP server
@@ -41,14 +42,15 @@ export function registerRunTestsTool(server, mcpUnity, logger) {
  * @throws McpUnityError if the request to Unity fails
  */
 async function toolHandler(mcpUnity, params = {}) {
-    const { testMode = 'EditMode', testFilter = '', returnOnlyFailures = true } = params;
+    const { testMode = 'EditMode', testFilter = '', returnOnlyFailures = true, returnWithLogs = false } = params;
     // Create and wait for the test run
     const response = await mcpUnity.sendRequest({
         method: toolName,
         params: {
             testMode,
             testFilter,
-            returnOnlyFailures
+            returnOnlyFailures,
+            returnWithLogs
         }
     });
     // Process the test results

Server~/src/tools/runTestsTool.ts

@@ -10,8 +10,9 @@ const toolName = 'run_tests';
 const toolDescription = 'Runs Unity\'s Test Runner tests';
 const paramsSchema = z.object({
   testMode: z.string().optional().default('EditMode').describe('The test mode to run (EditMode or PlayMode) - defaults to EditMode (optional)'),
-  testFilter: z.string().optional().default('').describe('The specific test filter to run (e.g. specific test name or namespace) (optional)'),
-  returnOnlyFailures: z.boolean().optional().default(true).describe('Whether to show only failed tests in the results (optional)')
+  testFilter: z.string().optional().default('').describe('The specific test filter to run (e.g. specific test name or class name, must include namespace) (optional)'),
+  returnOnlyFailures: z.boolean().optional().default(true).describe('Whether to show only failed tests in the results (optional)'),
+  returnWithLogs: z.boolean().optional().default(false).describe('Whether to return the test logs in the results (optional)')
 });
 
 /**
@@ -56,7 +57,8 @@ async function toolHandler(mcpUnity: McpUnity, params: any = {}): Promise<CallTo
   const {
     testMode = 'EditMode',
     testFilter = '',
-    returnOnlyFailures = true
+    returnOnlyFailures = true,
+    returnWithLogs = false
   } = params;
 
   // Create and wait for the test run
@@ -65,7 +67,8 @@ async function toolHandler(mcpUnity: McpUnity, params: any = {}): Promise<CallTo
     params: { 
       testMode,
       testFilter,
-      returnOnlyFailures
+      returnOnlyFailures,
+      returnWithLogs
     }
   });