Skip to content

Fix welcome dialogue delay (AST-152887) #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cx-aniket-shinde wants to merge 2 commits into
base: feature/AST-109633-ui-manager-changes
Choose a base branch
from
Open

Fix welcome dialogue delay (AST-152887) #326

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd45f5e
Fix Logout button state management for fresh login vs restored sessions
cx-aniket-shinde May 7, 2026
1511bc4
Optimize Welcome dialog appearance delay by moving MCP installation t…
cx-aniket-shinde May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 67 additions & 11 deletions ast-visual-studio-extension/CxPreferences/CxPreferencesUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ public partial class CxPreferencesUI : UserControl
private static bool _isAuthenticated;
internal static event Action<bool> AuthStateChanged;
private static int _restoreAuthInProgress;
private static bool _isFreshLoginInProgress = false;
private static bool _welcomeDialogVisible = false;
private bool _isValidationInProgress;
private bool _isInitializing;
private bool _hasLoaded;
Expand Down Expand Up @@ -155,6 +157,8 @@ private async void OnValidateConnection(object sender, EventArgs e)
if (_isValidationInProgress || string.IsNullOrWhiteSpace(tbApiKey.Text))
return;

_isFreshLoginInProgress = true;
UpdateAuthControlsState();
SetValidationMessage(CxConstants.AUTH_VALIDATE_IN_PROGRESS, isSuccess: true);
await ValidateApiKeyAsync(showErrorOnFailure: true);
}
Expand Down Expand Up @@ -259,38 +263,54 @@ await Task.Run(() =>

// Success message shown inside CompleteAuthenticationSetupAsync after license check
_ = CompleteAuthenticationSetupAsync(GetCxConfig(), showWelcomeDialog: showErrorOnFailure);

// DO NOT update UI here - let CompleteAuthenticationSetupAsync handle it
// to ensure Welcome dialog flag is set before button is enabled
}
catch (CxException ex) when (showErrorOnFailure)
{
SetAuthState(false);
_isFreshLoginInProgress = false;
_welcomeDialogVisible = false;
if (cxPreferencesModule != null)
cxPreferencesModule.RestoreAuthenticatedSession = false;
SetValidationMessage(string.Format(CxConstants.AUTH_VALIDATE_FAIL_TEMPLATE, SanitizeErrorMessage(ex.Message)), isSuccess: false);
_isValidationInProgress = false;
UpdateAuthControlsState();
}
catch (Exception ex) when (showErrorOnFailure)
{
SetAuthState(false);
_isFreshLoginInProgress = false;
_welcomeDialogVisible = false;
if (cxPreferencesModule != null)
cxPreferencesModule.RestoreAuthenticatedSession = false;
SetValidationMessage(CxConstants.AUTH_VALIDATE_ERROR, isSuccess: false);
System.Diagnostics.Debug.WriteLine($"Authentication error: {LogForgingSanitizer.StripLineTermination(ex.Message)}");
_isValidationInProgress = false;
UpdateAuthControlsState();
}
catch
{
SetAuthState(false);
_isFreshLoginInProgress = false;
_welcomeDialogVisible = false;
if (cxPreferencesModule != null)
cxPreferencesModule.RestoreAuthenticatedSession = false;
_isValidationInProgress = false;
UpdateAuthControlsState();
}
finally
{
_isValidationInProgress = false;
UpdateAuthControlsState();
}
}

private void ResetAuthState()
{
SetAuthState(false);
_isFreshLoginInProgress = false;
_welcomeDialogVisible = false;
ClearValidationMessage();
}

Expand Down Expand Up @@ -473,6 +493,8 @@ private async Task CompleteAuthenticationSetupAsync(CxConfig config, bool showWe
if (config == null || string.IsNullOrWhiteSpace(config.ApiKey))
return;

_isFreshLoginInProgress = false;

try
{
var package = cxPreferencesModule?.GetOwnerPackage() as AsyncPackage;
Expand All @@ -483,7 +505,7 @@ private async Task CompleteAuthenticationSetupAsync(CxConfig config, bool showWe
bool previousMcpEnabled = oneAssistModule?.McpEnabled ?? false;
bool mcpStatusPreviouslyChecked = oneAssistModule?.McpStatusChecked ?? false;

// Step 1: Check license
// Step 1: Check license (network call, can take time)
bool hadAssist = await ApplyAssistTenantLicenseAndMcpFlagsAsync(package, config, GetType());

// Step 2: Show success message after license check
Expand All @@ -496,24 +518,54 @@ private async Task CompleteAuthenticationSetupAsync(CxConfig config, bool showWe
if (oneAssistModule == null)
return;

// Step 3: Install MCP if enabled
if (oneAssistModule.McpEnabled)
{
var installService = new McpInstallService();
await installService.InstallSilentlyAsync(config, GetType());
}

if (showWelcomeDialog)
{
// Step 4: Show welcome dialog — policy, persist and scan start ONLY after user closes it
// Step 3a: Show welcome dialog immediately (don't wait for MCP installation)
ShowOneAssistWelcomeDialog(oneAssistModule, oneAssistModule.McpEnabled, previousMcpEnabled, mcpStatusPreviouslyChecked);

// Step 3b: Install MCP in background while user is viewing the Welcome dialog
if (oneAssistModule.McpEnabled)
{
_ = Task.Run(async () =>
{
try
{
var installService = new McpInstallService();
await installService.InstallSilentlyAsync(config, GetType());
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine($"Background MCP installation failed: {ex.Message}");
}
});
}
}
else
{
// No welcome dialog (background restore) — apply policy and persist immediately
_welcomeDialogVisible = true;
UpdateAuthControlsState();

ApplyJetBrainsStyleRealtimeScannerPolicy(oneAssistModule, previousMcpEnabled, mcpStatusPreviouslyChecked);
oneAssistModule.PersistSettings();
CxOneAssistSettingsUI.GetInstance()?.RefreshCheckboxesFromModule();

// Install MCP in background for restored sessions too
if (oneAssistModule.McpEnabled)
{
_ = Task.Run(async () =>
{
try
{
var installService = new McpInstallService();
await installService.InstallSilentlyAsync(config, GetType());
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine($"Background MCP installation failed (restore): {ex.Message}");
}
});
}
}
}
catch (Exception ex)
Expand Down Expand Up @@ -544,6 +596,10 @@ private void ShowOneAssistWelcomeDialog(CxOneAssistSettingsModule module, bool m
{
using (var welcomeDialog = new CxOneAssistWelcomeDialog(module, mcpEnabled))
{
// Mark welcome dialog as visible before showing it
_welcomeDialogVisible = true;
UpdateAuthControlsState();

welcomeDialog.ShowDialog(FindForm());
module.WelcomeShown = true;
}
Expand Down Expand Up @@ -579,7 +635,7 @@ private void UpdateAuthControlsState()
: System.Drawing.SystemColors.Window;

button1.Enabled = hasApiKey && !_isAuthenticated && !_isValidationInProgress;
btnLogout.Enabled = _isAuthenticated && !_isValidationInProgress;
btnLogout.Enabled = _isAuthenticated && !_isValidationInProgress && (!_isFreshLoginInProgress || _welcomeDialogVisible);
// Temporary: hide assist navigation link from the Authentication page.
goToAssistLink.Visible = false;

Expand Down