@codingame/monaco-vscode-api 34.1.2 → 35.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js

@@ -53,22 +53,24 @@ import { IChatToolInvocation, ElicitationState } from '../../common/chatService/
 import { IChatService } from '../../common/chatService/chatService.service.js';
 import { isRequestVM } from '../../common/model/chatViewModel.js';
 import { IChatWidgetHistoryService } from '../../common/widget/chatWidgetHistoryService.service.js';
-import { ChatConfiguration, ChatAgentLocation, ChatModeKind, getDefaultNewChatSessionType } from '../../common/constants.js';
+import { ChatConfiguration, ChatAgentLocation, getDefaultNewChatSessionResource, ChatModeKind, getDefaultNewChatSessionType } from '../../common/constants.js';
 import { AICustomizationManagementCommands } from '../aiCustomization/aiCustomizationManagement.js';
 import { ILanguageModelsService } from '../../common/languageModels.service.js';
 import { CopilotUsageExtensionFeatureId } from '../../common/languageModelStats.js';
 import { ILanguageModelToolsConfirmationService } from '../../common/tools/languageModelToolsConfirmationService.service.js';
-import { isToolSet } from '../../common/tools/languageModelToolsService.js';
+import { isToolSet, ToolAndToolSetEnablementMap } from '../../common/tools/languageModelToolsService.js';
 import { ILanguageModelToolsService } from '../../common/tools/languageModelToolsService.service.js';
 import { ChatViewId, isIChatViewViewContext } from '../chat.js';
 import { IChatWidgetService } from '../chat.service.js';
 import { ChatEditorInput, showClearEditingSessionConfirmation } from '../widgetHosts/editor/chatEditorInput.js';
 import { convertBufferToScreenshotVariable } from '../attachments/chatScreenshotContext.js';
-import { LocalChatSessionUri, getChatSessionType } from '../../common/model/chatUri.js';
+import { getChatSessionType } from '../../common/model/chatUri.js';
 import { localChatSessionType } from '../../common/chatSessionsService.js';
+import { IChatSessionsService } from '../../common/chatSessionsService.service.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
 
-const CHAT_CATEGORY = ( localize2(4930, "Chat"));
+const CHAT_CATEGORY = ( localize2(5132, "Chat"));
+const COPILOT_CLI_AGENT_HOST_PROVIDER_ID = "copilotcli";
 const ACTION_ID_NEW_CHAT = `workbench.action.chat.newChat`;
 const ACTION_ID_NEW_EDIT_SESSION = `workbench.action.chat.newEditSession`;
 const ACTION_ID_OPEN_CHAT = "workbench.action.openChat";
@@ -148,7 +150,7 @@ class OpenChatGlobalAction extends Action2 {
             chatWidget.input.setCurrentLanguageModel({
                 metadata: model,
                 identifier: id
-            });
+            }, true);
         }
         if (opts?.toolsInclude || opts?.toolsExclude) {
             const model = chatWidget.input.selectedLanguageModel.get()?.metadata;
@@ -403,7 +405,7 @@ class PrimaryOpenChatGlobalAction extends OpenChatGlobalAction {
     constructor() {
         super({
             id: CHAT_OPEN_ACTION_ID,
-            title: ( localize2(4931, "Open Chat")),
+            title: ( localize2(5133, "Open Chat")),
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
                 primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.KeyI,
@@ -426,12 +428,15 @@ class ModeOpenChatGlobalAction extends OpenChatGlobalAction {
     constructor(mode, keybinding) {
         super({
             id: getOpenChatActionIdForMode(mode),
-            title: ( localize2(4932, "Open Chat ({0})", mode.label.get())),
+            title: ( localize2(5134, "Open Chat ({0})", mode.label.get())),
             keybinding
         }, mode);
     }
 }
 function registerChatActions() {
+    function getNewChatEditorSessionUri(accessor) {
+        return getDefaultNewChatSessionResource(accessor.get(IConfigurationService), accessor.get(IChatSessionsService));
+    }
     registerAction2(PrimaryOpenChatGlobalAction);
     registerAction2(class extends ModeOpenChatGlobalAction {
         constructor() {
@@ -459,7 +464,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: TOGGLE_CHAT_ACTION_ID,
-                title: ( localize2(4933, "Toggle Chat")),
+                title: ( localize2(5135, "Toggle Chat")),
                 category: CHAT_CATEGORY
             });
         }
@@ -499,7 +504,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: ACTION_ID_OPEN_CHAT,
-                title: ( localize2(4934, "New Chat Editor")),
+                title: ( localize2(5136, "New Chat Editor")),
                 icon: Codicon.plus,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -527,7 +532,7 @@ function registerChatActions() {
         }
         async run(accessor) {
             const widgetService = accessor.get(IChatWidgetService);
-            await widgetService.openSession(LocalChatSessionUri.getNewSessionUri(), ACTIVE_GROUP, {
+            await widgetService.openSession(getNewChatEditorSessionUri(accessor), ACTIVE_GROUP, {
                 pinned: true
             });
         }
@@ -536,7 +541,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: ACTION_ID_OPEN_CHAT + ".copilotIcon",
-                title: ( localize2(4934, "New Chat Editor")),
+                title: ( localize2(5136, "New Chat Editor")),
                 icon: Codicon.copilot,
                 f1: false,
                 category: CHAT_CATEGORY,
@@ -551,7 +556,7 @@ function registerChatActions() {
         }
         async run(accessor) {
             const widgetService = accessor.get(IChatWidgetService);
-            await widgetService.openSession(LocalChatSessionUri.getNewSessionUri(), ACTIVE_GROUP, {
+            await widgetService.openSession(getNewChatEditorSessionUri(accessor), ACTIVE_GROUP, {
                 pinned: true
             });
         }
@@ -560,7 +565,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: ACTION_ID_OPEN_CHAT + ".newSessionIcon",
-                title: ( localize2(4934, "New Chat Editor")),
+                title: ( localize2(5136, "New Chat Editor")),
                 icon: Codicon.newSession,
                 f1: false,
                 category: CHAT_CATEGORY,
@@ -575,7 +580,7 @@ function registerChatActions() {
         }
         async run(accessor) {
             const widgetService = accessor.get(IChatWidgetService);
-            await widgetService.openSession(LocalChatSessionUri.getNewSessionUri(), ACTIVE_GROUP, {
+            await widgetService.openSession(getNewChatEditorSessionUri(accessor), ACTIVE_GROUP, {
                 pinned: true
             });
         }
@@ -584,7 +589,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: ACTION_ID_OPEN_CHAT + ".commentIcon",
-                title: ( localize2(4934, "New Chat Editor")),
+                title: ( localize2(5136, "New Chat Editor")),
                 icon: Codicon.comment,
                 f1: false,
                 category: CHAT_CATEGORY,
@@ -599,7 +604,7 @@ function registerChatActions() {
         }
         async run(accessor) {
             const widgetService = accessor.get(IChatWidgetService);
-            await widgetService.openSession(LocalChatSessionUri.getNewSessionUri(), ACTIVE_GROUP, {
+            await widgetService.openSession(getNewChatEditorSessionUri(accessor), ACTIVE_GROUP, {
                 pinned: true
             });
         }
@@ -608,7 +613,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: "workbench.action.openChatToSide",
-                title: ( localize2(4935, "New Chat Editor to the Side")),
+                title: ( localize2(5137, "New Chat Editor to the Side")),
                 f1: true,
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled
@@ -616,7 +621,7 @@ function registerChatActions() {
         }
         async run(accessor) {
             const widgetService = accessor.get(IChatWidgetService);
-            await widgetService.openSession(LocalChatSessionUri.getNewSessionUri(), SIDE_GROUP, {
+            await widgetService.openSession(getNewChatEditorSessionUri(accessor), SIDE_GROUP, {
                 pinned: true
             });
         }
@@ -625,7 +630,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: `workbench.action.newChatWindow`,
-                title: ( localize2(4936, "New Chat Window")),
+                title: ( localize2(5138, "New Chat Window")),
                 f1: true,
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
@@ -642,7 +647,7 @@ function registerChatActions() {
         }
         async run(accessor) {
             const widgetService = accessor.get(IChatWidgetService);
-            await widgetService.openSession(LocalChatSessionUri.getNewSessionUri(), AUX_WINDOW_GROUP, {
+            await widgetService.openSession(getNewChatEditorSessionUri(accessor), AUX_WINDOW_GROUP, {
                 pinned: true,
                 auxiliary: {
                     compact: true,
@@ -658,7 +663,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.clearInputHistory",
-                title: ( localize2(4937, "Clear Input History")),
+                title: ( localize2(5139, "Clear Input History")),
                 precondition: ChatContextKeys.enabled,
                 category: CHAT_CATEGORY,
                 f1: true
@@ -673,7 +678,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: "chat.action.focus",
-                title: ( localize2(4938, "Focus Chat List")),
+                title: ( localize2(5140, "Focus Chat List")),
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.inChatInput)),
                 category: CHAT_CATEGORY,
                 keybinding: [
@@ -707,7 +712,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: "workbench.chat.action.focusLastFocused",
-                title: ( localize2(4939, "Focus Last Focused Chat List Item")),
+                title: ( localize2(5141, "Focus Last Focused Chat List Item")),
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.inChatInput)),
                 category: CHAT_CATEGORY,
                 keybinding: [
@@ -741,7 +746,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.focusInput",
-                title: ( localize2(4940, "Focus Chat Input")),
+                title: ( localize2(5142, "Focus Chat Input")),
                 f1: false,
                 keybinding: [{
                     primary: KeyMod$1.CtrlCmd | KeyCode.DownArrow,
@@ -766,7 +771,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: FocusTodosViewAction.ID,
-                title: ( localize2(4941, "Toggle Focus Between TODOs and Input")),
+                title: ( localize2(5143, "Toggle Focus Between TODOs and Input")),
                 category: CHAT_CATEGORY,
                 f1: true,
                 precondition: ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)),
@@ -781,7 +786,7 @@ function registerChatActions() {
             const widgetService = accessor.get(IChatWidgetService);
             const widget = widgetService.lastFocusedWidget;
             if (!widget || !widget.toggleTodosViewFocus()) {
-                alert(( localize(4942, "No agent todos to focus right now.")));
+                alert(( localize(5144, "No agent todos to focus right now.")));
             }
         }
     });
@@ -792,7 +797,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: FocusQuestionCarouselAction.ID,
-                title: ( localize2(4943, "Chat: Toggle Focus Between Question and Input")),
+                title: ( localize2(5145, "Chat: Toggle Focus Between Question and Input")),
                 category: CHAT_CATEGORY,
                 f1: true,
                 precondition: ChatContextKeys.inChatSession,
@@ -807,7 +812,7 @@ function registerChatActions() {
             const widgetService = accessor.get(IChatWidgetService);
             const widget = widgetService.lastFocusedWidget;
             if (!widget || !widget.toggleQuestionCarouselFocus()) {
-                alert(( localize(4944, "No chat question to focus right now.")));
+                alert(( localize(5146, "No chat question to focus right now.")));
             }
         }
     });
@@ -818,7 +823,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: PreviousQuestionCarouselQuestionAction.ID,
-                title: ( localize2(4945, "Chat: Previous Question")),
+                title: ( localize2(5147, "Chat: Previous Question")),
                 category: CHAT_CATEGORY,
                 f1: true,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ChatContextKeys.Editing.hasQuestionCarousel)),
@@ -844,7 +849,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: NextQuestionCarouselQuestionAction.ID,
-                title: ( localize2(4946, "Chat: Next Question")),
+                title: ( localize2(5148, "Chat: Next Question")),
                 category: CHAT_CATEGORY,
                 f1: true,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ChatContextKeys.Editing.hasQuestionCarousel)),
@@ -870,7 +875,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: FocusQuestionCarouselTerminalAction.ID,
-                title: ( localize2(4947, "Chat: Focus Terminal from Question Carousel")),
+                title: ( localize2(5149, "Chat: Focus Terminal from Question Carousel")),
                 category: CHAT_CATEGORY,
                 f1: true,
                 precondition: ( ContextKeyExpr.and(
@@ -901,7 +906,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: FocusTipAction.ID,
-                title: ( localize2(4948, "Chat: Toggle Focus Between Tip and Input")),
+                title: ( localize2(5150, "Chat: Toggle Focus Between Tip and Input")),
                 category: CHAT_CATEGORY,
                 f1: true,
                 precondition: ChatContextKeys.inChatSession,
@@ -916,7 +921,7 @@ function registerChatActions() {
             const widgetService = accessor.get(IChatWidgetService);
             const widget = widgetService.lastFocusedWidget;
             if (!widget || !widget.toggleTipFocus()) {
-                alert(( localize(4949, "No chat tip.")));
+                alert(( localize(5151, "No chat tip.")));
             }
         }
     });
@@ -924,7 +929,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.showContextUsage",
-                title: ( localize2(4950, "Show Context Window Usage")),
+                title: ( localize2(5152, "Show Context Window Usage")),
                 category: CHAT_CATEGORY,
                 f1: true,
                 precondition: ChatContextKeys.enabled
@@ -936,11 +941,29 @@ function registerChatActions() {
             widget?.input.showContextUsageDetails();
         }
     });
+    registerAction2(class CompactAgentHostConversationAction extends Action2 {
+        constructor() {
+            super({
+                id: "workbench.action.chat.compactAgentHostConversation",
+                title: ( localize2(5153, "Compact Conversation")),
+                category: CHAT_CATEGORY,
+                precondition: ChatContextKeys.enabled,
+                menu: {
+                    id: MenuId.ChatContextUsageActions,
+                    group: "navigation",
+                    when: ( ContextKeyExpr.and(ChatContextKeys.chatIsAgentHostSession, ( ChatContextKeys.chatAgentHostProviderId.isEqualTo(COPILOT_CLI_AGENT_HOST_PROVIDER_ID))))
+                }
+            });
+        }
+        async run(_accessor, widget) {
+            await widget?.acceptInput("/compact");
+        }
+    });
     registerAction2(class ToggleShowContextUsageAction extends Action2 {
         constructor() {
             super({
                 id: "workbench.action.chat.toggleShowContextUsage",
-                title: ( localize2(4951, "Show Context Usage")),
+                title: ( localize2(5154, "Show Context Usage")),
                 category: CHAT_CATEGORY,
                 toggled: ( ContextKeyExpr.equals(`config.${ChatConfiguration.ChatContextUsageEnabled}`, true)),
                 menu: {
@@ -965,7 +988,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.manageSettings",
-                title: ( localize2(4952, "Manage Copilot Settings")),
+                title: ( localize2(5155, "Manage Copilot Settings")),
                 category: CHAT_CATEGORY,
                 f1: true,
                 precondition: ( ContextKeyExpr.and(( ContextKeyExpr.or(
@@ -993,7 +1016,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.showExtensionsUsingCopilot",
-                title: ( localize2(4953, "Show Extensions using Copilot")),
+                title: ( localize2(5156, "Show Extensions using Copilot")),
                 f1: true,
                 category: EXTENSIONS_CATEGORY,
                 precondition: ChatContextKeys.enabled
@@ -1008,7 +1031,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.configureCodeCompletions",
-                title: ( localize2(4954, "Configure Inline Suggestions...")),
+                title: ( localize2(5157, "Configure Inline Suggestions...")),
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.Setup.installed, ( ChatContextKeys.Setup.disabled.negate()), ( ChatContextKeys.Setup.untrusted.negate()))),
                 menu: {
                     id: MenuId.ChatTitleBarMenu,
@@ -1026,7 +1049,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: OPEN_CHAT_QUOTA_EXCEEDED_DIALOG,
-                title: ( localize(4955, "Upgrade GitHub Copilot Plan"))
+                title: ( localize(5158, "Upgrade GitHub Copilot Plan"))
             });
         }
         async run(accessor) {
@@ -1039,17 +1062,17 @@ function registerChatActions() {
             const completionsQuotaExceeded = chatEntitlementService.quotas.completions?.percentRemaining === 0;
             if (chatQuotaExceeded && !completionsQuotaExceeded) {
                 message = ( localize(
-                    4956,
+                    5159,
                     "You've reached your monthly chat messages quota. You still have free inline suggestions available."
                 ));
             } else if (completionsQuotaExceeded && !chatQuotaExceeded) {
                 message = ( localize(
-                    4957,
+                    5160,
                     "You've reached your monthly inline suggestions quota. You still have free chat messages available."
                 ));
             } else {
                 message = ( localize(
-                    4958,
+                    5161,
                     "You've reached your monthly chat messages and inline suggestions quota."
                 ));
             }
@@ -1067,25 +1090,25 @@ function registerChatActions() {
                 });
                 const quotaResetDate = ( new Date(chatEntitlementService.quotas.resetDate));
                 message = [message, ( localize(
-                    4959,
+                    5162,
                     "The allowance will reset on {0}.",
                     dateFormatter.value.format(quotaResetDate)
                 ))].join(" ");
             }
             const free = chatEntitlementService.entitlement === ChatEntitlement.Free;
             const upgradeToPro = free ? ( localize(
-                4960,
+                5163,
                 "Upgrade to GitHub Copilot Pro for:\n- Unlimited inline suggestions\n- Unlimited chat messages\n- Access to premium models"
             )) : undefined;
             await dialogService.prompt({
                 type: "none",
-                message: ( localize(4961, "GitHub Copilot Quota Reached")),
+                message: ( localize(5164, "GitHub Copilot Quota Reached")),
                 cancelButton: {
-                    label: ( localize(4962, "Dismiss")),
+                    label: ( localize(5165, "Dismiss")),
                     run: () => {}
                 },
                 buttons: [{
-                    label: free ? ( localize(4963, "Upgrade to GitHub Copilot Pro")) : ( localize(4964, "Upgrade GitHub Copilot Plan")),
+                    label: free ? ( localize(5166, "Upgrade to GitHub Copilot Pro")) : ( localize(5167, "Upgrade GitHub Copilot Plan")),
                     run: () => {
                         const commandId = "workbench.action.chat.upgradePlan";
                         telemetryService.publicLog2("workbenchActionExecuted", {
@@ -1110,7 +1133,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.resetTrustedTools",
-                title: ( localize2(4965, "Reset Tool Confirmations")),
+                title: ( localize2(5168, "Reset Tool Confirmations")),
                 category: CHAT_CATEGORY,
                 f1: true,
                 precondition: ChatContextKeys.enabled
@@ -1118,14 +1141,14 @@ function registerChatActions() {
         }
         run(accessor) {
             accessor.get(ILanguageModelToolsConfirmationService).resetToolAutoConfirmation();
-            accessor.get(INotificationService).info(( localize(4966, "Tool confirmation preferences have been reset.")));
+            accessor.get(INotificationService).info(( localize(5169, "Tool confirmation preferences have been reset.")));
         }
     });
     registerAction2(class GenerateInstructionsAction extends Action2 {
         constructor() {
             super({
                 id: GENERATE_AGENT_INSTRUCTIONS_COMMAND_ID,
-                title: ( localize2(4967, "Generate Agent Instructions")),
+                title: ( localize2(5170, "Generate Agent Instructions")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.sparkle,
                 f1: true,
@@ -1145,7 +1168,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: GENERATE_ON_DEMAND_INSTRUCTIONS_COMMAND_ID,
-                title: ( localize2(4968, "Generate On-Demand Instructions")),
+                title: ( localize2(5171, "Generate On-Demand Instructions")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.sparkle,
                 f1: true,
@@ -1165,8 +1188,8 @@ function registerChatActions() {
         constructor() {
             super({
                 id: GENERATE_PROMPT_COMMAND_ID,
-                title: ( localize2(4969, "Generate Prompt File")),
-                shortTitle: ( localize2(4970, "Generate Prompt")),
+                title: ( localize2(5172, "Generate Prompt File")),
+                shortTitle: ( localize2(5173, "Generate Prompt")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.sparkle,
                 f1: true,
@@ -1186,8 +1209,8 @@ function registerChatActions() {
         constructor() {
             super({
                 id: GENERATE_SKILL_COMMAND_ID,
-                title: ( localize2(4971, "Generate Skill")),
-                shortTitle: ( localize2(4972, "Generate Skill")),
+                title: ( localize2(5174, "Generate Skill")),
+                shortTitle: ( localize2(5175, "Generate Skill")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.sparkle,
                 f1: true,
@@ -1207,8 +1230,8 @@ function registerChatActions() {
         constructor() {
             super({
                 id: GENERATE_AGENT_COMMAND_ID,
-                title: ( localize2(4973, "Generate Custom Agent")),
-                shortTitle: ( localize2(4974, "Generate Agent")),
+                title: ( localize2(5176, "Generate Custom Agent")),
+                shortTitle: ( localize2(5177, "Generate Agent")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.sparkle,
                 f1: true,
@@ -1228,8 +1251,8 @@ function registerChatActions() {
         constructor() {
             super({
                 id: GENERATE_HOOK_COMMAND_ID,
-                title: ( localize2(4975, "Generate Hook")),
-                shortTitle: ( localize2(4976, "Generate Hook")),
+                title: ( localize2(5178, "Generate Hook")),
+                shortTitle: ( localize2(5179, "Generate Hook")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.sparkle,
                 f1: true,
@@ -1249,8 +1272,8 @@ function registerChatActions() {
         constructor() {
             super({
                 id: INSERT_FORK_CONVERSATION_COMMAND_ID,
-                title: ( localize2(4977, "Insert Fork Command")),
-                shortTitle: ( localize2(4978, "Insert /fork")),
+                title: ( localize2(5180, "Insert Fork Command")),
+                shortTitle: ( localize2(5181, "Insert /fork")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.repoForked,
                 f1: true,
@@ -1269,8 +1292,8 @@ function registerChatActions() {
         constructor() {
             super({
                 id: INSERT_TROUBLESHOOT_COMMAND_ID,
-                title: ( localize2(4979, "Insert Troubleshoot Command")),
-                shortTitle: ( localize2(4980, "Insert /troubleshoot")),
+                title: ( localize2(5182, "Insert Troubleshoot Command")),
+                shortTitle: ( localize2(5183, "Insert /troubleshoot")),
                 category: CHAT_CATEGORY,
                 f1: true,
                 precondition: ChatContextKeys.enabled
@@ -1288,8 +1311,8 @@ function registerChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.openFeatureSettings",
-                title: ( localize2(4981, "Chat Settings")),
-                shortTitle: ( localize(4982, "Chat Settings")),
+                title: ( localize2(5184, "Chat Settings")),
+                shortTitle: ( localize(5185, "Chat Settings")),
                 category: CHAT_CATEGORY,
                 f1: true,
                 precondition: ChatContextKeys.enabled,
@@ -1320,7 +1343,7 @@ function registerChatActions() {
     MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
         command: {
             id: AICustomizationManagementCommands.OpenEditor,
-            title: ( localize2(4983, "Open Customizations")),
+            title: ( localize2(5186, "Open Customizations")),
             category: CHAT_CATEGORY,
             icon: Codicon.gear
         },
@@ -1448,7 +1471,7 @@ function computeToolEnablementMap(options) {
         enablementMap.set(toolSet, allToolsEnabled);
     }
     return {
-        enablementMap,
+        enablementMap: ToolAndToolSetEnablementMap.fromMap(enablementMap),
         unknownIdentifiers
     };
 }
@@ -1466,7 +1489,7 @@ async function handleModeSwitch(accessor, fromMode, toMode, requestCount, model)
     const dialogService = accessor.get(IDialogService);
     const needToClearEdits = (fromMode === ChatModeKind.Edit || toMode === ChatModeKind.Edit) && requestCount > 0;
     if (needToClearEdits) {
-        const phrase = ( localize(4984, "Switching agents will end your current edit session."));
+        const phrase = ( localize(5187, "Switching agents will end your current edit session."));
         const currentEdits = model.editingSession.entries.get();
         const undecidedEdits = currentEdits.filter(edit => edit.state.get() === ModifiedFileEntryState.Modified);
         if (undecidedEdits.length > 0) {
@@ -1478,12 +1501,12 @@ async function handleModeSwitch(accessor, fromMode, toMode, requestCount, model)
             };
         } else {
             const confirmation = await dialogService.confirm({
-                title: ( localize(4985, "Start new session?")),
+                title: ( localize(5188, "Start new session?")),
                 message: ( localize(
-                    4986,
+                    5189,
                     "Changing the agent will end your current edit session. Would you like to change the agent?"
                 )),
-                primaryButton: ( localize(4987, "Yes")),
+                primaryButton: ( localize(5190, "Yes")),
                 type: "info"
             });
             if (!confirmation.confirmed) {
@@ -1507,7 +1530,8 @@ async function clearChatSessionPreservingType(
 ) {
     const currentResource = widget.viewModel?.model.sessionResource;
     const defaultType = getDefaultNewChatSessionType(configurationService, chatSessionsService);
-    const newSessionType = sessionType ?? (currentResource ? getChatSessionType(currentResource) : defaultType);
+    const currentSessionType = currentResource ? getChatSessionType(currentResource) : undefined;
+    const newSessionType = sessionType ?? (currentSessionType === localChatSessionType && defaultType !== localChatSessionType ? defaultType : currentSessionType ?? defaultType);
     if (isIChatViewViewContext(widget.viewContext) && newSessionType !== localChatSessionType) {
         const newResource = ( URI.from({
             scheme: newSessionType,
@@ -1523,14 +1547,14 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     submenu: MenuId.ChatTextEditorMenu,
     group: "1_chat",
     order: 5,
-    title: ( localize(4988, "Generate Code")),
+    title: ( localize(5191, "Generate Code")),
     when: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))
 });
 registerAction2(class ToggleDefaultVisibilityAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.toggleDefaultVisibility",
-            title: ( localize2(4989, "Show View by Default")),
+            title: ( localize2(5192, "Show View by Default")),
             toggled: ( ( ContextKeyExpr.equals("config.workbench.secondarySideBar.defaultVisibility", "hidden")).negate()),
             f1: false,
             menu: {
@@ -1554,10 +1578,10 @@ registerAction2(class EditToolApproval extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.editToolApproval",
-            title: ( localize2(4990, "Manage Tool Approval")),
+            title: ( localize2(5193, "Manage Tool Approval")),
             metadata: {
                 description: ( localize2(
-                    4991,
+                    5194,
                     "Edit/manage the tool approval and confirmation preferences for AI chat agents."
                 ))
             },

package/vscode/src/vs/workbench/contrib/chat/browser/actions/exportAgentHostDebugLogsAction.service.d.ts

@@ -4,5 +4,5 @@ export interface IAgentHostDebugLogsExportService {
     save(exportName: string, files: readonly {
         path: string;
         contents: string;
-    }[]): Promise<void>;
+    }[]): Promise<boolean>;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService.service.d.ts

@@ -17,5 +17,13 @@ export interface IAgentHostActiveClientService {
     /** Returns a {@link SessionActiveClient} for `sessionType` using the caller-supplied `clientId`. Customizations are empty when `sessionType` has not been registered. */
     getActiveClient(sessionType: string, clientId: string): SessionActiveClient;
     getCustomizations(sessionType: string): IObservable<readonly ClientPluginCustomization[]>;
-    readonly clientTools: IObservable<readonly ToolDefinition[]>;
+    /**
+    * Returns the tools this client advertises to the agent host for `sessionType`.
+    *
+    * Chat Customizations are the source of truth: a tool is advertised only when it is an enabled
+    * member of a tool set surfaced in the Agents window Tools section (`deprecated !== true`).
+    * Editor-only tool sets are not created in the Agents window. Enablement is tri-state per
+    * {@link IAgentHostToolSetEnablementService}.
+    */
+    getClientTools(sessionType: string): IObservable<readonly ToolDefinition[]>;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.service.d.ts

@@ -1,6 +1,8 @@
 import { Event } from "../../../../../../base/common/event.js";
 import { URI } from "../../../../../../base/common/uri.js";
+import { IAgentHostMcpServer } from "../../../../../../platform/agentHost/common/agentHostMcpServer.js";
 import { AgentCustomization, Customization } from "../../../../../../platform/agentHost/common/state/sessionState.js";
+import { IMcpServerConfiguration } from "../../../../../../platform/mcp/common/mcpPlatformTypes.js";
 export declare const IAgentHostCustomizationService: import("../../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IAgentHostCustomizationService>;
 export interface IAgentHostCustomizationService {
     readonly _serviceBrand: undefined;
@@ -9,4 +11,26 @@ export interface IAgentHostCustomizationService {
     getCustomAgents(sessionResource: URI): readonly AgentCustomization[];
     getCustomizations(sessionResource: URI): readonly Customization[];
     getWorkingDirectory(sessionResource: URI): string | undefined;
+    /**
+    * Returns the MCP servers exposed by an agent-host session. Each entry
+    * carries the current status, a {@link IAgentHostMcpServer.setEnabled}
+    * method that dispatches the protocol-level toggle on behalf of the
+    * caller, and the {@link IAgentHostMcpServer.logOutputChannelId} of the
+    * host backing the session. Returns an empty array for sessions not
+    * backed by an agent host, or that don't expose any MCP servers.
+    */
+    getMcpServers(sessionResource: URI): readonly IAgentHostMcpServer[];
+    /**
+    * Adds (or replaces) an agent-host-level MCP server in the root config of
+    * the agent host backing `sessionResource`. The write is routed to the
+    * correct connection (local or remote) for that session. No-op for
+    * sessions not backed by an agent host.
+    */
+    addMcpServer(sessionResource: URI, name: string, config: IMcpServerConfiguration): void;
+    /**
+    * Runs interactive authentication for an auth-required MCP server in an
+    * agent-host session. Returns false when the session/server cannot be
+    * resolved or authentication did not complete.
+    */
+    authenticateMcpServer(sessionResource: URI, serverId: string): Promise<boolean>;
 }