fix: resolve MCP settings not displaying in welcome dialog

Author: cx-atish-jadhav

src/main/java/com/checkmarx/intellij/commands/TenantSetting.java

@@ -1,24 +1,25 @@
 package com.checkmarx.intellij.commands;
 
-import com.checkmarx.ast.wrapper.CxConfig;
 import com.checkmarx.ast.wrapper.CxException;
 import com.checkmarx.intellij.settings.global.CxWrapperFactory;
-import org.jetbrains.annotations.NotNull;
+import com.checkmarx.intellij.settings.global.GlobalSettingsState;
+import com.checkmarx.intellij.settings.global.GlobalSettingsSensitiveState;
+import com.intellij.openapi.diagnostic.Logger;
 
 import java.io.IOException;
-import java.net.URISyntaxException;
 
 /**
  * Handle tenant settings related operations with the wrapper
  */
 public class TenantSetting {
 
+    private static final Logger LOG = Logger.getInstance(TenantSetting.class);
+
     /**
      * Check if current tenant has permissions to scan from the IDE
      *
      * @return true if tenant has permissions to scan. false otherwise
      */
-    @NotNull
     public static boolean isScanAllowed() throws
             IOException,
             CxException,
@@ -31,12 +32,12 @@ public static boolean isScanAllowed() throws
      *
      * @return true if AI MCP server is enabled, false otherwise
      */
-    @NotNull
-    public static boolean isAiMcpServerEnabled() throws
+    public static boolean isAiMcpServerEnabled(GlobalSettingsState state, GlobalSettingsSensitiveState sensitiveState) throws
             IOException,
             CxException,
             InterruptedException {
-        return CxWrapperFactory.build().aiMcpServerEnabled();
+        LOG.debug("Checking AI MCP server enabled flag using provided credentials");
+        return CxWrapperFactory.build(state, sensitiveState).aiMcpServerEnabled();
     }
 
 }

src/main/java/com/checkmarx/intellij/devassist/configuration/mcp/McpInstallService.java

@@ -18,7 +18,7 @@
  * registered in plugin.xml. On startup it auto-installs MCP configuration if:
  * <ul>
  *   <li>User is authenticated</li>
- *   <li>AI MCP server flag is enabled (TenantSetting.isAiMcpServerEnabled())</li>
+ *   <li>AI MCP server flag is enabled (TenantSetting.isAiMcpServerEnabled(state, sensitiveState))</li>
  *   <li>A credential token/API key is available</li>
  * </ul>
  * If any condition fails the auto-install silently skips (debug logged).
@@ -46,7 +46,7 @@ public void runActivity(@NotNull Project project) {
 
         boolean aiMcpEnabled;
         try {
-            aiMcpEnabled = TenantSetting.isAiMcpServerEnabled();
+            aiMcpEnabled = TenantSetting.isAiMcpServerEnabled(state, sensitive);
         } catch (Exception e) {
             LOG.warn("Failed to check AI MCP server status; skipping MCP auto-install.", e);
             return;

src/main/java/com/checkmarx/intellij/settings/global/CxOneAssistComponent.java

@@ -449,7 +449,9 @@ private void checkAndUpdateMcpStatusAsync() {
 
         CompletableFuture.supplyAsync(() -> {
             try {
-                return com.checkmarx.intellij.commands.TenantSetting.isAiMcpServerEnabled();
+                GlobalSettingsState currentState = GlobalSettingsState.getInstance();
+                GlobalSettingsSensitiveState currentSensitiveState = GlobalSettingsSensitiveState.getInstance();
+                return com.checkmarx.intellij.commands.TenantSetting.isAiMcpServerEnabled(currentState, currentSensitiveState);
             } catch (Exception ex) {
                 LOGGER.warn("Failed to check MCP status during upgrade scenario", ex);
                 return false; // Default to disabled on error

src/main/java/com/checkmarx/intellij/settings/global/GlobalSettingsComponent.java

@@ -318,10 +318,11 @@ private void onAuthSuccessApiKey() {
      * @param credential The credential to use for MCP installation (API key or refresh token)
      */
     private void completeAuthenticationSetup(String credential) {
-        // Check MCP server status once during authentication
+        // Check MCP server status using current authentication credentials
         boolean mcpServerEnabled = false;
         try {
-            mcpServerEnabled = com.checkmarx.intellij.commands.TenantSetting.isAiMcpServerEnabled();
+            mcpServerEnabled = com.checkmarx.intellij.commands.TenantSetting.isAiMcpServerEnabled(
+                getStateFromFields(), getSensitiveStateFromFields());
         } catch (Exception ex) {
             LOGGER.warn("Failed MCP server check", ex);
         }

src/test/java/com/checkmarx/intellij/unit/commands/TenantSettingTest.java

@@ -1,10 +1,11 @@
 package com.checkmarx.intellij.unit.commands;
 
-import com.checkmarx.ast.wrapper.CxConfig;
 import com.checkmarx.ast.wrapper.CxException;
 import com.checkmarx.ast.wrapper.CxWrapper;
 import com.checkmarx.intellij.commands.TenantSetting;
 import com.checkmarx.intellij.settings.global.CxWrapperFactory;
+import com.checkmarx.intellij.settings.global.GlobalSettingsState;
+import com.checkmarx.intellij.settings.global.GlobalSettingsSensitiveState;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -13,7 +14,6 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.io.IOException;
-import java.net.URISyntaxException;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
@@ -72,31 +72,39 @@ void isScanAllowed_ThrowsException() throws IOException, CxException, Interrupte
         }
     }
 
+
     @Test
-    void isAiMcpServerEnabled_ReturnsTrue() throws IOException, CxException, InterruptedException {
+    void isAiMcpServerEnabled_WithExplicitState_ReturnsTrue() throws IOException, CxException, InterruptedException {
         // Arrange
+        GlobalSettingsState mockState = mock(GlobalSettingsState.class);
+        GlobalSettingsSensitiveState mockSensitiveState = mock(GlobalSettingsSensitiveState.class);
+
         try (MockedStatic<CxWrapperFactory> mockedFactory = mockStatic(CxWrapperFactory.class)) {
-            mockedFactory.when(CxWrapperFactory::build).thenReturn(mockWrapper);
+            mockedFactory.when(() -> CxWrapperFactory.build(mockState, mockSensitiveState)).thenReturn(mockWrapper);
             when(mockWrapper.aiMcpServerEnabled()).thenReturn(true);
 
             // Act
-            boolean result = TenantSetting.isAiMcpServerEnabled();
+            boolean result = TenantSetting.isAiMcpServerEnabled(mockState, mockSensitiveState);
 
             // Assert
             assertTrue(result);
             verify(mockWrapper).aiMcpServerEnabled();
+            mockedFactory.verify(() -> CxWrapperFactory.build(mockState, mockSensitiveState));
         }
     }
 
     @Test
-    void isAiMcpServerEnabled_ThrowsException() throws IOException, CxException, InterruptedException {
+    void isAiMcpServerEnabled_WithExplicitState_ThrowsException() throws IOException, CxException, InterruptedException {
         // Arrange
+        GlobalSettingsState mockState = mock(GlobalSettingsState.class);
+        GlobalSettingsSensitiveState mockSensitiveState = mock(GlobalSettingsSensitiveState.class);
+
         try (MockedStatic<CxWrapperFactory> mockedFactory = mockStatic(CxWrapperFactory.class)) {
-            mockedFactory.when(CxWrapperFactory::build).thenReturn(mockWrapper);
+            mockedFactory.when(() -> CxWrapperFactory.build(mockState, mockSensitiveState)).thenReturn(mockWrapper);
             when(mockWrapper.aiMcpServerEnabled()).thenThrow(mock(CxException.class));
 
             // Act & Assert
-            assertThrows(CxException.class, TenantSetting::isAiMcpServerEnabled);
+            assertThrows(CxException.class, () -> TenantSetting.isAiMcpServerEnabled(mockState, mockSensitiveState));
         }
     }
-} 
+}