From f3b2321e2ce940f677f8f9f4b88d2ff070c9b6b0 Mon Sep 17 00:00:00 2001 From: Connor Peet Date: Thu, 23 Apr 2026 11:56:02 -0700 Subject: [PATCH 1/2] sessions: fix missing remote toggle for local agent host, duplicate permissions setting --- .../tunnelHost/electron-browser/tunnelHost.contribution.ts | 2 +- .../contrib/chat/browser/actions/chatExecuteActions.ts | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/vs/sessions/contrib/tunnelHost/electron-browser/tunnelHost.contribution.ts b/src/vs/sessions/contrib/tunnelHost/electron-browser/tunnelHost.contribution.ts index d1500e1379af8..b001326bfefb1 100644 --- a/src/vs/sessions/contrib/tunnelHost/electron-browser/tunnelHost.contribution.ts +++ b/src/vs/sessions/contrib/tunnelHost/electron-browser/tunnelHost.contribution.ts @@ -84,7 +84,7 @@ registerAction2(class ToggleRemoteConnectionsAction extends Action2 { ChatContextKeys.enabled, ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat), ChatContextKeys.inQuickChat.negate(), - ChatContextKeys.lockedCodingAgentId.isEqualTo(AgentSessionProviders.AgentHostCopilot), + ContextKeyExpr.regex(ChatContextKeys.lockedCodingAgentId.key, /^agent-host-/), ) } }); diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts index 765f80e7299f9..0c3d168f16829 100644 --- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts +++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts @@ -457,7 +457,11 @@ export class OpenPermissionPickerAction extends Action2 { ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat), ChatContextKeys.chatModeKind.notEqualsTo(ChatModeKind.Ask), ChatContextKeys.inQuickChat.negate(), - ChatContextKeys.lockedCodingAgentId.notEqualsTo(AgentSessionProviders.Cloud), + ContextKeyExpr.or( + ChatContextKeys.lockedToCodingAgent.negate(), + ChatContextKeys.lockedCodingAgentId.isEqualTo(AgentSessionProviders.Background), + ChatContextKeys.lockedCodingAgentId.isEqualTo(AgentSessionProviders.Claude), + ), ) } }); From f7d03d515ba90801021c335a536f6c7570003482 Mon Sep 17 00:00:00 2001 From: Connor Peet Date: Thu, 23 Apr 2026 12:03:01 -0700 Subject: [PATCH 2/2] fix: remove unused AgentSessionProviders import The import was declared but never used in the file, causing a TS6133 compilation error. --- .../tunnelHost/electron-browser/tunnelHost.contribution.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/vs/sessions/contrib/tunnelHost/electron-browser/tunnelHost.contribution.ts b/src/vs/sessions/contrib/tunnelHost/electron-browser/tunnelHost.contribution.ts index b001326bfefb1..69fbe51444247 100644 --- a/src/vs/sessions/contrib/tunnelHost/electron-browser/tunnelHost.contribution.ts +++ b/src/vs/sessions/contrib/tunnelHost/electron-browser/tunnelHost.contribution.ts @@ -16,7 +16,6 @@ import { INotificationService, Severity } from '../../../../platform/notificatio import { Registry } from '../../../../platform/registry/common/platform.js'; import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../workbench/common/contributions.js'; import { IOutputService } from '../../../../workbench/services/output/common/output.js'; -import { AgentSessionProviders } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js'; import { ChatContextKeys } from '../../../../workbench/contrib/chat/common/actions/chatContextKeys.js'; import { ChatAgentLocation } from '../../../../workbench/contrib/chat/common/constants.js'; import { ITunnelHostService } from '../common/tunnelHost.js';