@codingame/monaco-vscode-chat-service-override 28.4.0 → 29.0.0

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

@@ -13,10 +13,12 @@ import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/comm
 import { MarkdownString, createMarkdownCommandLink } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { Disposable, DisposableStore, toDisposable, combinedDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { getMediaMime } from '@codingame/monaco-vscode-api/vscode/vs/base/common/mime';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { StopWatch } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stopwatch';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
 import { AccessibilitySignal } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
@@ -39,8 +41,9 @@ import { toToolSetVariableEntry, toToolVariableEntry } from '@codingame/monaco-v
 import { ToolConfirmKind, IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ChatConfiguration, isAutoApproveLevel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { ChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatToolInvocation';
-import { chatSessionResourceToId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+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 { 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';
@@ -59,9 +62,12 @@ var AutoApproveStorageKeys;
     AutoApproveStorageKeys["GlobalAutoApproveOptIn"] = "chat.tools.global.autoApprove.optIn";
 })(AutoApproveStorageKeys || (AutoApproveStorageKeys = {}));
 const SkipAutoApproveConfirmationKey = "vscode.chat.tools.global.autoApprove.testMode";
-const toolIdThatCannotBeAutoApproved = "vscode_get_confirmation_with_options";
+const toolIdsThatCannotBeAutoApproved = ( new Set([
+    "vscode_get_confirmation_with_options",
+    "vscode_get_modified_files_confirmation"
+]));
 const globalAutoApproveDescription = ( localize2(
-    6440,
+    6605,
     "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 {
@@ -164,25 +170,25 @@ 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(6441, "Use VS Code features"))
+                description: ( localize(6606, "Use VS Code features"))
             })
         );
         this.executeToolSet = this._register(
             this.createToolSet(ToolDataSource.Internal, "execute", SpecedToolAliases.execute, {
                 icon: ThemeIcon.fromId(Codicon.terminal.id),
-                description: ( localize(6442, "Execute code and applications on your machine"))
+                description: ( localize(6607, "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(6443, "Read files in your workspace"))
+                description: ( localize(6608, "Read files in your workspace"))
             })
         );
         this.agentToolSet = this._register(
             this.createToolSet(ToolDataSource.Internal, "agent", SpecedToolAliases.agent, {
                 icon: ThemeIcon.fromId(Codicon.agent.id),
-                description: ( localize(6444, "Delegate tasks to other agents"))
+                description: ( localize(6609, "Delegate tasks to other agents"))
             })
         );
     }
@@ -336,8 +342,8 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         return undefined;
     }
     _handlePreToolUseDenial(dto, hookResult, toolData, pendingInvocation, request) {
-        const hookReason = hookResult.permissionDecisionReason ?? ( localize(6445, "Hook denied tool execution"));
-        const reason = ( localize(6446, "Denied by {0} hook: {1}", HookType.PreToolUse, hookReason));
+        const hookReason = hookResult.permissionDecisionReason ?? ( localize(6610, "Hook denied tool execution"));
+        const reason = ( localize(6611, "Denied by {0} hook: {1}", HookType.PreToolUse, hookReason));
         this._logService.debug(
             `[LanguageModelToolsService#invokeTool] Tool ${dto.toolId} denied by preToolUse hook: ${hookReason}`
         );
@@ -516,7 +522,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
                     toolInvocation = ( new ChatToolInvocation(
                         preparedInvocation,
                         tool.data,
-                        dto.callId,
+                        dto.chatStreamToolCallId ?? dto.callId,
                         dto.subAgentInvocationId,
                         dto.parameters
                     ));
@@ -581,7 +587,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
                 }
             }, token);
             invocationTimeWatch.stop();
-            this.ensureToolDetails(dto, toolResult, tool.data);
+            this.ensureToolDetails(dto, toolResult, tool.data, toolInvocation);
             const afterExecuteState = await toolInvocation?.didExecuteTool(toolResult, undefined, () => this.shouldAutoConfirmPostExecution(
                 tool.data.id,
                 tool.data.runsInWorkspace,
@@ -656,7 +662,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
     async prepareToolInvocationWithHookResult(tool, dto, hookResult, token) {
         let forceConfirmationReason;
         if (hookResult?.permissionDecision === "ask") {
-            const hookMessage = ( localize(6447, "{0} required confirmation", HookType.PreToolUse));
+            const hookMessage = ( localize(6612, "{0} required confirmation", HookType.PreToolUse));
             forceConfirmationReason = hookResult.permissionDecisionReason ? `${hookMessage}: ${hookResult.permissionDecisionReason}` : hookMessage;
         }
         return this.prepareToolInvocation(tool, dto, forceConfirmationReason, token);
@@ -669,7 +675,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             return {
                 autoConfirmed: {
                     type: ToolConfirmKind.ConfirmationNotNeeded,
-                    reason: ( localize(6448, "Allowed by hook"))
+                    reason: ( localize(6613, "Allowed by hook"))
                 },
                 preparedInvocation
             };
@@ -685,14 +691,14 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
                 const fullReferenceName = getToolFullReferenceName(tool.data);
                 const hookReason = hookResult.permissionDecisionReason;
                 const hookNote = hookReason ? ( localize(
-                    6449,
+                    6614,
                     "{0} hook required confirmation: {1}",
                     HookType.PreToolUse,
                     hookReason
-                )) : ( localize(6450, "{0} hook required confirmation", HookType.PreToolUse));
+                )) : ( localize(6615, "{0} hook required confirmation", HookType.PreToolUse));
                 preparedInvocation.confirmationMessages = {
                     ...preparedInvocation.confirmationMessages,
-                    title: ( localize(6451, "Use the '{0}' tool?", fullReferenceName)),
+                    title: ( localize(6616, "Use the '{0}' tool?", fullReferenceName)),
                     message: ( new MarkdownString(`_${hookNote}_`)),
                     allowAutoConfirm: false
                 };
@@ -703,11 +709,11 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             } else {
                 const hookReason = hookResult.permissionDecisionReason;
                 const hookNote = hookReason ? ( localize(
-                    6452,
+                    6617,
                     "{0} hook required confirmation: {1}",
                     HookType.PreToolUse,
                     hookReason
-                )) : ( localize(6453, "{0} hook required confirmation", HookType.PreToolUse));
+                )) : ( localize(6618, "{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;
@@ -731,13 +737,22 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
                 preparedInvocation
             };
         }
+        const approveCombination = preparedInvocation?.confirmationMessages?.approveCombination;
+        let combination;
+        if (approveCombination) {
+            combination = {
+                label: typeof approveCombination.label === "string" ? approveCombination.label : approveCombination.label.value,
+                key: approveCombination.key
+            };
+        }
         const autoConfirmed = await this.shouldAutoConfirm(
             tool.data.id,
             tool.data.runsInWorkspace,
             tool.data.source,
             dto.parameters,
             sessionResource,
-            dto.chatRequestId
+            dto.chatRequestId,
+            combination
         );
         return {
             autoConfirmed,
@@ -773,16 +788,17 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             const fullReferenceName = getToolFullReferenceName(tool.data);
             prepared.confirmationMessages = {
                 ...prepared.confirmationMessages,
-                title: ( localize(6454, "Confirm tool execution")),
-                message: ( localize(6455, "Run the '{0}' tool?", fullReferenceName)),
-                disclaimer: tool.data.id === toolIdThatCannotBeAutoApproved ? undefined : ( new MarkdownString(( localize(
-                    6456,
+                title: ( localize(6619, "Confirm tool execution")),
+                message: ( localize(6620, "Run the '{0}' tool?", fullReferenceName)),
+                disclaimer: ( toolIdsThatCannotBeAutoApproved.has(tool.data.id)) ? undefined : ( new MarkdownString(( localize(
+                    6621,
                     "Auto approval for '{0}' is restricted via {1}.",
                     getToolFullReferenceName(tool.data),
                     createMarkdownCommandLink({
-                        title: "`" + ChatConfiguration.EligibleForAutoApproval + "`",
+                        text: "`" + ChatConfiguration.EligibleForAutoApproval + "`",
                         id: "workbench.action.openSettings",
-                        arguments: [ChatConfiguration.EligibleForAutoApproval]
+                        arguments: [ChatConfiguration.EligibleForAutoApproval],
+                        tooltip: ( localize(6622, "Open settings to configure auto-approval"))
                     }, false)
                 )), {
                     isTrusted: true
@@ -791,14 +807,15 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             };
         }
         if (!isEligibleForAutoApproval && prepared?.confirmationMessages?.title) {
-            prepared.confirmationMessages.disclaimer = tool.data.id === toolIdThatCannotBeAutoApproved ? undefined : ( new MarkdownString(( localize(
-                6456,
+            prepared.confirmationMessages.disclaimer = ( toolIdsThatCannotBeAutoApproved.has(tool.data.id)) ? undefined : ( new MarkdownString(( localize(
+                6621,
                 "Auto approval for '{0}' is restricted via {1}.",
                 getToolFullReferenceName(tool.data),
                 createMarkdownCommandLink({
-                    title: "`" + ChatConfiguration.EligibleForAutoApproval + "`",
+                    text: "`" + ChatConfiguration.EligibleForAutoApproval + "`",
                     id: "workbench.action.openSettings",
-                    arguments: [ChatConfiguration.EligibleForAutoApproval]
+                    arguments: [ChatConfiguration.EligibleForAutoApproval],
+                    tooltip: ( localize(6622, "Open settings to configure auto-approval"))
                 }, false)
             )), {
                 isTrusted: true
@@ -912,14 +929,36 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             });
         }
     }
-    ensureToolDetails(dto, toolResult, toolData) {
-        if (!toolResult.toolResultDetails && toolData.alwaysDisplayInputOutput) {
+    ensureToolDetails(dto, toolResult, toolData, toolInvocation) {
+        if (!toolResult.toolResultDetails && (toolData.alwaysDisplayInputOutput || (this.toolResultHasImages(toolResult) && !this.toolResultMessageHasImageFileWidgets(toolResult, toolInvocation)))) {
             toolResult.toolResultDetails = {
                 input: this.formatToolInput(dto),
                 output: this.toolResultToIO(toolResult)
             };
         }
     }
+    toolResultHasImages(toolResult) {
+        return ( toolResult.content.some(part => part.kind === "data" && part.value.mimeType?.startsWith("image/")));
+    }
+    toolResultMessageHasImageFileWidgets(toolResult, toolInvocation) {
+        const message = toolResult.toolResultMessage ?? toolInvocation?.pastTenseMessage;
+        if (!message) {
+            return false;
+        }
+        const value = typeof message === "string" ? message : message.value;
+        const linkPattern = /\[\s*\]\((?<uri>[^)]+)\)/g;
+        let match;
+        while ((match = linkPattern.exec(value)) !== null) {
+            try {
+                const parsed = ( URI.parse(match.groups.uri));
+                const mime = getMediaMime(parsed.path);
+                if (mime?.startsWith("image/")) {
+                    return true;
+                }
+            } catch {}
+        }
+        return false;
+    }
     formatToolInput(dto) {
         return JSON.stringify(dto.parameters, undefined, 2);
     }
@@ -967,7 +1006,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         if (toolData.id === "copilot_fetchWebPage") {
             return true;
         }
-        if (toolData.id === toolIdThatCannotBeAutoApproved) {
+        if (( toolIdsThatCannotBeAutoApproved.has(toolData.id))) {
             return false;
         }
         const eligibilityConfig = this._configurationService.getValue(ChatConfiguration.EligibleForAutoApproval);
@@ -997,7 +1036,8 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         source,
         parameters,
         chatSessionResource,
-        chatRequestId
+        chatRequestId,
+        combination
     ) {
         const tool = this._tools.get(toolId);
         if (!tool) {
@@ -1007,10 +1047,12 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             const model = this._chatService.getSession(chatSessionResource);
             const request = model?.getRequests().at(-1);
             if (isAutoApproveLevel(request?.modeInfo?.permissionLevel) || this._isSessionLiveAutoApproveLevel(chatSessionResource)) {
-                return {
-                    type: ToolConfirmKind.ConfirmationNotNeeded,
-                    reason: "auto-approve-all"
-                };
+                if (!(( toolIdsThatCannotBeAutoApproved.has(tool.data.id)) && getChatSessionType(chatSessionResource) !== localChatSessionType)) {
+                    return {
+                        type: ToolConfirmKind.ConfirmationNotNeeded,
+                        reason: "auto-approve-all"
+                    };
+                }
             }
         }
         if (!this.isToolEligibleForAutoApproval(tool.data)) {
@@ -1020,7 +1062,8 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             toolId,
             source,
             parameters,
-            chatSessionResource
+            chatSessionResource,
+            combination
         });
         if (reason) {
             return reason;
@@ -1056,10 +1099,12 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             const model = this._chatService.getSession(chatSessionResource);
             const request = model?.getRequests().at(-1);
             if (isAutoApproveLevel(request?.modeInfo?.permissionLevel) || this._isSessionLiveAutoApproveLevel(chatSessionResource)) {
-                return {
-                    type: ToolConfirmKind.ConfirmationNotNeeded,
-                    reason: "auto-approve-all"
-                };
+                if (!(( toolIdsThatCannotBeAutoApproved.has(toolId)) && getChatSessionType(chatSessionResource) !== localChatSessionType)) {
+                    return {
+                        type: ToolConfirmKind.ConfirmationNotNeeded,
+                        reason: "auto-approve-all"
+                    };
+                }
             }
         }
         if (this._configurationService.getValue(ChatConfiguration.GlobalAutoApprove) && (await this._checkGlobalAutoApprove())) {
@@ -1117,12 +1162,12 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             }));
             const promptResult = await this._dialogService.prompt({
                 type: Severity.Warning,
-                message: ( localize(6457, "Enable global auto approve?")),
+                message: ( localize(6623, "Enable global auto approve?")),
                 buttons: [{
-                    label: ( localize(6458, "Enable")),
+                    label: ( localize(6624, "Enable")),
                     run: () => true
                 }, {
-                    label: ( localize(6459, "Disable")),
+                    label: ( localize(6625, "Disable")),
                     run: () => false
                 }],
                 custom: {

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

@@ -4,6 +4,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IBulkEditService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service";
 import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
 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 { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
@@ -13,14 +14,15 @@ import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/
 export declare const RenameToolId = "vscode_renameSymbol";
 export declare class RenameTool extends Disposable implements IToolImpl {
     private readonly _languageFeaturesService;
+    private readonly _languageService;
     private readonly _textModelService;
     private readonly _workspaceContextService;
     private readonly _chatService;
     private readonly _bulkEditService;
     private readonly _onDidUpdateToolData;
     readonly onDidUpdateToolData: Event<void>;
-    constructor(_languageFeaturesService: ILanguageFeaturesService, _textModelService: ITextModelService, _workspaceContextService: IWorkspaceContextService, _chatService: IChatService, _bulkEditService: IBulkEditService);
-    getToolData(): IToolData;
+    constructor(_languageFeaturesService: ILanguageFeaturesService, _languageService: ILanguageService, _textModelService: ITextModelService, _workspaceContextService: IWorkspaceContextService, _chatService: IChatService, _bulkEditService: IBulkEditService);
+    getToolData(): IToolData | undefined;
     prepareToolInvocation(context: IToolInvocationPreparationContext, _token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
     private _successResult;

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

@@ -11,6 +11,7 @@ import { ResourceTextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/
 import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service';
 import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.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';
@@ -38,6 +39,7 @@ If the tool returns an error, retry with corrected input - ensure the file path
 let RenameTool = class RenameTool extends Disposable {
     constructor(
         _languageFeaturesService,
+        _languageService,
         _textModelService,
         _workspaceContextService,
         _chatService,
@@ -45,6 +47,7 @@ let RenameTool = class RenameTool extends Disposable {
     ) {
         super();
         this._languageFeaturesService = _languageFeaturesService;
+        this._languageService = _languageService;
         this._textModelService = _textModelService;
         this._workspaceContextService = _workspaceContextService;
         this._chatService = _chatService;
@@ -57,22 +60,27 @@ let RenameTool = class RenameTool extends Disposable {
     }
     getToolData() {
         const languageIds = this._languageFeaturesService.renameProvider.registeredLanguageIds;
+        if (languageIds.size === 0) {
+            return undefined;
+        }
         let modelDescription = BaseModelDescription;
+        let userDescription;
         if (( languageIds.has("*"))) {
             modelDescription += "\n\nSupported for all languages.";
-        } else if (languageIds.size > 0) {
+            userDescription = ( localize(6626, "Rename a symbol across the workspace"));
+        } else {
             const sorted = [...languageIds].sort();
             modelDescription += `\n\nCurrently supported for: ${sorted.join(", ")}.`;
-        } else {
-            modelDescription += "\n\nNo languages currently have rename providers registered.";
+            const niceNames = ( sorted.map(id => this._languageService.getLanguageName(id) ?? id));
+            userDescription = ( localize(6627, "Rename a symbol across the workspace ({0})", niceNames.join(", ")));
         }
         return {
             id: RenameToolId,
             toolReferenceName: "rename",
             canBeReferencedInPrompt: false,
             icon: ThemeIcon.fromId(Codicon.rename.id),
-            displayName: ( localize(6460, "Rename Symbol")),
-            userDescription: ( localize(6461, "Rename a symbol across the workspace")),
+            displayName: ( localize(6628, "Rename Symbol")),
+            userDescription,
             modelDescription,
             source: ToolDataSource.Internal,
             when: ( ContextKeyExpr.has("config.chat.tools.renameTool.enabled")),
@@ -107,7 +115,7 @@ let RenameTool = class RenameTool extends Disposable {
     async prepareToolInvocation(context, _token) {
         const input = context.parameters;
         return {
-            invocationMessage: ( localize(6462, "Renaming `{0}` to `{1}`", input.symbol, input.newName))
+            invocationMessage: ( localize(6629, "Renaming `{0}` to `{1}`", input.symbol, input.newName))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {
@@ -195,13 +203,13 @@ let RenameTool = class RenameTool extends Disposable {
     }
     _successResult(input, fileCount, editCount) {
         const text = editCount === 1 ? ( localize(
-            6463,
+            6630,
             "Renamed `{0}` to `{1}` - 1 edit in {2} file.",
             input.symbol,
             input.newName,
             fileCount
         )) : ( localize(
-            6464,
+            6631,
             "Renamed `{0}` to `{1}` - {2} edits across {3} files.",
             input.symbol,
             input.newName,
@@ -213,7 +221,7 @@ let RenameTool = class RenameTool extends Disposable {
         return result;
     }
 };
-RenameTool = ( __decorate([( __param(0, ILanguageFeaturesService)), ( __param(1, ITextModelService)), ( __param(2, IWorkspaceContextService)), ( __param(3, IChatService)), ( __param(4, IBulkEditService))], RenameTool));
+RenameTool = ( __decorate([( __param(0, ILanguageFeaturesService)), ( __param(1, ILanguageService)), ( __param(2, ITextModelService)), ( __param(3, IWorkspaceContextService)), ( __param(4, IChatService)), ( __param(5, IBulkEditService))], RenameTool));
 let RenameToolContribution = class RenameToolContribution extends Disposable {
     static {
         this.ID = "chat.renameTool";
@@ -224,9 +232,12 @@ let RenameToolContribution = class RenameToolContribution extends Disposable {
         let registration;
         const registerRenameTool = () => {
             registration?.dispose();
+            registration = undefined;
             toolsService.flushToolUpdates();
             const toolData = renameTool.getToolData();
-            registration = toolsService.registerTool(toolData, renameTool);
+            if (toolData) {
+                registration = toolsService.registerTool(toolData, renameTool);
+            }
         };
         registerRenameTool();
         this._store.add(renameTool.onDidUpdateToolData(registerRenameTool));

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

@@ -10,7 +10,7 @@ import { isFalsyOrWhitespace } from '@codingame/monaco-vscode-api/vscode/vs/base
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { isObject, assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
@@ -31,6 +31,7 @@ import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/regist
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
@@ -44,7 +45,7 @@ const toolSetsSchema = {
     allowComments: true,
     allowTrailingCommas: true,
     defaultSnippets: [{
-        label: ( localize(6465, "Empty tool set")),
+        label: ( localize(6632, "Empty tool set")),
         body: {
             "${1:toolSetName}": {
                 "tools": ["${2:someTool}", "${3:anotherTool}"],
@@ -54,7 +55,7 @@ const toolSetsSchema = {
         }
     }],
     type: "object",
-    description: ( localize(6466, "User tool sets configuration")),
+    description: ( localize(6633, "User tool sets configuration")),
     additionalProperties: {
         type: "object",
         required: ["tools"],
@@ -62,7 +63,7 @@ const toolSetsSchema = {
         properties: {
             tools: {
                 description: ( localize(
-                    6467,
+                    6634,
                     "A list of tools or tool sets to include in this tool set. Cannot be empty and must reference tools the way they are referenced in prompts."
                 )),
                 type: "array",
@@ -75,7 +76,7 @@ const toolSetsSchema = {
             },
             icon: {
                 description: ( localize(
-                    6468,
+                    6635,
                     "Icon to use for this tool set in the UI. Uses the \"\\$(name)\"-syntax, like \"\\$(zap)\""
                 )),
                 type: "string",
@@ -83,7 +84,7 @@ const toolSetsSchema = {
                 markdownEnumDescriptions: Array.from(getAllCodicons(), icon => `$(${icon.id})`)
             },
             description: {
-                description: ( localize(6469, "A short description of this tool set.")),
+                description: ( localize(6636, "A short description of this tool set.")),
                 type: "string"
             }
         }
@@ -184,7 +185,7 @@ let UserToolSetsContributions = class UserToolSetsContributions extends Disposab
             });
             for (const item of data) {
                 toolEnumValues.push(item.name);
-                toolEnumDescriptions.push(( localize(6470, "{1} ({0})\n\n{2}", item.sourceLabel, item.name, item.description)));
+                toolEnumDescriptions.push(( localize(6637, "{1} ({0})\n\n{2}", item.sourceLabel, item.name, item.description)));
             }
             store.clear();
             reg.registerSchema(toolSetSchemaId, toolSetsSchema, store);
@@ -281,17 +282,22 @@ class ConfigureToolSets extends Action2 {
     constructor() {
         super({
             id: ConfigureToolSets.ID,
-            title: ( localize2(6471, "Configure Tool Sets...")),
-            shortTitle: ( localize(6472, "Tool Sets")),
+            title: ( localize2(6638, "Configure Tool Sets...")),
+            shortTitle: ( localize(6639, "Tool Sets")),
             category: CHAT_CATEGORY,
             f1: true,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.Tools.toolsCount.greater(0))),
-            menu: {
+            menu: [{
                 id: CHAT_CONFIG_MENU_ID,
                 when: ( ContextKeyExpr.equals("view", ChatViewId)),
                 order: 11,
                 group: "2_level"
-            }
+            }, {
+                id: MenuId.ViewTitle,
+                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.equals("view", ChatViewId)), ( ContextKeyExpr.has(`config.${ChatConfiguration.ChatCustomizationMenuEnabled}`)))),
+                order: 11,
+                group: "2_level"
+            }]
         });
     }
     async run(accessor) {
@@ -303,7 +309,7 @@ class ConfigureToolSets extends Action2 {
         const textFileService = accessor.get(ITextFileService);
         const picks = [];
         picks.push({
-            label: ( localize(6473, "Create new tool sets file...")),
+            label: ( localize(6640, "Create new tool sets file...")),
             alwaysShow: true,
             iconClass: ThemeIcon.asClassName(Codicon.plus)
         });
@@ -320,7 +326,7 @@ class ConfigureToolSets extends Action2 {
         }
         const pick = await quickInputService.pick(picks, {
             canPickMany: false,
-            placeHolder: ( localize(6474, "Select a tool set to configure"))
+            placeHolder: ( localize(6641, "Select a tool set to configure"))
         });
         if (!pick) {
             return;
@@ -328,13 +334,13 @@ class ConfigureToolSets extends Action2 {
         let resource;
         if (!pick.toolset) {
             const name = await quickInputService.input({
-                placeHolder: ( localize(6475, "Type tool sets file name")),
+                placeHolder: ( localize(6642, "Type tool sets file name")),
                 validateInput: async input => {
                     if (!input) {
-                        return localize(6476, "Invalid file name");
+                        return localize(6643, "Invalid file name");
                     }
                     if (!isValidBasename(input)) {
-                        return localize(6477, "'{0}' is not a valid file name", input);
+                        return localize(6644, "'{0}' is not a valid file name", input);
                     }
                     return undefined;
                 }

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

@@ -4,6 +4,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
 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 { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
@@ -13,14 +14,15 @@ import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/
 export declare const UsagesToolId = "vscode_listCodeUsages";
 export declare class UsagesTool extends Disposable implements IToolImpl {
     private readonly _languageFeaturesService;
+    private readonly _languageService;
     private readonly _modelService;
     private readonly _searchService;
     private readonly _textModelService;
     private readonly _workspaceContextService;
     private readonly _onDidUpdateToolData;
     readonly onDidUpdateToolData: Event<void>;
-    constructor(_languageFeaturesService: ILanguageFeaturesService, _modelService: IModelService, _searchService: ISearchService, _textModelService: ITextModelService, _workspaceContextService: IWorkspaceContextService);
-    getToolData(): IToolData;
+    constructor(_languageFeaturesService: ILanguageFeaturesService, _languageService: ILanguageService, _modelService: IModelService, _searchService: ISearchService, _textModelService: ITextModelService, _workspaceContextService: IWorkspaceContextService);
+    getToolData(): IToolData | undefined;
     prepareToolInvocation(context: IToolInvocationPreparationContext, _token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
     private _getLinePreviews;