fix(mcp): stable mutateAsync dep + preserve OAuth connection on no-op upsert

- useMcpOauthPopup: depend on the stable mutateAsync reference instead of the
  whole mutation object (which changes identity every render and defeats the
  useCallback memoization).
- POST /api/mcp/servers upsert path: only force connectionStatus to
  'disconnected' / clear lastConnected for OAuth servers when we actually
  cleared the OAuth row (URL/credential change or revival). When the upsert
  is a no-op for OAuth state, the existing tokens stay valid and the server
  should remain connected — we now leave both columns alone in that case.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: waleedlatif1

apps/sim/app/api/mcp/servers/route.ts

@@ -197,11 +197,18 @@ export const POST = withRouteHandler(
               timeout: body.timeout || 30000,
               retries: body.retries || 3,
               enabled: body.enabled !== false,
-              connectionStatus: resolvedAuthType === 'oauth' ? 'disconnected' : 'connected',
-              lastConnected: resolvedAuthType === 'oauth' ? null : new Date(),
               updatedAt: new Date(),
               deletedAt: null,
             }
+            if (resolvedAuthType === 'oauth') {
+              if (shouldClearOauth) {
+                updateValues.connectionStatus = 'disconnected'
+                updateValues.lastConnected = null
+              }
+            } else {
+              updateValues.connectionStatus = 'connected'
+              updateValues.lastConnected = new Date()
+            }
             if (oauthClientIdProvided) updateValues.oauthClientId = oauthClientId
             if (oauthClientSecretProvided) {
               updateValues.oauthClientSecret = oauthClientSecretEncrypted

apps/sim/hooks/mcp/use-mcp-oauth-popup.ts

@@ -15,7 +15,7 @@ interface UseMcpOauthPopupProps {
 
 export function useMcpOauthPopup({ workspaceId }: UseMcpOauthPopupProps) {
   const queryClient = useQueryClient()
-  const startOauthMutation = useStartMcpOauth()
+  const { mutateAsync: startOauth } = useStartMcpOauth()
 
   const [connectingServers, setConnectingServers] = useState<Set<string>>(() => new Set())
   const popupIntervalsRef = useRef<Map<string, number>>(new Map())
@@ -76,7 +76,7 @@ export function useMcpOauthPopup({ workspaceId }: UseMcpOauthPopupProps) {
         })
       }
       try {
-        const result = await startOauthMutation.mutateAsync({ serverId, workspaceId })
+        const result = await startOauth({ serverId, workspaceId })
         if (result.status === 'already_authorized') {
           clear()
           return
@@ -92,7 +92,7 @@ export function useMcpOauthPopup({ workspaceId }: UseMcpOauthPopupProps) {
         toast.error(toError(e).message || 'Failed to start authorization')
       }
     },
-    [startOauthMutation, workspaceId]
+    [startOauth, workspaceId]
   )
 
   return { connectingServers, startOauthForServer }