Skip to content

sessions: fix unified workspace picker setting references #334677

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

Merged
Megan Rogge (meganrogge) merged 1 commit into from
Sep 5, 2026
+5 −3
Merged

sessions: fix unified workspace picker setting references #334677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -1542,7 +1543,7 @@ export class CopilotChatSessionsProvider extends Disposable implements ISessions
}

get browseActions(): readonly ISessionWorkspaceBrowseAction[] {
const useConsolidatedRemoteWorkspaces = this.configurationService.getValue<boolean>(ChatConfiguration.ConsolidatedRemoteWorkspaces);
const useConsolidatedRemoteWorkspaces = this.configurationService.getValue<boolean>(UNIFIED_WORKSPACE_PICKER_SETTING);
const repositoryActions: ISessionWorkspaceBrowseAction[] = useConsolidatedRemoteWorkspaces
? [
...(!isWeb && this.pathService.defaultUriScheme === Schemas.file ? [
Expand Down
5 changes: 3 additions & 2 deletions ...ns/contrib/providers/copilotChatSessions/test/browser/copilotChatSessionsProvider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ----------------------------------------------------------------

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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({
Expand Down