From 73270031e91862dd781467a627cdfdbf933494de Mon Sep 17 00:00:00 2001
From: muxammadreza <137672463+muxammadreza@users.noreply.github.com>
Date: Thu, 25 Jun 2026 11:33:00 -0700
Subject: [PATCH 1/2] fix: avoid synthetic connecting state for enabled servers

---
 .../src/features/servers/ServersPage.tsx      | 39 ++++++++++++-------
 apps/desktop/src/stores/registryStore.ts      |  5 ++-
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/apps/desktop/src/features/servers/ServersPage.tsx b/apps/desktop/src/features/servers/ServersPage.tsx
index 8db8b895..ee1dbf35 100644
--- a/apps/desktop/src/features/servers/ServersPage.tsx
+++ b/apps/desktop/src/features/servers/ServersPage.tsx
@@ -62,10 +62,10 @@ function mergeDefinitionsWithStates(
       (input: InputDefinition) => input.required && !inputValues[input.id]
     );
 
-    // Calculate initial connection_status based on enabled state
-    // Calculate initial connection_status based on enabled state
-    // Actual runtime status comes from ServerManager events via useServerManager hook
-    const connection_status = state?.enabled ? 'connecting' : 'disconnected';
+    // Runtime status is in-memory only and comes from ServerManager.
+    // Do not infer `connecting` from persisted `enabled`; custom/offline servers can
+    // otherwise stay stuck in a synthetic Connecting state forever.
+    const connection_status = 'disconnected';
 
     return {
       ...def,
@@ -95,11 +95,7 @@ function createOfflineServerViewModel(state: InstalledServerState): ServerViewMo
       const inputValues = state.input_values;
       const requiredInputs = definition.transport.metadata?.inputs?.filter((i) => i.required) || [];
       const missing_required_inputs = requiredInputs.some((input) => !inputValues[input.id]);
-      const connection_status = state.enabled
-        ? missing_required_inputs
-          ? 'error'
-          : 'connecting'
-        : 'disconnected';
+      const connection_status = 'disconnected';
 
       return {
         ...definition,
@@ -143,7 +139,7 @@ function createOfflineServerViewModel(state: InstalledServerState): ServerViewMo
     enabled: state.enabled,
     oauth_connected: state.oauth_connected,
     input_values: state.input_values,
-    connection_status: state.enabled ? 'connecting' : 'disconnected',
+    connection_status: 'disconnected',
     missing_required_inputs: false,
     last_error: null,
     created_at: state.created_at,
@@ -450,6 +446,7 @@ export function ServersPage() {
    * - 'running': Server is connected and running
    * - 'error': Server has an error
    * - 'connected_auto': Non-OAuth server that's connected (no action buttons needed)
+   * - 'disconnected': Server is enabled but has no active runtime connection
    */
   const getServerAction = (
     server: ServerViewModel
@@ -461,7 +458,8 @@ export function ServersPage() {
     | 'auth_required'
     | 'running'
     | 'error'
-    | 'connected_auto' => {
+    | 'connected_auto'
+    | 'disconnected' => {
     if (!server.enabled) {
       return 'enable';
     }
@@ -489,8 +487,7 @@ export function ServersPage() {
         case 'error':
           return 'error';
         case 'disconnected':
-          // Enabled but disconnected - try to connect
-          return server.auth?.type === 'oauth' ? 'auth_required' : 'connected_auto';
+          return server.auth?.type === 'oauth' ? 'auth_required' : 'disconnected';
       }
     }
 
@@ -515,8 +512,8 @@ export function ServersPage() {
       return 'auth_required';
     }
 
-    // Non-OAuth server that's enabled but not yet connected
-    return 'connected_auto';
+    // Enabled but no runtime connection exists yet. Let the user start/retry it.
+    return 'disconnected';
   };
 
   // Get display status for UI
@@ -544,6 +541,8 @@ export function ServersPage() {
         return 'Connected';
       case 'connected_auto':
         return 'Connected';
+      case 'disconnected':
+        return 'Disconnected';
       case 'error':
         return 'Error';
     }
@@ -1228,6 +1227,16 @@ export function ServersPage() {
                         </button>
                       )}
 
+                      {serverAction === 'disconnected' && gatewayRunning && (
+                        <button
+                          onClick={() => handleRetry(server)}
+                          disabled={retryLoading}
+                          className="rounded-lg bg-[rgb(var(--success))] px-4 py-2 text-sm font-medium text-white shadow-sm transition-colors hover:bg-[rgb(var(--success))]/80 disabled:opacity-50"
+                        >
+                          {retryLoading ? 'Connecting...' : 'Connect'}
+                        </button>
+                      )}
+
                       {serverAction === 'error' && gatewayRunning && (
                         <button
                           onClick={() => handleRetry(server)}
diff --git a/apps/desktop/src/stores/registryStore.ts b/apps/desktop/src/stores/registryStore.ts
index 98bba9cd..26e169a8 100644
--- a/apps/desktop/src/stores/registryStore.ts
+++ b/apps/desktop/src/stores/registryStore.ts
@@ -363,8 +363,9 @@ function mergeServers(defs: ServerDefinition[], states: InstalledServerState[]):
       input.required && !inputValues[input.id]
     );
     
-    // Calculate initial connection_status based on enabled state
-    const connection_status = state?.enabled ? 'connecting' : 'disconnected';
+    // Runtime connection status is not persisted. Do not infer Connecting from
+    // the enabled flag; the ServerManager event/status stream owns that state.
+    const connection_status = 'disconnected';
     
     return {
       ...def,

From 0651c7b8919984d03d5ec3f5ca397070507829e4 Mon Sep 17 00:00:00 2001
From: Mohammod Al Amin Ashik <maa.ashik00@gmail.com>
Date: Sat, 27 Jun 2026 13:40:35 +0800
Subject: [PATCH 2/2] fix(servers): keep Disable available for disconnected
 enabled servers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The new 'disconnected' action state dropped the Disable button — it only
rendered for 'running'/'connected_auto', so an enabled server you Disconnect
could no longer be turned off without reconnecting first. Add 'disconnected'
to the Disable condition so it shows alongside Connect. Also refreshes a
stale comment that still referenced the old hardcoded 'connecting' seed.

Signed-off-by: Mohammod Al Amin Ashik <maa.ashik00@gmail.com>
---
 apps/desktop/src/features/servers/ServersPage.tsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/desktop/src/features/servers/ServersPage.tsx b/apps/desktop/src/features/servers/ServersPage.tsx
index ee1dbf35..c252c423 100644
--- a/apps/desktop/src/features/servers/ServersPage.tsx
+++ b/apps/desktop/src/features/servers/ServersPage.tsx
@@ -367,7 +367,8 @@ export function ServersPage() {
       }
 
       // Apply runtime statuses from ServerManager to fix initial connection_status
-      // (mergeDefinitionsWithStates hardcodes 'connecting' for enabled servers)
+      // (the view-model builders seed 'disconnected'; ServerManager owns the real
+      // runtime status, which arrives via events)
       const mapStatus = (s: ConnectionStatus): ServerViewModel['connection_status'] => {
         if (s === 'refreshing' || s === 'authenticating') return 'connecting';
         return s;
@@ -1251,9 +1252,13 @@ export function ServersPage() {
                         </button>
                       )}
 
-                      {/* Disable button - shown when enabled and connected/running */}
+                      {/* Disable button - shown when an enabled server is connected,
+                          running, or sitting disconnected (so it can still be turned off
+                          without first reconnecting) */}
                       {server.enabled &&
-                        (serverAction === 'running' || serverAction === 'connected_auto') && (
+                        (serverAction === 'running' ||
+                          serverAction === 'connected_auto' ||
+                          serverAction === 'disconnected') && (
                           <button
                             onClick={() => handleDisableClick(server)}
                             disabled={disableLoading}
@@ -1765,7 +1770,6 @@ export function ServersPage() {
                   </div>
                 </div>
               )}
-
             </div>
 
             {/* Pinned footer — always visible regardless of form length (#163) */}