Fix to persist request timeout seconds as an environment variable on Windows OS

Author: nowsprinting

Editor/Services/TestRunnerService.cs

@@ -71,7 +71,7 @@ public async void ExecuteTests(
             _testRunnerApi.Execute(new ExecutionSettings(filter));
 
             // Use timeout from settings if not specified
-            var timeoutSeconds =  McpUnitySettings.Instance.TestTimeoutSeconds;
+            var timeoutSeconds =  McpUnitySettings.Instance.RequestTimeoutSeconds;
 
             Task completedTask = await Task.WhenAny(
                 completionSource.Task,

Editor/UnityBridge/McpUnityEditorWindow.cs

@@ -109,16 +109,16 @@ private void DrawServerTab()
 
             // Test timeout setting
             EditorGUILayout.BeginHorizontal();
-            int newTimeout = EditorGUILayout.IntField(new GUIContent("Test Timeout (seconds)", "Timeout in seconds for test execution"), settings.TestTimeoutSeconds);
+            int newTimeout = EditorGUILayout.IntField(new GUIContent("Request Timeout (seconds)", "Timeout in seconds for tool request"), settings.RequestTimeoutSeconds);
             if (newTimeout < 60)
             {
                 newTimeout = 60;
-                Debug.LogError("Test timeout must be at least 60 seconds.");
+                Debug.LogError("Request timeout must be at least 60 seconds.");
             }
 
-            if (newTimeout != settings.TestTimeoutSeconds)
+            if (newTimeout != settings.RequestTimeoutSeconds)
             {
-                settings.TestTimeoutSeconds = newTimeout;
+                settings.RequestTimeoutSeconds = newTimeout;
                 settings.SaveSettings();
             }
             EditorGUILayout.EndHorizontal();

Editor/UnityBridge/McpUnitySettings.cs

@@ -15,6 +15,11 @@ public class McpUnitySettings
         // Constants
         public const string ServerVersion = "1.0.0";
         public const string PackageName = "com.gamelovers.mcp-unity";
+
+#if UNITY_EDITOR_WIN
+        private const string EnvUnityPort = "UNITY_PORT";
+        private const string EnvUnityRequestTimeout = "UNITY_REQUEST_TIMEOUT";
+#endif
 
         private static McpUnitySettings _instance;
         private static readonly string SettingsPath = "ProjectSettings/McpUnitySettings.json";
@@ -25,14 +30,17 @@ public class McpUnitySettings
 #endif
         public int Port { get; set; } = 8090;
 
+#if !UNITY_EDITOR_WIN
+        [field: SerializeField] // Note: On Windows, this property is  persisted in per-user environment variables.
+#endif
+        [Tooltip("Timeout in seconds for tool request")]
+        public int RequestTimeoutSeconds { get; set; } = 60;
+        
         [Tooltip("Whether to automatically start the MCP server when Unity opens")]
         public bool AutoStartServer = true;
 
         [Tooltip("Whether to show info logs in the Unity console")]
         public bool EnableInfoLogs = true;
-        
-        [Tooltip("Timeout in seconds for test execution")]
-        public int TestTimeoutSeconds = 60;
 
         /// <summary>
         /// Singleton instance of settings
@@ -74,11 +82,16 @@ public void LoadSettings()
 
 #if UNITY_EDITOR_WIN
                 // Check for environment variable PORT
-                string envPort = System.Environment.GetEnvironmentVariable("UNITY_PORT");
+                string envPort = System.Environment.GetEnvironmentVariable(EnvUnityPort);
                 if (!string.IsNullOrEmpty(envPort) && int.TryParse(envPort, out int port))
                 {
                     Port = port;
                 }
+                string envTimeout = System.Environment.GetEnvironmentVariable(EnvUnityRequestTimeout);
+                if (!string.IsNullOrEmpty(envTimeout) && int.TryParse(envTimeout, out int timeout))
+                {
+                    RequestTimeoutSeconds = timeout;
+                }
 #endif
             }
             catch (Exception ex)
@@ -104,7 +117,8 @@ public void SaveSettings()
                 // Note: This will only affect processes started after this point
                 // Note: EnvironmentVariableTarget.User should be used on .NET implementations running on Windows systems only.
                 //          see: https://learn.microsoft.com/ja-jp/dotnet/api/system.environmentvariabletarget?view=net-8.0#fields
-                System.Environment.SetEnvironmentVariable("UNITY_PORT", Port.ToString(), System.EnvironmentVariableTarget.User);
+                Environment.SetEnvironmentVariable(EnvUnityPort, Port.ToString(), EnvironmentVariableTarget.User);
+                Environment.SetEnvironmentVariable(EnvUnityRequestTimeout, RequestTimeoutSeconds.ToString(), EnvironmentVariableTarget.User);
 #endif
             }
             catch (Exception ex)