Revert "Bug fix and batch customization (#727)"

This reverts commit ad3756e.

Author: Scriptwonder

.claude/skills/unity-mcp-skill/SKILL.md

@@ -53,7 +53,7 @@ batch_execute(
 )
 ```
 
-**Max 25 commands per batch by default (configurable in Unity MCP Tools window, max 100).** Use `fail_fast=True` for dependent operations.
+**Max 25 commands per batch.** Use `fail_fast=True` for dependent operations. Batches are not transactional (no rollback on partial failure).
 
 ### 3. Use `screenshot` in manage_scene to Verify Visual Results
 

.claude/skills/unity-mcp-skill/references/workflows.md

@@ -829,7 +829,7 @@ batch_execute(fail_fast=True, commands=[
 
 ### Complete Example: Main Menu Screen
 
-Combines multiple templates into a full menu screen in two batch calls (default 25 command limit per batch, configurable in Unity MCP Tools window up to 100).
+Combines multiple templates into a full menu screen in two batch calls (25 command limit per batch).
 
 ```python
 # Batch 1: Canvas + EventSystem + Panel + Title

MCPForUnity/Editor/Constants/EditorPrefKeys.cs

@@ -63,7 +63,5 @@ internal static class EditorPrefKeys
         internal const string CustomerUuid = "MCPForUnity.CustomerUUID";
 
         internal const string ApiKey = "MCPForUnity.ApiKey";
-
-        internal const string BatchExecuteMaxCommands = "MCPForUnity.BatchExecute.MaxCommands";
     }
 }

MCPForUnity/Editor/Helpers/AssetPathUtility.cs

@@ -201,8 +201,6 @@ public static JObject GetPackageJson()
         /// Gets the package source for the MCP server (used with uvx --from).
         /// Checks for EditorPrefs override first (supports git URLs, file:// paths, etc.),
         /// then falls back to PyPI package reference.
-        /// When the override is a local path, auto-corrects to the "Server" subdirectory
-        /// if the path doesn't contain pyproject.toml but Server/pyproject.toml exists.
         /// </summary>
         /// <returns>Package source string for uvx --from argument</returns>
         public static string GetMcpServerPackageSource()
@@ -211,14 +209,7 @@ public static string GetMcpServerPackageSource()
             string sourceOverride = EditorPrefs.GetString(EditorPrefKeys.GitUrlOverride, "");
             if (!string.IsNullOrEmpty(sourceOverride))
             {
-                string resolved = ResolveLocalServerPath(sourceOverride);
-                // Persist the corrected path so future reads are consistent
-                if (resolved != sourceOverride)
-                {
-                    EditorPrefs.SetString(EditorPrefKeys.GitUrlOverride, resolved);
-                    McpLog.Info($"Auto-corrected server source override from '{sourceOverride}' to '{resolved}'");
-                }
-                return resolved;
+                return sourceOverride;
             }
 
             // Default to PyPI package (avoids Windows long path issues with git clone)
@@ -232,59 +223,6 @@ public static string GetMcpServerPackageSource()
             return $"mcpforunityserver=={version}";
         }
 
-        /// <summary>
-        /// Validates and auto-corrects a local server source path to ensure it points to the
-        /// directory containing pyproject.toml. If the path points to a parent directory
-        /// (e.g. the repo root "unity-mcp") instead of the Python package directory ("Server"),
-        /// this checks for a "Server" subdirectory with pyproject.toml and returns that path.
-        /// Non-local paths (URLs, PyPI references) are returned unchanged.
-        /// </summary>
-        internal static string ResolveLocalServerPath(string path)
-        {
-            if (string.IsNullOrEmpty(path))
-                return path;
-
-            // Skip non-local paths (git URLs, PyPI package names, etc.)
-            if (path.StartsWith("http://", StringComparison.OrdinalIgnoreCase) ||
-                path.StartsWith("https://", StringComparison.OrdinalIgnoreCase) ||
-                path.StartsWith("git+", StringComparison.OrdinalIgnoreCase) ||
-                path.StartsWith("ssh://", StringComparison.OrdinalIgnoreCase))
-            {
-                return path;
-            }
-
-            // If it looks like a PyPI package reference (no path separators), skip
-            if (!path.Contains('/') && !path.Contains('\\') && !path.StartsWith("file:", StringComparison.OrdinalIgnoreCase))
-            {
-                return path;
-            }
-
-            // Strip file:// prefix for filesystem checks, preserve for return value
-            string checkPath = path;
-            string prefix = string.Empty;
-            if (checkPath.StartsWith("file://", StringComparison.OrdinalIgnoreCase))
-            {
-                prefix = checkPath.Substring(0, 7); // preserve original casing
-                checkPath = checkPath.Substring(7);
-            }
-
-            // Already correct — pyproject.toml exists at this path
-            if (System.IO.File.Exists(System.IO.Path.Combine(checkPath, "pyproject.toml")))
-            {
-                return path;
-            }
-
-            // Check if "Server" subdirectory contains pyproject.toml
-            string serverSubDir = System.IO.Path.Combine(checkPath, "Server");
-            if (System.IO.File.Exists(System.IO.Path.Combine(serverSubDir, "pyproject.toml")))
-            {
-                return prefix + serverSubDir;
-            }
-
-            // Return as-is; uvx will report the error if the path is truly invalid
-            return path;
-        }
-
         /// <summary>
         /// Deprecated: Use GetMcpServerPackageSource() instead.
         /// Kept for backwards compatibility.

MCPForUnity/Editor/Services/EditorStateCache.cs

@@ -75,9 +75,6 @@ private sealed class EditorStateSnapshot
 
             [JsonProperty("transport")]
             public EditorStateTransport Transport { get; set; }
-
-            [JsonProperty("settings")]
-            public EditorStateSettings Settings { get; set; }
         }
 
         private sealed class EditorStateUnity
@@ -242,12 +239,6 @@ private sealed class EditorStateTransport
             public long? LastMessageUnixMs { get; set; }
         }
 
-        private sealed class EditorStateSettings
-        {
-            [JsonProperty("batch_execute_max_commands")]
-            public int BatchExecuteMaxCommands { get; set; }
-        }
-
         static EditorStateCache()
         {
             try
@@ -491,10 +482,6 @@ private static JObject BuildSnapshot(string reason)
                 {
                     UnityBridgeConnected = null,
                     LastMessageUnixMs = null
-                },
-                Settings = new EditorStateSettings
-                {
-                    BatchExecuteMaxCommands = Tools.BatchExecute.GetMaxCommandsPerBatch()
                 }
             };
 

MCPForUnity/Editor/Tools/BatchExecute.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using MCPForUnity.Editor.Constants;
 using MCPForUnity.Editor.Helpers;
 using Newtonsoft.Json.Linq;
-using UnityEditor;
 
 namespace MCPForUnity.Editor.Tools
 {
@@ -15,20 +13,7 @@ namespace MCPForUnity.Editor.Tools
     [McpForUnityTool("batch_execute", AutoRegister = false)]
     public static class BatchExecute
     {
-        /// <summary>Default limit when no EditorPrefs override is set.</summary>
-        internal const int DefaultMaxCommandsPerBatch = 25;
-
-        /// <summary>Hard ceiling to prevent extreme editor freezes regardless of user setting.</summary>
-        internal const int AbsoluteMaxCommandsPerBatch = 100;
-
-        /// <summary>
-        /// Returns the user-configured max commands per batch, clamped between 1 and <see cref="AbsoluteMaxCommandsPerBatch"/>.
-        /// </summary>
-        internal static int GetMaxCommandsPerBatch()
-        {
-            int configured = EditorPrefs.GetInt(EditorPrefKeys.BatchExecuteMaxCommands, DefaultMaxCommandsPerBatch);
-            return Math.Clamp(configured, 1, AbsoluteMaxCommandsPerBatch);
-        }
+        private const int MaxCommandsPerBatch = 25;
 
         public static async Task<object> HandleCommand(JObject @params)
         {
@@ -43,11 +28,9 @@ public static async Task<object> HandleCommand(JObject @params)
                 return new ErrorResponse("Provide at least one command entry in 'commands'.");
             }
 
-            int maxCommands = GetMaxCommandsPerBatch();
-            if (commandsToken.Count > maxCommands)
+            if (commandsToken.Count > MaxCommandsPerBatch)
             {
-                return new ErrorResponse(
-                    $"A maximum of {maxCommands} commands are allowed per batch (configurable in MCP Tools window, hard max {AbsoluteMaxCommandsPerBatch}).");
+                return new ErrorResponse($"A maximum of {MaxCommandsPerBatch} commands are allowed per batch.");
             }
 
             bool failFast = @params.Value<bool?>("failFast") ?? false;

MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs

@@ -158,12 +158,6 @@ private void RegisterCallbacks()
                 }
                 else
                 {
-                    url = ResolveServerPath(url);
-                    // Update the text field if the path was auto-corrected, without re-triggering the callback
-                    if (url != evt.newValue?.Trim())
-                    {
-                        gitUrlOverride.SetValueWithoutNotify(url);
-                    }
                     EditorPrefs.SetString(EditorPrefKeys.GitUrlOverride, url);
                 }
                 OnGitUrlChanged?.Invoke();
@@ -332,10 +326,9 @@ private void OnClearUvxClicked()
 
         private void OnBrowseGitUrlClicked()
         {
-            string picked = EditorUtility.OpenFolderPanel("Select Server folder (containing pyproject.toml)", string.Empty, string.Empty);
+            string picked = EditorUtility.OpenFolderPanel("Select Server folder", string.Empty, string.Empty);
             if (!string.IsNullOrEmpty(picked))
             {
-                picked = ResolveServerPath(picked);
                 gitUrlOverride.value = picked;
                 EditorPrefs.SetString(EditorPrefKeys.GitUrlOverride, picked);
                 OnGitUrlChanged?.Invoke();
@@ -344,54 +337,6 @@ private void OnBrowseGitUrlClicked()
             }
         }
 
-        /// <summary>
-        /// Validates and auto-corrects a local server path to ensure it points to the directory
-        /// containing pyproject.toml (the Python package root). If the user selects a parent
-        /// directory (e.g. the repo root), this checks for a "Server" subdirectory with
-        /// pyproject.toml and returns that instead.
-        /// </summary>
-        private static string ResolveServerPath(string path)
-        {
-            if (string.IsNullOrEmpty(path))
-                return path;
-
-            // If path is not a local filesystem path, return as-is (git URLs, PyPI refs, etc.)
-            if (path.StartsWith("http://", StringComparison.OrdinalIgnoreCase) ||
-                path.StartsWith("https://", StringComparison.OrdinalIgnoreCase) ||
-                path.StartsWith("git+", StringComparison.OrdinalIgnoreCase) ||
-                path.StartsWith("ssh://", StringComparison.OrdinalIgnoreCase))
-            {
-                return path;
-            }
-
-            // Strip file:// prefix for filesystem checks, but preserve it for the return value
-            string checkPath = path;
-            string prefix = string.Empty;
-            if (checkPath.StartsWith("file://", StringComparison.OrdinalIgnoreCase))
-            {
-                prefix = "file://";
-                checkPath = checkPath.Substring(7);
-            }
-
-            // Already points to a directory with pyproject.toml — correct path
-            if (File.Exists(Path.Combine(checkPath, "pyproject.toml")))
-            {
-                return path;
-            }
-
-            // Check if "Server" subdirectory contains pyproject.toml (common repo structure)
-            string serverSubDir = Path.Combine(checkPath, "Server");
-            if (File.Exists(Path.Combine(serverSubDir, "pyproject.toml")))
-            {
-                string corrected = prefix + serverSubDir;
-                McpLog.Info($"Auto-corrected server path to 'Server' subdirectory: {corrected}");
-                return corrected;
-            }
-
-            // Return as-is; uvx will report the error if the path is invalid
-            return path;
-        }
-
         private void UpdateDeploymentSection()
         {
             var deployService = MCPServiceLocator.Deployment;

MCPForUnity/Editor/Windows/Components/Tools/McpToolsSection.cs

@@ -220,11 +220,6 @@ private VisualElement CreateToolRow(ToolMetadata tool)
                 row.Add(CreateManageSceneActions());
             }
 
-            if (IsBatchExecuteTool(tool))
-            {
-                row.Add(CreateBatchExecuteSettings());
-            }
-
             return row;
         }
 
@@ -301,52 +296,6 @@ private VisualElement CreateManageSceneActions()
             return actions;
         }
 
-        private VisualElement CreateBatchExecuteSettings()
-        {
-            var container = new VisualElement();
-            container.AddToClassList("tool-item-actions");
-            container.style.flexDirection = FlexDirection.Row;
-            container.style.alignItems = Align.Center;
-            container.style.marginTop = 4;
-
-            var label = new Label("Max commands per batch:");
-            label.style.marginRight = 8;
-            label.style.unityFontStyleAndWeight = UnityEngine.FontStyle.Normal;
-            container.Add(label);
-
-            int currentValue = EditorPrefs.GetInt(
-                EditorPrefKeys.BatchExecuteMaxCommands,
-                BatchExecute.DefaultMaxCommandsPerBatch
-            );
-
-            var field = new IntegerField
-            {
-                value = Math.Clamp(currentValue, 1, BatchExecute.AbsoluteMaxCommandsPerBatch),
-                style = { width = 60 }
-            };
-            field.tooltip = $"Number of commands allowed per batch_execute call (1–{BatchExecute.AbsoluteMaxCommandsPerBatch}). Default: {BatchExecute.DefaultMaxCommandsPerBatch}.";
-
-            field.RegisterValueChangedCallback(evt =>
-            {
-                int clamped = Math.Clamp(evt.newValue, 1, BatchExecute.AbsoluteMaxCommandsPerBatch);
-                if (clamped != evt.newValue)
-                {
-                    field.SetValueWithoutNotify(clamped);
-                }
-                EditorPrefs.SetInt(EditorPrefKeys.BatchExecuteMaxCommands, clamped);
-            });
-
-            container.Add(field);
-
-            var hint = new Label($"(max {BatchExecute.AbsoluteMaxCommandsPerBatch})");
-            hint.style.marginLeft = 4;
-            hint.style.color = new UnityEngine.Color(0.5f, 0.5f, 0.5f);
-            hint.style.fontSize = 10;
-            container.Add(hint);
-
-            return container;
-        }
-
         private void OnManageSceneScreenshotClicked()
         {
             try
@@ -380,8 +329,6 @@ private static Label CreateTag(string text)
 
         private static bool IsManageSceneTool(ToolMetadata tool) => string.Equals(tool?.Name, "manage_scene", StringComparison.OrdinalIgnoreCase);
 
-        private static bool IsBatchExecuteTool(ToolMetadata tool) => string.Equals(tool?.Name, "batch_execute", StringComparison.OrdinalIgnoreCase);
-
         private static bool IsBuiltIn(ToolMetadata tool) => tool?.IsBuiltIn ?? false;
     }
 }

Server/src/services/resources/editor_state.py

@@ -91,10 +91,6 @@ class EditorStateTransport(BaseModel):
     last_message_unix_ms: int | None = None
 
 
-class EditorStateSettings(BaseModel):
-    batch_execute_max_commands: int | None = None
-
-
 class EditorStateAdvice(BaseModel):
     ready_for_tools: bool | None = None
     blocking_reasons: list[str] | None = None
@@ -118,7 +114,6 @@ class EditorStateData(BaseModel):
     assets: EditorStateAssets | None = None
     tests: EditorStateTests | None = None
     transport: EditorStateTransport | None = None
-    settings: EditorStateSettings | None = None
     advice: EditorStateAdvice | None = None
     staleness: EditorStateStaleness | None = None