From a5e3293e98a5fda805b6a490c47b6489d6bf52a6 Mon Sep 17 00:00:00 2001
From: Ivan Murzak <Ivan.D.Murzak@gmail.com>
Date: Wed, 18 Mar 2026 01:32:21 -0700
Subject: [PATCH 1/8] Hardcode Cloud server URL and remove UI input

Remove editable Cloud server URL and make the plugin use a single hardcoded cloud URL. Added CloudServerBaseUrl/CloudServerUrl constants to UnityMcpPlugin.Config and changed Host to use the constant (no extra /mcp suffix). Removed the cloud URL TextField and its focus/connection callbacks from the editor UI and adjusted authorisation flow to use UnityConnectionConfig.CloudServerBaseUrl. Updated UnityMcpPluginEditor.Static to expose the cloud URL via the runtime config. CLI changes: dropped cloudServerUrl from the config shape, added a CLOUD_SERVER_URL constant and make resolveConnectionFromConfig return that value for Cloud mode. Updated tests and run-tool behavior to reflect the hardcoded cloud URL and removed references to a configurable cloudServerUrl.
---
 .../UI/Window/MainWindowEditor.Connection.cs  | 33 ++-----------------
 .../Scripts/UnityMcpPluginEditor.Static.cs    | 10 +-----
 .../root/Editor/UI/uxml/MainWindow.uxml       |  1 -
 .../root/Runtime/UnityMcpPlugin.Config.cs     |  9 ++---
 cli/src/commands/run-tool.ts                  |  2 +-
 cli/src/utils/config.ts                       | 13 +++-----
 cli/tests/config.test.ts                      |  1 -
 cli/tests/run-tool.test.ts                    | 24 +++++---------
 8 files changed, 22 insertions(+), 71 deletions(-)

diff --git a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.Connection.cs b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.Connection.cs
index 725ef24a8..ad0f235a6 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.Connection.cs
+++ b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.Connection.cs
@@ -176,12 +176,11 @@ internal static bool IsAuthFlowRunning(DeviceAuthFlowState state) =>
 
         private void SetupCloudAuthSection(VisualElement root)
         {
-            var inputCloudUrl = root.Q<TextField>("inputCloudServerUrl");
             var inputCloudToken = root.Q<TextField>("inputCloudToken");
             var btnRevoke = root.Q<Button>("btnCloudRevoke");
             var btnAuthorize = root.Q<Button>("btnCloudAuthorize");
             var statusLabel = root.Q<Label>("labelCloudAuthStatus");
-            if (inputCloudUrl == null || inputCloudToken == null || btnAuthorize == null) return;
+            if (inputCloudToken == null || btnAuthorize == null) return;
 
             _btnAuthorize = btnAuthorize;
 
@@ -193,21 +192,9 @@ void SetTokenValue(string? token)
                 inputCloudToken.EnableInClassList("token-placeholder", isEmpty);
             }
 
-            inputCloudUrl.value = UnityMcpPluginEditor.CloudServerUrl;
             SetTokenValue(UnityMcpPluginEditor.CloudToken);
             UpdateCloudAuthState();
 
-            SubscribeToConnectionState((state, keepConnected) =>
-            {
-                var isReadOnly = keepConnected || state != HubConnectionState.Disconnected;
-                inputCloudUrl.isReadOnly = isReadOnly;
-                inputCloudUrl.EnableInClassList("disabled-text-field", isReadOnly);
-                inputCloudUrl.EnableInClassList("enabled-text-field", !isReadOnly);
-                inputCloudUrl.tooltip = isReadOnly
-                    ? "Editable only when Unity disconnected from the MCP Server."
-                    : "The cloud server URL to connect to.";
-            });
-
             void UpdateRevokeButtonVisibility()
             {
                 if (btnRevoke != null)
@@ -241,22 +228,6 @@ void UpdateRevokeButtonVisibility()
                     _ = UnityMcpPluginEditor.Instance.Disconnect();
             });
 
-            inputCloudUrl.RegisterCallback<FocusOutEvent>(_ =>
-            {
-                var newValue = inputCloudUrl.value;
-                if (UnityMcpPluginEditor.CloudServerUrl == newValue) return;
-                UnityMcpPluginEditor.CloudServerUrl = newValue;
-                SaveChanges($"[AI Game Developer] Cloud URL Changed: {newValue}");
-
-                // Invalidate cached AI agent configs so they pick up the new cloud URL
-                InvalidateAndReloadAgentUI();
-
-                // Reconnect to the new cloud URL if currently in Cloud mode (only if authorized)
-                if (UnityMcpPluginEditor.ConnectionMode == ConnectionMode.Cloud
-                    && !string.IsNullOrEmpty(UnityMcpPluginEditor.CloudToken))
-                    ReconnectAfterModeSwitch();
-            });
-
             btnAuthorize.RegisterCallback<ClickEvent>(async _ =>
             {
                 // If currently running, cancel
@@ -310,7 +281,7 @@ void UpdateRevokeButtonVisibility()
                     });
                 };
 
-                await capturedFlow.StartAsync(UnityMcpPluginEditor.CloudServerUrl, "Unity Editor");
+                await capturedFlow.StartAsync(UnityMcpPlugin.UnityConnectionConfig.CloudServerBaseUrl, "Unity Editor");
             });
         }
     }
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UnityMcpPluginEditor.Static.cs b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UnityMcpPluginEditor.Static.cs
index 2486a5ef0..8c2fbd30a 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UnityMcpPluginEditor.Static.cs
+++ b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UnityMcpPluginEditor.Static.cs
@@ -181,15 +181,7 @@ public static ConnectionMode ConnectionMode
                 NotifyChanged(Instance.unityConnectionConfig);
             }
         }
-        public static string CloudServerUrl
-        {
-            get => Instance.unityConnectionConfig.CloudServerUrl;
-            set
-            {
-                Instance.unityConnectionConfig.CloudServerUrl = value;
-                NotifyChanged(Instance.unityConnectionConfig);
-            }
-        }
+        public static string CloudServerUrl => UnityMcpPlugin.UnityConnectionConfig.CloudServerUrl;
         public static string? CloudToken
         {
             get => Instance.unityConnectionConfig.CloudToken;
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
index ece55ea48..c6ae7cf67 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
@@ -24,7 +24,6 @@
             <ui:TextField picking-mode="Ignore" label="Server URL" value="http://localhost:8080" name="InputServerURL" class="content-item" />
             <!-- Cloud Authorization (visible in Cloud mode only) -->
             <ui:VisualElement name="cloudAuthSection" style="flex-direction: column; margin-bottom: 8px; display: none;">
-                <ui:TextField name="inputCloudServerUrl" label="Cloud URL" value="https://ai-game.dev" class="content-item" />
                 <ui:VisualElement style="flex-direction: row; margin-top: 2px; align-items: center;">
                     <ui:TextField name="inputCloudToken" label="" placeholder-text="Cloud Token" readonly="true" style="flex-grow: 1;" class="token-input" />
                     <ui:Button name="btnCloudRevoke" text="Revoke" tooltip="Logout from the Cloud server. Clears the stored authentication token and disconnects Unity from the cloud." class="btn-compact btn-alert" style="display: none;" />
diff --git a/Unity-MCP-Plugin/Assets/root/Runtime/UnityMcpPlugin.Config.cs b/Unity-MCP-Plugin/Assets/root/Runtime/UnityMcpPlugin.Config.cs
index 2a63e0eeb..38a9f7480 100644
--- a/Unity-MCP-Plugin/Assets/root/Runtime/UnityMcpPlugin.Config.cs
+++ b/Unity-MCP-Plugin/Assets/root/Runtime/UnityMcpPlugin.Config.cs
@@ -46,15 +46,18 @@ public class UnityConnectionConfig : ConnectionConfig
             [JsonPropertyName("token")]
             public string? LocalToken { get; set; }
 
+            public const string CloudServerBaseUrl = "https://ai-game.dev";
+            public const string CloudServerUrl = CloudServerBaseUrl + "/mcp";
+
             /// <summary>
             /// Returns the active connection host based on <see cref="ConnectionMode"/>.
-            /// In Cloud mode, returns <see cref="CloudServerUrl"/> + "/mcp".
+            /// In Cloud mode, returns <see cref="CloudServerUrl"/>.
             /// In Local mode, returns <see cref="LocalHost"/>.
             /// </summary>
             [JsonIgnore]
             public override string Host
             {
-                get => ConnectionMode == ConnectionMode.Cloud ? CloudServerUrl + "/mcp" : LocalHost;
+                get => ConnectionMode == ConnectionMode.Cloud ? CloudServerUrl : LocalHost;
                 set => LocalHost = value;
             }
 
@@ -75,7 +78,6 @@ public override string? Token
             public TransportMethod TransportMethod { get; set; } = TransportMethod.streamableHttp;
             public AuthOption AuthOption { get; set; } = AuthOption.none;
             public ConnectionMode ConnectionMode { get; set; } = ConnectionMode.Custom;
-            public string CloudServerUrl { get; set; } = "https://ai-game.dev";
             public string? CloudToken { get; set; }
             public List<McpFeature> Tools { get; set; } = new();
             public List<McpFeature> Prompts { get; set; } = new();
@@ -107,7 +109,6 @@ public UnityConnectionConfig SetDefault()
                 TransportMethod = TransportMethod.streamableHttp;
                 AuthOption = AuthOption.none;
                 ConnectionMode = ConnectionMode.Custom;
-                CloudServerUrl = "https://ai-game.dev";
                 CloudToken = null;
                 LogLevel = LogLevel.Warning;
                 TimeoutMs = Consts.Hub.DefaultTimeoutMs;
diff --git a/cli/src/commands/run-tool.ts b/cli/src/commands/run-tool.ts
index 5e993429e..70498a056 100644
--- a/cli/src/commands/run-tool.ts
+++ b/cli/src/commands/run-tool.ts
@@ -32,7 +32,7 @@ function resolveProjectPath(positionalPath: string | undefined, options: RunTool
  *
  * URL priority:
  *   1. --url flag (explicit override)
- *   2. Config file connectionMode → Custom: host, Cloud: cloudServerUrl
+ *   2. Config file connectionMode → Custom: host, Cloud: hardcoded cloud URL
  *   3. Deterministic port from project path
  *
  * Token priority:
diff --git a/cli/src/utils/config.ts b/cli/src/utils/config.ts
index aed7011fe..aed563c20 100644
--- a/cli/src/utils/config.ts
+++ b/cli/src/utils/config.ts
@@ -19,7 +19,6 @@ export interface UnityConnectionConfig {
   transportMethod?: string;
   authOption?: string;
   connectionMode?: string | number;
-  cloudServerUrl?: string;
   cloudToken?: string;
   tools?: McpFeature[];
   prompts?: McpFeature[];
@@ -45,7 +44,6 @@ export function createDefaultConfig(projectPath: string): UnityConnectionConfig
     transportMethod: 'streamableHttp',
     authOption: 'none',
     connectionMode: 'Custom',
-    cloudServerUrl: 'https://ai-game.dev',
     tools: [],
     prompts: [],
     resources: [],
@@ -169,10 +167,12 @@ export function isCloudMode(config: UnityConnectionConfig): boolean {
   return mode === 'Cloud' || mode === 1;
 }
 
+export const CLOUD_SERVER_URL = 'https://ai-game.dev/mcp';
+
 /**
  * Resolve the server URL and auth token from a project config based on connectionMode.
  * - Custom mode (string "Custom" or integer 0): uses `host` and `token`
- * - Cloud mode (string "Cloud" or integer 1): uses `cloudServerUrl` and `cloudToken`
+ * - Cloud mode (string "Cloud" or integer 1): uses hardcoded cloud URL and `cloudToken`
  * Returns undefined values when the config or relevant fields are not set.
  */
 export function resolveConnectionFromConfig(config: UnityConnectionConfig): {
@@ -181,13 +181,8 @@ export function resolveConnectionFromConfig(config: UnityConnectionConfig): {
 } {
   const cloud = isCloudMode(config);
 
-  const rawCloudUrl = config.cloudServerUrl?.replace(/\/$/, '');
-  const cloudUrl = rawCloudUrl
-    ? rawCloudUrl.endsWith('/mcp') ? rawCloudUrl : rawCloudUrl + '/mcp'
-    : undefined;
-
   return {
-    url: cloud ? cloudUrl : config.host,
+    url: cloud ? CLOUD_SERVER_URL : config.host,
     token: cloud ? config.cloudToken : config.token,
   };
 }
diff --git a/cli/tests/config.test.ts b/cli/tests/config.test.ts
index c10bb176e..89ce84573 100644
--- a/cli/tests/config.test.ts
+++ b/cli/tests/config.test.ts
@@ -47,7 +47,6 @@ describe('config', () => {
       expect(config.transportMethod).toBe('streamableHttp');
       expect(config.authOption).toBe('none');
       expect(config.connectionMode).toBe('Custom');
-      expect(config.cloudServerUrl).toBe('https://ai-game.dev');
       expect(config.tools).toEqual([]);
       expect(config.prompts).toEqual([]);
       expect(config.resources).toEqual([]);
diff --git a/cli/tests/run-tool.test.ts b/cli/tests/run-tool.test.ts
index 1d18dcd4a..f71200808 100644
--- a/cli/tests/run-tool.test.ts
+++ b/cli/tests/run-tool.test.ts
@@ -4,7 +4,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
 import { fileURLToPath } from 'url';
-import { resolveConnectionFromConfig, isCloudMode, type UnityConnectionConfig } from '../src/utils/config.js';
+import { resolveConnectionFromConfig, isCloudMode, CLOUD_SERVER_URL, type UnityConnectionConfig } from '../src/utils/config.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const CLI_PATH = path.resolve(__dirname, '..', 'bin', 'unity-mcp-cli.js');
@@ -34,7 +34,6 @@ describe('resolveConnectionFromConfig', () => {
       connectionMode: 'Custom',
       host: 'http://localhost:55000',
       token: 'custom-secret',
-      cloudServerUrl: 'https://cloud.example.com',
       cloudToken: 'cloud-secret',
     };
     const result = resolveConnectionFromConfig(config);
@@ -42,16 +41,15 @@ describe('resolveConnectionFromConfig', () => {
     expect(result.token).toBe('custom-secret');
   });
 
-  it('returns cloudServerUrl with /mcp suffix and cloudToken in Cloud mode', () => {
+  it('returns hardcoded cloud URL and cloudToken in Cloud mode', () => {
     const config: UnityConnectionConfig = {
       connectionMode: 'Cloud',
       host: 'http://localhost:55000',
       token: 'custom-secret',
-      cloudServerUrl: 'https://cloud.example.com',
       cloudToken: 'cloud-secret',
     };
     const result = resolveConnectionFromConfig(config);
-    expect(result.url).toBe('https://cloud.example.com/mcp');
+    expect(result.url).toBe(CLOUD_SERVER_URL);
     expect(result.token).toBe('cloud-secret');
   });
 
@@ -74,12 +72,12 @@ describe('resolveConnectionFromConfig', () => {
     expect(result.token).toBeUndefined();
   });
 
-  it('returns undefined url and token when fields are missing in Cloud mode', () => {
+  it('returns hardcoded cloud URL and undefined token when fields are missing in Cloud mode', () => {
     const config: UnityConnectionConfig = {
       connectionMode: 'Cloud',
     };
     const result = resolveConnectionFromConfig(config);
-    expect(result.url).toBeUndefined();
+    expect(result.url).toBe(CLOUD_SERVER_URL);
     expect(result.token).toBeUndefined();
   });
 
@@ -110,7 +108,6 @@ describe('resolveConnectionFromConfig', () => {
       connectionMode: 0,
       host: 'http://localhost:55000',
       token: 'custom-secret',
-      cloudServerUrl: 'https://cloud.example.com',
       cloudToken: 'cloud-secret',
     };
     const result = resolveConnectionFromConfig(config);
@@ -118,16 +115,15 @@ describe('resolveConnectionFromConfig', () => {
     expect(result.token).toBe('custom-secret');
   });
 
-  it('handles legacy integer 1 as Cloud mode with /mcp suffix', () => {
+  it('handles legacy integer 1 as Cloud mode with hardcoded URL', () => {
     const config: UnityConnectionConfig = {
       connectionMode: 1,
       host: 'http://localhost:55000',
       token: 'custom-secret',
-      cloudServerUrl: 'https://cloud.example.com',
       cloudToken: 'cloud-secret',
     };
     const result = resolveConnectionFromConfig(config);
-    expect(result.url).toBe('https://cloud.example.com/mcp');
+    expect(result.url).toBe(CLOUD_SERVER_URL);
     expect(result.token).toBe('cloud-secret');
   });
 });
@@ -235,11 +231,10 @@ describe('run-tool config resolution', () => {
     expect(stdout).toContain('http://localhost:55555');
   });
 
-  it('reads URL from config in Cloud mode with /mcp suffix (--verbose shows config URL)', () => {
+  it('reads hardcoded cloud URL in Cloud mode (--verbose shows config URL)', () => {
     writeProjectConfig({
       connectionMode: 'Cloud',
       host: 'http://localhost:55555',
-      cloudServerUrl: 'http://localhost:55556',
       authOption: 'none',
     });
     const { stdout } = runCli([
@@ -249,7 +244,7 @@ describe('run-tool config resolution', () => {
       '--raw',
     ]);
     expect(stdout).toContain('Cloud mode');
-    expect(stdout).toContain('http://localhost:55556/mcp');
+    expect(stdout).toContain('https://ai-game.dev/mcp');
   });
 
   it('--url flag overrides config URL', () => {
@@ -298,7 +293,6 @@ describe('run-tool config resolution', () => {
   it('reads cloudToken from config in Cloud mode (--verbose shows hasToken)', () => {
     writeProjectConfig({
       connectionMode: 'Cloud',
-      cloudServerUrl: 'https://cloud.example.com',
       cloudToken: 'cloud-token-123',
     });
     const { stdout } = runCli([

From 1de44332bfea3868e641d3529cfccd43b175f43c Mon Sep 17 00:00:00 2001
From: Ivan Murzak <Ivan.D.Murzak@gmail.com>
Date: Wed, 18 Mar 2026 01:35:42 -0700
Subject: [PATCH 2/8] Mask token fields and add copy shortcut

Set password masking for cloud and local authorization token TextFields in the UXML and enable a Ctrl/Cmd+C shortcut to copy their values in the editor scripts. Changes:
- MainWindow.uxml: add password="true" to inputCloudToken and inputAuthorizationToken to hide token contents.
- MainWindowEditor.Connection.cs & MainWindowEditor.McpServer.cs: set isPasswordField = true and register KeyDownEvent handlers to copy the field value to GUIUtility.systemCopyBuffer on Ctrl/Cmd+C (and stop propagation/prevent default). Also add missing UnityEngine using in Connection script.

Purpose: improve token privacy in the UI while providing a convenient copy-to-clipboard shortcut.
---
 .../Scripts/UI/Window/MainWindowEditor.Connection.cs | 12 ++++++++++++
 .../Scripts/UI/Window/MainWindowEditor.McpServer.cs  | 11 +++++++++++
 .../Assets/root/Editor/UI/uxml/MainWindow.uxml       |  4 ++--
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.Connection.cs b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.Connection.cs
index ad0f235a6..8571ffeb5 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.Connection.cs
+++ b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.Connection.cs
@@ -13,6 +13,7 @@
 using com.IvanMurzak.ReflectorNet.Utils;
 using com.IvanMurzak.Unity.MCP.Editor.Services;
 using Microsoft.AspNetCore.SignalR.Client;
+using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace com.IvanMurzak.Unity.MCP.Editor.UI
@@ -184,6 +185,17 @@ private void SetupCloudAuthSection(VisualElement root)
 
             _btnAuthorize = btnAuthorize;
 
+            inputCloudToken.isPasswordField = true;
+            inputCloudToken.RegisterCallback<KeyDownEvent>(evt =>
+            {
+                if (evt.keyCode == KeyCode.C && (evt.ctrlKey || evt.commandKey))
+                {
+                    GUIUtility.systemCopyBuffer = inputCloudToken.value;
+                    evt.StopPropagation();
+                    evt.PreventDefault();
+                }
+            });
+
             const string tokenPlaceholder = "Token — press Authorize";
             void SetTokenValue(string? token)
             {
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.McpServer.cs b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.McpServer.cs
index c956b0fb7..6c9ea6728 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.McpServer.cs
+++ b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.McpServer.cs
@@ -62,6 +62,17 @@ private void SetupMcpServerSection(VisualElement root)
                 return;
             }
 
+            inputAuthorizationToken.isPasswordField = true;
+            inputAuthorizationToken.RegisterCallback<KeyDownEvent>(evt =>
+            {
+                if (evt.keyCode == KeyCode.C && (evt.ctrlKey || evt.commandKey))
+                {
+                    GUIUtility.systemCopyBuffer = inputAuthorizationToken.value;
+                    evt.StopPropagation();
+                    evt.PreventDefault();
+                }
+            });
+
             if (labelAuthorizationToken != null) labelAuthorizationToken.tooltip = Tooltip_LabelAuthorizationToken;
             toggleAuthorizationNone.tooltip = Tooltip_ToggleAuthNone;
             toggleAuthorizationRequired.tooltip = Tooltip_ToggleAuthRequired;
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
index c6ae7cf67..badf1dbd7 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
@@ -25,7 +25,7 @@
             <!-- Cloud Authorization (visible in Cloud mode only) -->
             <ui:VisualElement name="cloudAuthSection" style="flex-direction: column; margin-bottom: 8px; display: none;">
                 <ui:VisualElement style="flex-direction: row; margin-top: 2px; align-items: center;">
-                    <ui:TextField name="inputCloudToken" label="" placeholder-text="Cloud Token" readonly="true" style="flex-grow: 1;" class="token-input" />
+                    <ui:TextField name="inputCloudToken" label="" placeholder-text="Cloud Token" readonly="true" password="true" style="flex-grow: 1;" class="token-input" />
                     <ui:Button name="btnCloudRevoke" text="Revoke" tooltip="Logout from the Cloud server. Clears the stored authentication token and disconnects Unity from the cloud." class="btn-compact btn-alert" style="display: none;" />
                     <ui:Button name="btnCloudAuthorize" text="Authorize" tooltip="Authenticate with the Cloud server using device code flow. Opens a browser to complete authorization." class="btn-compact" />
                 </ui:VisualElement>
@@ -75,7 +75,7 @@
                         <!-- Row 4: Authorization Token -->
                         <ui:VisualElement name="tokenSection" style="flex-direction: column; margin-top: 2px; margin-bottom: 2px;">
                             <ui:VisualElement style="flex-direction: row;">
-                                <ui:TextField name="inputAuthorizationToken" label="" placeholder-text="Token" readonly="true" class="token-input" />
+                                <ui:TextField name="inputAuthorizationToken" label="" placeholder-text="Token" readonly="true" password="true" class="token-input" />
                                 <ui:Button name="btnGenerateToken" text="New" class="btn-compact" />
                             </ui:VisualElement>
                         </ui:VisualElement>

From 8e8f94ff62ec352e4be63f487fa1120ac005600a Mon Sep 17 00:00:00 2001
From: Ivan Murzak <Ivan.D.Murzak@gmail.com>
Date: Wed, 18 Mar 2026 02:40:26 -0700
Subject: [PATCH 3/8] Add SegmentedControl and replace toggle pairs

Introduce a new SegmentedControl UI element (with USS styles) and migrate several two-toggle UI patterns to this segmented control. Adds SegmentedControl.cs and its stylesheet (_segmented-control.uss) plus meta files, and updates MainWindow UXML and editor logic to use the control (Connection, McpFeatures, McpServer). Removed the old mutually-exclusive toggle logic and toggle-style CSS, wiring selection via ChangeEvent<int> and preserving tooltips and behavior (no functional changes beyond UI consolidation). Key files: SegmentedControl.cs, _segmented-control.uss, MainWindow.uxml, MainWindow.uss, and MainWindowEditor.* (Connection/CreateGUI/McpFeatures/McpServer).
---
 .../root/Editor/Scripts/UI/Controls.meta      |   8 +
 .../Scripts/UI/Controls/SegmentedControl.cs   | 194 ++++++++++++++++++
 .../UI/Controls/SegmentedControl.cs.meta      |  11 +
 .../UI/Window/MainWindowEditor.Connection.cs  |  27 ++-
 .../UI/Window/MainWindowEditor.CreateGUI.cs   |  39 ----
 .../UI/Window/MainWindowEditor.McpFeatures.cs |  28 +--
 .../UI/Window/MainWindowEditor.McpServer.cs   |  32 +--
 .../Assets/root/Editor/UI/uss/MainWindow.uss  |  66 ------
 .../UI/uss/common/_segmented-control.uss      |  52 +++++
 .../UI/uss/common/_segmented-control.uss.meta |  11 +
 .../root/Editor/UI/uxml/MainWindow.uxml       |  15 +-
 11 files changed, 328 insertions(+), 155 deletions(-)
 create mode 100644 Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Controls.meta
 create mode 100644 Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Controls/SegmentedControl.cs
 create mode 100644 Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Controls/SegmentedControl.cs.meta
 create mode 100644 Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_segmented-control.uss
 create mode 100644 Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_segmented-control.uss.meta

diff --git a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Controls.meta b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Controls.meta
new file mode 100644
index 000000000..d1d6f29cf
--- /dev/null
+++ b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Controls.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e636b87262de189439b3beeeed1f936d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Controls/SegmentedControl.cs b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Controls/SegmentedControl.cs
new file mode 100644
index 000000000..fac1e06c2
--- /dev/null
+++ b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Controls/SegmentedControl.cs
@@ -0,0 +1,194 @@
+/*
+┌──────────────────────────────────────────────────────────────────┐
+│  Author: Ivan Murzak (https://github.com/IvanMurzak)             │
+│  Repository: GitHub (https://github.com/IvanMurzak/Unity-MCP)    │
+│  Copyright (c) 2025 Ivan Murzak                                  │
+│  Licensed under the Apache License, Version 2.0.                 │
+│  See the LICENSE file in the project root for more information.  │
+└──────────────────────────────────────────────────────────────────┘
+*/
+
+#nullable enable
+using System;
+using System.Collections.Generic;
+using com.IvanMurzak.Unity.MCP.Editor.Utils;
+using UnityEngine.UIElements;
+
+namespace com.IvanMurzak.Unity.MCP.Editor.UI.Controls
+{
+    /// <summary>
+    /// A segmented control with N segments and a sliding highlight.
+    /// Implements <see cref="INotifyValueChanged{T}"/> for UI Toolkit integration.
+    /// All visual styling is defined in <c>_segmented-control.uss</c>.
+    /// </summary>
+    public class SegmentedControl : VisualElement, INotifyValueChanged<int>
+    {
+        private static readonly string[] UssPaths =
+            EditorAssetLoader.GetEditorAssetPaths("Editor/UI/uss/common/_segmented-control.uss");
+
+        public new class UxmlFactory : UxmlFactory<SegmentedControl, UxmlTraits> { }
+
+        public new class UxmlTraits : VisualElement.UxmlTraits
+        {
+            private readonly UxmlStringAttributeDescription _choices = new() { name = "choices", defaultValue = "" };
+            private readonly UxmlIntAttributeDescription _defaultIndex = new() { name = "default-index", defaultValue = 0 };
+
+            public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
+            {
+                base.Init(ve, bag, cc);
+                var control = (SegmentedControl)ve;
+                var choicesValue = _choices.GetValueFromBag(bag, cc);
+                var defaultIndex = _defaultIndex.GetValueFromBag(bag, cc);
+
+                if (!string.IsNullOrEmpty(choicesValue))
+                {
+                    var labels = choicesValue.Split(',');
+                    for (var i = 0; i < labels.Length; i++)
+                        labels[i] = labels[i].Trim();
+                    control.BuildSegments(labels);
+                    control.SetValueWithoutNotify(defaultIndex);
+                }
+            }
+        }
+
+        private readonly VisualElement _track;
+        private readonly VisualElement _highlight;
+        private readonly List<Label> _segments = new();
+        private int _selectedIndex;
+        private bool _transitionReady;
+
+        public int SelectedIndex
+        {
+            get => _selectedIndex;
+            set => SetValue(value);
+        }
+
+        int INotifyValueChanged<int>.value
+        {
+            get => _selectedIndex;
+            set => SetValue(value);
+        }
+
+        public SegmentedControl() : this(Array.Empty<string>()) { }
+
+        public SegmentedControl(params string[] labels)
+        {
+            AddToClassList("segmented-control");
+
+            var uss = EditorAssetLoader.LoadAssetAtPath<StyleSheet>(UssPaths);
+            if (uss != null)
+                styleSheets.Add(uss);
+
+            _track = new VisualElement();
+            _track.AddToClassList("segmented-control__track");
+            Add(_track);
+
+            _highlight = new VisualElement();
+            _highlight.AddToClassList("segmented-control__highlight");
+            _highlight.AddToClassList("segmented-control__highlight--no-transition");
+            _track.Add(_highlight);
+
+            if (labels.Length > 0)
+                BuildSegments(labels);
+        }
+
+        private void BuildSegments(string[] labels)
+        {
+            // Remove old segments (keep highlight at index 0)
+            foreach (var seg in _segments)
+                _track.Remove(seg);
+            _segments.Clear();
+
+            for (var i = 0; i < labels.Length; i++)
+            {
+                var label = new Label(labels[i]);
+                label.AddToClassList("segmented-control__segment");
+                var index = i;
+                label.RegisterCallback<ClickEvent>(_ => SelectedIndex = index);
+                label.RegisterCallback<GeometryChangedEvent>(_ => SnapHighlightToSegment());
+                _track.Add(label);
+                _segments.Add(label);
+            }
+
+            _transitionReady = false;
+            UpdateHighlight();
+        }
+
+        /// <summary>
+        /// Sets per-segment tooltips. Segment count must match.
+        /// </summary>
+        public void SetTooltips(params string[] tooltips)
+        {
+            for (var i = 0; i < tooltips.Length && i < _segments.Count; i++)
+                _segments[i].tooltip = tooltips[i];
+        }
+
+        public void SetValueWithoutNotify(int newValue)
+        {
+            if (newValue < 0 || (_segments.Count > 0 && newValue >= _segments.Count))
+                return;
+
+            _selectedIndex = newValue;
+            UpdateHighlight();
+        }
+
+        private void SetValue(int newValue)
+        {
+            if (newValue < 0 || (_segments.Count > 0 && newValue >= _segments.Count))
+                return;
+            if (newValue == _selectedIndex)
+                return;
+
+            using var evt = ChangeEvent<int>.GetPooled(_selectedIndex, newValue);
+            evt.target = this;
+            _selectedIndex = newValue;
+            UpdateHighlight();
+            SendEvent(evt);
+        }
+
+        /// <summary>
+        /// Positions the highlight to match the selected segment's actual layout.
+        /// Called on geometry changes and selection changes.
+        /// </summary>
+        private void SnapHighlightToSegment()
+        {
+            if (_segments.Count == 0 || _selectedIndex < 0 || _selectedIndex >= _segments.Count)
+                return;
+
+            var segment = _segments[_selectedIndex];
+            var x = segment.layout.x;
+            var w = segment.layout.width;
+
+            // layout is zero before first layout pass
+            if (float.IsNaN(w) || w <= 0)
+                return;
+
+            _highlight.style.left = x;
+            _highlight.style.width = w;
+        }
+
+        private void UpdateHighlight()
+        {
+            if (_segments.Count == 0)
+                return;
+
+            if (!_transitionReady)
+            {
+                // Start with transitions suppressed; enable after first layout
+                SnapHighlightToSegment();
+                schedule.Execute(() =>
+                {
+                    _transitionReady = true;
+                    _highlight.RemoveFromClassList("segmented-control__highlight--no-transition");
+                });
+            }
+            else
+            {
+                SnapHighlightToSegment();
+            }
+
+            for (var i = 0; i < _segments.Count; i++)
+                _segments[i].EnableInClassList("segmented-control__segment--selected", i == _selectedIndex);
+        }
+    }
+}
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Controls/SegmentedControl.cs.meta b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Controls/SegmentedControl.cs.meta
new file mode 100644
index 000000000..99099cc77
--- /dev/null
+++ b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Controls/SegmentedControl.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ef49594c9154bc747bb935e3f3f952b3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.Connection.cs b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.Connection.cs
index 8571ffeb5..b8f1f363f 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.Connection.cs
+++ b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.Connection.cs
@@ -12,6 +12,7 @@
 using System;
 using com.IvanMurzak.ReflectorNet.Utils;
 using com.IvanMurzak.Unity.MCP.Editor.Services;
+using com.IvanMurzak.Unity.MCP.Editor.UI.Controls;
 using Microsoft.AspNetCore.SignalR.Client;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -102,9 +103,14 @@ private static void HandleConnectButton(string buttonText)
 
         private void SetupConnectionModeToggle(VisualElement root)
         {
-            var toggleCustom = root.Q<Toggle>("toggleModeCustom");
-            var toggleCloud = root.Q<Toggle>("toggleModeCloud");
-            if (toggleCustom == null || toggleCloud == null) return;
+            var container = root.Q<VisualElement>("segmentConnectionMode");
+            if (container == null) return;
+
+            var control = new SegmentedControl("Custom", "Cloud");
+            control.SetTooltips(
+                "Connect to your own MCP server. The plugin starts a local MCP server automatically and manages its lifecycle. Use this when you want full control over the server configuration, port, transport, and authorization settings.",
+                "Connect to a remote MCP server hosted in the cloud (e.g. ai-game.dev). No local server is started — the plugin connects directly to the specified Cloud URL. Requires authorization via device code flow.");
+            container.Add(control);
 
             var inputServerUrl = root.Q<TextField>("InputServerURL");
             var mcpServerPoint = root.Q<VisualElement>("TimelinePointMcpServer");
@@ -119,12 +125,12 @@ void UpdateModeVisibility(ConnectionMode mode)
             }
 
             var currentMode = UnityMcpPluginEditor.ConnectionMode;
-            toggleCustom.SetValueWithoutNotify(currentMode == ConnectionMode.Custom);
-            toggleCloud.SetValueWithoutNotify(currentMode == ConnectionMode.Cloud);
+            control.SetValueWithoutNotify(currentMode == ConnectionMode.Custom ? 0 : 1);
             UpdateModeVisibility(currentMode);
 
-            SetupMutuallyExclusiveToggles(toggleCustom, toggleCloud,
-                onASelected: () =>
+            control.RegisterCallback<ChangeEvent<int>>(evt =>
+            {
+                if (evt.newValue == 0)
                 {
                     UnityMcpPluginEditor.ConnectionMode = ConnectionMode.Custom;
                     UnityMcpPluginEditor.Instance.Save();
@@ -137,8 +143,8 @@ void UpdateModeVisibility(ConnectionMode mode)
                     // Start local server if configured and reconnect to it
                     McpServerManager.StartServerIfNeeded();
                     ReconnectAfterModeSwitch();
-                },
-                onBSelected: () =>
+                }
+                else
                 {
                     UnityMcpPluginEditor.ConnectionMode = ConnectionMode.Cloud;
                     UnityMcpPluginEditor.Instance.Save();
@@ -155,7 +161,8 @@ void UpdateModeVisibility(ConnectionMode mode)
                     // Reconnect to cloud server (only if authorized)
                     if (!string.IsNullOrEmpty(UnityMcpPluginEditor.CloudToken))
                         ReconnectAfterModeSwitch();
-                });
+                }
+            });
         }
 
         internal static bool IsAuthFlowRunning(DeviceAuthFlowState state) =>
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.CreateGUI.cs b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.CreateGUI.cs
index 2bb13e9cf..27d7d6df0 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.CreateGUI.cs
+++ b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.CreateGUI.cs
@@ -309,45 +309,6 @@ private void SetupSettingsSection(VisualElement root)
 
         #region Shared Helpers
 
-        /// <summary>
-        /// Sets up two toggles as a mutually exclusive pair where exactly one must always be selected.
-        /// When toggle A is selected, toggle B is deselected and vice versa.
-        /// If the currently-selected toggle is unchecked and the other is also unchecked, it re-checks itself.
-        /// </summary>
-        private static void SetupMutuallyExclusiveToggles(
-            Toggle toggleA, Toggle toggleB,
-            Action onASelected, Action onBSelected,
-            Action? onChanged = null)
-        {
-            toggleA.RegisterValueChangedCallback(evt =>
-            {
-                if (evt.newValue)
-                {
-                    toggleB.SetValueWithoutNotify(false);
-                    onASelected();
-                }
-                else if (!toggleB.value)
-                {
-                    toggleA.SetValueWithoutNotify(true);
-                }
-                onChanged?.Invoke();
-            });
-
-            toggleB.RegisterValueChangedCallback(evt =>
-            {
-                if (evt.newValue)
-                {
-                    toggleA.SetValueWithoutNotify(false);
-                    onBSelected();
-                }
-                else if (!toggleA.value)
-                {
-                    toggleB.SetValueWithoutNotify(true);
-                }
-                onChanged?.Invoke();
-            });
-        }
-
         /// <summary>
         /// Subscribes to the combined connection state (HubConnectionState + KeepConnected) with
         /// throttling and synchronization context marshaling.
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.McpFeatures.cs b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.McpFeatures.cs
index 6f921927b..fd7b206ba 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.McpFeatures.cs
+++ b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.McpFeatures.cs
@@ -14,6 +14,7 @@
 using System.Threading;
 using com.IvanMurzak.McpPlugin.Common.Utils;
 using com.IvanMurzak.ReflectorNet.Utils;
+using com.IvanMurzak.Unity.MCP.Editor.UI.Controls;
 using com.IvanMurzak.Unity.MCP.Editor.Utils;
 using Microsoft.Extensions.Logging;
 using R3;
@@ -83,17 +84,16 @@ private void SetupAiAgentSection(VisualElement root)
             var containerMcpServer = root.Q<VisualElement>("mcpServerStatusControl") ?? throw new InvalidOperationException("mcpServerStatusControl element not found.");
             var btnStartStopMcpServer = root.Q<Button>("btnStartStopServer") ?? throw new InvalidOperationException("MCP Server start/stop button not found.");
 
-            var toggleOptionHttp = root.Q<Toggle>("toggleOptionHttp") ?? throw new NullReferenceException("Toggle 'toggleOptionHttp' not found in UI.");
-            var toggleOptionStdio = root.Q<Toggle>("toggleOptionStdio") ?? throw new NullReferenceException("Toggle 'toggleOptionStdio' not found in UI.");
+            var segmentTransport = root.Q<VisualElement>("segmentTransport") ?? throw new InvalidOperationException("segmentTransport element not found.");
+            var transportControl = new SegmentedControl("stdio", "http");
+            transportControl.SetTooltips(Tooltip_ToggleStdio, Tooltip_ToggleHttp);
+            segmentTransport.Add(transportControl);
 
             var labelTransport = root.Q<Label>("labelTransport");
             if (labelTransport != null) labelTransport.tooltip = Tooltip_LabelTransport;
-            toggleOptionStdio.tooltip = Tooltip_ToggleStdio;
-            toggleOptionHttp.tooltip = Tooltip_ToggleHttp;
 
-            // Initialize with HTTP selected by default
-            toggleOptionStdio.value = UnityMcpPluginEditor.TransportMethod == TransportMethod.stdio;
-            toggleOptionHttp.value = UnityMcpPluginEditor.TransportMethod != TransportMethod.stdio;
+            // Initialize: index 0 = stdio, index 1 = http
+            transportControl.SetValueWithoutNotify(UnityMcpPluginEditor.TransportMethod == TransportMethod.stdio ? 0 : 1);
             currentAiAgentConfigurator?.SetTransportMethod(UnityMcpPluginEditor.TransportMethod);
 
             void UpdateMcpServerState()
@@ -105,8 +105,9 @@ void UpdateMcpServerState()
             }
             UpdateMcpServerState();
 
-            SetupMutuallyExclusiveToggles(toggleOptionStdio, toggleOptionHttp,
-                onASelected: () =>
+            transportControl.RegisterCallback<ChangeEvent<int>>(evt =>
+            {
+                if (evt.newValue == 0)
                 {
                     UnityMcpPluginEditor.TransportMethod = TransportMethod.stdio;
                     UnityMcpPluginEditor.Instance.Save();
@@ -119,14 +120,15 @@ void UpdateMcpServerState()
                         UnityMcpPluginEditor.Instance.Save();
                         McpServerManager.StopServer();
                     }
-                },
-                onBSelected: () =>
+                }
+                else
                 {
                     UnityMcpPluginEditor.TransportMethod = TransportMethod.streamableHttp;
                     UnityMcpPluginEditor.Instance.Save();
                     currentAiAgentConfigurator?.SetTransportMethod(TransportMethod.streamableHttp);
-                },
-                onChanged: UpdateMcpServerState);
+                }
+                UpdateMcpServerState();
+            });
         }
 
         private void FetchAiAgentData(int retryCount = 3, int retryDelayMs = 3000)
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.McpServer.cs b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.McpServer.cs
index 6c9ea6728..ec166af93 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.McpServer.cs
+++ b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/Window/MainWindowEditor.McpServer.cs
@@ -14,6 +14,7 @@
 using com.IvanMurzak.McpPlugin.Common.Model;
 using com.IvanMurzak.McpPlugin.Common.Utils;
 using com.IvanMurzak.ReflectorNet.Utils;
+using com.IvanMurzak.Unity.MCP.Editor.UI.Controls;
 using Microsoft.Extensions.Logging;
 using R3;
 using UnityEngine;
@@ -44,24 +45,26 @@ private void SetupMcpServerSection(VisualElement root)
 
             // MCP server authorization configuration UI elements
             var labelAuthorizationToken = root.Q<Label>("labelAuthorizationToken");
-            var toggleAuthorizationNone = root.Q<Toggle>("toggleAuthorizationNone");
-            var toggleAuthorizationRequired = root.Q<Toggle>("toggleAuthorizationRequired");
+            var segmentAuthorization = root.Q<VisualElement>("segmentAuthorization");
             var inputAuthorizationToken = root.Q<TextField>("inputAuthorizationToken");
             var tokenSection = root.Q<VisualElement>("tokenSection");
             var btnGenerateToken = root.Q<Button>("btnGenerateToken");
 
-            if (toggleAuthorizationNone == null || toggleAuthorizationRequired == null
-                || inputAuthorizationToken == null || tokenSection == null || btnGenerateToken == null)
+            if (segmentAuthorization == null || inputAuthorizationToken == null
+                || tokenSection == null || btnGenerateToken == null)
             {
                 Debug.LogError("One or more authorization UI elements not found in UXML: " +
-                    $"toggleAuthorizationNone={toggleAuthorizationNone != null}, " +
-                    $"toggleAuthorizationRequired={toggleAuthorizationRequired != null}, " +
+                    $"segmentAuthorization={segmentAuthorization != null}, " +
                     $"inputAuthorizationToken={inputAuthorizationToken != null}, " +
                     $"tokenSection={tokenSection != null}, " +
                     $"btnGenerateToken={btnGenerateToken != null}");
                 return;
             }
 
+            var authControl = new SegmentedControl("none", "required");
+            authControl.SetTooltips(Tooltip_ToggleAuthNone, Tooltip_ToggleAuthRequired);
+            segmentAuthorization.Add(authControl);
+
             inputAuthorizationToken.isPasswordField = true;
             inputAuthorizationToken.RegisterCallback<KeyDownEvent>(evt =>
             {
@@ -74,18 +77,16 @@ private void SetupMcpServerSection(VisualElement root)
             });
 
             if (labelAuthorizationToken != null) labelAuthorizationToken.tooltip = Tooltip_LabelAuthorizationToken;
-            toggleAuthorizationNone.tooltip = Tooltip_ToggleAuthNone;
-            toggleAuthorizationRequired.tooltip = Tooltip_ToggleAuthRequired;
             btnGenerateToken.tooltip = Tooltip_BtnGenerateToken;
 
             var authOption = UnityMcpPluginEditor.AuthOption;
-            toggleAuthorizationNone.SetValueWithoutNotify(authOption == AuthOption.none);
-            toggleAuthorizationRequired.SetValueWithoutNotify(authOption == AuthOption.required);
+            authControl.SetValueWithoutNotify(authOption == AuthOption.none ? 0 : 1);
             inputAuthorizationToken.SetValueWithoutNotify(UnityMcpPluginEditor.Token ?? string.Empty);
             SetTokenFieldsVisible(inputAuthorizationToken, tokenSection, authOption == AuthOption.required);
 
-            SetupMutuallyExclusiveToggles(toggleAuthorizationNone, toggleAuthorizationRequired,
-                onASelected: () =>
+            authControl.RegisterCallback<ChangeEvent<int>>(evt =>
+            {
+                if (evt.newValue == 0)
                 {
                     ApplyServerSettingAndRestart(() =>
                     {
@@ -93,8 +94,8 @@ private void SetupMcpServerSection(VisualElement root)
                     });
                     SetTokenFieldsVisible(inputAuthorizationToken, tokenSection, false);
                     InvalidateAndReloadAgentUI();
-                },
-                onBSelected: () =>
+                }
+                else
                 {
                     ApplyServerSettingAndRestart(() =>
                     {
@@ -102,7 +103,8 @@ private void SetupMcpServerSection(VisualElement root)
                     });
                     SetTokenFieldsVisible(inputAuthorizationToken, tokenSection, true);
                     InvalidateAndReloadAgentUI();
-                });
+                }
+            });
 
             inputAuthorizationToken.RegisterCallback<FocusOutEvent>(_ =>
             {
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/MainWindow.uss b/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/MainWindow.uss
index 7af2a0708..3685b60a6 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/MainWindow.uss
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/MainWindow.uss
@@ -11,72 +11,6 @@
 @import url("common/_animations.uss");
 @import url("common/_foldout.uss");
 
-/* ==========================================================================
-   Toggle Text Button - Toggles styled as text buttons
-   ========================================================================== */
-
-.toggle-text-button {
-    flex-direction: row-reverse;
-    flex-grow: 0;
-    flex-shrink: 0;
-    /* margin: 2px 2px; */
-    min-width: 40px;
-}
-
-.toggle-text-button > .unity-toggle__input {
-    display: none;
-    width: 0;
-    height: 0;
-    min-width: 0;
-    min-height: 0;
-    max-width: 0;
-    max-height: 0;
-    padding: 0;
-    margin: 0;
-    border-width: 0;
-}
-
-.toggle-text-button .unity-toggle__checkmark {
-    display: none;
-    width: 0;
-    height: 0;
-    min-width: 0;
-    min-height: 0;
-    max-width: 0;
-    max-height: 0;
-    padding: 0;
-    margin: 0;
-    border-width: 0;
-}
-
-.toggle-text-button > .unity-label {
-    color: rgb(140, 140, 140);
-    font-size: 12px;
-    padding: 4px 8px;
-    margin: 0;
-    border-radius: 4px;
-    min-width: 40px;
-    background-color: rgba(255, 255, 255, 0.05);
-    transition-duration: 200ms;
-    -unity-text-align: middle-left;
-}
-
-.toggle-text-button:hover > .unity-label {
-    color: rgb(180, 180, 180);
-    background-color: rgba(255, 255, 255, 0.1);
-    transition-duration: 200ms;
-}
-
-.toggle-text-button:checked > .unity-label {
-    color: rgb(175, 232, 230);
-    background-color: rgba(175, 232, 230, 0.1);
-}
-
-.toggle-text-button:checked:hover > .unity-label {
-    color: rgb(200, 245, 243);
-    background-color: rgba(190, 232, 230, 0.1);
-}
-
 /* ==========================================================================
    Agent Icon - Icon displayed next to agent name in configuration panels
    ========================================================================== */
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_segmented-control.uss b/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_segmented-control.uss
new file mode 100644
index 000000000..06c6a339b
--- /dev/null
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_segmented-control.uss
@@ -0,0 +1,52 @@
+/* ==========================================================================
+   Segmented Control — tab-like toggle with sliding highlight
+   ========================================================================== */
+
+.segmented-control {
+    flex-direction: row;
+    flex-shrink: 0;
+    margin-right: 3px;
+}
+
+.segmented-control__track {
+    flex-direction: row;
+    background-color: rgba(255, 255, 255, 0.05);
+    border-radius: 6px;
+    padding: 2px;
+}
+
+.segmented-control__highlight {
+    position: absolute;
+    top: 2px;
+    bottom: 2px;
+    background-color: rgba(0, 0, 0, 0.4);
+    border-radius: 4px;
+    transition-property: left, width;
+    transition-duration: 200ms, 200ms;
+}
+
+.segmented-control__highlight--no-transition {
+    transition-duration: 0s, 0s;
+}
+
+.segmented-control__segment {
+    color: rgb(140, 140, 140);
+    font-size: 12px;
+    padding: 2px 8px;
+    margin: 0;
+    min-width: 40px;
+    -unity-text-align: middle-center;
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.segmented-control__segment:hover {
+    color: rgb(180, 180, 180);
+}
+
+.segmented-control__segment--selected {
+    color: rgb(175, 232, 230);
+}
+
+.segmented-control__segment--selected:hover {
+    color: rgb(200, 245, 243);
+}
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_segmented-control.uss.meta b/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_segmented-control.uss.meta
new file mode 100644
index 000000000..78fa873b5
--- /dev/null
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_segmented-control.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 658151eb48a9eea4abad5d6e75cfb4d6
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
index badf1dbd7..fd1992b36 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
@@ -16,10 +16,7 @@
             <!-- Connection Section ============================== -->
             <ui:VisualElement class="row" style="margin-top: 0; align-items: center;">
                 <ui:Label text="Connection" class="header" />
-                <ui:VisualElement style="flex-direction: row; flex-grow: 1; justify-content: flex-end; margin-right: 0;">
-                    <ui:Toggle name="toggleModeCustom" label="Custom" tooltip="Connect to your own MCP server. The plugin starts a local MCP server automatically and manages its lifecycle. Use this when you want full control over the server configuration, port, transport, and authorization settings." class="toggle-text-button" />
-                    <ui:Toggle name="toggleModeCloud" label="Cloud" tooltip="Connect to a remote MCP server hosted in the cloud (e.g. ai-game.dev). No local server is started — the plugin connects directly to the specified Cloud URL. Requires authorization via device code flow." class="toggle-text-button" />
-                </ui:VisualElement>
+                <ui:VisualElement name="segmentConnectionMode" style="flex-direction: row; flex-grow: 1; justify-content: flex-end; margin-right: 0;" />
             </ui:VisualElement>
             <ui:TextField picking-mode="Ignore" label="Server URL" value="http://localhost:8080" name="InputServerURL" class="content-item" />
             <!-- Cloud Authorization (visible in Cloud mode only) -->
@@ -59,18 +56,12 @@
                         <!-- Row 2: Transport -->
                         <ui:VisualElement style="flex-direction: row; align-items: center; justify-content: space-between; margin-top: 2px; margin-bottom: 2px;">
                             <ui:Label name="labelTransport" text="Transport" class="section-desc" style="margin-bottom: 0;" />
-                            <ui:VisualElement style="flex-direction: row;">
-                                <ui:Toggle name="toggleOptionStdio" label="stdio" class="toggle-text-button" />
-                                <ui:Toggle name="toggleOptionHttp" label="http" class="toggle-text-button" />
-                            </ui:VisualElement>
+                            <ui:VisualElement name="segmentTransport" />
                         </ui:VisualElement>
                         <!-- Row 3: Authorization -->
                         <ui:VisualElement style="flex-direction: row; align-items: center; justify-content: space-between; margin-top: 2px; margin-bottom: 2px;">
                             <ui:Label name="labelAuthorizationToken" text="Authorization Token" class="section-desc" style="margin-bottom: 0;" />
-                            <ui:VisualElement style="flex-direction: row;">
-                                <ui:Toggle name="toggleAuthorizationNone" label="none" class="toggle-text-button" />
-                                <ui:Toggle name="toggleAuthorizationRequired" label="required" class="toggle-text-button" />
-                            </ui:VisualElement>
+                            <ui:VisualElement name="segmentAuthorization" />
                         </ui:VisualElement>
                         <!-- Row 4: Authorization Token -->
                         <ui:VisualElement name="tokenSection" style="flex-direction: column; margin-top: 2px; margin-bottom: 2px;">

From ad3a847d46649248e9cf0a2b3af60f22f4562724 Mon Sep 17 00:00:00 2001
From: Ivan Murzak <Ivan.D.Murzak@gmail.com>
Date: Wed, 18 Mar 2026 02:46:28 -0700
Subject: [PATCH 4/8] Add transitions and muted styles for text fields

Update form USS to improve disabled/enabled text-field visuals: replace previous border/margin rules with transparent border, adjust background and text colors to muted tones, and add 200ms transition-duration to inputs and labels. New rules also apply muted color to .unity-label for disabled fields to ensure consistent appearance and smoother state changes.
---
 .../Assets/root/Editor/UI/uss/common/_forms.uss | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_forms.uss b/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_forms.uss
index f63560c52..48df682a0 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_forms.uss
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_forms.uss
@@ -57,9 +57,15 @@
 }
 
 .disabled-text-field .unity-text-field__input {
-    border-width: 0;
-    margin: 1px;
-    background-color: rgba(0, 255, 255, 0.1);
+    border-color: rgba(0, 0, 0, 0);
+    background-color: rgba(255, 255, 255, 0.03);
+    color: rgb(110, 110, 110);
+    transition-duration: 200ms;
+}
+
+.disabled-text-field .unity-label {
+    color: rgb(110, 110, 110);
+    transition-duration: 200ms;
 }
 
 .transparent-text-field {
@@ -73,6 +79,11 @@
 
 .enabled-text-field .unity-text-field__input {
     background-color: rgba(0, 0, 0, 0.2);
+    transition-duration: 200ms;
+}
+
+.enabled-text-field .unity-label {
+    transition-duration: 200ms;
 }
 
 /* Argument items (form-like display) */

From 05965a7cf107f4cf212651c51913e43712a9ae96 Mon Sep 17 00:00:00 2001
From: Ivan Murzak <Ivan.D.Murzak@gmail.com>
Date: Wed, 18 Mar 2026 02:50:50 -0700
Subject: [PATCH 5/8] Style AI agent dropdown

Add a .styled-dropdown stylesheet to _forms.uss to customize Unity popup fields (background, border, radius, padding, hover state, text size/color, arrow tint and transitions). Apply the styled-dropdown class to the aiAgentDropdown DropdownField in MainWindow.uxml so the AI agent selector uses the new visual styling.
---
 .../root/Editor/UI/uss/common/_forms.uss      | 26 +++++++++++++++++++
 .../root/Editor/UI/uxml/MainWindow.uxml       |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_forms.uss b/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_forms.uss
index 48df682a0..1ff30c06e 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_forms.uss
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_forms.uss
@@ -86,6 +86,32 @@
     transition-duration: 200ms;
 }
 
+/* Styled Dropdown */
+.styled-dropdown .unity-popup-field__input {
+    background-color: rgba(0, 0, 0, 0.25);
+    border-radius: 6px;
+    border-color: rgba(255, 255, 255, 0.08);
+    border-width: 1px;
+    padding: 3px 8px;
+    transition-duration: 200ms;
+}
+
+.styled-dropdown .unity-popup-field__input:hover {
+    background-color: rgba(0, 0, 0, 0.35);
+    border-color: rgba(175, 232, 230, 0.25);
+    transition-duration: 200ms;
+}
+
+.styled-dropdown .unity-base-popup-field__text {
+    color: rgb(200, 200, 200);
+    font-size: 12px;
+    -unity-text-align: middle-left;
+}
+
+.styled-dropdown .unity-base-popup-field__arrow {
+    -unity-background-image-tint-color: rgb(175, 232, 230);
+}
+
 /* Argument items (form-like display) */
 .argument-item {
     margin-left: 15px;
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
index fd1992b36..8c42eb886 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
@@ -86,7 +86,7 @@
             <!-- AI Agent Section ============================== -->
             <ui:VisualElement class="row" style="margin-top: 0; align-items: center;">
                 <ui:Label text="AI agent" class="header" />
-                <ui:DropdownField name="aiAgentDropdown" class="content-item" style="flex-grow: 1; flex-shrink: 1; min-width: 0; padding-top: 4px; margin-right: 0px;" />
+                <ui:DropdownField name="aiAgentDropdown" class="content-item styled-dropdown" style="flex-grow: 1; flex-shrink: 1; min-width: 0; padding-top: 4px; margin-right: 0px;" />
             </ui:VisualElement>
             <ui:VisualElement name="ConfigureAgentsContainer" />
             <ui:VisualElement class="divider" />

From 1a6ce98ad7dc5cd220a9cb7c42dd09152b35a446 Mon Sep 17 00:00:00 2001
From: Ivan Murzak <Ivan.D.Murzak@gmail.com>
Date: Wed, 18 Mar 2026 03:07:36 -0700
Subject: [PATCH 6/8] Apply styled-dropdown to EnumField and tweak CSS

Extend styled-dropdown rules to target EnumField inputs and their hover state, add top padding for the dropdown label, and remove the old arrow tint rule. Also add the styled-dropdown class to the Log Level EnumField in MainWindow.uxml so the updated styles apply to the UI.
---
 .../Assets/root/Editor/UI/uss/common/_forms.uss   | 15 +++++++++------
 .../Assets/root/Editor/UI/uxml/MainWindow.uxml    |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_forms.uss b/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_forms.uss
index 1ff30c06e..ca0e8f47e 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_forms.uss
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_forms.uss
@@ -86,8 +86,9 @@
     transition-duration: 200ms;
 }
 
-/* Styled Dropdown */
-.styled-dropdown .unity-popup-field__input {
+/* Styled Dropdown (DropdownField + EnumField) */
+.styled-dropdown .unity-popup-field__input,
+.styled-dropdown .unity-enum-field__input {
     background-color: rgba(0, 0, 0, 0.25);
     border-radius: 6px;
     border-color: rgba(255, 255, 255, 0.08);
@@ -96,21 +97,23 @@
     transition-duration: 200ms;
 }
 
-.styled-dropdown .unity-popup-field__input:hover {
+.styled-dropdown .unity-popup-field__input:hover,
+.styled-dropdown .unity-enum-field__input:hover {
     background-color: rgba(0, 0, 0, 0.35);
     border-color: rgba(175, 232, 230, 0.25);
     transition-duration: 200ms;
 }
 
+.styled-dropdown > .unity-label {
+    padding-top: 5px;
+}
+
 .styled-dropdown .unity-base-popup-field__text {
     color: rgb(200, 200, 200);
     font-size: 12px;
     -unity-text-align: middle-left;
 }
 
-.styled-dropdown .unity-base-popup-field__arrow {
-    -unity-background-image-tint-color: rgb(175, 232, 230);
-}
 
 /* Argument items (form-like display) */
 .argument-item {
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
index 8c42eb886..87fd6eded 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
@@ -4,7 +4,7 @@
             <!-- Header Section -->
             <ui:Box name="contHeader" style="background-color: rgba(222, 222, 222, 0); flex-direction: row; flex-shrink: 0;">
                 <ui:VisualElement style="flex-grow: 1; background-color: rgba(0, 0, 0, 0);">
-                    <ui:EnumField label="Log Level" name="dropdownLogLevel" type="com.IvanMurzak.Unity.MCP.Runtime.Utils.LogLevel, com.IvanMurzak.Unity.MCP.Runtime" value="Warning" class="content-item" style="align-self: flex-start;" />
+                    <ui:EnumField label="Log Level" name="dropdownLogLevel" type="com.IvanMurzak.Unity.MCP.Runtime.Utils.LogLevel, com.IvanMurzak.Unity.MCP.Runtime" value="Warning" class="content-item styled-dropdown" style="align-self: flex-start;" />
                     <ui:IntegerField label="Timeout (ms)" name="inputTimeoutMs" value="10000" class="content-item" style="align-self: flex-start;" />
                     <ui:TextField picking-mode="Ignore" label="Version" value="0.0.0" readonly="true" name="currentVersion" focusable="false" class="content-item transparent-text-field" style="align-self: flex-start;" />
                 </ui:VisualElement>

From 8da961da81768b0f17356b8983126015dddb0c11 Mon Sep 17 00:00:00 2001
From: Ivan Murzak <Ivan.D.Murzak@gmail.com>
Date: Wed, 18 Mar 2026 03:35:10 -0700
Subject: [PATCH 7/8] UI: Add styled form controls & update UXML

Introduce new USS styles for styled-text-field, styled-integer-field and refined dropdown/field states (hover/active/disabled), add consistent paddings and transitions, and tweak label spacing. Apply the new classes across several UXML views (MainWindow, McpPromptsWindow, McpResourcesWindow, McpToolsWindow, TemplateTextFieldReadOnly) to standardize appearance and replace some inline alignment. Also update header labels and tooltips in the resource/prompt/tool windows for clearer, shorter titles and helpful descriptions.
---
 .../root/Editor/UI/uss/common/_forms.uss      | 99 ++++++++++++++++---
 .../root/Editor/UI/uxml/MainWindow.uxml       |  8 +-
 .../root/Editor/UI/uxml/McpPromptsWindow.uxml |  7 +-
 .../Editor/UI/uxml/McpResourcesWindow.uxml    |  7 +-
 .../root/Editor/UI/uxml/McpToolsWindow.uxml   |  7 +-
 .../elements/TemplateTextFieldReadOnly.uxml   |  2 +-
 6 files changed, 98 insertions(+), 32 deletions(-)

diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_forms.uss b/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_forms.uss
index ca0e8f47e..0f9a8e65b 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_forms.uss
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uss/common/_forms.uss
@@ -50,12 +50,28 @@
 
 .content-item .unity-integer-field__input {
     width: 65px;
+    padding-left: 8px;
+}
+
+.content-item > .unity-label {
+    padding-top: 2px;
+}
+
+.content-item.transparent-text-field .unity-text-field__input {
+    padding-left: 8px;
 }
 
 /* Text field states */
-.disabled-text-field {
+.enabled-text-field .unity-text-field__input {
+    background-color: rgba(0, 0, 0, 0.2);
+    transition-duration: 200ms;
 }
 
+.enabled-text-field .unity-label {
+    transition-duration: 200ms;
+}
+
+.disabled-text-field.styled-text-field .unity-text-field__input,
 .disabled-text-field .unity-text-field__input {
     border-color: rgba(0, 0, 0, 0);
     background-color: rgba(255, 255, 255, 0.03);
@@ -63,29 +79,23 @@
     transition-duration: 200ms;
 }
 
+.disabled-text-field.styled-text-field:hover .unity-text-field__input,
+.disabled-text-field:hover .unity-text-field__input {
+    border-color: rgba(0, 0, 0, 0);
+    background-color: rgba(255, 255, 255, 0.03);
+}
+
 .disabled-text-field .unity-label {
     color: rgb(110, 110, 110);
     transition-duration: 200ms;
 }
 
-.transparent-text-field {
-}
-
 .transparent-text-field .unity-text-field__input {
     border-width: 0;
     margin: 1px;
     background-color: rgba(0, 0, 0, 0);
 }
 
-.enabled-text-field .unity-text-field__input {
-    background-color: rgba(0, 0, 0, 0.2);
-    transition-duration: 200ms;
-}
-
-.enabled-text-field .unity-label {
-    transition-duration: 200ms;
-}
-
 /* Styled Dropdown (DropdownField + EnumField) */
 .styled-dropdown .unity-popup-field__input,
 .styled-dropdown .unity-enum-field__input {
@@ -97,13 +107,20 @@
     transition-duration: 200ms;
 }
 
-.styled-dropdown .unity-popup-field__input:hover,
-.styled-dropdown .unity-enum-field__input:hover {
+.styled-dropdown:hover .unity-popup-field__input,
+.styled-dropdown:hover .unity-enum-field__input {
     background-color: rgba(0, 0, 0, 0.35);
     border-color: rgba(175, 232, 230, 0.25);
     transition-duration: 200ms;
 }
 
+.styled-dropdown:active .unity-popup-field__input,
+.styled-dropdown:active .unity-enum-field__input {
+    background-color: rgba(0, 0, 0, 0.5);
+    border-color: rgba(175, 232, 230, 0.4);
+    transition-duration: 50ms;
+}
+
 .styled-dropdown > .unity-label {
     padding-top: 5px;
 }
@@ -115,6 +132,58 @@
 }
 
 
+/* Styled Text Field */
+.styled-text-field .unity-text-field__input {
+    background-color: rgba(0, 0, 0, 0.25);
+    border-radius: 6px;
+    border-color: rgba(255, 255, 255, 0.08);
+    border-width: 1px;
+    padding: 3px 8px;
+    color: rgb(200, 200, 200);
+    transition-duration: 200ms;
+}
+
+.styled-text-field:hover .unity-text-field__input {
+    background-color: rgba(0, 0, 0, 0.35);
+    border-color: rgba(175, 232, 230, 0.25);
+    transition-duration: 200ms;
+}
+
+.styled-text-field > .unity-label {
+    padding-top: 5px;
+}
+
+.styled-text-field:active .unity-text-field__input {
+    background-color: rgba(0, 0, 0, 0.5);
+    border-color: rgba(175, 232, 230, 0.4);
+    transition-duration: 50ms;
+}
+
+
+/* Styled Integer Field */
+.styled-integer-field .unity-integer-field__input {
+    background-color: rgba(0, 0, 0, 0.25);
+    border-radius: 6px;
+    border-color: rgba(255, 255, 255, 0.08);
+    border-width: 1px;
+    padding: 3px 8px;
+    color: rgb(200, 200, 200);
+    transition-duration: 200ms;
+}
+
+.styled-integer-field:hover .unity-integer-field__input {
+    background-color: rgba(0, 0, 0, 0.35);
+    border-color: rgba(175, 232, 230, 0.25);
+    transition-duration: 200ms;
+}
+
+.styled-integer-field:active .unity-integer-field__input {
+    background-color: rgba(0, 0, 0, 0.5);
+    border-color: rgba(175, 232, 230, 0.4);
+    transition-duration: 50ms;
+}
+
+
 /* Argument items (form-like display) */
 .argument-item {
     margin-left: 15px;
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
index 87fd6eded..a2572c5cb 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/MainWindow.uxml
@@ -4,9 +4,9 @@
             <!-- Header Section -->
             <ui:Box name="contHeader" style="background-color: rgba(222, 222, 222, 0); flex-direction: row; flex-shrink: 0;">
                 <ui:VisualElement style="flex-grow: 1; background-color: rgba(0, 0, 0, 0);">
-                    <ui:EnumField label="Log Level" name="dropdownLogLevel" type="com.IvanMurzak.Unity.MCP.Runtime.Utils.LogLevel, com.IvanMurzak.Unity.MCP.Runtime" value="Warning" class="content-item styled-dropdown" style="align-self: flex-start;" />
-                    <ui:IntegerField label="Timeout (ms)" name="inputTimeoutMs" value="10000" class="content-item" style="align-self: flex-start;" />
-                    <ui:TextField picking-mode="Ignore" label="Version" value="0.0.0" readonly="true" name="currentVersion" focusable="false" class="content-item transparent-text-field" style="align-self: flex-start;" />
+                    <ui:EnumField label="Log Level" name="dropdownLogLevel" type="com.IvanMurzak.Unity.MCP.Runtime.Utils.LogLevel, com.IvanMurzak.Unity.MCP.Runtime" value="Warning" class="content-item styled-dropdown" />
+                    <ui:IntegerField label="Timeout (ms)" name="inputTimeoutMs" value="10000" class="content-item" />
+                    <ui:TextField picking-mode="Ignore" label="Version" value="0.0.0" readonly="true" name="currentVersion" focusable="false" class="content-item transparent-text-field" />
                 </ui:VisualElement>
                 <ui:VisualElement name="imgLogoPivot" class="animated-selectable" style="flex-grow: 0; height: 60px; width: 60px; right: 0; margin-left: 15px; flex-shrink: 0; margin-right: 0px; margin-top: 2px; flex-direction: row;">
                     <ui:VisualElement name="imgLogo" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); background-image: url(&quot;project://database/Assets/root/Editor/Gizmos/logo_512.png?fileID=2800000&amp;guid=bbb0f64bd8f15164781e01168cd6fa4f&amp;type=3#logo_512&quot;); -unity-background-scale-mode: stretch-to-fill; align-self: stretch;" />
@@ -18,7 +18,7 @@
                 <ui:Label text="Connection" class="header" />
                 <ui:VisualElement name="segmentConnectionMode" style="flex-direction: row; flex-grow: 1; justify-content: flex-end; margin-right: 0;" />
             </ui:VisualElement>
-            <ui:TextField picking-mode="Ignore" label="Server URL" value="http://localhost:8080" name="InputServerURL" class="content-item" />
+            <ui:TextField picking-mode="Ignore" label="Server URL" value="http://localhost:8080" name="InputServerURL" class="content-item styled-text-field" />
             <!-- Cloud Authorization (visible in Cloud mode only) -->
             <ui:VisualElement name="cloudAuthSection" style="flex-direction: column; margin-bottom: 8px; display: none;">
                 <ui:VisualElement style="flex-direction: row; margin-top: 2px; align-items: center;">
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/McpPromptsWindow.uxml b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/McpPromptsWindow.uxml
index 89e7aca9a..3645ae7f8 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/McpPromptsWindow.uxml
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/McpPromptsWindow.uxml
@@ -1,15 +1,14 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <ui:VisualElement class="root-container" style="min-width: 320px;">
         <ui:VisualElement class="header-container">
-            <ui:Label text="MCP Prompts" class="header-title" />
-            <ui:Label text="See and control all MCP prompts. Disable not needed prompts. Passive prompts do not consume AI context. Don't need to disable them until you want to clear your commands list in the MCP client." class="header-description" />
+            <ui:Label text="Prompts" class="header-title" tooltip="Browse and control all MCP prompts. Prompts are slash-commands the user can invoke from the AI client. They do not passively consume context — only when explicitly invoked. Disable prompts you don't need to keep your commands list clean." />
             <ui:VisualElement class="filter-row">
                 <ui:Label text="Filter:" class="filter-label" />
-                <ui:TextField name="filter-textfield" class="filter-textfield" />
+                <ui:TextField name="filter-textfield" class="filter-textfield styled-text-field" />
             </ui:VisualElement>
             <ui:VisualElement class="filter-row">
                 <ui:Label text="Type:" class="filter-label" />
-                <ui:DropdownField name="type-dropdown" index="0" class="type-dropdown" />
+                <ui:DropdownField name="type-dropdown" index="0" class="type-dropdown styled-dropdown" />
                 <ui:Label text="Filtered: 0, Total: 0" name="filter-stats-label" class="filter-stats-label" />
             </ui:VisualElement>
         </ui:VisualElement>
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/McpResourcesWindow.uxml b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/McpResourcesWindow.uxml
index f89e92c3f..10e69ae2b 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/McpResourcesWindow.uxml
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/McpResourcesWindow.uxml
@@ -1,15 +1,14 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <ui:VisualElement class="root-container" style="min-width: 320px;">
         <ui:VisualElement class="header-container">
-            <ui:Label text="MCP Resources" class="header-title" />
-            <ui:Label text="See and control all MCP resources. Disable not needed resources." class="header-description" />
+            <ui:Label text="Resources" class="header-title" tooltip="Browse and control all MCP resources. Resources are read-only data providers the AI can query for project information — scene hierarchy, asset metadata, settings. They never modify state. Disable unused resources to keep the list focused." />
             <ui:VisualElement class="filter-row">
                 <ui:Label text="Filter:" class="filter-label" />
-                <ui:TextField name="filter-textfield" class="filter-textfield" />
+                <ui:TextField name="filter-textfield" class="filter-textfield styled-text-field" />
             </ui:VisualElement>
             <ui:VisualElement class="filter-row">
                 <ui:Label text="Type:" class="filter-label" />
-                <ui:DropdownField name="type-dropdown" index="0" class="type-dropdown" />
+                <ui:DropdownField name="type-dropdown" index="0" class="type-dropdown styled-dropdown" />
                 <ui:Label text="Filtered: 0, Total: 0" name="filter-stats-label" class="filter-stats-label" />
             </ui:VisualElement>
         </ui:VisualElement>
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/McpToolsWindow.uxml b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/McpToolsWindow.uxml
index 2be7d9b8a..a2a720060 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/McpToolsWindow.uxml
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/McpToolsWindow.uxml
@@ -1,15 +1,14 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <ui:VisualElement class="root-container" style="min-width: 320px;">
         <ui:VisualElement class="header-container">
-            <ui:Label text="MCP Tools" class="header-title" />
-            <ui:Label text="See and control all MCP tools. Disable not needed tools for saving LLM context." class="header-description" />
+            <ui:Label text="Tools" class="header-title" tooltip="Browse and control all MCP tools. Each tool is exposed as a skill accessible from the command line and HTTP API. Disable unused tools to save LLM context — fewer active tools means more room for the AI to reason." />
             <ui:VisualElement class="filter-row">
                 <ui:Label text="Filter:" class="filter-label" />
-                <ui:TextField name="filter-textfield" class="filter-textfield" />
+                <ui:TextField name="filter-textfield" class="filter-textfield styled-text-field" />
             </ui:VisualElement>
             <ui:VisualElement class="filter-row">
                 <ui:Label text="Type:" class="filter-label" />
-                <ui:DropdownField name="type-dropdown" index="0" class="type-dropdown" />
+                <ui:DropdownField name="type-dropdown" index="0" class="type-dropdown styled-dropdown" />
                 <ui:Label text="Filtered: 0, Total: 0" name="filter-stats-label" class="filter-stats-label" />
             </ui:VisualElement>
         </ui:VisualElement>
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/agents/elements/TemplateTextFieldReadOnly.uxml b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/agents/elements/TemplateTextFieldReadOnly.uxml
index b0d8d0978..b933b19ed 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/agents/elements/TemplateTextFieldReadOnly.uxml
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/agents/elements/TemplateTextFieldReadOnly.uxml
@@ -1,3 +1,3 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <ui:TextField name="templateTextFieldReadOnly" multiline="true" readonly="true" selectOnFocus="true" value="..." class="config-snippet" />
+    <ui:TextField name="templateTextFieldReadOnly" multiline="true" readonly="true" selectOnFocus="true" value="..." class="config-snippet styled-text-field" />
 </ui:UXML>

From 6e4b7aabc5044e49aeeec37c1e586a3c0a74d037 Mon Sep 17 00:00:00 2001
From: Ivan Murzak <Ivan.D.Murzak@gmail.com>
Date: Wed, 18 Mar 2026 04:02:49 -0700
Subject: [PATCH 8/8] Refactor agent config UI and toggle behavior

Update agent configuration UI and interaction to improve clarity and usability.

- Show full skills/config paths as tooltips and add ellipsis/truncation in UXML to avoid overflow (TemplateSkillsSection, TemplateConfigureStatus, AiAgentConfigurator, ConfigurationElements).
- Restructure configure status element: remove circular status indicator, add header + inline path label, compact status row and button styling (TemplateConfigureStatus.uxml).
- Change configure button behavior to toggle configure/unconfigure: when configured the button now removes the config (text "Remove") and uses alert styling; previously it always attempted to configure (ConfigurationElements.cs).
- Minor layout tweaks: add top margin to transport containers in AiAgentTemplateConfig.uxml and set skills path tooltip in AiAgentConfigurator.cs.

These changes make paths visible via tooltip, prevent layout overflow, and provide a clearer configure/remove workflow.
---
 .../AiAgentConfigurator.cs                    |  1 +
 .../ConfigurationElements.cs                  | 36 +++++++++++--------
 .../UI/uxml/agents/AiAgentTemplateConfig.uxml |  4 +--
 .../elements/TemplateConfigureStatus.uxml     | 15 +++++---
 .../elements/TemplateSkillsSection.uxml       |  2 +-
 5 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/AiAgentConfigurators/AiAgentConfigurator.cs b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/AiAgentConfigurators/AiAgentConfigurator.cs
index c2660c63d..1cc7a21ac 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/AiAgentConfigurators/AiAgentConfigurator.cs
+++ b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/AiAgentConfigurators/AiAgentConfigurator.cs
@@ -424,6 +424,7 @@ protected virtual void SetupSkillsUI()
 
             // Show the skills output path
             pathLabel.text = SkillsPath;
+            pathLabel.tooltip = SkillsPath;
 
             // Configure toggle (per-agent)
             toggleAutoGenerate.SetValueWithoutNotify(UnityMcpPluginEditor.IsAutoGenerateSkills(AgentId));
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/AiAgentConfigurators/ConfigurationElements.cs b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/AiAgentConfigurators/ConfigurationElements.cs
index e1ea1f5cf..01a063eb5 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/AiAgentConfigurators/ConfigurationElements.cs
+++ b/Unity-MCP-Plugin/Assets/root/Editor/Scripts/UI/AiAgentConfigurators/ConfigurationElements.cs
@@ -20,7 +20,6 @@ namespace com.IvanMurzak.Unity.MCP.Editor.UI
     public class ConfigurationElements : IDisposable
     {
         public VisualElement Root { get; }
-        public VisualElement StatusCircle { get; }
         public Label StatusText { get; }
         public Button BtnConfigure { get; }
 
@@ -37,17 +36,33 @@ public ConfigurationElements(AiAgentConfig config, TransportMethod transportMode
             _transportMode = transportMode;
 
             Root = new UITemplate<VisualElement>("Editor/UI/uxml/agents/elements/TemplateConfigureStatus.uxml").Value;
-            StatusCircle = Root.Q<VisualElement>("configureStatusCircle") ?? throw new NullReferenceException("VisualElement 'configureStatusCircle' not found in UI.");
             StatusText = Root.Q<Label>("configureStatusText") ?? throw new NullReferenceException("Label 'configureStatusText' not found in UI.");
             BtnConfigure = Root.Q<Button>("btnConfigure") ?? throw new NullReferenceException("Button 'btnConfigure' not found in UI.");
 
+            var pathLabel = Root.Q<Label>("labelConfigPath");
+            if (pathLabel != null)
+            {
+                pathLabel.text = _config.ConfigPath;
+                pathLabel.tooltip = _config.ConfigPath;
+            }
+
             UpdateStatus();
 
             _clickCallback = new EventCallback<ClickEvent>(evt =>
             {
-                var result = _config.Configure();
-                UpdateStatus(result);
-                onConfigured.OnNext(result);
+                var isCurrentlyConfigured = _config.IsConfigured();
+                if (isCurrentlyConfigured)
+                {
+                    _config.Unconfigure();
+                    UpdateStatus(false);
+                    onConfigured.OnNext(false);
+                }
+                else
+                {
+                    var result = _config.Configure();
+                    UpdateStatus(result);
+                    onConfigured.OnNext(result);
+                }
             });
             BtnConfigure.RegisterCallback(_clickCallback);
         }
@@ -64,16 +79,9 @@ public void UpdateStatus(bool? isConfigured = null)
 
             StatusText.text = isConfiguredValue ? $"Configured ({transportText})" : "Not Configured";
 
-            StatusCircle.RemoveFromClassList(MainWindowEditor.USS_Connected);
-            StatusCircle.RemoveFromClassList(MainWindowEditor.USS_Connecting);
-            StatusCircle.RemoveFromClassList(MainWindowEditor.USS_Disconnected);
-            StatusCircle.AddToClassList(isConfiguredValue
-                ? MainWindowEditor.USS_Connected
-                : MainWindowEditor.USS_Disconnected);
-
-            BtnConfigure.text = isConfiguredValue ? "Reconfigure" : "Configure";
+            BtnConfigure.text = isConfiguredValue ? "Remove" : "Configure";
             BtnConfigure.EnableInClassList("btn-primary", !isConfiguredValue);
-            BtnConfigure.EnableInClassList("btn-secondary", isConfiguredValue);
+            BtnConfigure.EnableInClassList("btn-alert", isConfiguredValue);
         }
 
         public void Dispose()
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/agents/AiAgentTemplateConfig.uxml b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/agents/AiAgentTemplateConfig.uxml
index ee89a25d8..7032967a6 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/agents/AiAgentTemplateConfig.uxml
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/agents/AiAgentTemplateConfig.uxml
@@ -21,10 +21,10 @@
         <ui:VisualElement name="containerSkills" />
 
         <!-- Transport mode container: HTTP -->
-        <ui:VisualElement name="containerHttp" />
+        <ui:VisualElement name="containerHttp" style="margin-top: 4px;" />
 
         <!-- Transport mode container: STDIO -->
-        <ui:VisualElement name="containerStdio" />
+        <ui:VisualElement name="containerStdio" style="margin-top: 4px;" />
 
     </ui:VisualElement>
 </ui:UXML>
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/agents/elements/TemplateConfigureStatus.uxml b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/agents/elements/TemplateConfigureStatus.uxml
index aa4ad487a..f3df4c3ee 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/agents/elements/TemplateConfigureStatus.uxml
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/agents/elements/TemplateConfigureStatus.uxml
@@ -1,7 +1,14 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <ui:VisualElement name="templateConfigurationStatus" class="row" style="margin-top: 0px; margin-left: 7px;">
-        <ui:VisualElement name="configureStatusCircle" class="status-indicator-circle status-indicator-circle-disconnected" />
-        <ui:Label text="Not configured" name="configureStatusText" style="flex-grow: 1;" />
-        <ui:Button name="btnConfigure" text="Configure" class="btn-primary" />
+    <ui:VisualElement class="row" style="margin-top: 0px; margin-bottom: 6px;">
+        <ui:VisualElement name="templateConfigurationStatus" style="flex-grow: 1;">
+            <ui:VisualElement style="flex-direction: row; align-items: center; justify-content: space-between;">
+                <ui:Label name="labelMcpHeader" text="Model Context Protocol (MCP)" class="timeline-label" />
+                <ui:Label name="labelConfigPath" class="section-desc" style="margin-bottom: 0; -unity-text-align: middle-right; overflow: hidden; text-overflow: ellipsis; flex-shrink: 1; white-space: nowrap;" />
+            </ui:VisualElement>
+            <ui:VisualElement style="flex-direction: row; align-items: center; justify-content: space-between; margin-top: 2px;">
+                <ui:Label text="Not configured" name="configureStatusText" class="section-desc" style="margin-bottom: 0;" />
+                <ui:Button name="btnConfigure" text="Configure" class="btn-compact" />
+            </ui:VisualElement>
+        </ui:VisualElement>
     </ui:VisualElement>
 </ui:UXML>
diff --git a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/agents/elements/TemplateSkillsSection.uxml b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/agents/elements/TemplateSkillsSection.uxml
index dc6da2860..31ae1d1d8 100644
--- a/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/agents/elements/TemplateSkillsSection.uxml
+++ b/Unity-MCP-Plugin/Assets/root/Editor/UI/uxml/agents/elements/TemplateSkillsSection.uxml
@@ -3,7 +3,7 @@
         <ui:VisualElement name="templateSkillsSection" style="flex-grow: 1;">
             <ui:VisualElement style="flex-direction: row; align-items: center; justify-content: space-between;">
                 <ui:Label name="labelSkillsHeader" text="Skills" class="timeline-label" tooltip="Skills give the AI specialized procedural knowledge to handle complex tasks. They work by providing structured guides (Markdown files) that the AI reads to understand exactly how to execute workflows." />
-                <ui:Label name="labelSkillsPath" class="section-desc" style="margin-bottom: 0; -unity-text-align: middle-right;" />
+                <ui:Label name="labelSkillsPath" class="section-desc" style="margin-bottom: 0; -unity-text-align: middle-right; overflow: hidden; text-overflow: ellipsis; flex-shrink: 1; white-space: nowrap;" />
             </ui:VisualElement>
             <!-- Auto-generate toggle + Generate button row -->
             <ui:VisualElement style="flex-direction: row; align-items: center; justify-content: space-between; margin-top: 2px;">