diff --git a/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsProvider.ts b/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsProvider.ts index bc2aed81ada85d..6e270b2724b085 100644 --- a/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsProvider.ts +++ b/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsProvider.ts @@ -61,6 +61,7 @@ import { isCloudSandboxEnabled } from '../../../../../platform/agentHost/common/ import { getWorkbenchContribution } from '../../../../../workbench/common/contributions.js'; import { CloudSandboxAgentHostContribution, type ICloudSandboxProvisionedSession } from '../../remoteAgentHost/browser/cloudSandboxAgentHostContribution.js'; import { IPathService } from '../../../../../workbench/services/path/common/pathService.js'; +import { UNIFIED_WORKSPACE_PICKER_SETTING } from '../../../chat/common/constants.js'; /** Copilot Cloud session type - cloud-hosted agent. */ export const CopilotCloudSessionType: ISessionType = { @@ -1542,7 +1543,7 @@ export class CopilotChatSessionsProvider extends Disposable implements ISessions } get browseActions(): readonly ISessionWorkspaceBrowseAction[] { - const useConsolidatedRemoteWorkspaces = this.configurationService.getValue(ChatConfiguration.ConsolidatedRemoteWorkspaces); + const useConsolidatedRemoteWorkspaces = this.configurationService.getValue(UNIFIED_WORKSPACE_PICKER_SETTING); const repositoryActions: ISessionWorkspaceBrowseAction[] = useConsolidatedRemoteWorkspaces ? [ ...(!isWeb && this.pathService.defaultUriScheme === Schemas.file ? [ diff --git a/src/vs/sessions/contrib/providers/copilotChatSessions/test/browser/copilotChatSessionsProvider.test.ts b/src/vs/sessions/contrib/providers/copilotChatSessions/test/browser/copilotChatSessionsProvider.test.ts index 83002d96d62637..2473fb203a0d9b 100644 --- a/src/vs/sessions/contrib/providers/copilotChatSessions/test/browser/copilotChatSessionsProvider.test.ts +++ b/src/vs/sessions/contrib/providers/copilotChatSessions/test/browser/copilotChatSessionsProvider.test.ts @@ -60,6 +60,7 @@ import { IGitHubService } from '../../../../github/browser/githubService.js'; import { GitHubPullRequestModel } from '../../../../github/browser/models/githubPullRequestModel.js'; import { IPullRequestIconCache } from '../../../../github/browser/pullRequestIconCache.js'; import { computePullRequestIcon, GitHubPullRequestState, IGitHubPullRequest } from '../../../../github/common/types.js'; +import { UNIFIED_WORKSPACE_PICKER_SETTING } from '../../../../chat/common/constants.js'; // ---- Helpers ---------------------------------------------------------------- @@ -287,7 +288,7 @@ function createProviderWithConfig( const configService = new TestConfigurationService(); configService.setUserConfiguration('sessions.github.copilot.multiChatSessions', opts?.multiChatEnabled ?? true); - configService.setUserConfiguration(ChatConfiguration.ConsolidatedRemoteWorkspaces, opts?.consolidatedRemoteWorkspaces ?? false); + configService.setUserConfiguration(UNIFIED_WORKSPACE_PICKER_SETTING, opts?.consolidatedRemoteWorkspaces ?? false); const agentHostEnabled = observableValue('agentHostEnabled', opts?.agentHostEnabled ?? true); instantiationService.stub(IConfigurationService, configService); @@ -526,7 +527,7 @@ suite('CopilotChatSessionsProvider', () => { const { provider, configService } = createProviderWithConfig(disposables, model); const legacyActions = provider.browseActions.map(action => ({ label: action.label, icon: action.icon.id })); - configService.setUserConfiguration(ChatConfiguration.ConsolidatedRemoteWorkspaces, true); + configService.setUserConfiguration(UNIFIED_WORKSPACE_PICKER_SETTING, true); const unifiedActions = provider.browseActions.map(action => ({ label: action.label, icon: action.icon.id })); assert.deepStrictEqual({