Skip to content

Sessions: update new chat isolation picker behavior #300791

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
sandy081 merged 5 commits into from
Mar 11, 2026
Merged

Sessions: update new chat isolation picker behavior #300791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
acfadf0
Sessions: reorder pickers, rename isolation labels, gate on config
sandy081 Mar 11, 2026
7d604ab
revert
sandy081 Mar 11, 2026
d83f3a3
Update src/vs/sessions/contrib/chat/browser/newChatViewPane.ts
sandy081 Mar 11, 2026
2c67862
fix compilation
sandy081 Mar 11, 2026
8209d84
Refactor IsolationModePicker: update trigger label on enable/disable
sandy081 Mar 11, 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
39 changes: 34 additions & 5 deletions src/vs/sessions/contrib/chat/browser/newChatViewPane.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
this._register(this._targetPicker.onDidChangeTarget((target) => {
this._createNewSession();
const isLocal = target === AgentSessionProviders.Background;
this._isolationModePicker.setVisible(isLocal);
this._updateIsolationPickerVisibility();
this._permissionPicker.setVisible(isLocal);
this._branchPicker.setVisible(isLocal);
this._syncIndicator.setVisible(isLocal);
Expand Down Expand Up @@ -275,6 +275,27 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
this._currentLanguageModel.read(reader);
this._updateDraftState();
}));

// When isolation option config changes, update picker visibility
this._register(this.configurationService.onDidChangeConfiguration(e => {
if (e.affectsConfiguration('github.copilot.chat.cli.isolationOption.enabled')) {
this._updateIsolationPickerVisibility();
}
}));
}

private get _isIsolationOptionEnabled(): boolean {
return this.configurationService.getValue<boolean>('github.copilot.chat.cli.isolationOption.enabled') !== false;
}

private _updateIsolationPickerVisibility(): void {
const isLocal = this._targetPicker.selectedTarget === AgentSessionProviders.Background;
const enabled = this._isIsolationOptionEnabled;
if (!enabled) {
this._isolationModePicker.setPreferredIsolationMode('worktree');
}
this._isolationModePicker.setVisible(isLocal);
this._isolationModePicker.setEnabled(enabled);
}

// --- Rendering ---
Expand Down Expand Up @@ -324,9 +345,9 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {

// Set initial visibility based on default target and isolation mode
const isLocal = this._targetPicker.selectedTarget === AgentSessionProviders.Background;
const isWorktree = this._isolationModePicker.isolationMode === 'worktree';
this._isolationModePicker.setVisible(isLocal);
this._updateIsolationPickerVisibility();
this._permissionPicker.setVisible(isLocal);
const isWorktree = this._isolationModePicker.isolationMode === 'worktree';
this._branchPicker.setVisible(isLocal && isWorktree);
this._syncIndicator.setVisible(isLocal && isWorktree);

Expand Down Expand Up @@ -443,6 +464,7 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
this._updateInputLoadingState();
this._branchPicker.setRepository(undefined);
this._isolationModePicker.setRepository(undefined);
this._updateIsolationPickerVisibility();
this._syncIndicator.setRepository(undefined);
this._modePicker.setRepository(undefined);

Expand All @@ -453,6 +475,7 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
this._repositoryLoading = false;
this._updateInputLoadingState();
this._isolationModePicker.setRepository(repository);
this._updateIsolationPickerVisibility();
this._branchPicker.setRepository(repository);
this._syncIndicator.setRepository(repository);
this._modePicker.setRepository(repository);
Expand All @@ -464,6 +487,7 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
this._repositoryLoading = false;
this._updateInputLoadingState();
this._isolationModePicker.setRepository(undefined);
this._updateIsolationPickerVisibility();
this._branchPicker.setRepository(undefined);
this._syncIndicator.setRepository(undefined);
this._modePicker.setRepository(undefined);
Expand Down Expand Up @@ -1119,8 +1143,13 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
}
}
if (draft.isolationMode) {
this._isolationModePicker.setPreferredIsolationMode(draft.isolationMode);
this._isolationModePicker.setIsolationMode(draft.isolationMode);
if (this._isIsolationOptionEnabled) {
this._isolationModePicker.setPreferredIsolationMode(draft.isolationMode);
this._isolationModePicker.setIsolationMode(draft.isolationMode);
} else {
this._isolationModePicker.setPreferredIsolationMode('worktree');
this._isolationModePicker.setIsolationMode('worktree');
}
}
if (draft.branch) {
this._branchPicker.setPreferredBranch(draft.branch);
Expand Down
34 changes: 24 additions & 10 deletions src/vs/sessions/contrib/chat/browser/sessionTargetPicker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ export class IsolationModePicker extends Disposable {
private _isolationMode: IsolationMode = 'worktree';
private _preferredIsolationMode: IsolationMode | undefined;
private _repository: IGitRepository | undefined;
private _enabled: boolean = true;

private readonly _onDidChange = this._register(new Emitter<IsolationMode>());
readonly onDidChange: Event<IsolationMode> = this._onDidChange.event;
Expand Down Expand Up @@ -225,23 +226,32 @@ export class IsolationModePicker extends Disposable {
}
}

/**
* Enables or disables the picker. When disabled, the picker is shown
* but cannot be interacted with.
*/
setEnabled(enabled: boolean): void {
this._enabled = enabled;
this._updateTriggerLabel();
}

private _showPicker(): void {
if (!this._triggerElement || this.actionWidgetService.isVisible || !this._repository) {
if (!this._triggerElement || this.actionWidgetService.isVisible || !this._repository || !this._enabled) {
return;
}

const items: IActionListItem<IsolationMode>[] = [
{
kind: ActionListItemKind.Action,
label: localize('isolationMode.folder', "Folder"),
group: { title: '', icon: Codicon.folder },
item: 'workspace',
label: localize('isolationMode.worktree', "Copilot CLI"),
group: { title: '', icon: Codicon.worktree },
item: 'worktree',
},
{
kind: ActionListItemKind.Action,
label: localize('isolationMode.worktree', "Worktree"),
group: { title: '', icon: Codicon.worktree },
item: 'worktree',
label: localize('isolationMode.folder', "Local"),
group: { title: '', icon: Codicon.folder },
item: 'workspace',
},
Comment thread
sandy081 marked this conversation as resolved.
];

Expand Down Expand Up @@ -286,15 +296,19 @@ export class IsolationModePicker extends Disposable {
const isDisabled = !this._repository;
const modeIcon = this._isolationMode === 'worktree' ? Codicon.worktree : Codicon.folder;
const modeLabel = this._isolationMode === 'worktree'
? localize('isolationMode.worktree', "Worktree")
: localize('isolationMode.folder', "Folder");
? localize('isolationMode.worktree', "Copilot CLI")
: localize('isolationMode.folder', "Local");

dom.append(this._triggerElement, renderIcon(modeIcon));
const labelSpan = dom.append(this._triggerElement, dom.$('span.sessions-chat-dropdown-label'));
labelSpan.textContent = modeLabel;
dom.append(this._triggerElement, renderIcon(Codicon.chevronDown));

this._slotElement?.classList.toggle('disabled', isDisabled);
this._slotElement?.classList.toggle('disabled', isDisabled || !this._enabled);
if (this._triggerElement) {
this._triggerElement.tabIndex = (!isDisabled && this._enabled) ? 0 : -1;
this._triggerElement.setAttribute('aria-disabled', String(isDisabled || !this._enabled));
}
}
}

Expand Down
Loading