Merge pull request #1084 from Scriptwonder/chore/issue-fixes-2026-04-26

Patch-Fix-04-26

Author: Scriptwonder

MCPForUnity/Editor/Clients/Configurators/OpenCodeConfigurator.cs

@@ -16,6 +16,8 @@ public class OpenCodeConfigurator : McpClientConfiguratorBase
     {
         private const string ServerName = "unityMCP";
         private const string SchemaUrl = "https://opencode.ai/config.json";
+        private const string RemoteType = "remote";
+        private const string LocalType = "local";
 
         public OpenCodeConfigurator() : base(new McpClient
         {
@@ -96,10 +98,7 @@ public override McpStatus CheckStatus(bool attemptAutoRewrite = true)
                     return client.status;
                 }
 
-                string configuredUrl = unityMcp["url"]?.ToString();
-                string expectedUrl = HttpEndpointUtility.GetMcpRpcUrl();
-
-                if (UrlsEqual(configuredUrl, expectedUrl))
+                if (EntryMatchesCurrentTransport(unityMcp))
                 {
                     client.SetStatus(McpStatus.Configured);
                 }
@@ -168,11 +167,58 @@ public override string GetManualSnippet()
             "The Unity MCP server should be detected automatically"
         };
 
-        private static JObject BuildServerEntry() => new JObject
+        private static JObject BuildServerEntry()
         {
-            ["type"] = "remote",
-            ["url"] = HttpEndpointUtility.GetMcpRpcUrl(),
-            ["enabled"] = true
-        };
+            if (HttpEndpointUtility.GetCurrentServerTransport() == ConfiguredTransport.Stdio)
+            {
+                var (uvxPath, _, packageName) = AssetPathUtility.GetUvxCommandParts();
+                if (string.IsNullOrWhiteSpace(uvxPath))
+                {
+                    throw new InvalidOperationException("uvx not found. Install uv/uvx or set the override in Advanced Settings.");
+                }
+
+                var command = new JArray { uvxPath };
+                foreach (string value in AssetPathUtility.GetUvxDevFlagsList())
+                {
+                    command.Add(value);
+                }
+                foreach (string value in AssetPathUtility.GetBetaServerFromArgsList())
+                {
+                    command.Add(value);
+                }
+                command.Add(packageName);
+                command.Add("--transport");
+                command.Add("stdio");
+
+                return new JObject
+                {
+                    ["type"] = LocalType,
+                    ["command"] = command,
+                    ["enabled"] = true
+                };
+            }
+
+            return new JObject
+            {
+                ["type"] = RemoteType,
+                ["url"] = HttpEndpointUtility.GetMcpRpcUrl(),
+                ["enabled"] = true
+            };
+        }
+
+        private bool EntryMatchesCurrentTransport(JObject entry)
+        {
+            string entryType = entry["type"]?.ToString();
+            ConfiguredTransport expected = HttpEndpointUtility.GetCurrentServerTransport();
+
+            if (expected == ConfiguredTransport.Stdio)
+            {
+                return string.Equals(entryType, LocalType, StringComparison.OrdinalIgnoreCase)
+                    && entry["command"] is JArray;
+            }
+
+            return string.Equals(entryType, RemoteType, StringComparison.OrdinalIgnoreCase)
+                && UrlsEqual(entry["url"]?.ToString(), HttpEndpointUtility.GetMcpRpcUrl());
+        }
     }
 }

MCPForUnity/Editor/Helpers/GameObjectLookup.cs

@@ -70,11 +70,7 @@ public static GameObject FindByTarget(JToken target, string searchMethod, bool i
         /// </summary>
         public static UnityEngine.Object ResolveInstanceID(int instanceId)
         {
-#if UNITY_6000_3_OR_NEWER
-            return EditorUtility.EntityIdToObject(instanceId);
-#else
-            return EditorUtility.InstanceIDToObject(instanceId);
-#endif
+            return UnityObjectIdCompat.InstanceIDToObjectCompat(instanceId);
         }
 
         /// <summary>

MCPForUnity/Editor/Helpers/HttpEndpointUtility.cs

@@ -336,6 +336,17 @@ private static string NormalizeBaseUrl(string value, string defaultUrl, bool rem
                 trimmed = trimmed[..^4];
             }
 
+            // For local scope, force 127.0.0.1 over "localhost". Windows getaddrinfo returns ::1
+            // first; clients without Happy Eyeballs (e.g., Codex/reqwest) hit the v6 socket while
+            // our server binds v4-only, breaking the handshake. The default server bind is
+            // 127.0.0.1, so emitting the literal v4 keeps every client unambiguous.
+            if (!remoteScope && Uri.TryCreate(trimmed, UriKind.Absolute, out Uri parsed)
+                && string.Equals(parsed.Host, "localhost", StringComparison.OrdinalIgnoreCase))
+            {
+                var builder = new UriBuilder(parsed) { Host = "127.0.0.1" };
+                trimmed = builder.Uri.GetLeftPart(UriPartial.Authority);
+            }
+
             return trimmed;
         }
 

MCPForUnity/Editor/Helpers/McpLogRecord.cs

@@ -16,11 +16,22 @@ internal static class McpLogRecord
         private const long MaxLogSizeBytes = 1024 * 1024; // 1 MB
         private static bool _sessionStarted;
         private static readonly object _logLock = new();
+        private static volatile bool _isEnabledCached;
+
+        [InitializeOnLoadMethod]
+        private static void RefreshFromPrefs()
+        {
+            _isEnabledCached = EditorPrefs.GetBool(EditorPrefKeys.LogRecordEnabled, false);
+        }
 
         internal static bool IsEnabled
         {
-            get => EditorPrefs.GetBool(EditorPrefKeys.LogRecordEnabled, false);
-            set => EditorPrefs.SetBool(EditorPrefKeys.LogRecordEnabled, value);
+            get => _isEnabledCached;
+            set
+            {
+                EditorPrefs.SetBool(EditorPrefKeys.LogRecordEnabled, value);
+                _isEnabledCached = value;
+            }
         }
 
         internal static void Log(string commandType, JObject parameters, string type, string status, long durationMs, string error = null)

MCPForUnity/Editor/MCPForUnity.Editor.asmdef

@@ -8,7 +8,7 @@
         "Editor"
     ],
     "excludePlatforms": [],
-    "overrideReferences": false,
+    "overrideReferences": true,
     "precompiledReferences": [
         "Newtonsoft.Json.dll"
     ],

MCPForUnity/Runtime/Helpers/UnityObjectIdCompat.cs

@@ -0,0 +1,73 @@
+using UnityEngine;
+#if UNITY_EDITOR
+using System.Reflection;
+using UnityEditor;
+#endif
+
+namespace MCPForUnity.Runtime.Helpers
+{
+    /// <summary>
+    /// Version-gated wrappers for the InstanceID ↔ EntityId migration introduced in Unity 6.5
+    /// and tightened in 6.6.
+    ///   Forward (Object → int): <see cref="GetInstanceIDCompat"/>
+    ///   Reverse (int → Object, Editor-only): <see cref="InstanceIDToObjectCompat"/>
+    /// </summary>
+    public static class UnityObjectIdCompat
+    {
+        /// <summary>
+        /// Returns a session-scoped int handle for the object. On 6.5+ truncates the
+        /// EntityId's underlying ulong; lossy but stable within a session and preserves
+        /// the int-shaped wire format that older consumers expect. For deserialization
+        /// round-trips on 6.5+, prefer the full <c>entityID</c> field.
+        /// </summary>
+        public static int GetInstanceIDCompat(this Object obj)
+        {
+            if (obj == null)
+            {
+                return 0;
+            }
+
+#if UNITY_6000_5_OR_NEWER
+            return (int)EntityId.ToULong(obj.GetEntityId());
+#else
+            return obj.GetInstanceID();
+#endif
+        }
+
+#if UNITY_EDITOR
+#if UNITY_6000_6_OR_NEWER
+        private static MethodInfo _instanceIdToObject;
+        private static bool _instanceIdToObjectInitialized;
+#endif
+
+        /// <summary>
+        /// Resolves an int instance ID handle back to a UnityEngine.Object.
+        ///   Pre-6.0  : EditorUtility.InstanceIDToObject(int)
+        ///   6.0–6.5  : EditorUtility.EntityIdToObject(int)  (implicit int→EntityId cast)
+        ///   6.6+     : reflection on InstanceIDToObject(int) — the API still exists at runtime
+        ///              but is obsolete-as-error; reflection bypasses CS0619 until the public
+        ///              EntityId(int) ctor stabilizes.
+        /// </summary>
+        public static Object InstanceIDToObjectCompat(int instanceId)
+        {
+#if UNITY_6000_6_OR_NEWER
+            if (!_instanceIdToObjectInitialized)
+            {
+                _instanceIdToObject = typeof(EditorUtility).GetMethod(
+                    "InstanceIDToObject",
+                    BindingFlags.Public | BindingFlags.Static,
+                    null,
+                    new[] { typeof(int) },
+                    null);
+                _instanceIdToObjectInitialized = true;
+            }
+            return _instanceIdToObject?.Invoke(null, new object[] { instanceId }) as Object;
+#elif UNITY_6000_3_OR_NEWER
+            return EditorUtility.EntityIdToObject(instanceId);
+#else
+            return EditorUtility.InstanceIDToObject(instanceId);
+#endif
+        }
+#endif
+    }
+}

MCPForUnity/Runtime/Helpers/UnityObjectIdCompat.cs.meta

@@ -414,11 +414,7 @@ public override UnityEngine.Object ReadJson(JsonReader reader, Type objectType,
                 if (jo.TryGetValue("instanceID", out JToken idToken) && idToken.Type == JTokenType.Integer)
                 {
                     int instanceId = idToken.ToObject<int>();
-#if UNITY_6000_3_OR_NEWER
-                    UnityEngine.Object obj = UnityEditor.EditorUtility.EntityIdToObject(instanceId);
-#else
-                    UnityEngine.Object obj = UnityEditor.EditorUtility.InstanceIDToObject(instanceId);
-#endif
+                    UnityEngine.Object obj = UnityObjectIdCompat.InstanceIDToObjectCompat(instanceId);
                     if (obj != null)
                     {
                         // Direct type match