attempted ManageScene debugging for hang

dsarno · dsarno · commit 46df7250b514 · 2025-09-09T19:26:17.000-07:00
diff --git a/UnityMcpBridge/Editor/MCPForUnityBridge.cs b/UnityMcpBridge/Editor/MCPForUnityBridge.cs
@@ -575,6 +575,10 @@ private static async Task HandleClientAsync(TcpClient client, CancellationToken
                             response = JsonConvert.SerializeObject(errorResponse);
                         }
 
+                        if (IsDebugEnabled())
+                        {
+                            try { MCPForUnity.Editor.Helpers.McpLog.Info("[MCP] sending framed response", always: false); } catch { }
+                        }
                         byte[] responseBytes = System.Text.Encoding.UTF8.GetBytes(response);
                         await WriteFrameAsync(stream, responseBytes);
                     }
@@ -858,6 +862,12 @@ private static object InvokeOnMainThreadWithTimeout(Func<object> func, int timeo
             if (func == null) return null;
             try
             {
+                // If mainThreadId is unknown, assume we're on main thread to avoid blocking the editor.
+                if (mainThreadId == 0)
+                {
+                    try { return func(); }
+                    catch (Exception ex) { throw new InvalidOperationException($"Main thread handler error: {ex.Message}", ex); }
+                }
                 // If we are already on the main thread, execute directly to avoid deadlocks
                 try
                 {
@@ -895,13 +905,13 @@ private static object InvokeOnMainThreadWithTimeout(Func<object> func, int timeo
                 }
                 if (captured != null)
                 {
-                    return Response.Error($"Main thread handler error: {captured.Message}");
+                    throw new InvalidOperationException($"Main thread handler error: {captured.Message}", captured);
                 }
                 return result;
             }
             catch (Exception ex)
             {
-                return Response.Error($"Failed to invoke on main thread: {ex.Message}");
+                throw new InvalidOperationException($"Failed to invoke on main thread: {ex.Message}", ex);
             }
         }
 
@@ -969,8 +979,9 @@ private static string ExecuteCommand(Command command)
                     // Maps the command type (tool name) to the corresponding handler's static HandleCommand method
                     // Assumes each handler class has a static method named 'HandleCommand' that takes JObject parameters
                     "manage_script" => ManageScript.HandleCommand(paramsObject),
-                    // Run scene operations on the main thread to avoid deadlocks/hangs
-                    "manage_scene" => InvokeOnMainThreadWithTimeout(() => ManageScene.HandleCommand(paramsObject), FrameIOTimeoutMs) ?? Response.Error("manage_scene timed out on main thread"),
+                    // Run scene operations on the main thread to avoid deadlocks/hangs (with diagnostics under debug flag)
+                    "manage_scene" => HandleManageScene(paramsObject)
+                        ?? throw new TimeoutException($"manage_scene timed out after {FrameIOTimeoutMs} ms on main thread"),
                     "manage_editor" => ManageEditor.HandleCommand(paramsObject),
                     "manage_gameobject" => ManageGameObject.HandleCommand(paramsObject),
                     "manage_asset" => ManageAsset.HandleCommand(paramsObject),
@@ -1008,6 +1019,23 @@ private static string ExecuteCommand(Command command)
             }
         }
 
+        private static object HandleManageScene(JObject paramsObject)
+        {
+            try
+            {
+                if (IsDebugEnabled()) Debug.Log("[MCP] manage_scene: dispatching to main thread");
+                var sw = System.Diagnostics.Stopwatch.StartNew();
+                var r = InvokeOnMainThreadWithTimeout(() => ManageScene.HandleCommand(paramsObject), FrameIOTimeoutMs);
+                sw.Stop();
+                if (IsDebugEnabled()) Debug.Log($"[MCP] manage_scene: completed in {sw.ElapsedMilliseconds} ms");
+                return r ?? Response.Error("manage_scene returned null (timeout or error)");
+            }
+            catch (Exception ex)
+            {
+                return Response.Error($"manage_scene dispatch error: {ex.Message}");
+            }
+        }
+
         // Helper method to get a summary of parameters for error reporting
         private static string GetParamsSummary(JObject @params)
         {
diff --git a/UnityMcpBridge/Editor/Tools/ManageScene.cs b/UnityMcpBridge/Editor/Tools/ManageScene.cs
@@ -21,6 +21,7 @@ public static class ManageScene
         /// </summary>
         public static object HandleCommand(JObject @params)
         {
+            try { McpLog.Info("[ManageScene] HandleCommand: start", always: false); } catch { }
             string action = @params["action"]?.ToString().ToLower();
             string name = @params["name"]?.ToString();
             string path = @params["path"]?.ToString(); // Relative to Assets/
@@ -76,6 +77,7 @@ public static object HandleCommand(JObject @params)
             }
 
             // Route action
+            try { McpLog.Info($"[ManageScene] Route action='{action}' name='{name}' path='{path}' buildIndex={(buildIndex.HasValue ? buildIndex.Value.ToString() : "null")}", always: false); } catch { }
             switch (action)
             {
                 case "create":
@@ -98,9 +100,15 @@ public static object HandleCommand(JObject @params)
                     // Save current scene, optionally to a new path
                     return SaveScene(fullPath, relativePath);
                 case "get_hierarchy":
-                    return GetSceneHierarchy();
+                    try { McpLog.Info("[ManageScene] get_hierarchy: entering", always: false); } catch { }
+                    var gh = GetSceneHierarchy();
+                    try { McpLog.Info("[ManageScene] get_hierarchy: exiting", always: false); } catch { }
+                    return gh;
                 case "get_active":
-                    return GetActiveSceneInfo();
+                    try { McpLog.Info("[ManageScene] get_active: entering", always: false); } catch { }
+                    var ga = GetActiveSceneInfo();
+                    try { McpLog.Info("[ManageScene] get_active: exiting", always: false); } catch { }
+                    return ga;
                 case "get_build_settings":
                     return GetBuildSettingsScenes();
                 // Add cases for modifying build settings, additive loading, unloading etc.
@@ -294,7 +302,9 @@ private static object GetActiveSceneInfo()
         {
             try
             {
+                try { McpLog.Info("[ManageScene] get_active: querying EditorSceneManager.GetActiveScene", always: false); } catch { }
                 Scene activeScene = EditorSceneManager.GetActiveScene();
+                try { McpLog.Info($"[ManageScene] get_active: got scene valid={activeScene.IsValid()} loaded={activeScene.isLoaded} name='{activeScene.name}'", always: false); } catch { }
                 if (!activeScene.IsValid())
                 {
                     return Response.Error("No active scene found.");
@@ -314,6 +324,7 @@ private static object GetActiveSceneInfo()
             }
             catch (Exception e)
             {
+                try { McpLog.Error($"[ManageScene] get_active: exception {e.Message}"); } catch { }
                 return Response.Error($"Error getting active scene info: {e.Message}");
             }
         }
@@ -348,24 +359,31 @@ private static object GetSceneHierarchy()
         {
             try
             {
+                try { McpLog.Info("[ManageScene] get_hierarchy: querying EditorSceneManager.GetActiveScene", always: false); } catch { }
                 Scene activeScene = EditorSceneManager.GetActiveScene();
+                try { McpLog.Info($"[ManageScene] get_hierarchy: got scene valid={activeScene.IsValid()} loaded={activeScene.isLoaded} name='{activeScene.name}'", always: false); } catch { }
                 if (!activeScene.IsValid() || !activeScene.isLoaded)
                 {
                     return Response.Error(
                         "No valid and loaded scene is active to get hierarchy from."
                     );
                 }
 
+                try { McpLog.Info("[ManageScene] get_hierarchy: fetching root objects", always: false); } catch { }
                 GameObject[] rootObjects = activeScene.GetRootGameObjects();
+                try { McpLog.Info($"[ManageScene] get_hierarchy: rootCount={rootObjects?.Length ?? 0}", always: false); } catch { }
                 var hierarchy = rootObjects.Select(go => GetGameObjectDataRecursive(go)).ToList();
 
-                return Response.Success(
+                var resp = Response.Success(
                     $"Retrieved hierarchy for scene '{activeScene.name}'.",
                     hierarchy
                 );
+                try { McpLog.Info("[ManageScene] get_hierarchy: success", always: false); } catch { }
+                return resp;
             }
             catch (Exception e)
             {
+                try { McpLog.Error($"[ManageScene] get_hierarchy: exception {e.Message}"); } catch { }
                 return Response.Error($"Error getting scene hierarchy: {e.Message}");
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -575,6 +575,10 @@ private static async Task HandleClientAsync(TcpClient client, CancellationToken`
`575`	`575`	`response = JsonConvert.SerializeObject(errorResponse);`
`576`	`576`	`}`
`577`	`577`
	`578`	`+ if (IsDebugEnabled())`
	`579`	`+ {`
	`580`	`+ try { MCPForUnity.Editor.Helpers.McpLog.Info("[MCP] sending framed response", always: false); } catch { }`
	`581`	`+ }`
`578`	`582`	`byte[] responseBytes = System.Text.Encoding.UTF8.GetBytes(response);`
`579`	`583`	`await WriteFrameAsync(stream, responseBytes);`
`580`	`584`	`}`
`@@ -858,6 +862,12 @@ private static object InvokeOnMainThreadWithTimeout(Func<object> func, int timeo`
`858`	`862`	`if (func == null) return null;`
`859`	`863`	`try`
`860`	`864`	`{`
	`865`	`+ // If mainThreadId is unknown, assume we're on main thread to avoid blocking the editor.`
	`866`	`+ if (mainThreadId == 0)`
	`867`	`+ {`
	`868`	`+ try { return func(); }`
	`869`	`+ catch (Exception ex) { throw new InvalidOperationException($"Main thread handler error: {ex.Message}", ex); }`
	`870`	`+ }`
`861`	`871`	`// If we are already on the main thread, execute directly to avoid deadlocks`
`862`	`872`	`try`
`863`	`873`	`{`
`@@ -895,13 +905,13 @@ private static object InvokeOnMainThreadWithTimeout(Func<object> func, int timeo`
`895`	`905`	`}`
`896`	`906`	`if (captured != null)`
`897`	`907`	`{`
`898`		`- return Response.Error($"Main thread handler error: {captured.Message}");`
	`908`	`+ throw new InvalidOperationException($"Main thread handler error: {captured.Message}", captured);`
`899`	`909`	`}`
`900`	`910`	`return result;`
`901`	`911`	`}`
`902`	`912`	`catch (Exception ex)`
`903`	`913`	`{`
`904`		`- return Response.Error($"Failed to invoke on main thread: {ex.Message}");`
	`914`	`+ throw new InvalidOperationException($"Failed to invoke on main thread: {ex.Message}", ex);`
`905`	`915`	`}`
`906`	`916`	`}`
`907`	`917`
`@@ -969,8 +979,9 @@ private static string ExecuteCommand(Command command)`
`969`	`979`	`// Maps the command type (tool name) to the corresponding handler's static HandleCommand method`
`970`	`980`	`// Assumes each handler class has a static method named 'HandleCommand' that takes JObject parameters`
`971`	`981`	`"manage_script" => ManageScript.HandleCommand(paramsObject),`
`972`		`- // Run scene operations on the main thread to avoid deadlocks/hangs`
`973`		`- "manage_scene" => InvokeOnMainThreadWithTimeout(() => ManageScene.HandleCommand(paramsObject), FrameIOTimeoutMs) ?? Response.Error("manage_scene timed out on main thread"),`
	`982`	`+ // Run scene operations on the main thread to avoid deadlocks/hangs (with diagnostics under debug flag)`
	`983`	`+ "manage_scene" => HandleManageScene(paramsObject)`
	`984`	`+ ?? throw new TimeoutException($"manage_scene timed out after {FrameIOTimeoutMs} ms on main thread"),`
`974`	`985`	`"manage_editor" => ManageEditor.HandleCommand(paramsObject),`
`975`	`986`	`"manage_gameobject" => ManageGameObject.HandleCommand(paramsObject),`
`976`	`987`	`"manage_asset" => ManageAsset.HandleCommand(paramsObject),`
`@@ -1008,6 +1019,23 @@ private static string ExecuteCommand(Command command)`
`1008`	`1019`	`}`
`1009`	`1020`	`}`
`1010`	`1021`
	`1022`	`+ private static object HandleManageScene(JObject paramsObject)`
	`1023`	`+ {`
	`1024`	`+ try`
	`1025`	`+ {`
	`1026`	`+ if (IsDebugEnabled()) Debug.Log("[MCP] manage_scene: dispatching to main thread");`
	`1027`	`+ var sw = System.Diagnostics.Stopwatch.StartNew();`
	`1028`	`+ var r = InvokeOnMainThreadWithTimeout(() => ManageScene.HandleCommand(paramsObject), FrameIOTimeoutMs);`
	`1029`	`+ sw.Stop();`
	`1030`	`+ if (IsDebugEnabled()) Debug.Log($"[MCP] manage_scene: completed in {sw.ElapsedMilliseconds} ms");`
	`1031`	`+ return r ?? Response.Error("manage_scene returned null (timeout or error)");`
	`1032`	`+ }`
	`1033`	`+ catch (Exception ex)`
	`1034`	`+ {`
	`1035`	`+ return Response.Error($"manage_scene dispatch error: {ex.Message}");`
	`1036`	`+ }`
	`1037`	`+ }`
	`1038`	`+`
`1011`	`1039`	`// Helper method to get a summary of parameters for error reporting`
`1012`	`1040`	`private static string GetParamsSummary(JObject @params)`
`1013`	`1041`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ public static class ManageScene`
`21`	`21`	`/// </summary>`
`22`	`22`	`public static object HandleCommand(JObject @params)`
`23`	`23`	`{`
	`24`	`+ try { McpLog.Info("[ManageScene] HandleCommand: start", always: false); } catch { }`
`24`	`25`	`string action = @params["action"]?.ToString().ToLower();`
`25`	`26`	`string name = @params["name"]?.ToString();`
`26`	`27`	`string path = @params["path"]?.ToString(); // Relative to Assets/`
`@@ -76,6 +77,7 @@ public static object HandleCommand(JObject @params)`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`// Route action`
	`80`	`+ try { McpLog.Info($"[ManageScene] Route action='{action}' name='{name}' path='{path}' buildIndex={(buildIndex.HasValue ? buildIndex.Value.ToString() : "null")}", always: false); } catch { }`
`79`	`81`	`switch (action)`
`80`	`82`	`{`
`81`	`83`	`case "create":`
`@@ -98,9 +100,15 @@ public static object HandleCommand(JObject @params)`
`98`	`100`	`// Save current scene, optionally to a new path`
`99`	`101`	`return SaveScene(fullPath, relativePath);`
`100`	`102`	`case "get_hierarchy":`
`101`		`- return GetSceneHierarchy();`
	`103`	`+ try { McpLog.Info("[ManageScene] get_hierarchy: entering", always: false); } catch { }`
	`104`	`+ var gh = GetSceneHierarchy();`
	`105`	`+ try { McpLog.Info("[ManageScene] get_hierarchy: exiting", always: false); } catch { }`
	`106`	`+ return gh;`
`102`	`107`	`case "get_active":`
`103`		`- return GetActiveSceneInfo();`
	`108`	`+ try { McpLog.Info("[ManageScene] get_active: entering", always: false); } catch { }`
	`109`	`+ var ga = GetActiveSceneInfo();`
	`110`	`+ try { McpLog.Info("[ManageScene] get_active: exiting", always: false); } catch { }`
	`111`	`+ return ga;`
`104`	`112`	`case "get_build_settings":`
`105`	`113`	`return GetBuildSettingsScenes();`
`106`	`114`	`// Add cases for modifying build settings, additive loading, unloading etc.`
`@@ -294,7 +302,9 @@ private static object GetActiveSceneInfo()`
`294`	`302`	`{`
`295`	`303`	`try`
`296`	`304`	`{`
	`305`	`+ try { McpLog.Info("[ManageScene] get_active: querying EditorSceneManager.GetActiveScene", always: false); } catch { }`
`297`	`306`	`Scene activeScene = EditorSceneManager.GetActiveScene();`
	`307`	`+ try { McpLog.Info($"[ManageScene] get_active: got scene valid={activeScene.IsValid()} loaded={activeScene.isLoaded} name='{activeScene.name}'", always: false); } catch { }`
`298`	`308`	`if (!activeScene.IsValid())`
`299`	`309`	`{`
`300`	`310`	`return Response.Error("No active scene found.");`
`@@ -314,6 +324,7 @@ private static object GetActiveSceneInfo()`
`314`	`324`	`}`
`315`	`325`	`catch (Exception e)`
`316`	`326`	`{`
	`327`	`+ try { McpLog.Error($"[ManageScene] get_active: exception {e.Message}"); } catch { }`
`317`	`328`	`return Response.Error($"Error getting active scene info: {e.Message}");`
`318`	`329`	`}`
`319`	`330`	`}`
`@@ -348,24 +359,31 @@ private static object GetSceneHierarchy()`
`348`	`359`	`{`
`349`	`360`	`try`
`350`	`361`	`{`
	`362`	`+ try { McpLog.Info("[ManageScene] get_hierarchy: querying EditorSceneManager.GetActiveScene", always: false); } catch { }`
`351`	`363`	`Scene activeScene = EditorSceneManager.GetActiveScene();`
	`364`	`+ try { McpLog.Info($"[ManageScene] get_hierarchy: got scene valid={activeScene.IsValid()} loaded={activeScene.isLoaded} name='{activeScene.name}'", always: false); } catch { }`
`352`	`365`	`if (!activeScene.IsValid() \|\| !activeScene.isLoaded)`
`353`	`366`	`{`
`354`	`367`	`return Response.Error(`
`355`	`368`	`"No valid and loaded scene is active to get hierarchy from."`
`356`	`369`	`);`
`357`	`370`	`}`
`358`	`371`
	`372`	`+ try { McpLog.Info("[ManageScene] get_hierarchy: fetching root objects", always: false); } catch { }`
`359`	`373`	`GameObject[] rootObjects = activeScene.GetRootGameObjects();`
	`374`	`+ try { McpLog.Info($"[ManageScene] get_hierarchy: rootCount={rootObjects?.Length ?? 0}", always: false); } catch { }`
`360`	`375`	`var hierarchy = rootObjects.Select(go => GetGameObjectDataRecursive(go)).ToList();`
`361`	`376`
`362`		`- return Response.Success(`
	`377`	`+ var resp = Response.Success(`
`363`	`378`	`$"Retrieved hierarchy for scene '{activeScene.name}'.",`
`364`	`379`	`hierarchy`
`365`	`380`	`);`
	`381`	`+ try { McpLog.Info("[ManageScene] get_hierarchy: success", always: false); } catch { }`
	`382`	`+ return resp;`
`366`	`383`	`}`
`367`	`384`	`catch (Exception e)`
`368`	`385`	`{`
	`386`	`+ try { McpLog.Error($"[ManageScene] get_hierarchy: exception {e.Message}"); } catch { }`
`369`	`387`	`return Response.Error($"Error getting scene hierarchy: {e.Message}");`
`370`	`388`	`}`
`371`	`389`	`}`