Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/vs/sessions/contrib/chat/browser/chat.contribution.ts
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
type: 'boolean',
default: true,
scope: ConfigurationScope.WINDOW,
description: localize('sessions.chat.experimental.environmentPickerManageRemotes', "Controls whether Remote Environments management and its picker visibility preferences are enabled. Adds a command, a Sessions menu entry, and a Manage entry when the Environment picker and remote agent hosts are enabled. When disabled, saved visibility preferences are ignored but retained."),
description: localize('sessions.chat.experimental.environmentPickerManageRemotes', "Controls whether Remote Environments management and its picker visibility preferences are enabled. Adds a command, a Sessions menu entry, and a Manage Remote Environments entry when the Environment picker and remote agent hosts are enabled. When disabled, saved visibility preferences are ignored but retained."),
tags: ['experimental'],
experiment: { mode: 'auto' },
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ export class SessionEnvironmentPicker extends Disposable {
{ kind: ActionListItemKind.Separator, label: '' },
{
kind: ActionListItemKind.Action,
label: localize('environmentPicker.manage', "Manage..."),
label: localize('environmentPicker.manage', "Manage Remote Environments..."),
group: { title: '', icon: Codicon.settingsGear },
item: { run: async () => { await this.commandService.executeCommand(OPEN_REMOTES_EDITOR_COMMAND_ID); } },
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export class SessionsChatAccessibilityHelp implements IAccessibleViewImplementat
if (configurationService.getValue<boolean>(RemoteAgentHostsEnabledSettingId)) {
logSettingExperimentTrigger(accessor.get(ITelemetryService), ENVIRONMENT_PICKER_MANAGE_REMOTES_SETTING);
if (configurationService.getValue<boolean>(ENVIRONMENT_PICKER_MANAGE_REMOTES_SETTING)) {
content.push(localize('sessionsChat.environmentPicker.manage', "Choose Manage at the bottom of the Environment picker to open the Remote Environments dialog. This does not change your selected environment. Hosts not listed in Remote Environments, including configured WebSocket hosts, keep their per-entry Manage submenu."));
content.push(localize('sessionsChat.environmentPicker.manage', "Choose Manage Remote Environments at the bottom of the Environment picker to open the Remote Environments dialog. This does not change your selected environment. Hosts not listed in Remote Environments, including configured WebSocket hosts, keep their per-entry Manage submenu."));
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ suite('SessionEnvironmentPicker', () => {
...providers.map(provider => ({ label: provider.label, separator: false })),
{ label: '', separator: true },
{ label: 'Connect via SSH...', separator: false },
...(showManage ? [{ label: '', separator: true }, { label: 'Manage...', separator: false }] : []),
...(showManage ? [{ label: '', separator: true }, { label: 'Manage Remote Environments...', separator: false }] : []),
],
hideDefaultKeybindingTooltip: true,
remoteSubmenus: [
Expand All @@ -364,7 +364,7 @@ suite('SessionEnvironmentPicker', () => {
await configuration.setUserConfiguration(ENVIRONMENT_PICKER_MANAGE_REMOTES_SETTING, !manageEnabled);
trigger.click();
assert.deepStrictEqual({
visibleAfterSettingChange: menu.some(item => item.label === 'Manage...'),
visibleAfterSettingChange: menu.some(item => item.label === 'Manage Remote Environments...'),
sshSubmenu: submenus[1], environmentSubmenu: submenus[4], websocketSubmenu: submenus[6],
triggers: telemetry.triggers,
}, {
Expand All @@ -383,7 +383,7 @@ suite('SessionEnvironmentPicker', () => {
};
await configuration.setUserConfiguration(ENVIRONMENT_PICKER_SETTING, false);
const pickerDisabled = environmentSubmenu();
const manageWithoutPicker = menu.some(item => item.label === 'Manage...');
const manageWithoutPicker = menu.some(item => item.label === 'Manage Remote Environments...');
await configuration.setUserConfiguration(ENVIRONMENT_PICKER_SETTING, true);
const pickerReenabled = environmentSubmenu();
hosts.set(hosts.get().map(host => ({ ...host, status: 'offline' })), undefined);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ suite('SessionsChatAccessibilityHelp', () => {
instantiation.stub(IAccessibilityService, { isScreenReaderOptimized: () => false });
const content = store.add(new SessionsChatAccessibilityHelp().getProvider(instantiation)).provideContent();
assert.deepStrictEqual({
describesManage: content.includes('Choose Manage at the bottom of the Environment picker'),
describesManage: content.includes('Choose Manage Remote Environments at the bottom of the Environment picker'),
describesWebSocketManagement: content.includes('configured WebSocket hosts, keep their per-entry Manage submenu'),
triggers: telemetry.triggers.filter(name => name === `config.${ENVIRONMENT_PICKER_MANAGE_REMOTES_SETTING}`),
}, {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class RemotesAccessibleView implements IAccessibleViewImplementation {
AccessibleViewProviderId.Remotes,
{ type: this.type },
() => this.type === AccessibleViewType.Help ? [
localize('remotes.help.overview', "Remote Environments lists known SSH hosts and Dev Tunnels in a table grouped by connection type. Open it with Manage Remote Environments in the Command Palette, from the Sessions section's More Actions menu, or with Manage in the Environment picker. WSL distributions are also available on Windows. When enabled and available, GitHub Environments lists known user-shared machines, including offline machines. The columns are Name, Status, and Actions."),
localize('remotes.help.overview', "Remote Environments lists known SSH hosts and Dev Tunnels in a table grouped by connection type. Open it with Manage Remote Environments in the Command Palette, from the Sessions section's More Actions menu, or with Manage Remote Environments in the Environment picker. WSL distributions are also available on Windows. When enabled and available, GitHub Environments lists known user-shared machines, including offline machines. The columns are Name, Status, and Actions."),
localize('remotes.help.environments', "For GitHub Environments, Connect is disabled when the owning application is offline. Disconnect retains the environment and follows its existing reconnection preferences. Rename applies only to the current account and profile. Delete asks for confirmation before removing the user-shared environment registration and disconnecting this client. It does not delete files on the machine. The environment can reappear if its owning application registers it again. The GitHub Environments gear opens its settings."),
localize('remotes.help.navigation', "Type in Search to filter remotes by name, address, or connection type. Clear Search and Collapse All are at the right of the search field; use Tab to reach these actions and Left and Right Arrow to move between them. Clear Search returns focus to the input. Collapse All preserves the search text. Groups without matches are hidden while searching. Use Down Arrow from Search to enter the table. Use Up and Down Arrow to navigate rows. On a group, use Left and Right Arrow to collapse or expand it, or press Enter to toggle it. Visibility icons are always shown; other row actions appear on hover or keyboard focus. On a remote, press Tab to reach its actions and use Left and Right Arrow to move between Connect or Disconnect and Rename. Use Enter or Space to activate an action. Resize columns by dragging their boundaries. Narrow windows scroll horizontally."),
localize('remotes.help.connection', "Status labels include Connected, Connecting, and Disconnected. A warning indicates that a connection you requested failed. Hover the warning or open the Accessible View to read the error. Automatic connection failures do not create a warning, but automatic retries retain an existing warning until they finish. A failed retry updates the error; a successful retry clears it. GitHub environments whose owning application is not online show Offline. Use Connect or Disconnect to manage the connection. Connection actions are unavailable while connecting or reconnecting. Disconnect follows the existing remote behavior and may remove it from the picker."),
Expand Down
Loading