@codingame/monaco-vscode-chat-service-override 31.0.1 → 32.0.0

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

@@ -8,13 +8,13 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
+import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 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 { IAgentPluginRepositoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service';
 import { IPluginInstallService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service';
 import '../../common/plugins/pluginMarketplaceService.js';
-import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
-import { InstalledAgentPluginsViewId } from '../agentPluginsView.js';
+import { InstalledAgentPluginsViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { CHAT_CONFIG_MENU_ID, CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { parseMarketplaceReference, parseMarketplaceReferences, MarketplaceReferenceKind } from '../../common/plugins/marketplaceReference.js';
 
@@ -25,7 +25,7 @@ class ManagePluginsAction extends Action2 {
     constructor() {
         super({
             id: ManagePluginsAction.ID,
-            title: ( localize2(4981, "Plugins")),
+            title: ( localize2(5042, "Plugins")),
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.enabled,
             menu: [{
@@ -46,7 +46,7 @@ class InstallFromSourceAction extends Action2 {
     constructor() {
         super({
             id: InstallFromSourceAction.ID,
-            title: ( localize2(4982, "Install Plugin from Source")),
+            title: ( localize2(5043, "Install Plugin from Source")),
             category: CHAT_CATEGORY,
             icon: Codicon.add,
             precondition: ChatContextKeys.enabled,
@@ -62,17 +62,21 @@ class InstallFromSourceAction extends Action2 {
     async run(accessor) {
         const quickInputService = accessor.get(IQuickInputService);
         const pluginInstallService = accessor.get(IPluginInstallService);
+        const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
         const store = ( new DisposableStore());
         const inputBox = store.add(quickInputService.createInputBox());
-        inputBox.placeholder = ( localize(4983, "owner/repo or git clone URL"));
-        inputBox.prompt = ( localize(4984, "Enter a GitHub repository or git URL to install a plugin from"));
+        inputBox.placeholder = ( localize(5044, "owner/repo or git clone URL"));
+        inputBox.prompt = ( localize(5045, "Enter a GitHub repository or git URL to install a plugin from"));
         inputBox.ignoreFocusOut = true;
         inputBox.show();
         store.add(inputBox.onDidChangeValue(() => {
             inputBox.validationMessage = undefined;
         }));
+        let installing = false;
         store.add(inputBox.onDidHide(() => {
-            store.dispose();
+            if (!installing) {
+                store.dispose();
+            }
         }));
         store.add(inputBox.onDidAccept(async () => {
             const source = inputBox.value.trim();
@@ -86,6 +90,7 @@ class InstallFromSourceAction extends Action2 {
             }
             inputBox.busy = true;
             inputBox.enabled = false;
+            installing = true;
             try {
                 inputBox.hide();
                 const result = await pluginInstallService.installPluginFromValidatedSource(source);
@@ -97,12 +102,16 @@ class InstallFromSourceAction extends Action2 {
                 } else {
                     const ref = parseMarketplaceReference(source);
                     if (ref) {
-                        accessor.get(IExtensionsWorkbenchService).openSearch(`@agentPlugins ${ref.displayLabel}`);
+                        extensionsWorkbenchService.openSearch(`@agentPlugins ${ref.displayLabel}`);
                     }
+                    store.dispose();
                 }
             } finally {
-                inputBox.busy = false;
-                inputBox.enabled = true;
+                installing = false;
+                if (!store.isDisposed) {
+                    inputBox.busy = false;
+                    inputBox.enabled = true;
+                }
             }
         }));
     }
@@ -114,7 +123,7 @@ class ManagePluginMarketplacesAction extends Action2 {
     constructor() {
         super({
             id: ManagePluginMarketplacesAction.ID,
-            title: ( localize2(4985, "Manage Plugin Marketplaces")),
+            title: ( localize2(5046, "Manage Plugin Marketplaces")),
             icon: Codicon.globe,
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.enabled,
@@ -138,17 +147,17 @@ class ManagePluginMarketplacesAction extends Action2 {
         const refs = parseMarketplaceReferences(configuredRefs);
         if (refs.length === 0) {
             quickInputService.pick([], {
-                placeHolder: ( localize(4986, "No plugin marketplaces configured"))
+                placeHolder: ( localize(5047, "No plugin marketplaces configured"))
             });
             return;
         }
         const items = ( refs.map(ref => ({
             label: ref.displayLabel,
-            description: ref.kind === MarketplaceReferenceKind.LocalFileUri ? ( localize(4987, "Local")) : ref.cloneUrl,
+            description: ref.kind === MarketplaceReferenceKind.LocalFileUri ? ( localize(5048, "Local")) : ref.cloneUrl,
             reference: ref
         })));
         const selected = await quickInputService.pick(items, {
-            placeHolder: ( localize(4988, "Select a plugin marketplace"))
+            placeHolder: ( localize(5049, "Select a plugin marketplace"))
         });
         if (!selected) {
             return;
@@ -156,22 +165,22 @@ class ManagePluginMarketplacesAction extends Action2 {
         const ref = selected.reference;
         const actionItems = [{
             id: "showPlugins",
-            label: ( localize(4989, "Show Plugins"))
+            label: ( localize(5050, "Show Plugins"))
         }];
         const repoUri = pluginRepositoryService.getRepositoryUri(ref);
         const repoExists = await fileService.exists(repoUri);
         if (repoExists) {
             actionItems.push({
                 id: "openDirectory",
-                label: ( localize(4990, "Open Folder"))
+                label: ( localize(5051, "Open Folder"))
             });
         }
         actionItems.push({
             id: "removeMarketplace",
-            label: ( localize(4991, "Remove Marketplace"))
+            label: ( localize(5052, "Remove Marketplace"))
         });
         const action = await quickInputService.pick(actionItems, {
-            placeHolder: ( localize(4992, "Select an action for '{0}'", ref.displayLabel))
+            placeHolder: ( localize(5053, "Select an action for '{0}'", ref.displayLabel))
         });
         if (!action) {
             return;

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

@@ -13,7 +13,7 @@ function registerChatPromptNavigationActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.nextUserPrompt",
-                title: ( localize2(4993, "Next User Prompt")),
+                title: ( localize2(5054, "Next User Prompt")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.DownArrow,
                     weight: KeybindingWeight.WorkbenchContrib,
@@ -32,7 +32,7 @@ function registerChatPromptNavigationActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.previousUserPrompt",
-                title: ( localize2(4994, "Previous User Prompt")),
+                title: ( localize2(5055, "Previous User Prompt")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.UpArrow,
                     weight: KeybindingWeight.WorkbenchContrib,

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

@@ -32,8 +32,8 @@ class ChatQueueMessageAction extends Action2 {
     constructor() {
         super({
             id: ChatQueueMessageAction.ID,
-            title: ( localize2(4995, "Add to Queue")),
-            tooltip: ( localize(4996, "Queue this message to send after the current request completes")),
+            title: ( localize2(5056, "Add to Queue")),
+            tooltip: ( localize(5057, "Queue this message to send after the current request completes")),
             icon: Codicon.add,
             f1: false,
             category: CHAT_CATEGORY,
@@ -79,9 +79,9 @@ class ChatSteerWithMessageAction extends Action2 {
     constructor() {
         super({
             id: ChatSteerWithMessageAction.ID,
-            title: ( localize2(4997, "Steer with Message")),
+            title: ( localize2(5058, "Steer with Message")),
             tooltip: ( localize(
-                4998,
+                5059,
                 "Send this message at the next opportunity, signaling the current request to yield"
             )),
             icon: Codicon.arrowUp,
@@ -129,7 +129,7 @@ class ChatRemovePendingRequestAction extends Action2 {
     constructor() {
         super({
             id: ChatRemovePendingRequestAction.ID,
-            title: ( localize2(4999, "Remove from Queue")),
+            title: ( localize2(5060, "Remove from Queue")),
             icon: Codicon.close,
             f1: false,
             category: CHAT_CATEGORY,
@@ -161,7 +161,7 @@ class ChatEditPendingRequestAction extends Action2 {
     constructor() {
         super({
             id: ChatEditPendingRequestAction.ID,
-            title: ( localize2(5000, "Edit")),
+            title: ( localize2(5061, "Edit")),
             icon: Codicon.edit,
             f1: false,
             category: CHAT_CATEGORY,
@@ -195,7 +195,7 @@ class ChatSendPendingImmediatelyAction extends Action2 {
     constructor() {
         super({
             id: ChatSendPendingImmediatelyAction.ID,
-            title: ( localize2(5001, "Send Immediately")),
+            title: ( localize2(5062, "Send Immediately")),
             icon: Codicon.arrowUp,
             f1: false,
             category: CHAT_CATEGORY,
@@ -244,7 +244,7 @@ class ChatRemoveAllPendingRequestsAction extends Action2 {
     constructor() {
         super({
             id: ChatRemoveAllPendingRequestsAction.ID,
-            title: ( localize2(5002, "Remove All Queued")),
+            title: ( localize2(5063, "Remove All Queued")),
             icon: Codicon.clearAll,
             f1: false,
             category: CHAT_CATEGORY,
@@ -280,7 +280,7 @@ function registerChatQueueActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatExecuteQueue, {
         command: {
             id: ChatQueueMessageAction.ID,
-            title: ( localize2(4995, "Add to Queue")),
+            title: ( localize2(5056, "Add to Queue")),
             icon: Codicon.add
         },
         group: "navigation",
@@ -289,7 +289,7 @@ function registerChatQueueActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatExecuteQueue, {
         command: {
             id: ChatSteerWithMessageAction.ID,
-            title: ( localize2(4997, "Steer with Message")),
+            title: ( localize2(5058, "Steer with Message")),
             icon: Codicon.arrowUp
         },
         group: "navigation",
@@ -297,7 +297,7 @@ function registerChatQueueActions() {
     });
     MenuRegistry.appendMenuItem(MenuId.ChatExecute, {
         submenu: MenuId.ChatExecuteQueue,
-        title: ( localize2(5003, "Queue")),
+        title: ( localize2(5064, "Queue")),
         icon: Codicon.listOrdered,
         when: ( ContextKeyExpr.and(queuingActionsPresent, ChatContextKeys.inputHasText)),
         group: "navigation",

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

@@ -18,7 +18,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: "workbench.action.quickchat.openInChatView",
-                title: ( localize2(5004, "Open in Chat View")),
+                title: ( localize2(5065, "Open in Chat View")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.chatSparkle,
@@ -38,7 +38,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: "workbench.action.quickchat.close",
-                title: ( localize2(5005, "Close Quick Chat")),
+                title: ( localize2(5066, "Close Quick Chat")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.close,
@@ -59,7 +59,7 @@ class QuickChatGlobalAction extends Action2 {
     constructor() {
         super({
             id: ASK_QUICK_QUESTION_ACTION_ID,
-            title: ( localize2(5006, "Open Quick Chat")),
+            title: ( localize2(5067, "Open Quick Chat")),
             precondition: ChatContextKeys.enabled,
             icon: Codicon.chatSparkle,
             f1: false,
@@ -74,7 +74,7 @@ class QuickChatGlobalAction extends Action2 {
                 order: 4
             },
             metadata: {
-                description: ( localize(5007, "Toggle the quick chat")),
+                description: ( localize(5068, "Toggle the quick chat")),
                 args: [{
                     name: "args",
                     schema: {
@@ -83,17 +83,17 @@ class QuickChatGlobalAction extends Action2 {
                             required: ["query"],
                             properties: {
                                 query: {
-                                    description: ( localize(5008, "The query to open the quick chat with")),
+                                    description: ( localize(5069, "The query to open the quick chat with")),
                                     type: "string"
                                 },
                                 isPartialQuery: {
-                                    description: ( localize(5009, "Whether the query is partial; it will wait for more user input")),
+                                    description: ( localize(5070, "Whether the query is partial; it will wait for more user input")),
                                     type: "boolean"
                                 }
                             }
                         }, {
                             type: "string",
-                            description: ( localize(5008, "The query to open the quick chat with"))
+                            description: ( localize(5069, "The query to open the quick chat with"))
                         }]
                     }
                 }]
@@ -124,7 +124,7 @@ class AskQuickChatAction extends Action2 {
         super({
             id: `workbench.action.openQuickChat`,
             category: CHAT_CATEGORY,
-            title: ( localize2(5010, "Open Quick Chat")),
+            title: ( localize2(5071, "Open Quick Chat")),
             precondition: ChatContextKeys.enabled,
             f1: true
         });

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

@@ -27,7 +27,7 @@ import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
-import { reviewEdits, reviewNotebookEdits } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { reviewEdits, reviewNotebookEdits } from './reviewEdits.js';
 import { insertCell } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
 import { CellKind, NOTEBOOK_EDITOR_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
@@ -65,7 +65,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
                 await this.handleNotebookEditor(activeNotebookEditor, context);
             } else {
                 this.notify(( localize(
-                    5044,
+                    5105,
                     "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."
                 )));
             }
@@ -92,13 +92,14 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
                 modelId: request?.modelId,
                 presentation: "codeBlock",
                 applyCodeBlockSuggestionId: undefined,
-                source: undefined
+                source: undefined,
+                sourceRequestId: undefined
             });
         }
     }
     async handleNotebookEditor(notebookEditor, codeBlockContext) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(5045, "Cannot insert the code block to read-only notebook editor.")));
+            this.notify(( localize(5106, "Cannot insert the code block to read-only notebook editor.")));
             return false;
         }
         const focusRange = notebookEditor.getFocus();
@@ -117,7 +118,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     async handleTextEditor(codeEditor, codeBlockContext) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(5046, "Cannot insert the code block to read-only code editor.")));
+            this.notify(( localize(5107, "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 +180,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                     this.tryToRevealCodeBlock(codeEditor, context.code);
                     activeEditorControl = codeEditor;
                 } else {
-                    this.notify(( localize(5047, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
+                    this.notify(( localize(5108, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
                     return;
                 }
             } catch (e) {
@@ -211,7 +212,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             if (activeNotebookEditor) {
                 result = await this.handleNotebookEditor(activeNotebookEditor, context.chatSessionResource, context.code);
             } else {
-                this.notify(( localize(5048, "To apply this code block, open a code or notebook editor.")));
+                this.notify(( localize(5109, "To apply this code block, open a code or notebook editor.")));
             }
         }
         if (isResponseVM(context.element)) {
@@ -235,7 +236,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         }
         const activeEditorOption = activeEditorControl?.getModel().uri ? {
             label: ( localize(
-                5049,
+                5110,
                 "Active editor '{0}'",
                 this.labelService.getUriLabel(activeEditorControl.getModel().uri, {
                     relative: true
@@ -244,13 +245,13 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             id: "activeEditor"
         } : undefined;
         const untitledEditorOption = {
-            label: ( localize(5050, "New untitled editor")),
+            label: ( localize(5111, "New untitled editor")),
             id: "newUntitledFile"
         };
         const options = [];
         if (resource) {
             options.push({
-                label: ( localize(5051, "New file '{0}'", this.labelService.getUriLabel(resource, {
+                label: ( localize(5112, "New file '{0}'", this.labelService.getUriLabel(resource, {
                     relative: true
                 }))),
                 id: "createFile"
@@ -266,7 +267,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             options.push(untitledEditorOption);
         }
         const selected = options.length > 1 ? await this.quickInputService.pick(options, {
-            placeHolder: ( localize(5052, "Select where to apply the code block"))
+            placeHolder: ( localize(5113, "Select where to apply the code block"))
         }) : options[0];
         if (selected) {
             switch (selected.id) {
@@ -275,7 +276,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                     try {
                         await this.fileService.writeFile(resource, VSBuffer.fromString(""));
                     } catch (error) {
-                        this.notify(( localize(5053, "Failed to create file: {0}", error.message)));
+                        this.notify(( localize(5114, "Failed to create file: {0}", error.message)));
                         return ( URI.from({
                             scheme: "untitled",
                             path: resource.path
@@ -296,7 +297,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     }
     async handleNotebookEditor(notebookEditor, chatSessionResource, code) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(5054, "Cannot apply code block to read-only notebook editor.")));
+            this.notify(( localize(5115, "Cannot apply code block to read-only notebook editor.")));
             return undefined;
         }
         const uri = notebookEditor.textModel.uri;
@@ -307,7 +308,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         };
         const codeMapper = this.codeMapperService.providers[0]?.displayName;
         if (!codeMapper) {
-            this.notify(( localize(5055, "No code mapper available.")));
+            this.notify(( localize(5116, "No code mapper available.")));
             return undefined;
         }
         let editsProposed = false;
@@ -320,7 +321,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                 cancellable: true
             }, async progress => {
                 progress.report({
-                    message: ( localize(5056, "Applying code block using {0}...", codeMapper))
+                    message: ( localize(5117, "Applying code block using {0}...", codeMapper))
                 });
                 const editsIterable = this.getNotebookEdits(codeBlock, chatSessionResource, cancellationTokenSource.token);
                 return await this.waitForFirstElement(editsIterable);
@@ -328,7 +329,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             editsProposed = await this.applyNotebookEditsWithInlinePreview(iterable, uri, cancellationTokenSource);
         } catch (e) {
             if (!isCancellationError(e)) {
-                this.notify(( localize(5057, "Failed to apply code block: {0}", e.message)));
+                this.notify(( localize(5118, "Failed to apply code block: {0}", e.message)));
             }
         } finally {
             cancellationTokenSource.dispose();
@@ -341,7 +342,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     async handleTextEditor(codeEditor, chatSessionResource, code, applyCodeBlockSuggestionId) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(5058, "Cannot apply code block to read-only file.")));
+            this.notify(( localize(5119, "Cannot apply code block to read-only file.")));
             return undefined;
         }
         const codeBlock = {
@@ -352,7 +353,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         };
         const codeMapper = this.codeMapperService.providers[0]?.displayName;
         if (!codeMapper) {
-            this.notify(( localize(5055, "No code mapper available.")));
+            this.notify(( localize(5116, "No code mapper available.")));
             return undefined;
         }
         let editsProposed = false;
@@ -365,7 +366,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                 cancellable: true
             }, async progress => {
                 progress.report({
-                    message: ( localize(5056, "Applying code block using {0}...", codeMapper))
+                    message: ( localize(5117, "Applying code block using {0}...", codeMapper))
                 });
                 const editsIterable = this.getTextEdits(codeBlock, chatSessionResource, cancellationTokenSource.token);
                 return await this.waitForFirstElement(editsIterable);
@@ -373,7 +374,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             editsProposed = await this.applyWithInlinePreview(iterable, codeEditor, cancellationTokenSource, applyCodeBlockSuggestionId);
         } catch (e) {
             if (!isCancellationError(e)) {
-                this.notify(( localize(5057, "Failed to apply code block: {0}", e.message)));
+                this.notify(( localize(5118, "Failed to apply code block: {0}", e.message)));
             }
         } finally {
             cancellationTokenSource.dispose();

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

@@ -15,7 +15,7 @@ import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
-import { InstalledAgentPluginsViewId } from '../agentPluginsView.js';
+import { InstalledAgentPluginsViewId } 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 { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { PromptsStorage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
@@ -28,19 +28,19 @@ const VALID_PLUGIN_NAME = /^[a-z0-9]([a-z0-9\-.]*[a-z0-9])?$/;
 const INVALID_CONSECUTIVE = /--|[.][.]/;
 function validatePluginName(name) {
     if (!name) {
-        return localize(5059, "Plugin name is required.");
+        return localize(5120, "Plugin name is required.");
     }
     if (name.length > 64) {
-        return localize(5060, "Plugin name must be at most 64 characters.");
+        return localize(5121, "Plugin name must be at most 64 characters.");
     }
     if (!VALID_PLUGIN_NAME.test(name)) {
         return localize(
-            5061,
+            5122,
             "Plugin name must contain only lowercase alphanumeric characters, hyphens, and periods, and must start and end with an alphanumeric character."
         );
     }
     if (INVALID_CONSECUTIVE.test(name)) {
-        return localize(5062, "Plugin name must not contain consecutive hyphens or periods.");
+        return localize(5123, "Plugin name must not contain consecutive hyphens or periods.");
     }
     return undefined;
 }
@@ -48,7 +48,7 @@ function isUserDefined(storage) {
     return storage === PromptsStorage.local || storage === PromptsStorage.user;
 }
 function isUserDefinedMcpCollection(collection) {
-    const order = collection.presentation?.order;
+    const order = collection.order;
     return order === McpCollectionSortOrder.User || order === McpCollectionSortOrder.WorkspaceFolder || order === McpCollectionSortOrder.Workspace;
 }
 function getResourceLabel(r) {
@@ -72,7 +72,7 @@ class CreatePluginAction extends Action2 {
     constructor() {
         super({
             id: CreatePluginAction.ID,
-            title: ( localize2(5063, "Create Plugin")),
+            title: ( localize2(5124, "Create Plugin")),
             category: CHAT_CATEGORY,
             f1: true,
             precondition: ChatContextKeys.enabled,
@@ -132,11 +132,11 @@ class CreatePluginAction extends Action2 {
                     children
                 });
             };
-            addGroup(instructions, "instruction", ( localize(5064, "Instructions")), Codicon.book);
-            addGroup(prompts, "prompt", ( localize(5065, "Prompts")), Codicon.comment);
-            addGroup(agents, "agent", ( localize(5066, "Agents")), Codicon.copilot);
-            addGroup(skills, "skill", ( localize(5067, "Skills")), Codicon.lightbulb);
-            addGroup(hooks, "hook", ( localize(5068, "Hooks")), Codicon.zap);
+            addGroup(instructions, "instruction", ( localize(5125, "Instructions")), Codicon.book);
+            addGroup(prompts, "prompt", ( localize(5126, "Prompts")), Codicon.comment);
+            addGroup(agents, "agent", ( localize(5127, "Agents")), Codicon.copilot);
+            addGroup(skills, "skill", ( localize(5128, "Skills")), Codicon.lightbulb);
+            addGroup(hooks, "hook", ( localize(5129, "Hooks")), Codicon.zap);
             const mcpChildren = [];
             for (const collection of mcpCollections) {
                 if (!showAll && !isUserDefinedMcpCollection(collection)) {
@@ -158,7 +158,7 @@ class CreatePluginAction extends Action2 {
             }
             if (mcpChildren.length > 0) {
                 groups.push({
-                    label: ( localize(5069, "MCP Servers")),
+                    label: ( localize(5130, "MCP Servers")),
                     iconClass: ThemeIcon.asClassName(Codicon.mcp),
                     checked: undefined,
                     collapsed: false,
@@ -170,15 +170,15 @@ class CreatePluginAction extends Action2 {
         };
         const disposables = ( new DisposableStore());
         const tree = disposables.add(quickInputService.createQuickTree());
-        tree.placeholder = ( localize(5070, "Select resources to include in the plugin"));
+        tree.placeholder = ( localize(5131, "Select resources to include in the plugin"));
         tree.matchOnDescription = true;
         tree.matchOnLabel = true;
         tree.sortByLabel = false;
-        tree.title = ( localize(5071, "Create Plugin"));
+        tree.title = ( localize(5132, "Create Plugin"));
         tree.setItemTree(buildTree());
         const toggleButton = {
             iconClass: ThemeIcon.asClassName(Codicon.filter),
-            tooltip: ( localize(5072, "Show Built-in, Extension, and Plugin Resources"))
+            tooltip: ( localize(5133, "Show Built-in, Extension, and Plugin Resources"))
         };
         tree.buttons = [toggleButton];
         disposables.add(tree.onDidTriggerButton(button => {
@@ -203,7 +203,7 @@ class CreatePluginAction extends Action2 {
         }
         const selected = selectedItems.filter(i => !!i.resourceType);
         const pluginName = await quickInputService.input({
-            prompt: ( localize(5073, "Enter a name for the plugin")),
+            prompt: ( localize(5134, "Enter a name for the plugin")),
             placeHolder: "my-plugin",
             validateInput: async value => validatePluginName(value)
         });
@@ -214,8 +214,8 @@ class CreatePluginAction extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localize(5074, "Select Plugin Save Location")),
-            openLabel: ( localize(5075, "Select Folder"))
+            title: ( localize(5135, "Select Plugin Save Location")),
+            openLabel: ( localize(5136, "Select Folder"))
         });
         if (!folderUris || folderUris.length === 0) {
             return;
@@ -224,7 +224,7 @@ class CreatePluginAction extends Action2 {
         const pluginRoot = joinPath(targetDir, pluginName);
         if (await fileService.exists(pluginRoot)) {
             notificationService.error(( localize(
-                5076,
+                5137,
                 "A directory named '{0}' already exists at this location. Please choose a different name or location.",
                 pluginName
             )));
@@ -236,9 +236,9 @@ class CreatePluginAction extends Action2 {
             try {
                 await commandService.executeCommand("revealFileInOS", pluginRoot);
             } catch {}
-            notificationService.info(( localize(5077, "Plugin '{0}' created successfully.", pluginName)));
+            notificationService.info(( localize(5138, "Plugin '{0}' created successfully.", pluginName)));
         } catch (err) {
-            notificationService.error(( localize(5078, "Failed to create plugin: {0}", String(err))));
+            notificationService.error(( localize(5139, "Failed to create plugin: {0}", String(err))));
         }
     }
 }

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

@@ -0,0 +1,12 @@
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
+import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
+import { EditSuggestionId } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditSource";
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
+export declare function reviewEdits(accessor: ServicesAccessor, editor: ICodeEditor, stream: AsyncIterable<TextEdit[]>, token: CancellationToken, applyCodeBlockSuggestionId: EditSuggestionId | undefined): Promise<boolean>;
+export declare function reviewNotebookEdits(accessor: ServicesAccessor, uri: URI, stream: AsyncIterable<[
+    URI,
+    TextEdit[]
+] | ICellEditOperation[]>, token: CancellationToken): Promise<boolean>;