Skip to content

sessions: add SSH entry to workspace picker alongside Tunnels #309893

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
roblourens merged 1 commit into from
Apr 14, 2026
Merged

sessions: add SSH entry to workspace picker alongside Tunnels #309893

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
21 changes: 15 additions & 6 deletions src/vs/sessions/contrib/chat/browser/sessionWorkspacePicker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { MarkdownString } from '../../../../base/common/htmlContent.js';
import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
import { URI, UriComponents } from '../../../../base/common/uri.js';
import { Schemas } from '../../../../base/common/network.js';
import { isNative } from '../../../../base/common/platform.js';
import { localize } from '../../../../nls.js';
import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
import { ActionListItemKind, IActionListDelegate, IActionListItem } from '../../../../platform/actionWidget/browser/actionList.js';
Expand Down Expand Up @@ -65,8 +66,8 @@ interface IWorkspacePickerItem {
readonly checked?: boolean;
/** Remote provider reference for gear menu actions. */
readonly remoteProvider?: IAgentHostSessionsProvider;
/** When true, clicking this item triggers the tunnel connection command. */
readonly tunnelAction?: boolean;
/** Command to execute when this item is selected. */
readonly commandId?: string;
}

/**
Expand Down Expand Up @@ -189,8 +190,8 @@ export class WorkspacePicker extends Disposable {
const delegate: IActionListDelegate<IWorkspacePickerItem> = {
onSelect: (item) => {
this.actionWidgetService.hide();
if (item.tunnelAction) {
this.commandService.executeCommand('workbench.action.sessions.connectViaTunnel');
if (item.commandId) {
this.commandService.executeCommand(item.commandId);
Comment thread
roblourens marked this conversation as resolved.
} else if (item.selection && this._isProviderUnavailable(item.selection.providerId)) {
// Workspace belongs to an unavailable remote — ignore selection
return;
Expand Down Expand Up @@ -469,7 +470,7 @@ export class WorkspacePicker extends Disposable {
});
}

// "Tunnels..." entry — shown when remote agent hosts are enabled
// "Tunnels..." and "SSH..." entries — shown when remote agent hosts are enabled
if (this.configurationService.getValue<boolean>(RemoteAgentHostsEnabledSettingId)) {
if (items.length > 0 && items[items.length - 1].kind !== ActionListItemKind.Separator) {
items.push({ kind: ActionListItemKind.Separator, label: '' });
Expand All @@ -478,8 +479,16 @@ export class WorkspacePicker extends Disposable {
kind: ActionListItemKind.Action,
label: localize('workspacePicker.tunnels', "Tunnels..."),
group: { title: '', icon: Codicon.cloud },
item: { tunnelAction: true },
item: { commandId: 'workbench.action.sessions.connectViaTunnel' },
});
if (isNative) {
items.push({
kind: ActionListItemKind.Action,
label: localize('workspacePicker.ssh', "SSH..."),
group: { title: '', icon: Codicon.remote },
item: { commandId: 'workbench.action.sessions.connectViaSSH' },
});
}
}

return items;
Expand Down
Loading