@codingame/monaco-vscode-chat-service-override 32.0.2 → 33.0.5

package/vscode/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsConfirmationService.js

@@ -15,8 +15,8 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 
-const RUN_WITHOUT_APPROVAL = ( localize(6958, "without approval"));
-const CONTINUE_WITHOUT_REVIEWING_RESULTS = ( localize(6959, "without reviewing result"));
+const RUN_WITHOUT_APPROVAL = ( localize(7028, "without approval"));
+const CONTINUE_WITHOUT_REVIEWING_RESULTS = ( localize(7029, "without reviewing result"));
 class GenericConfirmStore extends Disposable {
     constructor(_storageKey, _instantiationService) {
         super();
@@ -275,9 +275,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 arguments: combinationArgs
             } = ref.combination;
             actions.push({
-                label: ( localize(6960, "{0} in this Session", combinationLabel)),
+                label: ( localize(7030, "{0} in this Session", combinationLabel)),
                 detail: ( localize(
-                    6961,
+                    7031,
                     "Allow this particular combination of tool and arguments in this session without confirmation."
                 )),
                 divider: !!actions.length,
@@ -287,9 +287,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(6962, "{0} in this Workspace", combinationLabel)),
+                label: ( localize(7032, "{0} in this Workspace", combinationLabel)),
                 detail: ( localize(
-                    6963,
+                    7033,
                     "Allow this particular combination of tool and arguments in this workspace without confirmation."
                 )),
                 scope: "workspace",
@@ -298,9 +298,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(6964, "Always {0}", combinationLabel)),
+                label: ( localize(7034, "Always {0}", combinationLabel)),
                 detail: ( localize(
-                    6965,
+                    7035,
                     "Always allow this particular combination of tool and arguments without confirmation."
                 )),
                 scope: "profile",
@@ -311,8 +311,8 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
             });
         }
         actions.push({
-            label: ( localize(6966, "Allow in this Session")),
-            detail: ( localize(6967, "Allow this tool to run in this session without confirmation.")),
+            label: ( localize(7036, "Allow in this Session")),
+            detail: ( localize(7037, "Allow this tool to run in this session without confirmation.")),
             divider: !!actions.length,
             scope: "session",
             select: async () => {
@@ -320,16 +320,16 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 return true;
             }
         }, {
-            label: ( localize(6968, "Allow in this Workspace")),
-            detail: ( localize(6969, "Allow this tool to run in this workspace without confirmation.")),
+            label: ( localize(7038, "Allow in this Workspace")),
+            detail: ( localize(7039, "Allow this tool to run in this workspace without confirmation.")),
             scope: "workspace",
             select: async () => {
                 this._preExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, "workspace");
                 return true;
             }
         }, {
-            label: ( localize(6970, "Always Allow")),
-            detail: ( localize(6971, "Always allow this tool to run without confirmation.")),
+            label: ( localize(7040, "Always Allow")),
+            detail: ( localize(7041, "Always allow this tool to run without confirmation.")),
             scope: "profile",
             select: async () => {
                 this._preExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, "profile");
@@ -342,9 +342,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 definitionId
             } = ref.source;
             actions.push({
-                label: ( localize(6972, "Allow Tools from {0} in this Session", serverLabel)),
+                label: ( localize(7042, "Allow Tools from {0} in this Session", serverLabel)),
                 detail: ( localize(
-                    6973,
+                    7043,
                     "Allow all tools from this server to run in this session without confirmation."
                 )),
                 divider: true,
@@ -354,9 +354,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(6974, "Allow Tools from {0} in this Workspace", serverLabel)),
+                label: ( localize(7044, "Allow Tools from {0} in this Workspace", serverLabel)),
                 detail: ( localize(
-                    6975,
+                    7045,
                     "Allow all tools from this server to run in this workspace without confirmation."
                 )),
                 scope: "workspace",
@@ -365,9 +365,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(6976, "Always Allow Tools from {0}", serverLabel)),
+                label: ( localize(7046, "Always Allow Tools from {0}", serverLabel)),
                 detail: ( localize(
-                    6977,
+                    7047,
                     "Always allow all tools from this server to run without confirmation."
                 )),
                 scope: "profile",
@@ -389,9 +389,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
             return actions;
         }
         actions.push({
-            label: ( localize(6978, "Allow Without Review in this Session")),
+            label: ( localize(7048, "Allow Without Review in this Session")),
             detail: ( localize(
-                6979,
+                7049,
                 "Allow results from this tool to be sent without confirmation in this session."
             )),
             divider: !!actions.length,
@@ -401,9 +401,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 return true;
             }
         }, {
-            label: ( localize(6980, "Allow Without Review in this Workspace")),
+            label: ( localize(7050, "Allow Without Review in this Workspace")),
             detail: ( localize(
-                6981,
+                7051,
                 "Allow results from this tool to be sent without confirmation in this workspace."
             )),
             scope: "workspace",
@@ -412,9 +412,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 return true;
             }
         }, {
-            label: ( localize(6982, "Always Allow Without Review")),
+            label: ( localize(7052, "Always Allow Without Review")),
             detail: ( localize(
-                6983,
+                7053,
                 "Always allow results from this tool to be sent without confirmation."
             )),
             scope: "profile",
@@ -429,9 +429,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 definitionId
             } = ref.source;
             actions.push({
-                label: ( localize(6984, "Allow Tools from {0} Without Review in this Session", serverLabel)),
+                label: ( localize(7054, "Allow Tools from {0} Without Review in this Session", serverLabel)),
                 detail: ( localize(
-                    6985,
+                    7055,
                     "Allow results from all tools from this server to be sent without confirmation in this session."
                 )),
                 divider: true,
@@ -441,9 +441,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(6986, "Allow Tools from {0} Without Review in this Workspace", serverLabel)),
+                label: ( localize(7056, "Allow Tools from {0} Without Review in this Workspace", serverLabel)),
                 detail: ( localize(
-                    6987,
+                    7057,
                     "Allow results from all tools from this server to be sent without confirmation in this workspace."
                 )),
                 scope: "workspace",
@@ -452,9 +452,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(6988, "Always Allow Tools from {0} Without Review", serverLabel)),
+                label: ( localize(7058, "Always Allow Tools from {0} Without Review", serverLabel)),
                 detail: ( localize(
-                    6989,
+                    7059,
                     "Always allow results from all tools from this server to be sent without confirmation."
                 )),
                 scope: "profile",
@@ -505,7 +505,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
     manageConfirmationPreferences(tools, options) {
         const viewArgsButton = {
             iconClass: ThemeIcon.asClassName(Codicon.info),
-            tooltip: ( localize(6990, "View Arguments"))
+            tooltip: ( localize(7060, "View Arguments"))
         };
         const trackServerTool = (serverId, label, toolId, serversWithTools) => {
             if (!( serversWithTools.has(serverId))) {
@@ -652,7 +652,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                         type: "server-post",
                         serverId,
                         iconClass: ThemeIcon.asClassName(Codicon.play),
-                        label: ( localize(6991, "Continue without reviewing any tool results")),
+                        label: ( localize(7061, "Continue without reviewing any tool results")),
                         checked: serverPostConfirmed
                     });
                 }
@@ -661,7 +661,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                         type: "server-pre",
                         serverId,
                         iconClass: ThemeIcon.asClassName(Codicon.play),
-                        label: ( localize(6992, "Run any tool without approval")),
+                        label: ( localize(7062, "Run any tool without approval")),
                         checked: serverPreConfirmed
                     });
                 }
@@ -779,7 +779,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
         if (currentScope !== "session") {
             const scopeButton = {
                 iconClass: ThemeIcon.asClassName(Codicon.folder),
-                tooltip: ( localize(6993, "Configure for this workspace only")),
+                tooltip: ( localize(7063, "Configure for this workspace only")),
                 toggle: {
                     checked: currentScope === "workspace"
                 },
@@ -796,9 +796,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
         }
         const updatePlaceholder = () => {
             if (currentScope === "session") {
-                quickTree.placeholder = ( localize(6994, "Configure session tool approvals"));
+                quickTree.placeholder = ( localize(7064, "Configure session tool approvals"));
             } else {
-                quickTree.placeholder = currentScope === "workspace" ? ( localize(6995, "Configure workspace tool approvals")) : ( localize(6996, "Configure global tool approvals"));
+                quickTree.placeholder = currentScope === "workspace" ? ( localize(7065, "Configure workspace tool approvals")) : ( localize(7066, "Configure global tool approvals"));
             }
         };
         updatePlaceholder();
@@ -849,7 +849,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 i.item.onDidTriggerItemButton?.(i.button);
             } else if (i.item.type === "combination" && i.button === viewArgsButton && i.item.combinationArgs) {
                 this._dialogService.prompt({
-                    message: ( localize(6997, "Arguments")),
+                    message: ( localize(7067, "Arguments")),
                     buttons: [],
                     custom: {
                         markdownDetails: [{

package/vscode/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.d.ts

@@ -71,6 +71,7 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     private _pendingGlobalAutoApproveCheck;
     private readonly _isAgentModeEnabled;
     constructor(_instantiationService: IInstantiationService, _extensionService: IExtensionService, _contextKeyService: IContextKeyService, _chatService: IChatService, _dialogService: IDialogService, _telemetryService: ITelemetryService, _logService: ILogService, _configurationService: IConfigurationService, _accessibilityService: IAccessibilityService, _accessibilitySignalService: IAccessibilitySignalService, _storageService: IStorageService, _confirmationService: ILanguageModelToolsConfirmationService, _commandService: ICommandService, _chatWidgetService: IChatWidgetService, _toolResultCompressor: IToolResultCompressor);
+    private isToolEnabledForModel;
     /**
      * Returns if the given tool or toolset is permitted in the current context.
      * When agent mode is enabled, all tools are permitted (no restriction)

package/vscode/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.js

@@ -45,8 +45,9 @@ import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/wor
 import { ChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatToolInvocation';
 import { chatSessionResourceToId, getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
+import { CopilotChatSettingId, CopilotToolId } from '../../common/tools/copilotToolIds.js';
 import { ILanguageModelToolsConfirmationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service';
-import { ToolDataSource, VSCodeToolReference, SpecedToolAliases, isToolSet, createToolSchemaUri, toolMatchesModel, ToolInvocationPresentation, stringifyPromptTsxPart, ToolSetForModel, ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { ToolDataSource, VSCodeToolReference, SpecedToolAliases, toolMatchesModel, isToolSet, createToolSchemaUri, ToolInvocationPresentation, stringifyPromptTsxPart, ToolSetForModel, ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { IToolResultCompressor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/toolResultCompressor.service';
 import { getToolConfirmationAlert } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/accessibility/chatAccessibilityProvider';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
@@ -68,7 +69,7 @@ const toolIdsThatCannotBeAutoApproved = ( new Set([
     "vscode_get_modified_files_confirmation"
 ]));
 const globalAutoApproveDescription = ( localize2(
-    6998,
+    7068,
     "Global auto approve also known as \"YOLO mode\" disables manual approval completely for _all tools in all workspaces_, allowing the agent to act fully autonomously. This is extremely dangerous and is *never* recommended, even containerized environments like [Codespaces](https://github.com/features/codespaces) and [Dev Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) have user keys forwarded into the container that could be compromised.\n\n**This feature disables [critical security protections](https://code.visualstudio.com/docs/copilot/security) and makes it much easier for an attacker to compromise the machine.**\n\nNote: This setting only controls tool approval and does not prevent the agent from asking questions. To automatically answer agent questions, use the [`chat.autoReply`](command:workbench.action.openSettings?%5B%22chat.autoReply%22%5D) setting."
 ));
 let LanguageModelToolsService = class LanguageModelToolsService extends Disposable {
@@ -156,7 +157,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             }
         }));
         this._register(this._configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(ChatConfiguration.ExtensionToolsEnabled) || e.affectsConfiguration(ChatConfiguration.AgentEnabled)) {
+            if (e.affectsConfiguration(ChatConfiguration.ExtensionToolsEnabled) || e.affectsConfiguration(ChatConfiguration.AgentEnabled) || e.affectsConfiguration(CopilotChatSettingId.Gpt55ReadFileToolEnabled)) {
                 this._onDidChangeToolsScheduler.schedule();
             }
         }));
@@ -173,28 +174,37 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         this.vscodeToolSet = this._register(
             this.createToolSet(ToolDataSource.Internal, "vscode", VSCodeToolReference.vscode, {
                 icon: ThemeIcon.fromId(Codicon.vscode.id),
-                description: ( localize(6999, "Use VS Code features"))
+                description: ( localize(7069, "Use VS Code features"))
             })
         );
         this.executeToolSet = this._register(
             this.createToolSet(ToolDataSource.Internal, "execute", SpecedToolAliases.execute, {
                 icon: ThemeIcon.fromId(Codicon.terminal.id),
-                description: ( localize(7000, "Execute code and applications on your machine"))
+                description: ( localize(7070, "Execute code and applications on your machine"))
             })
         );
         this.readToolSet = this._register(
             this.createToolSet(ToolDataSource.Internal, "read", SpecedToolAliases.read, {
                 icon: ThemeIcon.fromId(Codicon.book.id),
-                description: ( localize(7001, "Read files in your workspace"))
+                description: ( localize(7071, "Read files in your workspace"))
             })
         );
         this.agentToolSet = this._register(
             this.createToolSet(ToolDataSource.Internal, "agent", SpecedToolAliases.agent, {
                 icon: ThemeIcon.fromId(Codicon.agent.id),
-                description: ( localize(7002, "Delegate tasks to other agents"))
+                description: ( localize(7072, "Delegate tasks to other agents"))
             })
         );
     }
+    isToolEnabledForModel(toolData, model) {
+        if (!toolMatchesModel(toolData, model)) {
+            return false;
+        }
+        if (toolData.id === CopilotToolId.ReadFile && model?.family.startsWith("gpt-5.5") && this._configurationService.getValue(CopilotChatSettingId.Gpt55ReadFileToolEnabled) === false) {
+            return false;
+        }
+        return true;
+    }
     isPermitted(toolOrToolSet, reader) {
         const agentModeEnabled = this._isAgentModeEnabled.read(reader);
         if (agentModeEnabled !== false) {
@@ -306,7 +316,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             const satisfiesWhenClause = !toolData.when || this._contextKeyService.contextMatchesRules(toolData.when);
             const satisfiesExternalToolCheck = toolData.source.type !== "extension" || !!extensionToolsEnabled;
             const satisfiesPermittedCheck = this.isPermitted(toolData);
-            const satisfiesModelFilter = toolMatchesModel(toolData, model);
+            const satisfiesModelFilter = this.isToolEnabledForModel(toolData, model);
             return satisfiesWhenClause && satisfiesExternalToolCheck && satisfiesPermittedCheck && satisfiesModelFilter;
         });
     }
@@ -345,8 +355,8 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         return undefined;
     }
     _handlePreToolUseDenial(dto, hookResult, toolData, pendingInvocation, request) {
-        const hookReason = hookResult.permissionDecisionReason ?? ( localize(7003, "Hook denied tool execution"));
-        const reason = ( localize(7004, "Denied by {0} hook: {1}", HookType.PreToolUse, hookReason));
+        const hookReason = hookResult.permissionDecisionReason ?? ( localize(7073, "Hook denied tool execution"));
+        const reason = ( localize(7074, "Denied by {0} hook: {1}", HookType.PreToolUse, hookReason));
         this._logService.debug(
             `[LanguageModelToolsService#invokeTool] Tool ${dto.toolId} denied by preToolUse hook: ${hookReason}`
         );
@@ -684,7 +694,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
     async prepareToolInvocationWithHookResult(tool, dto, hookResult, token) {
         let forceConfirmationReason;
         if (hookResult?.permissionDecision === "ask") {
-            const hookMessage = ( localize(7005, "{0} required confirmation", HookType.PreToolUse));
+            const hookMessage = ( localize(7075, "{0} required confirmation", HookType.PreToolUse));
             forceConfirmationReason = hookResult.permissionDecisionReason ? `${hookMessage}: ${hookResult.permissionDecisionReason}` : hookMessage;
         }
         return this.prepareToolInvocation(tool, dto, forceConfirmationReason, token);
@@ -727,7 +737,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             return {
                 autoConfirmed: {
                     type: ToolConfirmKind.ConfirmationNotNeeded,
-                    reason: ( localize(7006, "Allowed by hook"))
+                    reason: ( localize(7076, "Allowed by hook"))
                 },
                 preparedInvocation
             };
@@ -743,14 +753,14 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
                 const fullReferenceName = getToolFullReferenceName(tool.data);
                 const hookReason = hookResult.permissionDecisionReason;
                 const hookNote = hookReason ? ( localize(
-                    7007,
+                    7077,
                     "{0} hook required confirmation: {1}",
                     HookType.PreToolUse,
                     hookReason
-                )) : ( localize(7008, "{0} hook required confirmation", HookType.PreToolUse));
+                )) : ( localize(7078, "{0} hook required confirmation", HookType.PreToolUse));
                 preparedInvocation.confirmationMessages = {
                     ...preparedInvocation.confirmationMessages,
-                    title: ( localize(7009, "Use the '{0}' tool?", fullReferenceName)),
+                    title: ( localize(7079, "Use the '{0}' tool?", fullReferenceName)),
                     message: ( new MarkdownString(`_${hookNote}_`)),
                     allowAutoConfirm: false
                 };
@@ -761,11 +771,11 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             } else {
                 const hookReason = hookResult.permissionDecisionReason;
                 const hookNote = hookReason ? ( localize(
-                    7010,
+                    7080,
                     "{0} hook required confirmation: {1}",
                     HookType.PreToolUse,
                     hookReason
-                )) : ( localize(7011, "{0} hook required confirmation", HookType.PreToolUse));
+                )) : ( localize(7081, "{0} hook required confirmation", HookType.PreToolUse));
                 const existing = preparedInvocation.confirmationMessages;
                 if (preparedInvocation.toolSpecificData?.kind === "terminal") {
                     const existingDisclaimerText = existing.disclaimer ? (typeof existing.disclaimer === "string" ? existing.disclaimer : existing.disclaimer.value) : undefined;
@@ -842,17 +852,17 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             const fullReferenceName = getToolFullReferenceName(tool.data);
             prepared.confirmationMessages = {
                 ...prepared.confirmationMessages,
-                title: ( localize(7012, "Confirm tool execution")),
-                message: ( localize(7013, "Run the '{0}' tool?", fullReferenceName)),
+                title: ( localize(7082, "Confirm tool execution")),
+                message: ( localize(7083, "Run the '{0}' tool?", fullReferenceName)),
                 disclaimer: ( toolIdsThatCannotBeAutoApproved.has(tool.data.id)) ? undefined : ( new MarkdownString(( localize(
-                    7014,
+                    7084,
                     "Auto approval for '{0}' is restricted via {1}.",
                     getToolFullReferenceName(tool.data),
                     createMarkdownCommandLink({
                         text: "`" + ChatConfiguration.EligibleForAutoApproval + "`",
                         id: "workbench.action.openSettings",
                         arguments: [ChatConfiguration.EligibleForAutoApproval],
-                        tooltip: ( localize(7015, "Open settings to configure auto-approval"))
+                        tooltip: ( localize(7085, "Open settings to configure auto-approval"))
                     }, false)
                 )), {
                     isTrusted: true
@@ -862,14 +872,14 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         }
         if (!isEligibleForAutoApproval && prepared?.confirmationMessages?.title) {
             prepared.confirmationMessages.disclaimer = ( toolIdsThatCannotBeAutoApproved.has(tool.data.id)) ? undefined : ( new MarkdownString(( localize(
-                7014,
+                7084,
                 "Auto approval for '{0}' is restricted via {1}.",
                 getToolFullReferenceName(tool.data),
                 createMarkdownCommandLink({
                     text: "`" + ChatConfiguration.EligibleForAutoApproval + "`",
                     id: "workbench.action.openSettings",
                     arguments: [ChatConfiguration.EligibleForAutoApproval],
-                    tooltip: ( localize(7015, "Open settings to configure auto-approval"))
+                    tooltip: ( localize(7085, "Open settings to configure auto-approval"))
                 }, false)
             )), {
                 isTrusted: true
@@ -1221,12 +1231,12 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             }));
             const promptResult = await this._dialogService.prompt({
                 type: Severity.Warning,
-                message: ( localize(7016, "Enable global auto approve?")),
+                message: ( localize(7086, "Enable global auto approve?")),
                 buttons: [{
-                    label: ( localize(7017, "Enable")),
+                    label: ( localize(7087, "Enable")),
                     run: () => true
                 }, {
-                    label: ( localize(7018, "Disable")),
+                    label: ( localize(7088, "Disable")),
                     run: () => false
                 }],
                 custom: {
@@ -1369,7 +1379,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
                     }
                 }
             } else {
-                if (model && !toolMatchesModel(tool, model)) {
+                if (!this.isToolEnabledForModel(tool, model)) {
                     continue;
                 }
                 if (!( result.has(tool))) {
@@ -1430,7 +1440,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         if (!model) {
             return this.toolSets.read(reader);
         }
-        return ( Iterable.map(this.toolSets.read(reader), ts => ( new ToolSetForModel(ts, model))));
+        return ( Iterable.map(this.toolSets.read(reader), ts => ( new ToolSetForModel(ts, model, toolData => this.isToolEnabledForModel(toolData, model)))));
     }
     getToolSet(id) {
         for (const toolSet of this._toolSets) {

package/vscode/src/vs/workbench/contrib/chat/browser/tools/renameTool.js

@@ -12,7 +12,6 @@ import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { rename } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/rename/browser/rename';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
@@ -53,7 +52,7 @@ let RenameTool = class RenameTool extends Disposable {
         this._bulkEditService = _bulkEditService;
     }
     getToolData() {
-        return this._buildToolData(StaticModelDescription, ( localize(7019, "Rename a symbol across the workspace")));
+        return this._buildToolData(StaticModelDescription, ( localize(7089, "Rename a symbol across the workspace")));
     }
     _buildToolData(modelDescription, userDescription) {
         return {
@@ -61,11 +60,10 @@ let RenameTool = class RenameTool extends Disposable {
             toolReferenceName: "rename",
             canBeReferencedInPrompt: false,
             icon: ThemeIcon.fromId(Codicon.rename.id),
-            displayName: ( localize(7020, "Rename Symbol")),
+            displayName: ( localize(7090, "Rename Symbol")),
             userDescription,
             modelDescription,
             source: ToolDataSource.Internal,
-            when: ( ContextKeyExpr.has("config.chat.tools.renameTool.enabled")),
             inputSchema: {
                 type: "object",
                 properties: {
@@ -97,7 +95,7 @@ let RenameTool = class RenameTool extends Disposable {
     async prepareToolInvocation(context, _token) {
         const input = context.parameters;
         return {
-            invocationMessage: ( localize(7021, "Renaming `{0}` to `{1}`", input.symbol, input.newName))
+            invocationMessage: ( localize(7091, "Renaming `{0}` to `{1}`", input.symbol, input.newName))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {
@@ -185,13 +183,13 @@ let RenameTool = class RenameTool extends Disposable {
     }
     _successResult(input, fileCount, editCount) {
         const text = editCount === 1 ? ( localize(
-            7022,
+            7092,
             "Renamed `{0}` to `{1}` - 1 edit in {2} file.",
             input.symbol,
             input.newName,
             fileCount
         )) : ( localize(
-            7023,
+            7093,
             "Renamed `{0}` to `{1}` - {2} edits across {3} files.",
             input.symbol,
             input.newName,

package/vscode/src/vs/workbench/contrib/chat/browser/tools/toolResultCompressorService.d.ts

@@ -3,7 +3,7 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IToolResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
-import { IToolResultFilter } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/toolResultCompressor";
+import { IToolResultCache, IToolResultFilter } from "../../common/tools/toolResultCompressor.js";
 import { IToolResultCompressor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/toolResultCompressor.service";
 export declare class ToolResultCompressorService extends Disposable implements IToolResultCompressor {
     private readonly _configurationService;
@@ -11,8 +11,12 @@ export declare class ToolResultCompressorService extends Disposable implements I
     private readonly _logService;
     readonly _serviceBrand: undefined;
     private readonly _filters;
+    private readonly _caches;
     constructor(_configurationService: IConfigurationService, _telemetryService: ITelemetryService, _logService: ILogService);
     registerFilter(filter: IToolResultFilter): void;
+    registerCache(cache: IToolResultCache): void;
     maybeCompress(toolId: string, input: unknown, result: IToolResult): IToolResult | undefined;
+    private _buildCacheHitResult;
+    private _recordInCaches;
     private _sendTelemetry;
 }