diff --git a/MCPForUnity/Editor/Dependencies/PlatformDetectors/PlatformDetectorBase.cs b/MCPForUnity/Editor/Dependencies/PlatformDetectors/PlatformDetectorBase.cs
index c64881c6..dd554aff 100644
--- a/MCPForUnity/Editor/Dependencies/PlatformDetectors/PlatformDetectorBase.cs
+++ b/MCPForUnity/Editor/Dependencies/PlatformDetectors/PlatformDetectorBase.cs
@@ -54,7 +54,7 @@ protected bool TryFindUvInPath(out string uvPath, out string version)
 
             // Try common uv command names
             var commands = new[] { "uvx", "uv" };
-            
+
             foreach (var cmd in commands)
             {
                 try
diff --git a/MCPForUnity/Editor/Helpers/CodexConfigHelper.cs b/MCPForUnity/Editor/Helpers/CodexConfigHelper.cs
index 786bc7f9..75b243b8 100644
--- a/MCPForUnity/Editor/Helpers/CodexConfigHelper.cs
+++ b/MCPForUnity/Editor/Helpers/CodexConfigHelper.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using MCPForUnity.External.Tommy;
 using MCPForUnity.Editor.Services;
+using MCPForUnity.External.Tommy;
 using UnityEditor;
 
 namespace MCPForUnity.Editor.Helpers
diff --git a/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs b/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
index 294579b4..6df986ae 100644
--- a/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
+++ b/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
@@ -1,10 +1,10 @@
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using Newtonsoft.Json.Linq;
-using MCPForUnity.Editor.Models;
-using MCPForUnity.Editor.Helpers;
 using MCPForUnity.Editor.Constants;
+using MCPForUnity.Editor.Helpers;
+using MCPForUnity.Editor.Models;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using UnityEditor;
 
 namespace MCPForUnity.Editor.Helpers
diff --git a/MCPForUnity/Editor/Helpers/ExecPath.cs b/MCPForUnity/Editor/Helpers/ExecPath.cs
index 9190ec38..2224009e 100644
--- a/MCPForUnity/Editor/Helpers/ExecPath.cs
+++ b/MCPForUnity/Editor/Helpers/ExecPath.cs
@@ -2,10 +2,10 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Runtime.InteropServices;
-using UnityEditor;
+using System.Text;
 using MCPForUnity.Editor.Constants;
+using UnityEditor;
 
 namespace MCPForUnity.Editor.Helpers
 {
diff --git a/MCPForUnity/Editor/Helpers/GameObjectSerializer.cs b/MCPForUnity/Editor/Helpers/GameObjectSerializer.cs
index 05d1b8b3..2e2c61d3 100644
--- a/MCPForUnity/Editor/Helpers/GameObjectSerializer.cs
+++ b/MCPForUnity/Editor/Helpers/GameObjectSerializer.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using MCPForUnity.Runtime.Serialization; // For Converters
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
-using MCPForUnity.Runtime.Serialization; // For Converters
 
 namespace MCPForUnity.Editor.Helpers
 {
diff --git a/MCPForUnity/Editor/Helpers/HttpEndpointUtility.cs b/MCPForUnity/Editor/Helpers/HttpEndpointUtility.cs
index 53a1c843..95991f5f 100644
--- a/MCPForUnity/Editor/Helpers/HttpEndpointUtility.cs
+++ b/MCPForUnity/Editor/Helpers/HttpEndpointUtility.cs
@@ -1,7 +1,7 @@
 using System;
-using UnityEditor;
-using MCPForUnity.Editor.Constants;
 using MCPForUnity.Editor.Config;
+using MCPForUnity.Editor.Constants;
+using UnityEditor;
 
 namespace MCPForUnity.Editor.Helpers
 {
diff --git a/MCPForUnity/Editor/Helpers/McpLog.cs b/MCPForUnity/Editor/Helpers/McpLog.cs
index 2b0a3148..ca9f7713 100644
--- a/MCPForUnity/Editor/Helpers/McpLog.cs
+++ b/MCPForUnity/Editor/Helpers/McpLog.cs
@@ -1,6 +1,6 @@
+using MCPForUnity.Editor.Constants;
 using UnityEditor;
 using UnityEngine;
-using MCPForUnity.Editor.Constants;
 
 namespace MCPForUnity.Editor.Helpers
 {
diff --git a/MCPForUnity/Editor/Helpers/PortManager.cs b/MCPForUnity/Editor/Helpers/PortManager.cs
index 1de6f02d..e8e80c5c 100644
--- a/MCPForUnity/Editor/Helpers/PortManager.cs
+++ b/MCPForUnity/Editor/Helpers/PortManager.cs
@@ -1,14 +1,14 @@
 using System;
 using System.IO;
-using UnityEditor;
 using System.Net;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
+using MCPForUnity.Editor.Constants;
 using Newtonsoft.Json;
+using UnityEditor;
 using UnityEngine;
-using MCPForUnity.Editor.Constants;
 
 namespace MCPForUnity.Editor.Helpers
 {
diff --git a/MCPForUnity/Editor/Helpers/Response.cs b/MCPForUnity/Editor/Helpers/Response.cs
index 39d7f6c0..6c6c299d 100644
--- a/MCPForUnity/Editor/Helpers/Response.cs
+++ b/MCPForUnity/Editor/Helpers/Response.cs
@@ -2,8 +2,8 @@
 
 namespace MCPForUnity.Editor.Helpers
 {
-public interface IMcpResponse
-{
+    public interface IMcpResponse
+    {
         [JsonProperty("success")]
         bool Success { get; }
     }
diff --git a/MCPForUnity/Editor/Helpers/TelemetryHelper.cs b/MCPForUnity/Editor/Helpers/TelemetryHelper.cs
index 953fa795..6e092d46 100644
--- a/MCPForUnity/Editor/Helpers/TelemetryHelper.cs
+++ b/MCPForUnity/Editor/Helpers/TelemetryHelper.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using UnityEngine;
 using MCPForUnity.Editor.Constants;
 using MCPForUnity.Editor.Services.Transport.Transports;
+using UnityEngine;
 
 namespace MCPForUnity.Editor.Helpers
 {
diff --git a/MCPForUnity/Editor/Migrations/LegacyServerSrcMigration.cs b/MCPForUnity/Editor/Migrations/LegacyServerSrcMigration.cs
index 186f62f9..e90019d8 100644
--- a/MCPForUnity/Editor/Migrations/LegacyServerSrcMigration.cs
+++ b/MCPForUnity/Editor/Migrations/LegacyServerSrcMigration.cs
@@ -1,7 +1,7 @@
 using System;
+using MCPForUnity.Editor.Constants;
 using MCPForUnity.Editor.Helpers;
 using MCPForUnity.Editor.Services;
-using MCPForUnity.Editor.Constants;
 using UnityEditor;
 using UnityEngine;
 
diff --git a/MCPForUnity/Editor/Migrations/StdIoVersionMigration.cs b/MCPForUnity/Editor/Migrations/StdIoVersionMigration.cs
index b00a4faf..84b63f32 100644
--- a/MCPForUnity/Editor/Migrations/StdIoVersionMigration.cs
+++ b/MCPForUnity/Editor/Migrations/StdIoVersionMigration.cs
@@ -1,14 +1,14 @@
 using System;
 using System.IO;
+using System.Linq;
 using MCPForUnity.Editor.Clients;
+using MCPForUnity.Editor.Constants;
 using MCPForUnity.Editor.Helpers;
 using MCPForUnity.Editor.Models;
 using MCPForUnity.Editor.Services;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
-using MCPForUnity.Editor.Constants;
-using System.Linq;
 
 namespace MCPForUnity.Editor.Migrations
 {
diff --git a/MCPForUnity/Editor/Resources/Tests/GetTests.cs b/MCPForUnity/Editor/Resources/Tests/GetTests.cs
index f7eeda92..e535208e 100644
--- a/MCPForUnity/Editor/Resources/Tests/GetTests.cs
+++ b/MCPForUnity/Editor/Resources/Tests/GetTests.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
 using MCPForUnity.Editor.Helpers;
 using MCPForUnity.Editor.Services;
+using Newtonsoft.Json.Linq;
 using UnityEditor.TestTools.TestRunner.Api;
 
 namespace MCPForUnity.Editor.Resources.Tests
diff --git a/MCPForUnity/Editor/Services/BridgeControlService.cs b/MCPForUnity/Editor/Services/BridgeControlService.cs
index 4c18da04..0786de05 100644
--- a/MCPForUnity/Editor/Services/BridgeControlService.cs
+++ b/MCPForUnity/Editor/Services/BridgeControlService.cs
@@ -1,11 +1,11 @@
 
 using System;
 using System.Threading.Tasks;
-using UnityEditor;
 using MCPForUnity.Editor.Constants;
 using MCPForUnity.Editor.Helpers;
 using MCPForUnity.Editor.Services.Transport;
 using MCPForUnity.Editor.Services.Transport.Transports;
+using UnityEditor;
 
 namespace MCPForUnity.Editor.Services
 {
diff --git a/MCPForUnity/Editor/Services/HttpBridgeReloadHandler.cs b/MCPForUnity/Editor/Services/HttpBridgeReloadHandler.cs
index 0422a92e..2f5ef681 100644
--- a/MCPForUnity/Editor/Services/HttpBridgeReloadHandler.cs
+++ b/MCPForUnity/Editor/Services/HttpBridgeReloadHandler.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Threading.Tasks;
-using UnityEditor;
 using MCPForUnity.Editor.Constants;
 using MCPForUnity.Editor.Helpers;
 using MCPForUnity.Editor.Services.Transport;
 using MCPForUnity.Editor.Windows;
+using UnityEditor;
 
 namespace MCPForUnity.Editor.Services
 {
diff --git a/MCPForUnity/Editor/Services/PackageUpdateService.cs b/MCPForUnity/Editor/Services/PackageUpdateService.cs
index b4384d9a..91248cff 100644
--- a/MCPForUnity/Editor/Services/PackageUpdateService.cs
+++ b/MCPForUnity/Editor/Services/PackageUpdateService.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Net;
+using MCPForUnity.Editor.Constants;
 using MCPForUnity.Editor.Helpers;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
-using MCPForUnity.Editor.Constants;
 
 namespace MCPForUnity.Editor.Services
 {
diff --git a/MCPForUnity/Editor/Services/ServerManagementService.cs b/MCPForUnity/Editor/Services/ServerManagementService.cs
index b4fe2f32..5a031f88 100644
--- a/MCPForUnity/Editor/Services/ServerManagementService.cs
+++ b/MCPForUnity/Editor/Services/ServerManagementService.cs
@@ -41,15 +41,24 @@ public bool ClearUvxCache()
                     McpLog.Debug($"uv cache cleared successfully: {stdout}");
                     return true;
                 }
-                else
-                {
-                    string errorMessage = string.IsNullOrEmpty(stderr)
-                        ? "Unknown error"
-                        : stderr;
+                string combinedOutput = string.Join(
+                    Environment.NewLine,
+                    new[] { stderr, stdout }.Where(s => !string.IsNullOrWhiteSpace(s)).Select(s => s.Trim()));
 
-                    McpLog.Error($"Failed to clear uv cache using '{uvCommand} {args}': {errorMessage}. Ensure uv is installed, available on PATH, or set an override in Advanced Settings.");
-                    return false;
+                string lockHint = (!string.IsNullOrEmpty(combinedOutput) &&
+                                   combinedOutput.IndexOf("currently in-use", StringComparison.OrdinalIgnoreCase) >= 0)
+                    ? "Another uv process may be holding the cache lock; wait a moment and try again or clear with '--force' from a terminal."
+                    : string.Empty;
+
+                if (string.IsNullOrEmpty(combinedOutput))
+                {
+                    combinedOutput = "Command failed with no output. Ensure uv is installed, on PATH, or set an override in Advanced Settings.";
                 }
+
+                McpLog.Error(
+                    $"Failed to clear uv cache using '{uvCommand} {args}'. " +
+                    $"Details: {combinedOutput}{(string.IsNullOrEmpty(lockHint) ? string.Empty : " Hint: " + lockHint)}");
+                return false;
             }
             catch (Exception ex)
             {
diff --git a/MCPForUnity/Editor/Services/StdioBridgeReloadHandler.cs b/MCPForUnity/Editor/Services/StdioBridgeReloadHandler.cs
index 32020351..bb70ffb0 100644
--- a/MCPForUnity/Editor/Services/StdioBridgeReloadHandler.cs
+++ b/MCPForUnity/Editor/Services/StdioBridgeReloadHandler.cs
@@ -1,9 +1,9 @@
 using System;
-using UnityEditor;
 using MCPForUnity.Editor.Constants;
 using MCPForUnity.Editor.Helpers;
 using MCPForUnity.Editor.Services.Transport;
 using MCPForUnity.Editor.Services.Transport.Transports;
+using UnityEditor;
 
 namespace MCPForUnity.Editor.Services
 {
diff --git a/MCPForUnity/Editor/Services/Transport/Transports/StdioBridgeHost.cs b/MCPForUnity/Editor/Services/Transport/Transports/StdioBridgeHost.cs
index ab127b48..ffecd2ef 100644
--- a/MCPForUnity/Editor/Services/Transport/Transports/StdioBridgeHost.cs
+++ b/MCPForUnity/Editor/Services/Transport/Transports/StdioBridgeHost.cs
@@ -1,22 +1,22 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using UnityEditor;
-using UnityEngine;
 using MCPForUnity.Editor.Constants;
 using MCPForUnity.Editor.Helpers;
 using MCPForUnity.Editor.Models;
+using MCPForUnity.Editor.Services.Transport;
 using MCPForUnity.Editor.Tools;
 using MCPForUnity.Editor.Tools.Prefabs;
-using MCPForUnity.Editor.Services.Transport;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using UnityEditor;
+using UnityEngine;
 
 namespace MCPForUnity.Editor.Services.Transport.Transports
 {
diff --git a/MCPForUnity/Editor/Setup/SetupWindowService.cs b/MCPForUnity/Editor/Setup/SetupWindowService.cs
index 1bf4ad91..2045ba45 100644
--- a/MCPForUnity/Editor/Setup/SetupWindowService.cs
+++ b/MCPForUnity/Editor/Setup/SetupWindowService.cs
@@ -1,10 +1,10 @@
 using System;
+using MCPForUnity.Editor.Config;
+using MCPForUnity.Editor.Constants;
 using MCPForUnity.Editor.Dependencies;
 using MCPForUnity.Editor.Dependencies.Models;
 using MCPForUnity.Editor.Helpers;
 using MCPForUnity.Editor.Windows;
-using MCPForUnity.Editor.Constants;
-using MCPForUnity.Editor.Config;
 using UnityEditor;
 using UnityEngine;
 
diff --git a/MCPForUnity/Editor/Tools/ManageEditor.cs b/MCPForUnity/Editor/Tools/ManageEditor.cs
index 1cdcb8bd..0c9411eb 100644
--- a/MCPForUnity/Editor/Tools/ManageEditor.cs
+++ b/MCPForUnity/Editor/Tools/ManageEditor.cs
@@ -1,8 +1,8 @@
 using System;
+using MCPForUnity.Editor.Helpers;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEditorInternal; // Required for tag management
-using MCPForUnity.Editor.Helpers;
 
 namespace MCPForUnity.Editor.Tools
 {
diff --git a/MCPForUnity/Editor/Tools/ManageGameObject.cs b/MCPForUnity/Editor/Tools/ManageGameObject.cs
index ec6b0ef1..bc876b97 100644
--- a/MCPForUnity/Editor/Tools/ManageGameObject.cs
+++ b/MCPForUnity/Editor/Tools/ManageGameObject.cs
@@ -3,6 +3,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using MCPForUnity.Editor.Helpers; // For Response class
+using MCPForUnity.Runtime.Serialization;
 using Newtonsoft.Json; // Added for JsonSerializationException
 using Newtonsoft.Json.Linq;
 using UnityEditor;
@@ -11,8 +13,6 @@
 using UnityEditorInternal;
 using UnityEngine;
 using UnityEngine.SceneManagement;
-using MCPForUnity.Editor.Helpers; // For Response class
-using MCPForUnity.Runtime.Serialization;
 
 namespace MCPForUnity.Editor.Tools
 {
diff --git a/MCPForUnity/Editor/Tools/ManageScene.cs b/MCPForUnity/Editor/Tools/ManageScene.cs
index d8ff578d..150055e1 100644
--- a/MCPForUnity/Editor/Tools/ManageScene.cs
+++ b/MCPForUnity/Editor/Tools/ManageScene.cs
@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using MCPForUnity.Editor.Helpers; // For Response class
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEditor.SceneManagement;
 using UnityEngine;
 using UnityEngine.SceneManagement;
-using MCPForUnity.Editor.Helpers; // For Response class
 
 namespace MCPForUnity.Editor.Tools
 {
diff --git a/MCPForUnity/Editor/Tools/ManageShader.cs b/MCPForUnity/Editor/Tools/ManageShader.cs
index 8b59fb21..2b61806c 100644
--- a/MCPForUnity/Editor/Tools/ManageShader.cs
+++ b/MCPForUnity/Editor/Tools/ManageShader.cs
@@ -2,10 +2,10 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using MCPForUnity.Editor.Helpers;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
-using MCPForUnity.Editor.Helpers;
 
 namespace MCPForUnity.Editor.Tools
 {
diff --git a/MCPForUnity/Editor/Tools/ReadConsole.cs b/MCPForUnity/Editor/Tools/ReadConsole.cs
index 7a5046af..8bdd3b9d 100644
--- a/MCPForUnity/Editor/Tools/ReadConsole.cs
+++ b/MCPForUnity/Editor/Tools/ReadConsole.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using MCPForUnity.Editor.Helpers; // For Response class
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEditorInternal;
 using UnityEngine;
-using MCPForUnity.Editor.Helpers; // For Response class
 
 namespace MCPForUnity.Editor.Tools
 {
diff --git a/MCPForUnity/Editor/Windows/Components/ClientConfig/McpClientConfigSection.cs b/MCPForUnity/Editor/Windows/Components/ClientConfig/McpClientConfigSection.cs
index 883526b4..617347cb 100644
--- a/MCPForUnity/Editor/Windows/Components/ClientConfig/McpClientConfigSection.cs
+++ b/MCPForUnity/Editor/Windows/Components/ClientConfig/McpClientConfigSection.cs
@@ -4,13 +4,13 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
-using UnityEditor;
-using UnityEngine;
-using UnityEngine.UIElements;
 using MCPForUnity.Editor.Clients;
 using MCPForUnity.Editor.Helpers;
 using MCPForUnity.Editor.Models;
 using MCPForUnity.Editor.Services;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
 
 namespace MCPForUnity.Editor.Windows.Components.ClientConfig
 {
diff --git a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
index 926ce4cb..1dfada10 100644
--- a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
+++ b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
@@ -4,8 +4,8 @@
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
-using MCPForUnity.Editor.Helpers;
-using MCPForUnity.Editor.Services;
+using MCPForUnity.Editor.Helpers;
+using MCPForUnity.Editor.Services;
 using MCPForUnity.Editor.Windows.Components.Settings;
 using MCPForUnity.Editor.Windows.Components.Connection;
 using MCPForUnity.Editor.Windows.Components.ClientConfig;
@@ -19,7 +19,7 @@ public class MCPForUnityEditorWindow : EditorWindow
         private McpConnectionSection connectionSection;
         private McpClientConfigSection clientConfigSection;
 
-        private static readonly HashSet<MCPForUnityEditorWindow> OpenWindows = new();
+        private static readonly HashSet<MCPForUnityEditorWindow> OpenWindows = new();
 
         public static void ShowWindow()
         {
@@ -102,8 +102,8 @@ public void CreateGUI()
             {
                 var clientConfigRoot = clientConfigTree.Instantiate();
                 sectionsContainer.Add(clientConfigRoot);
-                clientConfigSection = new McpClientConfigSection(clientConfigRoot);
-            }
+                clientConfigSection = new McpClientConfigSection(clientConfigRoot);
+            }
 
             // Initial updates
             RefreshAllData();
diff --git a/MCPForUnity/Editor/Windows/MCPSetupWindow.cs b/MCPForUnity/Editor/Windows/MCPSetupWindow.cs
index 1633053b..8cf5a01d 100644
--- a/MCPForUnity/Editor/Windows/MCPSetupWindow.cs
+++ b/MCPForUnity/Editor/Windows/MCPSetupWindow.cs
@@ -1,10 +1,10 @@
 using System;
-using UnityEditor;
-using UnityEngine;
-using UnityEngine.UIElements;
 using MCPForUnity.Editor.Dependencies;
 using MCPForUnity.Editor.Dependencies.Models;
 using MCPForUnity.Editor.Helpers;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
 
 namespace MCPForUnity.Editor.Windows
 {
diff --git a/Server/src/services/tools/manage_editor.py b/Server/src/services/tools/manage_editor.py
index adf75841..852da67a 100644
--- a/Server/src/services/tools/manage_editor.py
+++ b/Server/src/services/tools/manage_editor.py
@@ -13,8 +13,7 @@
 )
 async def manage_editor(
     ctx: Context,
-    action: Annotated[Literal["telemetry_status", "telemetry_ping", "play", "pause", "stop", "get_state", "get_project_root", "get_windows",
-                              "get_active_tool", "get_selection", "get_prefab_stage", "set_active_tool", "add_tag", "remove_tag", "get_tags", "add_layer", "remove_layer", "get_layers"], "Get and update the Unity Editor state."],
+    action: Annotated[Literal["telemetry_status", "telemetry_ping", "play", "pause", "stop", "set_active_tool", "add_tag", "remove_tag", "add_layer", "remove_layer"], "Get and update the Unity Editor state."],
     wait_for_completion: Annotated[bool | str,
                                    "Optional. If True, waits for certain actions (accepts true/false or 'true'/'false')"] | None = None,
     tool_name: Annotated[str,
diff --git a/Server/src/services/tools/manage_gameobject.py b/Server/src/services/tools/manage_gameobject.py
index 7a34a9be..4d28c43a 100644
--- a/Server/src/services/tools/manage_gameobject.py
+++ b/Server/src/services/tools/manage_gameobject.py
@@ -13,7 +13,7 @@
 )
 async def manage_gameobject(
     ctx: Context,
-    action: Annotated[Literal["create", "modify", "delete", "find", "add_component", "remove_component", "set_component_property", "get_components"], "Perform CRUD operations on GameObjects and components."],
+    action: Annotated[Literal["create", "modify", "delete", "find", "add_component", "remove_component", "set_component_property", "get_components", "get_component"], "Perform CRUD operations on GameObjects and components."],
     target: Annotated[str,
                       "GameObject identifier by name or path for modify/delete/component actions"] | None = None,
     search_method: Annotated[Literal["by_id", "by_name", "by_path", "by_tag", "by_layer", "by_component"],
diff --git a/Server/src/services/tools/manage_prefabs.py b/Server/src/services/tools/manage_prefabs.py
index 484557d6..14b91ead 100644
--- a/Server/src/services/tools/manage_prefabs.py
+++ b/Server/src/services/tools/manage_prefabs.py
@@ -8,11 +8,11 @@
 
 
 @mcp_for_unity_tool(
-    description="Performs prefab operations (create, modify, delete, etc.)."
+    description="Performs prefab operations (open_stage, close_stage, save_open_stage, create_from_gameobject)."
 )
 async def manage_prefabs(
     ctx: Context,
-    action: Annotated[Literal["create", "modify", "delete", "get_components"], "Perform prefab operations."],
+    action: Annotated[Literal["open_stage", "close_stage", "save_open_stage", "create_from_gameobject"], "Perform prefab operations."],
     prefab_path: Annotated[str,
                            "Prefab asset path relative to Assets e.g. Assets/Prefabs/favorite.prefab"] | None = None,
     mode: Annotated[str,
@@ -25,8 +25,6 @@ async def manage_prefabs(
                                "Allow replacing an existing prefab at the same path"] | None = None,
     search_inactive: Annotated[bool,
                                "Include inactive objects when resolving the target name"] | None = None,
-    component_properties: Annotated[str,
-                                    "Component properties in JSON format"] | None = None,
 ) -> dict[str, Any]:
     # Get active instance from session state
     # Removed session_state import