Fixed issue where resources would provide the wrong output to the MCP host

Removed toolRegistry and made all tools follow the similar pattern as resources. Simplefied the code readability
Fixed issue preventing tools and resources to work if they had white spaces in them

Author: CoderGamester

Editor/Resources/GetGameObjectResource.cs

@@ -36,7 +36,7 @@ public override JObject Fetch(JObject parameters)
                 };
             }
 
-            string objectPathId = parameters["objectPathId"].ToString();
+            string objectPathId = parameters["objectPathId"]?.ToObject<string>();
             GameObject gameObject = null;
 
             // Try to parse as an instance ID first

Editor/Tools/AddPackageTool.cs

@@ -302,8 +302,8 @@ private void ProcessCompletedOperation(PackageOperation operation)
                     operation.CompletionSource.SetResult(new JObject
                     {
                         ["success"] = true,
-                        ["message"] = $"Successfully added package: {result.displayName} ({result.name}) version {result.version}",
                         ["type"] = "text",
+                        ["message"] = $"Successfully added package: {result.displayName} ({result.name}) version {result.version}",
                         ["packageInfo"] = JObject.FromObject(new
                         {
                             name = result.name,
@@ -317,6 +317,7 @@ private void ProcessCompletedOperation(PackageOperation operation)
                     operation.CompletionSource.SetResult(new JObject
                     {
                         ["success"] = true,
+                        ["type"] = "text",
                         ["message"] = $"Package operation completed successfully, but no package information was returned."
                     });
                 }

Editor/Tools/MenuItemTool.cs

@@ -44,6 +44,7 @@ public override JObject Execute(JObject parameters)
             return new JObject
             {
                 ["success"] = success,
+                ["type"] = "text",
                 ["message"] = success 
                     ? $"Successfully executed menu item: {menuPath}" 
                     : $"Failed to execute menu item: {menuPath}"

Editor/Tools/NotifyMessageTool.cs

@@ -52,8 +52,8 @@ public override JObject Execute(JObject parameters)
             return new JObject
             {
                 ["success"] = true,
-                ["message"] = $"Message displayed: {message}",
-                ["type"] = "text"
+                ["type"] = "text",
+                ["message"] = $"Message displayed: {message}"
             };
         }
     }

Editor/Tools/RunTestsTool.cs

@@ -161,7 +161,12 @@ public void RunFinished(ITestResultAdaptor result)
             // Set the test run completion result
             try
             {
-                _testRunCompletionSource.SetResult(summary);
+                _testRunCompletionSource.SetResult(new JObject
+                {
+                    ["success"] = true,
+                    ["type"] = "text",
+                    ["message"] = summary["message"].Value<string>()
+                });
             }
             catch (Exception ex)
             {

Editor/Tools/SelectGameObjectTool.cs

@@ -60,6 +60,7 @@ public override JObject Execute(JObject parameters)
             return new JObject
             {
                 ["success"] = true,
+                ["type"] = "text",
                 ["message"] = $"Successfully selected GameObject" + 
                     (instanceId.HasValue ? $" with instance ID: {instanceId.Value}" : $": {objectPath}")
             };

Editor/Tools/UpdateComponentTool.cs

@@ -57,14 +57,6 @@ public override JObject Execute(JObject parameters)
             {
                 gameObject = EditorUtility.InstanceIDToObject(instanceId.Value) as GameObject;
                 identifier = $"ID {instanceId.Value}";
-                
-                if (gameObject == null)
-                {
-                    return McpUnitySocketHandler.CreateErrorResponse(
-                        $"GameObject with instance ID {instanceId.Value} not found", 
-                        "not_found_error"
-                    );
-                }
             }
             else
             {
@@ -76,16 +68,16 @@ public override JObject Execute(JObject parameters)
                 {
                     // Try to find using the Unity Scene hierarchy path
                     gameObject = FindGameObjectByPath(objectPath);
-                    
-                    if (gameObject == null)
-                    {
-                        return McpUnitySocketHandler.CreateErrorResponse(
-                            $"GameObject with path '{objectPath}' not found", 
-                            "not_found_error"
-                        );
-                    }
                 }
             }
+                    
+            if (gameObject == null)
+            {
+                return McpUnitySocketHandler.CreateErrorResponse(
+                    $"GameObject with path '{objectPath}' or instance ID {instanceId} not found", 
+                    "not_found_error"
+                );
+            }
 
             Debug.Log($"[MCP Unity] Updating component '{componentName}' on GameObject '{gameObject.name}' (found by {identifier})");
 
@@ -127,10 +119,10 @@ public override JObject Execute(JObject parameters)
             return new JObject
             {
                 ["success"] = true,
+                ["type"] = "text",
                 ["message"] = wasAdded
                     ? $"Successfully added component '{componentName}' to GameObject '{gameObject.name}' and updated its data"
-                    : $"Successfully updated component '{componentName}' on GameObject '{gameObject.name}'",
-                ["type"] = "text"
+                    : $"Successfully updated component '{componentName}' on GameObject '{gameObject.name}'"
             };
         }
 

Server/build/index.js

@@ -3,8 +3,6 @@ import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { McpUnity } from './unity/mcpUnity.js';
 import { Logger, LogLevel } from './utils/logger.js';
-import { ToolRegistry } from './tools/toolRegistry.js';
-// No longer need to import from resourceRegistry
 import { createMenuItemTool } from './tools/menuItemTool.js';
 import { createSelectGameObjectTool } from './tools/selectGameObjectTool.js';
 import { createAddPackageTool } from './tools/addPackageTool.js';
@@ -35,15 +33,13 @@ const server = new McpServer({
 });
 // Initialize MCP HTTP bridge with Unity editor
 const mcpUnity = new McpUnity(unityLogger);
-// Initialize the tool registry
-const toolRegistry = new ToolRegistry(toolLogger);
 // Add all tools to the registry
-toolRegistry.add(createMenuItemTool(mcpUnity, toolLogger));
-toolRegistry.add(createSelectGameObjectTool(mcpUnity, toolLogger));
-toolRegistry.add(createAddPackageTool(mcpUnity, toolLogger));
-toolRegistry.add(createRunTestsTool(mcpUnity, toolLogger));
-toolRegistry.add(createNotifyMessageTool(mcpUnity, toolLogger));
-toolRegistry.add(createUpdateComponentTool(mcpUnity, toolLogger));
+createMenuItemTool(server, mcpUnity, toolLogger);
+createSelectGameObjectTool(server, mcpUnity, toolLogger);
+createAddPackageTool(server, mcpUnity, toolLogger);
+createRunTestsTool(server, mcpUnity, toolLogger);
+createNotifyMessageTool(server, mcpUnity, toolLogger);
+createUpdateComponentTool(server, mcpUnity, toolLogger);
 // Create and register all resources with the MCP server
 createGetTestsResource(server, mcpUnity, resourceLogger);
 createGetGameObjectResource(server, mcpUnity, resourceLogger);
@@ -52,8 +48,6 @@ createGetConsoleLogsResource(server, mcpUnity, resourceLogger);
 createGetHierarchyResource(server, mcpUnity, resourceLogger);
 createGetPackagesResource(server, mcpUnity, resourceLogger);
 createGetAssetsResource(server, mcpUnity, resourceLogger);
-// Register all tools with the MCP server
-toolRegistry.registerWithServer(server);
 // Server startup function
 async function startServer() {
     try {

Server/build/resources/getGameObjectResource.js

@@ -1,5 +1,6 @@
 import { ResourceTemplate } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { McpUnityError, ErrorType } from '../utils/errors.js';
+import { resourceUri as hierarchyResourceUri } from './getHierarchyResource.js';
 // Constants for the resource
 const resourceName = 'get_gameobject';
 const resourceUri = 'unity://gameobject/{id}';
@@ -15,7 +16,7 @@ const resourceMimeType = 'application/json';
 export function createGetGameObjectResource(server, mcpUnity, logger) {
     // Create a resource template with the MCP SDK
     const resourceTemplate = new ResourceTemplate(resourceUri, {
-        list: () => listGameObjects(mcpUnity, logger, resourceMimeType)
+        list: async () => listGameObjects(mcpUnity, logger, resourceMimeType)
     });
     logger.info(`Registering resource: ${resourceName}`);
     // Register this resource with the MCP server
@@ -44,7 +45,7 @@ export function createGetGameObjectResource(server, mcpUnity, logger) {
  */
 async function resourceHandler(mcpUnity, uri, variables, logger) {
     // Extract and convert the parameter from the template variables
-    const id = variables["id"];
+    const id = decodeURIComponent(variables["id"]);
     // Send request to Unity
     const response = await mcpUnity.sendRequest({
         method: resourceName,
@@ -72,7 +73,7 @@ async function resourceHandler(mcpUnity, uri, variables, logger) {
  */
 async function listGameObjects(mcpUnity, logger, resourceMimeType) {
     const hierarchyResponse = await mcpUnity.sendRequest({
-        method: 'get_hierarchy',
+        method: hierarchyResourceUri,
         params: {}
     });
     if (!hierarchyResponse.success) {
@@ -81,6 +82,7 @@ async function listGameObjects(mcpUnity, logger, resourceMimeType) {
     }
     // Process the hierarchy to create a list of GameObject references
     const gameObjects = processHierarchyToGameObjectList(hierarchyResponse.hierarchy || []);
+    logger.info(`[getGameObjectResource] Fetched hierarchy with ${gameObjects.length} GameObjects ${hierarchyResponse.hierarchy}`);
     // Create resources array with both instance ID and path URIs
     const resources = [];
     // Add resources for each GameObject

Server/build/resources/getHierarchyResource.d.ts

@@ -1,6 +1,9 @@
 import { McpUnity } from '../unity/mcpUnity.js';
 import { Logger } from '../utils/logger.js';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+export declare const resourceName = "get_hierarchy";
+export declare const resourceUri = "unity://hierarchy";
+export declare const resourceMimeType = "application/json";
 /**
  * Creates and registers the Hierarchy resource with the MCP server
  * This resource provides access to the Unity scene hierarchy