Address dashboard launch review feedback

adamint · Copilot · adamint · commit ec0e17a29552 · 2026-06-19T23:56:00.000-04:00
Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/extension/loc/xlf/aspire-vscode.xlf b/extension/loc/xlf/aspire-vscode.xlf
diff --git a/extension/package.nls.json b/extension/package.nls.json
@@ -212,7 +212,7 @@
   "walkthrough.getStarted.createProject.title": "Create a new project",
   "walkthrough.getStarted.createProject.description": "Scaffold a new Aspire project from a starter template. The template includes an AppHost orchestrator, a sample API, and a web frontend.\n\n[Create new project](command:aspire-vscode.new)",
   "walkthrough.getStarted.runApp.title": "Run your app",
-  "walkthrough.getStarted.runApp.description": "Start your Aspire app to launch all services and open the real-time dashboard.\n\n[Run AppHost](command:aspire-vscode.runAppHostCommand)\n\n[Debug AppHost](command:aspire-vscode.debugAppHostCommand)",
+  "walkthrough.getStarted.runApp.description": "Start your Aspire app to launch all services. The dashboard stays available from the Aspire panel when you need it.\n\n[Run AppHost](command:aspire-vscode.runAppHostCommand)\n\n[Debug AppHost](command:aspire-vscode.debugAppHostCommand)",
   "walkthrough.getStarted.dashboard.title": "Explore the dashboard",
   "walkthrough.getStarted.dashboard.description": "The Aspire Dashboard shows your resources, endpoints, logs, traces, and metrics \u2014 all in one place.\n\n[Open dashboard](command:aspire-vscode.openDashboard)",
   "walkthrough.getStarted.nextSteps.title": "Next steps",
diff --git a/extension/src/server/interactionService.ts b/extension/src/server/interactionService.ts
@@ -10,7 +10,7 @@ import { extensionLogOutputChannel } from '../utils/logging';
 import { AspireExtendedDebugConfiguration, EnvVar } from '../dcp/types';
 import { AnsiColors, AspireTerminal } from '../utils/AspireTerminalProvider';
 import { AspireDebugSession } from '../debugger/AspireDebugSession';
-import type { DashboardBrowserType, DashboardLaunchBehavior } from '../debugger/AspireDebugSession';
+import type { DashboardLaunchBehavior } from '../debugger/AspireDebugSession';
 import { isDirectory } from '../utils/io';
 
 export interface IInteractionService {
@@ -44,6 +44,11 @@ export interface IInteractionService {
 
 type CSLogLevel = 'Trace' | 'Debug' | 'Information' | 'Warn' | 'Error' | 'Critical';
 const dashboardDefaultChangedNotificationKey = 'aspire.dashboardBrowser.defaultChangedNotification.v1';
+type DashboardLaunchBehaviorSource = 'debugConfiguration' | 'globalConfiguration' | 'legacyConfiguration' | 'default';
+type ResolvedDashboardLaunchBehavior = {
+    behavior: DashboardLaunchBehavior;
+    source: DashboardLaunchBehaviorSource;
+};
 
 // Support both PascalCase (old) and camelCase (new) for backwards compatibility
 // with different versions of the CLI/AppHost.
@@ -132,15 +137,6 @@ function getConfiguredDashboardLaunchBehavior(aspireConfig: vscode.WorkspaceConf
     return normalizeDashboardLaunchBehavior(configuredValue);
 }
 
-function hasConfiguredDashboardLaunchBehavior(aspireConfig: vscode.WorkspaceConfiguration): boolean {
-    const dashboardBrowserInspection = aspireConfig.inspect<unknown>('dashboardBrowser');
-    const dashboardBrowserConfigured = dashboardBrowserInspection?.workspaceFolderValue !== undefined
-        || dashboardBrowserInspection?.workspaceValue !== undefined
-        || dashboardBrowserInspection?.globalValue !== undefined;
-
-    return dashboardBrowserConfigured || getConfiguredLegacyDashboardLaunchBehavior(aspireConfig) !== undefined;
-}
-
 // Support both PascalCase (old) and camelCase (new) for backwards compatibility.
 // DisplayLineState is serialized with ModelContextProtocol.McpJsonUtilities.DefaultOptions
 // which changed to camelCase in version 0.2.0+
@@ -412,17 +408,17 @@ export class InteractionService implements IInteractionService {
         const aspireConfig = vscode.workspace.getConfiguration('aspire');
         const dashboardLaunchBehavior = this.getDashboardLaunchBehavior(aspireConfig);
 
-        if (dashboardLaunchBehavior === 'none') {
-            await this.showDashboardDefaultChangedNotificationIfNeeded(aspireConfig);
+        if (dashboardLaunchBehavior.behavior === 'none') {
+            await this.showDashboardDefaultChangedNotificationIfNeeded(dashboardLaunchBehavior.source);
             return;
         }
 
-        if (dashboardLaunchBehavior !== 'notification') {
+        if (dashboardLaunchBehavior.behavior !== 'notification') {
             // Open the dashboard URL in the configured browser. Prefer codespaces URL if available.
             const urlToOpen = codespacesUrl || baseUrl;
             const debugSession = this._getAspireDebugSession();
             if (debugSession) {
-                await debugSession.openDashboard(urlToOpen, dashboardLaunchBehavior);
+                await debugSession.openDashboard(urlToOpen, dashboardLaunchBehavior.behavior);
             }
             return;
         }
@@ -457,61 +453,80 @@ export class InteractionService implements IInteractionService {
                     vscode.env.openExternal(vscode.Uri.parse(codespacesUrl));
                 }
                 else if (selected.title === settingsLabel) {
-                    vscode.commands.executeCommand('workbench.action.openSettings', 'aspire.dashboardBrowser');
+                    this.openDashboardLaunchBehaviorSettings(dashboardLaunchBehavior.source);
                 }
             });
         }, 1000);
     }
 
-    private getDashboardLaunchBehavior(aspireConfig: vscode.WorkspaceConfiguration): DashboardLaunchBehavior {
+    private getDashboardLaunchBehavior(aspireConfig: vscode.WorkspaceConfiguration): ResolvedDashboardLaunchBehavior {
         const debugSession = this._getAspireDebugSession();
         const debugConfigurationBehavior = normalizeDashboardLaunchBehavior(debugSession?.configuration.dashboardBrowser);
         if (debugConfigurationBehavior) {
-            return debugConfigurationBehavior;
+            return { behavior: debugConfigurationBehavior, source: 'debugConfiguration' };
         }
 
         const configuredGlobalBehavior = getConfiguredDashboardLaunchBehavior(aspireConfig);
         if (configuredGlobalBehavior === 'none' || configuredGlobalBehavior === 'notification') {
-            return configuredGlobalBehavior;
+            return { behavior: configuredGlobalBehavior, source: 'globalConfiguration' };
         }
 
         const legacyBehavior = getConfiguredLegacyDashboardLaunchBehavior(aspireConfig);
 
         if (legacyBehavior) {
             if (legacyBehavior === 'notification' || legacyBehavior === 'none') {
-                return legacyBehavior;
+                return { behavior: legacyBehavior, source: 'legacyConfiguration' };
             }
 
-            return configuredGlobalBehavior ?? 'integratedBrowser';
+            return {
+                behavior: configuredGlobalBehavior ?? 'integratedBrowser',
+                source: configuredGlobalBehavior ? 'globalConfiguration' : 'legacyConfiguration'
+            };
         }
 
         if (configuredGlobalBehavior) {
-            return configuredGlobalBehavior;
+            return { behavior: configuredGlobalBehavior, source: 'globalConfiguration' };
         }
 
-        return normalizeDashboardLaunchBehavior(aspireConfig.get<unknown>('dashboardBrowser', 'none')) ?? 'none';
+        return {
+            behavior: normalizeDashboardLaunchBehavior(aspireConfig.get<unknown>('dashboardBrowser', 'none')) ?? 'none',
+            source: 'default'
+        };
     }
 
-    private async showDashboardDefaultChangedNotificationIfNeeded(aspireConfig: vscode.WorkspaceConfiguration): Promise<void> {
+    private async showDashboardDefaultChangedNotificationIfNeeded(source: DashboardLaunchBehaviorSource): Promise<void> {
         if (!this._globalState || this._globalState.get<boolean>(dashboardDefaultChangedNotificationKey, false)) {
             return;
         }
 
-        if (hasConfiguredDashboardLaunchBehavior(aspireConfig)) {
+        if (source !== 'default') {
             return;
         }
 
         await this._globalState.update(dashboardDefaultChangedNotificationKey, true);
         vscode.window.showInformationMessage(dashboardLaunchBehaviorChanged, settingsLabel, changelogLabel).then(selected => {
             if (selected === settingsLabel) {
-                vscode.commands.executeCommand('workbench.action.openSettings', 'aspire.dashboardBrowser');
+                this.openDashboardLaunchBehaviorSettings(source);
             }
             else if (selected === changelogLabel) {
                 vscode.env.openExternal(vscode.Uri.parse('https://github.com/microsoft/aspire/blob/main/extension/CHANGELOG.md'));
             }
         });
     }
 
+    private openDashboardLaunchBehaviorSettings(source: DashboardLaunchBehaviorSource): void {
+        if (source === 'debugConfiguration') {
+            vscode.commands.executeCommand('workbench.action.debug.configure');
+            return;
+        }
+
+        vscode.commands.executeCommand(
+            'workbench.action.openSettings',
+            source === 'legacyConfiguration'
+                ? 'aspire.enableAspireDashboardAutoLaunch'
+                : 'aspire.dashboardBrowser');
+    }
+
     async displayLines(lines: ConsoleLine[]) {
         this.clearProgressNotification();
 
diff --git a/extension/src/test-e2e/commandPalette.e2e.test.ts b/extension/src/test-e2e/commandPalette.e2e.test.ts
@@ -4,7 +4,7 @@ import * as path from 'path';
 import { getCommandInvocationCount, getTerminalCommandCount, isSamePath, waitForCommandOutcome, waitForExtensionState, waitForRepositoryIdle, waitForTerminalCommand, waitForWorkspaceAppHost } from './helpers/assertions';
 import { createAdditionalAppHostCandidate, executeE2eControlCommand, removeAdditionalAppHostCandidate, removeWorkspaceAppHostConfig, restoreE2eCliPathForE2E, restoreWorkspaceAppHostConfig, restoreWorkspaceCliPath, runE2eTeardown, setCliUnavailableForE2E, setE2eCliPathForE2E, setTerminalCommandExecutionSuppressedForE2E, writeWorkspaceCliPath } from './helpers/fixtures';
 import { getWorkspaceRoot } from './helpers/paths';
-import { executeCommandFromPalette, openAspireView, waitForEditorTitle, waitForNotificationMessage, waitForTerminalChannel, waitForWorkbenchText } from './helpers/vscode';
+import { chooseActiveQuickPick, executeCommandFromPalette, openAspireView, waitForEditorTitle, waitForNotificationMessage, waitForTerminalChannel, waitForWorkbenchText } from './helpers/vscode';
 
 suite('Aspire command palette E2E', function () {
     this.timeout(420000);
@@ -84,12 +84,13 @@ suite('Aspire command palette E2E', function () {
 
         const configureBefore = getCommandInvocationCount('aspire-vscode.configureLaunchJson');
         await executeCommandFromPalette('Aspire: Configure launch.json file');
+        await chooseActiveQuickPick('Do not open the dashboard');
         await waitForCommandOutcome('aspire-vscode.configureLaunchJson', 'success', 60000, configureBefore);
         assert.ok((await waitForEditorTitle('launch.json')).includes('launch.json'));
 
         const launchJsonPath = path.join(getWorkspaceRoot(), '.vscode', 'launch.json');
-        const launchJson = JSON.parse(fs.readFileSync(launchJsonPath, 'utf8')) as { configurations?: Array<{ type?: string; request?: string }> };
-        assert.ok(launchJson.configurations?.some(configuration => configuration.type === 'aspire' && configuration.request === 'launch'));
+        const launchJson = JSON.parse(fs.readFileSync(launchJsonPath, 'utf8')) as { configurations?: Array<{ type?: string; request?: string; dashboardBrowser?: string }> };
+        assert.ok(launchJson.configurations?.some(configuration => configuration.type === 'aspire' && configuration.request === 'launch' && configuration.dashboardBrowser === 'none'));
     });
 
     test('observes multiple AppHost candidates without selecting the wrong one', async () => {
diff --git a/extension/src/test-e2e/debugDashboard.e2e.test.ts b/extension/src/test-e2e/debugDashboard.e2e.test.ts
@@ -2,7 +2,7 @@ import * as assert from 'assert';
 import * as fs from 'fs';
 import * as path from 'path';
 import { getCommandInvocationCount, getDebugLaunchCount, getTreeAppHostLabel, isSamePath, waitForAppHostLaunching, waitForCommandOutcome, waitForDebugConsoleOutput, waitForDebugDashboardUrl, waitForDebugLaunch, waitForDebugSessionStartup, waitForExtensionState, waitForHttpText, waitForNoDebugSessions, waitForNoRunningAppHost, waitForRepositoryIdle, waitForRunningAppHost, waitForWorkspaceAppHost } from './helpers/assertions';
-import { executeE2eControlCommand, restoreWorkspaceCliPath, runE2eTeardown, setCliUnavailableForE2E, setShowStatusDelayForE2E, stopPrimaryAppHostIfRunning, writeFileWithRetry } from './helpers/fixtures';
+import { executeE2eControlCommand, restoreWorkspaceCliPath, runE2eTeardown, setCliUnavailableForE2E, setShowStatusDelayForE2E, stopPrimaryAppHostIfRunning, writeFileWithRetry, writeWorkspaceSetting } from './helpers/fixtures';
 import { getPrimaryAppHostProjectPath } from './helpers/paths';
 import { openAspireView, waitForEditorTitle, waitForTreeItem, waitForWorkbenchTextAfterIntegratedBrowserNavigation } from './helpers/vscode';
 
@@ -13,6 +13,7 @@ suite('Aspire debug dashboard E2E', function () {
         await runE2eTeardown([
             () => setCliUnavailableForE2E(false),
             () => setShowStatusDelayForE2E(undefined),
+            () => writeWorkspaceSetting('aspire.dashboardBrowser', undefined),
             () => restoreWorkspaceCliPath(),
             () => executeE2eControlCommand({ name: 'stopDebugging' }),
             () => stopPrimaryAppHostIfRunning(),
@@ -22,6 +23,7 @@ suite('Aspire debug dashboard E2E', function () {
     });
 
     test('debugs the AppHost and opens the dashboard in the integrated browser', async () => {
+        writeWorkspaceSetting('aspire.dashboardBrowser', 'integratedBrowser');
         await openAspireView();
         await waitForRepositoryIdle();
         const discovered = await waitForWorkspaceAppHost();
diff --git a/extension/src/test-e2e/edgeCases.e2e.test.ts b/extension/src/test-e2e/edgeCases.e2e.test.ts
@@ -5,7 +5,7 @@ import type { AspireExtensionE2EControlCommand } from '../types/extensionApi';
 import { getCommandInvocationCount, getDebugLaunchCount, isSamePath, waitForCommandOutcome, waitForDebugLaunch, waitForExtensionState, waitForRepositoryIdle, waitForWorkspaceAppHost } from './helpers/assertions';
 import { executeE2eControlCommand, restoreWorkspaceCliPath, runE2eTeardown, setCliUnavailableForE2E, setDebugLaunchSuppressedForE2E, stopPrimaryAppHostIfRunning } from './helpers/fixtures';
 import { getPrimaryAppHostProjectPath, getWorkspaceRoot } from './helpers/paths';
-import { openAspireView } from './helpers/vscode';
+import { chooseActiveQuickPick, openAspireView } from './helpers/vscode';
 
 suite('Aspire extension edge case E2E', function () {
     this.timeout(180000);
@@ -61,12 +61,13 @@ suite('Aspire extension edge case E2E', function () {
         await waitForCommandOutcome('aspire-vscode.settings', 'success', 60000, settingsBefore);
 
         const configureBefore = getCommandInvocationCount('aspire-vscode.configureLaunchJson');
-        await executeE2eControlCommand({ name: 'executeAspireCommand', commandId: 'aspire-vscode.configureLaunchJson' });
+        await executeE2eControlCommand({ name: 'executeAspireCommand', commandId: 'aspire-vscode.configureLaunchJson' }, { waitFor: 'started' });
+        await chooseActiveQuickPick('Do not open the dashboard');
         await waitForCommandOutcome('aspire-vscode.configureLaunchJson', 'success', 60000, configureBefore);
 
         const launchJsonPath = path.join(getWorkspaceRoot(), '.vscode', 'launch.json');
-        const launchJson = JSON.parse(fs.readFileSync(launchJsonPath, 'utf8')) as { configurations?: Array<{ type?: string }> };
-        assert.ok(launchJson.configurations?.some(configuration => configuration.type === 'aspire'));
+        const launchJson = JSON.parse(fs.readFileSync(launchJsonPath, 'utf8')) as { configurations?: Array<{ type?: string; dashboardBrowser?: string }> };
+        assert.ok(launchJson.configurations?.some(configuration => configuration.type === 'aspire' && configuration.dashboardBrowser === 'none'));
     });
 
     test('clears launch state after suppressed debug launch requests', async () => {
diff --git a/extension/src/test/rpc/interactionServiceTests.test.ts b/extension/src/test/rpc/interactionServiceTests.test.ts
