@codingame/monaco-vscode-chat-service-override 27.0.0 → 28.0.1

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

@@ -17,6 +17,7 @@ import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { McpServerEditorTab, McpConnectionState, McpServerCacheState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IMcpService, IMcpWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
 import { startServerAndWaitForLiveTools } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypesUtils';
+import { ILanguageModelToolsConfirmationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service';
 import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { ConfigureToolSets } from '../tools/toolSetsContribution.js';
@@ -78,7 +79,7 @@ function createToolSetTreeItem(toolset, checked, editorService) {
         const resource = toolset.source.file;
         buttons.push({
             iconClass: ThemeIcon.asClassName(Codicon.edit),
-            tooltip: ( localize(4974, "Edit Tool Set")),
+            tooltip: ( localize(4984, "Edit Tool Set")),
             action: () => editorService.openEditor({
                 resource
             })
@@ -106,6 +107,7 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
     const editorService = accessor.get(IEditorService);
     const mcpWorkbenchService = accessor.get(IMcpWorkbenchService);
     const toolsService = accessor.get(ILanguageModelToolsService);
+    const confirmationService = accessor.get(ILanguageModelToolsConfirmationService);
     const telemetryService = accessor.get(ITelemetryService);
     const mcpServerByTool = ( new Map());
     for (const server of mcpService.servers.get()) {
@@ -164,7 +166,7 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
                 if (collection?.source) {
                     buttons.push({
                         iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                        tooltip: ( localize(4975, "Configure {0}", collection.label)),
+                        tooltip: ( localize(4985, "Configure {0}", collection.label)),
                         action: () => collection.source ? collection.source instanceof ExtensionIdentifier ? extensionsWorkbenchService.open(collection.source.value, {
                             tab: ExtensionEditorTab.Features,
                             feature: "mcp"
@@ -175,7 +177,7 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
                 } else if (collection?.presentation?.origin) {
                     buttons.push({
                         iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                        tooltip: ( localize(4975, "Configure {0}", collection.label)),
+                        tooltip: ( localize(4985, "Configure {0}", collection.label)),
                         action: () => editorService.openEditor({
                             resource: collection.presentation.origin
                         })
@@ -184,7 +186,7 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
                 if (mcpServer.connectionState.get().state === McpConnectionState.Kind.Error) {
                     buttons.push({
                         iconClass: ThemeIcon.asClassName(Codicon.warning),
-                        tooltip: ( localize(4976, "Show Output")),
+                        tooltip: ( localize(4986, "Show Output")),
                         action: () => mcpServer.showOutput()
                     });
                 }
@@ -196,7 +198,7 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
                     children.push({
                         itemType: "callback",
                         iconClass: ThemeIcon.asClassName(Codicon.sync),
-                        label: ( localize(4977, "Update Tools")),
+                        label: ( localize(4987, "Update Tools")),
                         pickable: false,
                         run: () => {
                             treePicker.busy = true;
@@ -252,7 +254,7 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
                     itemType: "bucket",
                     ordinal: BucketOrdinal.BuiltIn,
                     id: key,
-                    label: ( localize(4978, "Built-In")),
+                    label: ( localize(4988, "Built-In")),
                     checked: undefined,
                     children: [],
                     buttons: [],
@@ -264,7 +266,7 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
                     itemType: "bucket",
                     ordinal: BucketOrdinal.User,
                     id: key,
-                    label: ( localize(4979, "User Defined Tool Sets")),
+                    label: ( localize(4989, "User Defined Tool Sets")),
                     checked: undefined,
                     children: [],
                     buttons: [],
@@ -355,8 +357,41 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
                 }
             }
         }
+        for (const bucket of sortedBuckets) {
+            const isMcpBucket = bucket.ordinal === BucketOrdinal.Mcp;
+            const addConfirmationButton = toolItem => {
+                if (!confirmationService.toolCanManageConfirmation(toolItem.tool)) {
+                    return;
+                }
+                const tool = toolItem.tool;
+                const manageTools = isMcpBucket ? bucket.children.flatMap(
+                    c => isToolTreeItem(c) ? [c.tool] : isToolSetTreeItem(c) && c.children ? ( c.children.filter(isToolTreeItem).map(gc => gc.tool)) : []
+                ) : [tool];
+                const buttons = toolItem.buttons ? [...toolItem.buttons] : [];
+                buttons.push({
+                    iconClass: ThemeIcon.asClassName(Codicon.pass),
+                    tooltip: ( localize(4990, "Manage Approval")),
+                    keepOpen: true,
+                    action: () => confirmationService.manageConfirmationPreferences(manageTools, {
+                        focusToolId: tool.id
+                    })
+                });
+                toolItem.buttons = buttons;
+            };
+            for (const child of bucket.children) {
+                if (isToolTreeItem(child)) {
+                    addConfirmationButton(child);
+                } else if (isToolSetTreeItem(child) && child.children) {
+                    for (const grandchild of child.children) {
+                        if (isToolTreeItem(grandchild)) {
+                            addConfirmationButton(grandchild);
+                        }
+                    }
+                }
+            }
+        }
         if (treeItems.length === 0) {
-            treePicker.placeholder = ( localize(4980, "Add tools to chat"));
+            treePicker.placeholder = ( localize(4991, "Add tools to chat"));
         } else {
             treePicker.placeholder = placeHolder;
         }
@@ -372,7 +407,8 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
     computeItems();
     store.add(treePicker.onDidTriggerItemButton(e => {
         if (e.button && typeof e.button.action === "function") {
-            e.button.action();
+            const actionableButton = e.button;
+            actionableButton.action();
             store.dispose();
         }
     }));
@@ -416,17 +452,17 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
     }));
     const addMcpServerButton = {
         iconClass: ThemeIcon.asClassName(Codicon.mcp),
-        tooltip: ( localize(4981, "Add MCP Server..."))
+        tooltip: ( localize(4992, "Add MCP Server..."))
     };
     const installExtension = {
         iconClass: ThemeIcon.asClassName(Codicon.extensions),
-        tooltip: ( localize(4982, "Install Extension..."))
+        tooltip: ( localize(4993, "Install Extension..."))
     };
     const configureToolSets = {
         iconClass: ThemeIcon.asClassName(Codicon.gear),
-        tooltip: ( localize(4983, "Configure Tool Sets..."))
+        tooltip: ( localize(4994, "Configure Tool Sets..."))
     };
-    treePicker.title = ( localize(4984, "Configure Tools"));
+    treePicker.title = ( localize(4995, "Configure Tools"));
     treePicker.buttons = [addMcpServerButton, installExtension, configureToolSets];
     store.add(treePicker.onDidTriggerButton(button => {
         if (button === addMcpServerButton) {

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

@@ -65,7 +65,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
                 await this.handleNotebookEditor(activeNotebookEditor, context);
             } else {
                 this.notify(( localize(
-                    4985,
+                    4996,
                     "To insert the code block, open a code editor or notebook editor and set the cursor at the location where to insert the code block."
                 )));
             }
@@ -98,7 +98,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     }
     async handleNotebookEditor(notebookEditor, codeBlockContext) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(4986, "Cannot insert the code block to read-only notebook editor.")));
+            this.notify(( localize(4997, "Cannot insert the code block to read-only notebook editor.")));
             return false;
         }
         const focusRange = notebookEditor.getFocus();
@@ -117,7 +117,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     async handleTextEditor(codeEditor, codeBlockContext) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(4987, "Cannot insert the code block to read-only code editor.")));
+            this.notify(( localize(4998, "Cannot insert the code block to read-only code editor.")));
             return false;
         }
         const range = codeEditor.getSelection() ?? ( new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1));
@@ -179,7 +179,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                     this.tryToRevealCodeBlock(codeEditor, context.code);
                     activeEditorControl = codeEditor;
                 } else {
-                    this.notify(( localize(4988, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
+                    this.notify(( localize(4999, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
                     return;
                 }
             } catch (e) {
@@ -211,7 +211,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             if (activeNotebookEditor) {
                 result = await this.handleNotebookEditor(activeNotebookEditor, context.chatSessionResource, context.code);
             } else {
-                this.notify(( localize(4989, "To apply this code block, open a code or notebook editor.")));
+                this.notify(( localize(5000, "To apply this code block, open a code or notebook editor.")));
             }
         }
         if (isResponseVM(context.element)) {
@@ -235,7 +235,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         }
         const activeEditorOption = activeEditorControl?.getModel().uri ? {
             label: ( localize(
-                4990,
+                5001,
                 "Active editor '{0}'",
                 this.labelService.getUriLabel(activeEditorControl.getModel().uri, {
                     relative: true
@@ -244,13 +244,13 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             id: "activeEditor"
         } : undefined;
         const untitledEditorOption = {
-            label: ( localize(4991, "New untitled editor")),
+            label: ( localize(5002, "New untitled editor")),
             id: "newUntitledFile"
         };
         const options = [];
         if (resource) {
             options.push({
-                label: ( localize(4992, "New file '{0}'", this.labelService.getUriLabel(resource, {
+                label: ( localize(5003, "New file '{0}'", this.labelService.getUriLabel(resource, {
                     relative: true
                 }))),
                 id: "createFile"
@@ -266,7 +266,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             options.push(untitledEditorOption);
         }
         const selected = options.length > 1 ? await this.quickInputService.pick(options, {
-            placeHolder: ( localize(4993, "Select where to apply the code block"))
+            placeHolder: ( localize(5004, "Select where to apply the code block"))
         }) : options[0];
         if (selected) {
             switch (selected.id) {
@@ -275,7 +275,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                     try {
                         await this.fileService.writeFile(resource, VSBuffer.fromString(""));
                     } catch (error) {
-                        this.notify(( localize(4994, "Failed to create file: {0}", error.message)));
+                        this.notify(( localize(5005, "Failed to create file: {0}", error.message)));
                         return ( URI.from({
                             scheme: "untitled",
                             path: resource.path
@@ -296,7 +296,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     }
     async handleNotebookEditor(notebookEditor, chatSessionResource, code) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(4995, "Cannot apply code block to read-only notebook editor.")));
+            this.notify(( localize(5006, "Cannot apply code block to read-only notebook editor.")));
             return undefined;
         }
         const uri = notebookEditor.textModel.uri;
@@ -307,7 +307,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         };
         const codeMapper = this.codeMapperService.providers[0]?.displayName;
         if (!codeMapper) {
-            this.notify(( localize(4996, "No code mapper available.")));
+            this.notify(( localize(5007, "No code mapper available.")));
             return undefined;
         }
         let editsProposed = false;
@@ -320,7 +320,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                 cancellable: true
             }, async progress => {
                 progress.report({
-                    message: ( localize(4997, "Applying code block using {0}...", codeMapper))
+                    message: ( localize(5008, "Applying code block using {0}...", codeMapper))
                 });
                 const editsIterable = this.getNotebookEdits(codeBlock, chatSessionResource, cancellationTokenSource.token);
                 return await this.waitForFirstElement(editsIterable);
@@ -328,7 +328,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             editsProposed = await this.applyNotebookEditsWithInlinePreview(iterable, uri, cancellationTokenSource);
         } catch (e) {
             if (!isCancellationError(e)) {
-                this.notify(( localize(4998, "Failed to apply code block: {0}", e.message)));
+                this.notify(( localize(5009, "Failed to apply code block: {0}", e.message)));
             }
         } finally {
             cancellationTokenSource.dispose();
@@ -341,7 +341,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     async handleTextEditor(codeEditor, chatSessionResource, code, applyCodeBlockSuggestionId) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(4999, "Cannot apply code block to read-only file.")));
+            this.notify(( localize(5010, "Cannot apply code block to read-only file.")));
             return undefined;
         }
         const codeBlock = {
@@ -352,7 +352,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         };
         const codeMapper = this.codeMapperService.providers[0]?.displayName;
         if (!codeMapper) {
-            this.notify(( localize(4996, "No code mapper available.")));
+            this.notify(( localize(5007, "No code mapper available.")));
             return undefined;
         }
         let editsProposed = false;
@@ -365,7 +365,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                 cancellable: true
             }, async progress => {
                 progress.report({
-                    message: ( localize(4997, "Applying code block using {0}...", codeMapper))
+                    message: ( localize(5008, "Applying code block using {0}...", codeMapper))
                 });
                 const editsIterable = this.getTextEdits(codeBlock, chatSessionResource, cancellationTokenSource.token);
                 return await this.waitForFirstElement(editsIterable);
@@ -373,7 +373,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             editsProposed = await this.applyWithInlinePreview(iterable, codeEditor, cancellationTokenSource, applyCodeBlockSuggestionId);
         } catch (e) {
             if (!isCancellationError(e)) {
-                this.notify(( localize(4998, "Failed to apply code block: {0}", e.message)));
+                this.notify(( localize(5009, "Failed to apply code block: {0}", e.message)));
             }
         } finally {
             cancellationTokenSource.dispose();

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

@@ -0,0 +1,58 @@
+import { Dimension } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/dom";
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
+import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
+import { IRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
+import { EditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorPane";
+import { IEditorOpenContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
+import { IEditorGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService";
+import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { IWebview } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IWebviewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service";
+import { IAgentPluginService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service";
+import { IPluginInstallService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service";
+import { AgentPluginEditorInput } from "./agentPluginEditorInput.js";
+export declare class AgentPluginEditor extends EditorPane {
+    private readonly instantiationService;
+    private readonly openerService;
+    private readonly extensionService;
+    private readonly webviewService;
+    private readonly languageService;
+    private readonly fileService;
+    private readonly requestService;
+    private readonly agentPluginService;
+    private readonly pluginInstallService;
+    private readonly labelService;
+    static readonly ID: string;
+    private template;
+    private pluginReadme;
+    private initialScrollProgress;
+    private currentIdentifier;
+    private layoutParticipants;
+    private readonly contentDisposables;
+    private readonly transientDisposables;
+    private activeElement;
+    private dimension;
+    constructor(group: IEditorGroup, telemetryService: ITelemetryService, instantiationService: IInstantiationService, themeService: IThemeService, openerService: IOpenerService, storageService: IStorageService, extensionService: IExtensionService, webviewService: IWebviewService, languageService: ILanguageService, fileService: IFileService, requestService: IRequestService, agentPluginService: IAgentPluginService, pluginInstallService: IPluginInstallService, labelService: ILabelService);
+    protected createEditor(parent: HTMLElement): void;
+    setInput(input: AgentPluginEditorInput, options: undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void>;
+    private render;
+    private getItemActions;
+    private installedPluginToItem;
+    private fetchReadme;
+    private openDetails;
+    private openMarkdown;
+    private renderMarkdown;
+    private renderBody;
+    private loadContents;
+    clearInput(): void;
+    focus(): void;
+    get activeWebview(): IWebview | undefined;
+    layout(dimension: Dimension): void;
+}