@codingame/monaco-vscode-api 37.6.1 → 38.0.0

package/vscode/src/vs/sessions/contrib/chat/browser/sessionWorkspacePicker.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { append, $, DisposableResizeObserver, getWindow, EventType, addDisposableListener, EventHelper, clearNode } from '../../../../base/browser/dom.js';
+import { append, $, DisposableResizeObserver, getWindow, addDisposableListener, EventType, EventHelper, clearNode } from '../../../../base/browser/dom.js';
 import { Gesture, EventType as EventType$1 } from '../../../../base/browser/touch.js';
 import { status } from '../../../../base/browser/ui/aria/aria.js';
 import { CountBadge } from '../../../../base/browser/ui/countBadge/countBadge.js';
@@ -22,12 +22,15 @@ import { IMenuService } from '../../../../platform/actions/common/actions.servic
 import { RemoteAgentHostsEnabledSettingId, RemoteAgentHostConnectionStatus } from '../../../../platform/agentHost/common/remoteAgentHostService.js';
 import { IRemoteAgentHostService } from '../../../../platform/agentHost/common/remoteAgentHostService.service.js';
 import { TUNNEL_ADDRESS_PREFIX } from '../../../../platform/agentHost/common/tunnelAgentHost.js';
+import { findDevContainerSample, devContainerSamples, devContainerSampleUri, getDevContainerSampleUrl } from '../../../../platform/agentHost/common/devContainerSamples.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IFileDialogService, IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.service.js';
 import '../../../../platform/notification/common/notification.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
@@ -35,15 +38,16 @@ import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js'
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { isActiveSessionStatus, SESSION_WORKSPACE_GROUP_LOCAL, SESSION_WORKSPACE_GROUP_GITHUB, SESSION_WORKSPACE_GROUP_REMOTE } from '../../../services/sessions/common/session.js';
 import { ISessionsProvidersService } from '../../../services/sessions/browser/sessionsProvidersService.service.js';
+import { IAgentHostFilterService } from '../../../services/agentHostFilter/common/agentHostFilter.service.js';
 import { isWorktreeWorkspaceUri } from '../../../services/sessions/browser/sessionsRecentWorkspacesService.js';
 import { ISessionsRecentWorkspacesService } from '../../../services/sessions/browser/sessionsRecentWorkspacesService.service.js';
-import { isAgentHostProvider } from '../../../common/agentHostSessionsProvider.js';
+import { isAgentHostProvider, LOCAL_AGENT_HOST_PROVIDER_ID } from '../../../common/agentHostSessionsProvider.js';
 import { SessionWorkspacePickerGroupContext } from '../../../common/contextkeys.js';
 import { getStatusLabel, getStatusHover, removeRemoteHost, showRemoteHostOptions } from '../../providers/remoteAgentHost/browser/remoteHostOptions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { defaultCountBadgeStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-import { DevContainerAgentHostEnabledSettingId } from '../../../common/devContainerAgentHostService.js';
+import { DevContainerAgentHostEnabledSettingId, DevContainerSamplesEnabledSettingId, areDevContainerSamplesEnabled } from '../../../common/devContainerAgentHostService.js';
 import { reportNewChatPickerClosed } from './newChatPickerTelemetry.js';
 import { Menus } from '../../../browser/menus.js';
 import { markOnboardingTarget } from '../../../../workbench/contrib/onboarding/browser/spotlight/onboardingTarget.js';
@@ -51,17 +55,31 @@ import { NewSessionWorkspacePreselectionSource } from './newSessionComposerServi
 import { WorkspaceSelectionOrigin } from '../../../common/workspaceSelection.js';
 import { SessionWorkspaceFallback } from './sessionWorkspaceFallback.js';
 import { getAdditionalFolderContextId, ADDITIONAL_FOLDER_CONTEXT_ID_PREFIX, ADDITIONAL_REPOSITORY_CONTEXT_ID_PREFIX, getAdditionalRepositoryContextId } from '../common/newChatContextIds.js';
-import { UNIFIED_WORKSPACE_PICKER_SETTING } from '../common/constants.js';
+import { UNIFIED_WORKSPACE_PICKER_SETTING, EXPERIMENTAL_NEW_SESSION_COMPOSER_LAYOUT_SETTING } from '../common/constants.js';
+import { registerPickerKeybindingPresentation } from './newChatPickerKeybinding.js';
+import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
 import { autorun } from '../../../../base/common/observableInternal/reactions/autorun.js';
 import Severity$1 from '../../../../base/common/severity.js';
+import { waitForState } from '../../../../base/common/observableInternal/utils/utilsCancellation.js';
 
 const FILTER_THRESHOLD = 10;
 const TABBED_PICKER_WIDTH = 360;
 const RESTORE_CONNECT_GRACE_MS = 5000;
+const MAX_NEW_PICKER_RECENT_WORKSPACES = 10;
+const GHOST_CLICK_GUARD_MS = 500;
+const GHOST_CLICK_GUARD_DISTANCE = 30;
 function getWorkspacePickerItemAriaLabel(item) {
     return item.item?.ariaLabel ?? item.label ?? "";
 }
 function getRemoteHostStatusDescription(provider, status) {
+    if (provider.hostDescription) {
+        const availability = provider.hostDescription.get();
+        if (status.kind === "disconnected") {
+            return availability;
+        }
+        const connection = status.kind === "connected" ? ( localize(4479, "Connected")) : getStatusLabel(status);
+        return localize(4480, "{0} · {1}", availability, connection);
+    }
     const statusLabel = getStatusLabel(status);
     const activeSessionCount = provider.getSessions().filter(
         session => !session.isArchived.get() && isActiveSessionStatus(session.status.get())
@@ -69,7 +87,7 @@ function getRemoteHostStatusDescription(provider, status) {
     if (activeSessionCount === 0) {
         return statusLabel;
     }
-    return activeSessionCount === 1 ? ( localize(3930, "{0} · {1} active session", statusLabel, activeSessionCount)) : ( localize(3931, "{0} · {1} active sessions", statusLabel, activeSessionCount));
+    return activeSessionCount === 1 ? ( localize(4481, "{0} · {1} active session", statusLabel, activeSessionCount)) : ( localize(4482, "{0} · {1} active sessions", statusLabel, activeSessionCount));
 }
 let WorkspacePicker = class WorkspacePicker extends Disposable {
     get selectedFolderUri() {
@@ -158,7 +176,7 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         return this._preselectionSource;
     }
     get selectionSnapshot() {
-        const restoreState = this._sessionRestoreState;
+        const restoreState = this._sessionRestoreState.get();
         return {
             folderUri: this._selectedFolderUri,
             origin: this._selectionOrigin,
@@ -192,8 +210,11 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         telemetryService,
         notificationService,
         hoverService,
+        keybindingService,
+        contextMenuService,
         fileService,
-        dialogService
+        dialogService,
+        agentHostFilterService
     ) {
         super();
         this.options = options;
@@ -211,8 +232,11 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         this.telemetryService = telemetryService;
         this.notificationService = notificationService;
         this.hoverService = hoverService;
+        this.keybindingService = keybindingService;
+        this.contextMenuService = contextMenuService;
         this.fileService = fileService;
         this.dialogService = dialogService;
+        this.agentHostFilterService = agentHostFilterService;
         this._onDidSelectWorkspace = this._register(( new Emitter()));
         this.onDidSelectWorkspace = this._onDidSelectWorkspace.event;
         this._onDidSelectWorkspaceMode = this._register(( new Emitter()));
@@ -233,12 +257,13 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         this._selectionOrigin = WorkspaceSelectionOrigin.None;
         this._selectionGeneration = 0;
         this._sessionRestoreGeneration = 0;
+        this._sessionRestoreState = observableValue(this, undefined);
         this._userHasPicked = false;
         this._connectionStatusWatch = this._register(( new MutableDisposable()));
         this._gitHubInfoWatch = this._register(( new MutableDisposable()));
         this._providerSessionTypesWatch = this._register(( new MutableDisposable()));
         this._localBrowseAction = {
-            label: ( localize(3932, "Select...")),
+            label: ( localize(4483, "Select...")),
             group: SESSION_WORKSPACE_GROUP_LOCAL,
             icon: Codicon.folderOpened,
             providerId: "",
@@ -258,15 +283,20 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             if (!activeTrigger || (!this.actionWidgetService.isVisible && !this._tabbedWidget.isVisible)) {
                 return;
             }
-            if (this._tabbedWidget.isVisible) {
-                this._tabbedWidget.refreshActiveList();
-            } else {
+            if (this._showTabs()) {
                 this.showPicker(
                     true,
                     activeTrigger,
                     this._directPickerGroup,
                     this._directPickerAttachesContext
                 );
+            } else if (this._tabbedWidget.isVisible) {
+                this._tabbedWidget.refreshActiveList();
+            } else {
+                this.actionWidgetService.updateItems(this._buildItems(), undefined, {
+                    preserveHover: true,
+                    preserveScrollPosition: true
+                });
             }
         }, 50)));
         this._attachedContext = [];
@@ -322,21 +352,13 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             }
             this._restoreAutomaticSelection();
             this._syncAttachedContext();
-            const activeTrigger = this._activeTriggerElement;
-            if (activeTrigger && (this.actionWidgetService.isVisible || this._tabbedWidget.isVisible)) {
-                this.showPicker(
-                    true,
-                    activeTrigger,
-                    this._directPickerGroup,
-                    this._directPickerAttachesContext
-                );
-            }
+            this._refreshPickerItems();
         }));
         this._register(this.recentWorkspacesService.onDidChangeRecentWorkspaces(() => {
             this._restoreAutomaticSelection();
         }));
         this._register(this.configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(DevContainerAgentHostEnabledSettingId) || e.affectsConfiguration(RemoteAgentHostsEnabledSettingId)) {
+            if (e.affectsConfiguration(DevContainerAgentHostEnabledSettingId) || e.affectsConfiguration(RemoteAgentHostsEnabledSettingId) || e.affectsConfiguration(DevContainerSamplesEnabledSettingId) || e.affectsConfiguration("chat.disableAIFeatures")) {
                 this._clearDevContainerAvailability(true);
             }
         }));
@@ -371,6 +393,18 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         this._renderDisposables.add(this._addTrigger(slot));
         return slot;
     }
+    renderAdditionalTrigger(container, options) {
+        const disposables = ( new DisposableStore());
+        const slot = append(
+            container,
+            $(".sessions-chat-picker-slot.sessions-chat-workspace-picker")
+        );
+        disposables.add({
+            dispose: () => slot.remove()
+        });
+        disposables.add(this._addTrigger(slot, options));
+        return disposables;
+    }
     renderCategoryTriggers(container, triggers, label) {
         this._renderDisposables.clear();
         const row = append(container, $(".sessions-workspace-category-picker"));
@@ -403,7 +437,7 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         return Array.from(this._triggerElements);
     }
     getContextPickerActions() {
-        return this.sessionsProvidersService.getProviders().flatMap(provider => provider.browseActions).filter(action => action.attachesContext === true).map(action => ({
+        return this.sessionsProvidersService.getProviders().filter(provider => this._isWorkspaceProviderVisible(provider.id)).flatMap(provider => provider.browseActions).filter(action => action.attachesContext === true).map(action => ({
             label: action.label,
             description: action.description,
             icon: action.icon,
@@ -429,20 +463,66 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         this._triggerElement = trigger;
         this._renderTriggerLabel(trigger);
         if (options?.tooltip) {
-            triggerDisposables.add(this.hoverService.setupDelayedHover(trigger, {
-                content: options.tooltip
-            }));
+            if (options.focusCommand) {
+                const tooltip = typeof options.tooltip === "function" ? options.tooltip() : options.tooltip;
+                registerPickerKeybindingPresentation(
+                    triggerDisposables,
+                    trigger,
+                    tooltip,
+                    options.focusCommand.id,
+                    options.focusCommand.when,
+                    options.focusCommand.enabled,
+                    this.commandService,
+                    this.contextMenuService,
+                    this.hoverService,
+                    this.keybindingService
+                );
+            } else {
+                const tooltip = options.tooltip;
+                triggerDisposables.add(
+                    typeof tooltip === "function" ? this.hoverService.setupDelayedHover(trigger, () => ({
+                        content: tooltip()
+                    })) : this.hoverService.setupDelayedHover(trigger, {
+                        content: tooltip
+                    })
+                );
+            }
         }
         triggerDisposables.add(markOnboardingTarget(trigger, "sessions.newSession.workspacePicker", {
-            open: () => this.showPicker(false, trigger, options?.group, options?.attachesContext)
+            open: () => this.showPicker(false, trigger, options?.group, options?.attachesContext),
+            hasSelection: () => !!this._selectedFolderUri,
+            onDidSelect: Event.map(Event.filter(
+                this.onDidSelectWorkspace,
+                uri => !!uri && this._selectionOrigin === WorkspaceSelectionOrigin.User
+            ), () => this.options.whenSelectionAccepted?.() ?? Promise.resolve(true))
         }));
         triggerDisposables.add(Gesture.addTarget(trigger));
-        [EventType.CLICK, EventType$1.Tap].forEach(eventType => {
-            triggerDisposables.add(addDisposableListener(trigger, eventType, e => {
-                EventHelper.stop(e, true);
-                this.showPicker(false, trigger, options?.group, options?.attachesContext);
-            }));
-        });
+        let pendingTap;
+        triggerDisposables.add(
+            addDisposableListener(getWindow(trigger).document, EventType.CLICK, e => {
+                if (!pendingTap || this._now() - pendingTap.at >= GHOST_CLICK_GUARD_MS) {
+                    pendingTap = undefined;
+                    return;
+                }
+                if (e.detail > 0 && Math.abs(e.pageX - pendingTap.pageX) < GHOST_CLICK_GUARD_DISTANCE && Math.abs(e.pageY - pendingTap.pageY) < GHOST_CLICK_GUARD_DISTANCE) {
+                    pendingTap = undefined;
+                    EventHelper.stop(e, true);
+                }
+            }, true)
+        );
+        triggerDisposables.add(addDisposableListener(trigger, EventType$1.Tap, e => {
+            pendingTap = {
+                at: this._now(),
+                pageX: e.pageX,
+                pageY: e.pageY
+            };
+            EventHelper.stop(e, true);
+            this.showPicker(false, trigger, options?.group, options?.attachesContext);
+        }));
+        triggerDisposables.add(addDisposableListener(trigger, EventType.CLICK, e => {
+            EventHelper.stop(e, true);
+            this.showPicker(false, trigger, options?.group, options?.attachesContext);
+        }));
         triggerDisposables.add(addDisposableListener(trigger, EventType.KEY_DOWN, e => {
             if (e.key === "Enter" || e.key === " ") {
                 EventHelper.stop(e, true);
@@ -462,6 +542,9 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         });
         return triggerDisposables;
     }
+    _now() {
+        return Date.now();
+    }
     showPicker(force = false, anchor, preferredGroup, attachesContext) {
         const triggerElement = anchor ?? this._triggerElement;
         if (!triggerElement) {
@@ -511,6 +594,13 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             this._activeTab = undefined;
             this._showFlatPicker(triggerElement);
         }
+        if (!alreadyVisible && (preferredGroup === undefined || preferredGroup === SESSION_WORKSPACE_GROUP_REMOTE) && this.configurationService.getValue(RemoteAgentHostsEnabledSettingId) && !this.agentHostFilterService.isDiscovering) {
+            void this.agentHostFilterService.rediscover().then(success => {
+                if (!success) {
+                    this.notificationService.warn(( localize(4484, "Could not refresh remote hosts. Showing the last known hosts.")));
+                }
+            }, onUnexpectedError);
+        }
     }
     _setDirectPickerFilter(group, attachesContext) {
         this._directPickerGroup = group;
@@ -532,10 +622,13 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             byLabel.set(SESSION_WORKSPACE_GROUP_REMOTE, {
                 id: SESSION_WORKSPACE_GROUP_REMOTE,
                 icon: Codicon.beaker,
-                tooltip: `${SESSION_WORKSPACE_GROUP_REMOTE} (${( localize(3933, "Experimental"))})`
+                tooltip: `${SESSION_WORKSPACE_GROUP_REMOTE} (${( localize(4485, "Experimental"))})`
             });
         }
         for (const provider of this.sessionsProvidersService.getProviders()) {
+            if (!this._isWorkspaceProviderVisible(provider.id)) {
+                continue;
+            }
             if (provider.supportsLocalWorkspaces && !( byLabel.has(SESSION_WORKSPACE_GROUP_LOCAL))) {
                 byLabel.set(SESSION_WORKSPACE_GROUP_LOCAL, {
                     id: SESSION_WORKSPACE_GROUP_LOCAL
@@ -581,7 +674,8 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             className: "sessions-new-chat-picker-list",
             showFilter: true,
             focusFilterOnOpen: isConsolidatedWorkspacePicker,
-            filterPlaceholder: isConsolidatedWorkspacePicker ? ( localize(3934, "Search")) : undefined,
+            filterPlaceholder: isConsolidatedWorkspacePicker ? ( localize(4486, "Search")) : undefined,
+            submenuHoverDelay: isConsolidatedWorkspacePicker ? 0 : undefined,
             reserveSubmenuSpace: false,
             inlineDescription: true,
             showGroupTitleOnFirstItem: true,
@@ -590,6 +684,7 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             hideDefaultKeybindingTooltip: true
         } : {
             className: "sessions-new-chat-picker-list",
+            submenuHoverDelay: isConsolidatedWorkspacePicker ? 0 : undefined,
             reserveSubmenuSpace: false,
             inlineDescription: true,
             showGroupTitleOnFirstItem: true,
@@ -613,9 +708,10 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             [],
             {
                 getAriaLabel: getWorkspacePickerItemAriaLabel,
-                getWidgetAriaLabel: () => ( localize(3935, "Workspace Picker"))
+                getWidgetAriaLabel: () => ( localize(4487, "Workspace Picker"))
             },
-            this._buildListOptions(items, undefined)
+            this._buildListOptions(items, undefined),
+            this._triggerOptions.get(triggerElement)?.contextViewLayer
         );
     }
     _showTabbedPicker(tabs, triggerElement) {
@@ -625,7 +721,7 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         const delegate = this._buildDelegate(triggerElement, () => this._hidePicker());
         const accessibilityProvider = {
             getAriaLabel: getWorkspacePickerItemAriaLabel,
-            getWidgetAriaLabel: () => ( localize(3935, "Workspace Picker"))
+            getWidgetAriaLabel: () => ( localize(4487, "Workspace Picker"))
         };
         triggerElement.setAttribute("aria-expanded", "true");
         this._pickerGroupContext.set(this._activeTab ?? tabs[0].id);
@@ -651,6 +747,7 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             delegate,
             accessibilityProvider,
             width: TABBED_PICKER_WIDTH,
+            contextViewLayer: this._triggerOptions.get(triggerElement)?.contextViewLayer,
             tabBarClassName: "sessions-workspace-picker-tabbar"
         });
     }
@@ -733,6 +830,12 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
                 preferDevContainer: item.preferDevContainer === true
             });
             this._selectFolder(item.folderUri, true, item.providerId);
+            const sample = findDevContainerSample(item.folderUri);
+            if (sample) {
+                this.telemetryService.publicLog2("devContainerSampleSelected", {
+                    sampleId: sample.id
+                });
+            }
             return true;
         }
         return false;
@@ -807,17 +910,18 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         const store = ( new DisposableStore());
         this._providerSessionTypesWatch.value = store;
         for (const provider of this.sessionsProvidersService.getProviders()) {
-            store.add(provider.onDidChangeSessionTypes(() => {
-                const activeTrigger = this._activeTriggerElement;
-                if (activeTrigger && (this.actionWidgetService.isVisible || this._tabbedWidget.isVisible)) {
-                    this.showPicker(
-                        true,
-                        activeTrigger,
-                        this._directPickerGroup,
-                        this._directPickerAttachesContext
-                    );
-                }
-            }));
+            store.add(provider.onDidChangeSessionTypes(() => this._refreshPickerItems()));
+            if (isAgentHostProvider(provider) && provider.isVisibleInEnvironmentPicker) {
+                const visibility = provider.isVisibleInEnvironmentPicker;
+                let initialized = false;
+                store.add(autorun(reader => {
+                    visibility.read(reader);
+                    if (initialized) {
+                        this._refreshPickerItems();
+                    }
+                    initialized = true;
+                }));
+            }
             if (isAgentHostProvider(provider) && provider.onDidChangeDevContainerAvailability) {
                 store.add(
                     provider.onDidChangeDevContainerAvailability(() => this._clearDevContainerAvailability(true))
@@ -825,6 +929,26 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             }
         }
     }
+    _refreshPickerItems() {
+        const activeTrigger = this._activeTriggerElement;
+        if (activeTrigger && (this.actionWidgetService.isVisible || this._tabbedWidget.isVisible)) {
+            if (this._showTabs()) {
+                this.showPicker(
+                    true,
+                    activeTrigger,
+                    this._directPickerGroup,
+                    this._directPickerAttachesContext
+                );
+            } else if (this._tabbedWidget.isVisible) {
+                this._tabbedWidget.refreshActiveList();
+            } else {
+                this.actionWidgetService.updateItems(this._buildItems(), undefined, {
+                    preserveHover: true,
+                    preserveScrollPosition: true
+                });
+            }
+        }
+    }
     _getCurrentRepositoryId() {
         const workspace = this._getSelectedRepositoryWorkspace();
         return workspace && this._getRepositoryId(workspace);
@@ -887,8 +1011,10 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
     isNoWorkspaceSelected() {
         return !!this.options.getNoWorkspaceOption && this.recentWorkspacesService.isNoWorkspaceChecked();
     }
-    selectNoWorkspace() {
-        this.options.onUserSelection?.();
+    selectNoWorkspace(userSelection = true) {
+        if (userSelection) {
+            this.options.onUserSelection?.();
+        }
         this._selectionGeneration++;
         this._sessionRestoreGeneration++;
         this._hidePicker();
@@ -1043,6 +1169,9 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             return undefined;
         }
         await Promise.resolve();
+        if (action.providerId && !this._isWorkspaceProviderVisible(action.providerId)) {
+            return undefined;
+        }
         try {
             if (action === this._localBrowseAction) {
                 const selection = await this._browseForLocalFolder();
@@ -1071,15 +1200,17 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             }
             if (!exists) {
                 this._removeRecentWorkspace(folderUri);
-                await this.dialogService.info(( localize(3936, "Path does not exist")), ( localize(3937, "The path '{0}' does not exist on this computer.", folderUri.fsPath)));
+                await this.dialogService.info(( localize(4488, "Path does not exist")), ( localize(4489, "The path '{0}' does not exist on this computer.", folderUri.fsPath)));
                 return false;
             }
         }
-        return !this.options.canSelectWorkspace || (await this.options.canSelectWorkspace(folderUri, providerId));
+        const canSelect = !this.options.canSelectWorkspace || (await this.options.canSelectWorkspace(folderUri, providerId));
+        return canSelect && (!providerId || this._isWorkspaceProviderVisible(providerId));
     }
     _getAllBrowseActions() {
-        const all = this.sessionsProvidersService.getProviders().flatMap(p => p.browseActions);
-        const hasLocalSupport = ( this.sessionsProvidersService.getProviders().some(p => p.supportsLocalWorkspaces));
+        const providers = this.sessionsProvidersService.getProviders().filter(provider => this._isWorkspaceProviderVisible(provider.id));
+        const all = providers.flatMap(p => p.browseActions);
+        const hasLocalSupport = ( providers.some(p => p.supportsLocalWorkspaces));
         if (hasLocalSupport) {
             all.unshift(this._localBrowseAction);
         }
@@ -1087,6 +1218,10 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             a => (!this._isTabFiltered() || this._isGroupInActiveTab(a.group)) && (this._directPickerAttachesContext === undefined || Boolean(a.attachesContext) === this._directPickerAttachesContext)
         );
     }
+    _isWorkspaceProviderVisible(providerId) {
+        const provider = this.sessionsProvidersService.getProvider(providerId);
+        return provider?.supportsWorkspaceSelection !== false && (!provider || !isAgentHostProvider(provider) || provider.isVisibleInEnvironmentPicker?.get() !== false);
+    }
     _useConsolidatedRemoteWorkspaces() {
         return this.configurationService.getValue(UNIFIED_WORKSPACE_PICKER_SETTING);
     }
@@ -1144,7 +1279,7 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
     }
     _buildItems() {
         const items = [];
-        const allProviders = this.sessionsProvidersService.getProviders();
+        const allProviders = this.sessionsProvidersService.getProviders().filter(provider => this._isWorkspaceProviderVisible(provider.id));
         const providerIds = ( new Set(allProviders.map(p => p.id)));
         const availableTabs = this._getAvailableTabs();
         const activeGroup = this._activeTab ?? (availableTabs.length === 1 ? availableTabs[0].id : undefined);
@@ -1164,14 +1299,38 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         }
         const tabFilter = this._isTabFiltered() ? w => this._isGroupInActiveTab(w.workspace.group) : undefined;
         const useRemoteSubmenu = this._useConsolidatedRemoteWorkspaces() && this._directPickerGroup === undefined;
-        const remotePickerItem = {};
+        const limitRecentWorkspaces = this._useConsolidatedRemoteWorkspaces() || this.configurationService.getValue(EXPERIMENTAL_NEW_SESSION_COMPOSER_LAYOUT_SETTING);
+        const remotePickerItem = {
+            id: "workspacePicker.remote"
+        };
         const remoteSubmenuActions = [];
+        const remoteFilterItems = [];
         let devContainerActionIndex = 0;
-        const setRemotePickerItem = item => {
-            remotePickerItem.folderUri = item.folderUri;
-            remotePickerItem.providerId = item.providerId;
-            remotePickerItem.browseAction = item.browseAction;
-            remotePickerItem.run = item.run;
+        const setRemotePickerRun = run => {
+            remotePickerItem.run = run;
+        };
+        const createWorkspaceModeActions = (workspace, folderUri, providerId, item) => {
+            if (findDevContainerSample(folderUri) || (workspace.group !== SESSION_WORKSPACE_GROUP_LOCAL && workspace.group !== SESSION_WORKSPACE_GROUP_REMOTE) || this._isProviderUnavailable(providerId) || !this._isDevContainerWorkspaceAvailable(folderUri, providerId)) {
+                return undefined;
+            }
+            const usingDevContainer = !!this._selectedDevContainerFolderUri && this.uriIdentityService.extUri.isEqual(this._selectedDevContainerFolderUri, folderUri);
+            const actionId = `workspacePicker.devContainer.${providerId}.${devContainerActionIndex++}`;
+            const selectMode = preferDevContainer => {
+                item.preferDevContainer = preferDevContainer;
+            };
+            return [toAction({
+                id: `${actionId}.host`,
+                label: workspace.group === SESSION_WORKSPACE_GROUP_LOCAL ? ( localize(4490, "Use Local")) : ( localize(4491, "Use Remote Host")),
+                tooltip: "",
+                checked: !usingDevContainer,
+                run: () => selectMode(false)
+            }), toAction({
+                id: `${actionId}.container`,
+                label: ( localize(4492, "Use Dev Container")),
+                tooltip: "",
+                checked: usingDevContainer,
+                run: () => selectMode(true)
+            })];
         };
         const recentWorkspaces = this._directPickerAttachesContext === true ? [] : this._getRecentWorkspaces().filter(w => ( providerIds.has(w.providerId))).filter(w => !tabFilter || tabFilter(w)).filter(
             w => !workspaceGroupAction?.hideWorkspaceItems || w.workspace.group !== workspaceGroupActionGroup
@@ -1190,15 +1349,20 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
                 repositoryId
             }
         ) => workspace.group !== SESSION_WORKSPACE_GROUP_GITHUB || !repositoryId || !localRepositoryIds?.has(repositoryId));
-        const orderedRecentWorkspaceEntries = this._useConsolidatedRemoteWorkspaces() ? [...recentWorkspaceEntries.filter((
+        const orderByWorkspaceKind = entries => this._useConsolidatedRemoteWorkspaces() ? [...entries.filter((
             {
                 workspace
             }
-        ) => !ThemeIcon.isEqual(this._getWorkspaceIcon(workspace), Codicon.repo)), ...recentWorkspaceEntries.filter((
+        ) => !ThemeIcon.isEqual(this._getWorkspaceIcon(workspace), Codicon.repo)), ...entries.filter((
             {
                 workspace
             }
-        ) => ThemeIcon.isEqual(this._getWorkspaceIcon(workspace), Codicon.repo))] : recentWorkspaceEntries;
+        ) => ThemeIcon.isEqual(this._getWorkspaceIcon(workspace), Codicon.repo))] : entries;
+        const recentEntries = orderByWorkspaceKind(recentWorkspaceEntries.filter(entry => !entry.isSessionWorkspace));
+        const orderedRecentWorkspaceEntries = [
+            ...recentEntries,
+            ...orderByWorkspaceKind(recentWorkspaceEntries.filter(entry => entry.isSessionWorkspace))
+        ].slice(0, limitRecentWorkspaces ? MAX_NEW_PICKER_RECENT_WORKSPACES : undefined);
         let previousRecentWorkspaceIsRepository;
         for (const {
             workspace,
@@ -1212,25 +1376,14 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             const icon = this._getWorkspaceIcon(workspace);
             const selected = this._isSelectedFolder(folderUri) || (repositoryId !== undefined && repositoryId === this._getCurrentRepositoryId());
             const attached = ( this._additionalFolderSelections.has(this.uriIdentityService.extUri.getComparisonKey(folderUri))) || (repositoryId !== undefined && ( this._additionalRepositorySelections.has(repositoryId)));
-            if (useRemoteSubmenu && workspace.group === SESSION_WORKSPACE_GROUP_REMOTE) {
-                const unavailable = this._isProviderUnavailable(providerId);
-                const submenuAction = toAction({
-                    id: `workspacePicker.remote.workspace.${providerId}.${remoteSubmenuActions.length}`,
-                    label: workspace.label,
-                    tooltip: typeof workspace.description === "string" ? workspace.description : undefined,
-                    enabled: !unavailable,
-                    run: () => setRemotePickerItem({
-                        folderUri,
-                        providerId
-                    })
-                });
-                Object.assign(submenuAction, {
-                    icon,
-                    onRemove: () => this._removeRecentWorkspace(folderUri)
-                });
-                remoteSubmenuActions.push(submenuAction);
-                continue;
-            }
+            const item = {
+                id: `workspacePicker.workspace.${this.uriIdentityService.extUri.getComparisonKey(folderUri)}`,
+                folderUri,
+                providerId,
+                checked: selected || attached || undefined,
+                preferDevContainer: !!findDevContainerSample(folderUri)
+            };
+            const modeActions = createWorkspaceModeActions(workspace, folderUri, providerId, item);
             const recentWorkspaceIsRepository = ThemeIcon.isEqual(icon, Codicon.repo);
             if (previousRecentWorkspaceIsRepository !== undefined && previousRecentWorkspaceIsRepository !== recentWorkspaceIsRepository) {
                 items.push({
@@ -1239,28 +1392,10 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
                 });
             }
             previousRecentWorkspaceIsRepository = recentWorkspaceIsRepository;
-            const item = {
-                folderUri,
-                providerId,
-                checked: selected || attached || undefined
-            };
-            const usingDevContainer = !!this._selectedDevContainerFolderUri && this.uriIdentityService.extUri.isEqual(this._selectedDevContainerFolderUri, folderUri);
-            const submenuActions = workspace.group === SESSION_WORKSPACE_GROUP_LOCAL && this._isDevContainerWorkspaceAvailable(folderUri, providerId) ? [( new SubmenuAction(
-                `workspacePicker.devContainer.${providerId}.${devContainerActionIndex}`,
+            const submenuActions = modeActions ? [( new SubmenuAction(
+                `workspacePicker.devContainer.${providerId}.${devContainerActionIndex}.options`,
                 "",
-                [toAction({
-                    id: `workspacePicker.devContainer.local.${providerId}.${devContainerActionIndex}`,
-                    label: ( localize(3938, "Use Local")),
-                    tooltip: "",
-                    checked: !usingDevContainer,
-                    run: () => item.preferDevContainer = false
-                }), toAction({
-                    id: `workspacePicker.devContainer.use.${providerId}.${devContainerActionIndex++}`,
-                    label: ( localize(3939, "Use Dev Container")),
-                    tooltip: "",
-                    checked: usingDevContainer,
-                    run: () => item.preferDevContainer = true
-                })]
+                modeActions
             ))] : undefined;
             items.push({
                 kind: ActionListItemKind.Action,
@@ -1319,29 +1454,19 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             }
         ) => {
             const actionIcon = action === this._localBrowseAction && this._useConsolidatedRemoteWorkspaces() ? Codicon.folder : action.icon;
-            const actionLabel = action === this._localBrowseAction && this._useConsolidatedRemoteWorkspaces() && this._directPickerAttachesContext !== true ? ( localize(3940, "Choose Folder")) : this._useConsolidatedRemoteWorkspaces() ? action.label.replace(/(?:\.\.\.|…)$/, "") : action.label;
+            const actionLabel = action === this._localBrowseAction && this._useConsolidatedRemoteWorkspaces() && this._directPickerAttachesContext !== true ? ( localize(4493, "Open Folder...")) : this._useConsolidatedRemoteWorkspaces() ? action.label.replace(/(?:\.\.\.|\u2026)$/, "") : action.label;
+            const isPromotedRemoteBrowseAction = useRemoteSubmenu && action.group === SESSION_WORKSPACE_GROUP_REMOTE;
+            const itemLabel = isPromotedRemoteBrowseAction ? action.description || actionLabel : actionLabel;
+            const browseDescription = isPromotedRemoteBrowseAction && action.description ? actionLabel : action.description;
+            const actionProvider = action.providerId ? this.sessionsProvidersService.getProvider(action.providerId) : undefined;
+            const hostDescription = actionProvider && isAgentHostProvider(actionProvider) ? actionProvider.hostDescription?.get() : undefined;
+            const itemDescription = hostDescription ? ( localize(4494, "{0} · {1}", browseDescription ?? actionLabel, hostDescription)) : browseDescription;
             const isUnavailable = this._isProviderUnavailable(action.providerId);
-            if (useRemoteSubmenu && action.group === SESSION_WORKSPACE_GROUP_REMOTE) {
-                const submenuAction = toAction({
-                    id: `workspacePicker.remote.browse.${action.providerId}.${index}`,
-                    label: actionLabel,
-                    tooltip: action.description,
-                    enabled: !isUnavailable,
-                    run: () => setRemotePickerItem({
-                        browseAction: action
-                    })
-                });
-                Object.assign(submenuAction, {
-                    icon: actionIcon
-                });
-                remoteSubmenuActions.push(submenuAction);
-                return;
-            }
             const isRepositoryAction = action.group === SESSION_WORKSPACE_GROUP_GITHUB && action.attachesContext !== true;
             items.push({
                 kind: ActionListItemKind.Action,
-                label: actionLabel,
-                description: action.description,
+                label: itemLabel,
+                description: itemDescription,
                 group: {
                     title: "",
                     icon: actionIcon
@@ -1357,7 +1482,7 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
                 hasRepositoryAttachmentAction ||= canAttachRepository;
                 items.push({
                     kind: ActionListItemKind.Action,
-                    label: canAttachFolder ? this._useConsolidatedRemoteWorkspaces() ? ( localize(3941, "Attach Folder")) : ( localize(3942, "Attach Folder...")) : this._useConsolidatedRemoteWorkspaces() ? ( localize(3943, "Attach Repository")) : ( localize(3944, "Attach Repository...")),
+                    label: canAttachFolder ? this._useConsolidatedRemoteWorkspaces() ? ( localize(4495, "Attach Folder")) : ( localize(4496, "Attach Folder...")) : this._useConsolidatedRemoteWorkspaces() ? ( localize(4497, "Attach Repository")) : ( localize(4498, "Attach Repository...")),
                     description: action.description,
                     group: {
                         title: "",
@@ -1371,6 +1496,51 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
                 });
             }
         });
+        if (this._directPickerAttachesContext !== true && (!activeGroup || activeGroup === SESSION_WORKSPACE_GROUP_LOCAL) && areDevContainerSamplesEnabled(this.configurationService) && ( allProviders.some(
+            provider => provider.id === LOCAL_AGENT_HOST_PROVIDER_ID && isAgentHostProvider(provider)
+        ))) {
+            const sampleItem = {
+                providerId: LOCAL_AGENT_HOST_PROVIDER_ID,
+                preferDevContainer: true
+            };
+            const filterItems = devContainerSamples.map(sample => ({
+                kind: ActionListItemKind.Action,
+                label: sample.name,
+                description: getDevContainerSampleUrl(sample),
+                group: {
+                    title: "",
+                    icon: Codicon.remote
+                },
+                item: {
+                    folderUri: devContainerSampleUri(sample),
+                    providerId: LOCAL_AGENT_HOST_PROVIDER_ID,
+                    preferDevContainer: true
+                }
+            }));
+            items.push({
+                kind: ActionListItemKind.Action,
+                label: ( localize(4499, "Dev Container Sample")),
+                group: {
+                    title: "",
+                    icon: Codicon.remote
+                },
+                item: sampleItem,
+                submenuActions: [( new SubmenuAction(
+                    "workspacePicker.devContainer.samples",
+                    "",
+                    devContainerSamples.map(sample => toAction({
+                        id: `workspacePicker.devContainer.sample.${sample.id}`,
+                        label: sample.name,
+                        tooltip: getDevContainerSampleUrl(sample),
+                        run: () => {
+                            sampleItem.folderUri = devContainerSampleUri(sample);
+                        }
+                    }))
+                ))],
+                filterItems,
+                openSubmenuOnClick: true
+            });
+        }
         const manageActions = [];
         if (includeRemoteProviders) {
             for (const provider of remoteProviders) {
@@ -1388,10 +1558,10 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
                     }
                 });
                 const extended = action;
-                extended.ariaLabel = ( localize(3945, "{0}, {1}", provider.label, statusDescription));
+                extended.ariaLabel = ( localize(4500, "{0}, {1}", provider.label, statusDescription));
                 extended.icon = RemoteAgentHostConnectionStatus.isIncompatible(status) ? Codicon.warning : (isTunnel ? Codicon.cloud : Codicon.remote);
                 extended.hoverContent = getStatusHover(status, provider.remoteAddress);
-                if (provider.remoteAddress) {
+                if (provider.remoteAddress && provider.canRemove !== false) {
                     extended.onRemove = async () => {
                         await removeRemoteHost(provider, this.remoteAgentHostService, this.configurationService);
                     };
@@ -1399,12 +1569,10 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
                 if (useRemoteSubmenu) {
                     const submenuAction = toAction({
                         id: action.id,
-                        label: action.label,
+                        label: ( localize(4501, "Manage {0}", action.label)),
                         tooltip: action.tooltip,
                         enabled: action.enabled,
-                        run: () => setRemotePickerItem({
-                            run: () => action.run()
-                        })
+                        run: () => setRemotePickerRun(() => action.run())
                     });
                     Object.assign(submenuAction, {
                         icon: extended.icon,
@@ -1412,6 +1580,20 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
                         onRemove: extended.onRemove
                     });
                     remoteSubmenuActions.push(submenuAction);
+                    remoteFilterItems.push({
+                        kind: ActionListItemKind.Action,
+                        label: submenuAction.label,
+                        description: submenuAction.tooltip || undefined,
+                        group: {
+                            title: "",
+                            icon: extended.icon
+                        },
+                        item: {
+                            run: () => action.run(),
+                            ariaLabel: extended.ariaLabel
+                        },
+                        onRemove: extended.onRemove
+                    });
                 } else {
                     manageActions.push(action);
                 }
@@ -1431,14 +1613,25 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
                             label: menuAction.label,
                             tooltip: menuAction.tooltip,
                             enabled: menuAction.enabled,
-                            run: () => setRemotePickerItem({
-                                run: () => menuAction.run()
-                            })
+                            run: () => setRemotePickerRun(() => menuAction.run())
                         });
                         Object.assign(submenuAction, {
                             icon
                         });
                         remoteSubmenuActions.push(submenuAction);
+                        remoteFilterItems.push({
+                            kind: ActionListItemKind.Action,
+                            label: submenuAction.label,
+                            description: submenuAction.tooltip || undefined,
+                            group: {
+                                title: "",
+                                icon
+                            },
+                            disabled: !submenuAction.enabled,
+                            item: {
+                                run: () => menuAction.run()
+                            }
+                        });
                     } else {
                         manageActions.push(Object.assign(menuAction, {
                             icon
@@ -1456,13 +1649,28 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             }
             items.push({
                 kind: ActionListItemKind.Action,
-                label: ( localize(3946, "Remote")),
+                label: ( localize(4502, "Remote")),
                 group: {
                     title: "",
                     icon: Codicon.remote
                 },
                 item: remotePickerItem,
-                submenuActions: [( new SubmenuAction("workspacePicker.remote.options", "", remoteSubmenuActions))]
+                hover: {
+                    preserveVerticalPosition: true,
+                    alignToAnchorTop: true
+                },
+                submenuActions: [( new SubmenuAction("workspacePicker.remote.options", "", remoteSubmenuActions))],
+                filterItems: remoteFilterItems,
+                openSubmenuOnClick: true,
+                submenuOptions: {
+                    showFilter: true,
+                    filterPlaceholder: ( localize(4503, "Search Remote")),
+                    filterAsCombobox: true,
+                    focusFilterOnOpen: true,
+                    minWidth: 180,
+                    hideDefaultKeybindingTooltip: true,
+                    stopToolbarPointerPropagation: true
+                }
             });
         }
         if (manageActions.length > 0) {
@@ -1477,7 +1685,7 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
                 items.push({
                     kind: ActionListItemKind.Action,
                     label: action.label,
-                    description: extended.onRemove ? action.tooltip || undefined : undefined,
+                    description: extended.onRemove || extended.ariaLabel ? action.tooltip || undefined : undefined,
                     group: {
                         title: "",
                         icon: extended.icon ?? Codicon.settingsGear
@@ -1494,7 +1702,7 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         if (items.length === 0 && this._getActivePickerGroup() === SESSION_WORKSPACE_GROUP_GITHUB) {
             items.push({
                 kind: ActionListItemKind.Action,
-                label: ( localize(3947, "GitHub repositories are still loading")),
+                label: ( localize(4504, "GitHub repositories are still loading")),
                 group: {
                     title: "",
                     icon: Codicon.loading
@@ -1504,25 +1712,31 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             });
         }
         const noWorkspaceOption = this._getNoWorkspaceOption();
-        if (!noWorkspaceOption || this._directPickerAttachesContext === true) {
+        const hideNoWorkspaceOption = this._activeTriggerElement ? this._triggerOptions.get(this._activeTriggerElement)?.hideNoWorkspaceOption === true : false;
+        if (!noWorkspaceOption || this._directPickerAttachesContext === true || hideNoWorkspaceOption) {
             return items;
         }
+        const noWorkspaceAriaDescription = this._useConsolidatedRemoteWorkspaces() ? ( localize(4505, "Start the session in a temporary directory.")) : undefined;
         const noWorkspace = {
             kind: ActionListItemKind.Action,
             label: this._getNoWorkspaceLabel(),
             description: this._useConsolidatedRemoteWorkspaces() ? undefined : noWorkspaceOption.description,
+            ariaDescription: noWorkspaceAriaDescription,
             group: {
                 title: "",
                 icon: this._useConsolidatedRemoteWorkspaces() ? Codicon.comment : Codicon.commentDiscussion
             },
             item: {
+                id: "workspacePicker.chat",
                 checked: noWorkspaceOption.isSelected || undefined,
-                run: () => {
+                run: noWorkspaceOption.submenuActions?.length ? undefined : () => {
                     noWorkspaceOption.select();
                     this._updateTriggerLabel();
                     this._onDidChangeSelection.fire();
                 }
-            }
+            },
+            submenuActions: noWorkspaceOption.submenuActions ? [...noWorkspaceOption.submenuActions] : undefined,
+            openSubmenuOnClick: !!noWorkspaceOption.submenuActions?.length
         };
         return items.length > 0 ? [noWorkspace, {
             kind: ActionListItemKind.Separator,
@@ -1533,7 +1747,10 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         return this.options.getNoWorkspaceOption?.();
     }
     _getNoWorkspaceLabel() {
-        return this._useConsolidatedRemoteWorkspaces() ? ( localize(3948, "Start from Scratch")) : ( localize(3949, "No workspace"));
+        return this._useConsolidatedRemoteWorkspaces() ? ( localize(4506, "Chat")) : ( localize(4507, "No workspace"));
+    }
+    _getSelectedNoWorkspaceLabel() {
+        return this._getNoWorkspaceOption()?.selectedLabel ?? this._getNoWorkspaceLabel();
     }
     _showRemoteHostOptionsDelayed(provider) {
         const timeout = setTimeout(() => {
@@ -1548,6 +1765,9 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             this._renderTriggerLabel(trigger);
         }
     }
+    refreshTriggerLabel() {
+        this._updateTriggerLabel();
+    }
     _renderTriggerLabel(trigger) {
         const options = this._triggerOptions.get(trigger);
         const contents = this._triggerContents.get(trigger);
@@ -1590,8 +1810,8 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
                 }
                 contents.icon.className = ThemeIcon.asClassName(icon);
             }
-            const label = noWorkspaceSelected ? this._getNoWorkspaceLabel() : (reflectsWorkspace && workspace ? this._getWorkspaceLabel(workspace) : undefined) ?? (relatedGitHubInfo ? `${relatedGitHubInfo.owner}/${relatedGitHubInfo.repo}` : (isSelectedCategory && workspace ? workspace.label : options.label));
-            trigger.setAttribute("aria-label", badgeCount > 0 ? ( localize(3950, "{0}, {1} attached", options.ariaLabel, badgeCount)) : label && label !== options.label ? ( localize(3951, "{0}: {1}", options.label ?? options.ariaLabel, label)) : options.ariaLabel);
+            const label = noWorkspaceSelected ? this._getSelectedNoWorkspaceLabel() : (reflectsWorkspace && workspace ? this._getWorkspaceLabel(workspace) : undefined) ?? (relatedGitHubInfo ? `${relatedGitHubInfo.owner}/${relatedGitHubInfo.repo}` : (isSelectedCategory && workspace ? workspace.label : options.label));
+            trigger.setAttribute("aria-label", badgeCount > 0 ? ( localize(4508, "{0}, {1} attached", options.ariaLabel, badgeCount)) : label && label !== options.label ? ( localize(4509, "{0}: {1}", options.label ?? options.ariaLabel, label)) : options.ariaLabel);
             if (label) {
                 contents.label ??= append(trigger, $("span.sessions-chat-dropdown-label"));
                 contents.label.textContent = label;
@@ -1619,16 +1839,16 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         clearNode(trigger);
         const noWorkspaceSelected = this._getNoWorkspaceOption()?.isSelected === true;
         const workspace = noWorkspaceSelected ? undefined : this._selectedResolved?.workspace;
-        const label = noWorkspaceSelected ? ( localize(3949, "No workspace")) : workspace ? this._getWorkspaceLabel(workspace) : ( localize(3952, "workspace"));
+        const label = noWorkspaceSelected ? this._getSelectedNoWorkspaceLabel() : workspace ? this._getWorkspaceLabel(workspace) : ( localize(4510, "workspace"));
         const icon = noWorkspaceSelected ? Codicon.commentDiscussion : workspace?.icon ?? Codicon.project;
-        trigger.setAttribute("aria-label", noWorkspaceSelected ? ( localize(3953, "New session with no workspace")) : workspace ? ( localize(3954, "New session in {0}", label)) : ( localize(3955, "Start by picking a workspace")));
+        trigger.setAttribute("aria-label", noWorkspaceSelected ? ( localize(4511, "New session with no workspace")) : workspace ? ( localize(4512, "New session in {0}", label)) : ( localize(4513, "Start by picking a workspace")));
         contents.icon = append(trigger, renderIcon(icon));
         contents.label = append(trigger, $("span.sessions-chat-dropdown-label"));
         contents.label.textContent = label;
         append(trigger, renderIcon(Codicon.chevronDownCompact)).classList.add("sessions-chat-dropdown-chevron");
     }
     _getWorkspaceLabel(workspace) {
-        return this._selectedDevContainerFolderUri && this.uriIdentityService.extUri.isEqual(this._selectedDevContainerFolderUri, workspace.folders[0]?.root) ? ( localize(3956, "{0} - Dev Container", workspace.label)) : workspace.label;
+        return this._selectedDevContainerFolderUri && this.uriIdentityService.extUri.isEqual(this._selectedDevContainerFolderUri, workspace.folders[0]?.root) ? ( localize(4514, "{0} - Dev Container", workspace.label)) : workspace.label;
     }
     _isDevContainerWorkspaceAvailable(folderUri, providerId) {
         let provider = this.sessionsProvidersService.getProvider(providerId);
@@ -1675,7 +1895,7 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             return false;
         }
         const connectionStatus = provider.connectionStatus.get();
-        return RemoteAgentHostConnectionStatus.isIncompatible(connectionStatus) || (!RemoteAgentHostConnectionStatus.isConnected(connectionStatus) && !provider.canConnectOnDemand);
+        return provider.isVisibleInEnvironmentPicker?.get() === false || RemoteAgentHostConnectionStatus.isIncompatible(connectionStatus) || (!RemoteAgentHostConnectionStatus.isConnected(connectionStatus) && !provider.canConnectOnDemand);
     }
     async _connectProviderOnDemand(providerId) {
         const provider = this.sessionsProvidersService.getProvider(providerId);
@@ -1689,7 +1909,7 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         if (RemoteAgentHostConnectionStatus.isIncompatible(connectionStatus) || !provider.canConnectOnDemand || !provider.connect) {
             return false;
         }
-        const initialMessage = ( localize(3957, "Connecting to {0}...", provider.label));
+        const initialMessage = ( localize(4515, "Connecting to {0}...", provider.label));
         const handle = this.notificationService.notify({
             severity: Severity$1.Info,
             message: initialMessage,
@@ -1715,7 +1935,7 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         if (connected) {
             return true;
         }
-        const message = ( localize(3958, "Failed to connect to {0}.", provider.label));
+        const message = ( localize(4516, "Failed to connect to {0}.", provider.label));
         this.notificationService.error(message);
         status(message);
         return false;
@@ -1770,6 +1990,25 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
     refreshAutomaticSelection() {
         return this._restoreAutomaticSelection();
     }
+    async whenWorkspaceRestored(token) {
+        if (!this._userHasPicked) {
+            await waitForState(
+                this.recentWorkspacesService.historyLoadState,
+                state => state !== "loading",
+                undefined,
+                token
+            );
+            while (!this._userHasPicked && this._sessionRestoreState.get()?.state === "pending") {
+                await waitForState(
+                    this._sessionRestoreState,
+                    state => state?.state !== "pending",
+                    undefined,
+                    token
+                );
+            }
+        }
+        return this.recentWorkspacesService.historyLoadState.get() === "loaded" && this._sessionRestoreState.get()?.state === "completed";
+    }
     _restoreAutomaticSelection() {
         if (this._userHasPicked || !this._canRestoreWorkspace()) {
             return false;
@@ -1800,14 +2039,19 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         }
         const restoreGeneration = ++this._sessionRestoreGeneration;
         const selectionGeneration = this._selectionGeneration;
-        this._sessionRestoreState = {
+        this._sessionRestoreState.set({
             generation: restoreGeneration,
             selectionGeneration,
             state: "pending"
-        };
-        const restoreState = this._sessionRestoreState;
+        }, undefined);
         void this._sessionWorkspaceFallback.findWorkspace().then(restored => {
-            restoreState.state = "completed";
+            if (this._sessionRestoreState.get()?.generation === restoreGeneration) {
+                this._sessionRestoreState.set({
+                    generation: restoreGeneration,
+                    selectionGeneration,
+                    state: "completed"
+                }, undefined);
+            }
             if (restoreGeneration !== this._sessionRestoreGeneration || selectionGeneration !== this._selectionGeneration || this._userHasPicked || !this._canRestoreWorkspace()) {
                 return;
             }
@@ -1840,12 +2084,18 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
             this._onDidSelectWorkspace.fire(this._selectedFolderUri);
             this._watchForConnectionFailure(restored);
         }).catch(error => {
-            restoreState.state = "error";
+            if (this._sessionRestoreState.get()?.generation === restoreGeneration) {
+                this._sessionRestoreState.set({
+                    generation: restoreGeneration,
+                    selectionGeneration,
+                    state: "error"
+                }, undefined);
+            }
             onUnexpectedError(error);
         });
     }
     _canRestoreProviderWorkspace(providerId) {
-        return !this.options.sessionWorkspaceProviderFilter || this.options.sessionWorkspaceProviderFilter(providerId);
+        return this._isWorkspaceProviderVisible(providerId) && (!this.options.sessionWorkspaceProviderFilter || this.options.sessionWorkspaceProviderFilter(providerId));
     }
     _canRestoreWorkspace() {
         return !this.isNoWorkspaceSelected() && (this.options.canRestoreWorkspace?.() ?? true);
@@ -1905,7 +2155,25 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         }, RESTORE_CONNECT_GRACE_MS, store);
     }
     _getRecentWorkspaces() {
-        return this.recentWorkspacesService.getRecentWorkspaces(true, this._useConsolidatedRemoteWorkspaces());
+        const recentWorkspaces = this.recentWorkspacesService.getRecentWorkspaces(true, this._useConsolidatedRemoteWorkspaces()).filter(workspace => this._isWorkspaceProviderVisible(workspace.providerId));
+        const seen = ( new Set(recentWorkspaces.map((
+            {
+                workspace
+            }
+        ) => this.uriIdentityService.extUri.getComparisonKey(workspace.folders[0]?.root ?? workspace.uri))));
+        const sessionWorkspaces = (this._sessionWorkspaceFallback?.getWorkspaces() ?? []).filter((
+            {
+                workspace
+            }
+        ) => {
+            const key = this.uriIdentityService.extUri.getComparisonKey(workspace.folders[0]?.root ?? workspace.uri);
+            if (( seen.has(key))) {
+                return false;
+            }
+            seen.add(key);
+            return true;
+        });
+        return [...recentWorkspaces, ...sessionWorkspaces];
     }
     _removeRecentWorkspace(folderUri) {
         this.recentWorkspacesService.removeRecentWorkspace(folderUri, this._useConsolidatedRemoteWorkspaces());
@@ -1921,6 +2189,6 @@ let WorkspacePicker = class WorkspacePicker extends Disposable {
         }
     }
 };
-WorkspacePicker = ( __decorate([( __param(1, IActionWidgetService)), ( __param(2, IUriIdentityService)), ( __param(3, ISessionsProvidersService)), ( __param(4, ISessionsRecentWorkspacesService)), ( __param(5, IRemoteAgentHostService)), ( __param(6, IConfigurationService)), ( __param(7, ICommandService)), ( __param(8, IMenuService)), ( __param(9, IContextKeyService)), ( __param(10, IInstantiationService)), ( __param(11, IFileDialogService)), ( __param(12, ITelemetryService)), ( __param(13, INotificationService)), ( __param(14, IHoverService)), ( __param(15, IFileService)), ( __param(16, IDialogService))], WorkspacePicker));
+WorkspacePicker = ( __decorate([( __param(1, IActionWidgetService)), ( __param(2, IUriIdentityService)), ( __param(3, ISessionsProvidersService)), ( __param(4, ISessionsRecentWorkspacesService)), ( __param(5, IRemoteAgentHostService)), ( __param(6, IConfigurationService)), ( __param(7, ICommandService)), ( __param(8, IMenuService)), ( __param(9, IContextKeyService)), ( __param(10, IInstantiationService)), ( __param(11, IFileDialogService)), ( __param(12, ITelemetryService)), ( __param(13, INotificationService)), ( __param(14, IHoverService)), ( __param(15, IKeybindingService)), ( __param(16, IContextMenuService)), ( __param(17, IFileService)), ( __param(18, IDialogService)), ( __param(19, IAgentHostFilterService))], WorkspacePicker));
 
 export { WorkspacePicker };