@codingame/monaco-vscode-extensions-service-override 16.1.0 → 17.0.0

package/index.d.ts

@@ -15,7 +15,7 @@ import { IWebExtensionsScannerService, IWorkbenchExtensionEnablementService, IWo
 import { IExtensionManifestPropertiesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
-import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
+import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
 import type { IEditorOverrideServices } from "@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices";
 import { IUserDataInitializationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userData/browser/userDataInit.service";
 import { ExtensionService } from "./vscode/src/vs/workbench/services/extensions/browser/extensionService.js";

package/index.js

@@ -20,7 +20,7 @@ import { ExtensionManifestPropertiesService } from '@codingame/monaco-vscode-d7f
 import { IExtensionManifestPropertiesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
-import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { IUserDataInitializationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userData/browser/userDataInit.service';
 import { ExtensionsProposedApi } from './vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.js';
@@ -127,6 +127,7 @@ import './vscode/src/vs/workbench/api/browser/mainThreadShare.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadProfileContentHandlers.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadAiRelatedInformation.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadAiEmbeddingVector.js';
+import './vscode/src/vs/workbench/api/browser/mainThreadAiSettingsSearch.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadMcp.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadChatStatus.js';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "16.1.0",
+  "version": "17.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - extensions service-override",
   "keywords": [],
@@ -15,37 +15,33 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common": "16.1.0",
-    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "16.1.0",
-    "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common": "16.1.0",
-    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "16.1.0",
-    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "16.1.0",
-    "@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common": "16.1.0",
-    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "16.1.0",
-    "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common": "16.1.0",
-    "@codingame/monaco-vscode-4893679b-56e5-52c5-a8fb-c366cce9660f-common": "16.1.0",
-    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "16.1.0",
-    "@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common": "16.1.0",
-    "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common": "16.1.0",
-    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "16.1.0",
-    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "16.1.0",
-    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "16.1.0",
-    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "16.1.0",
-    "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common": "16.1.0",
-    "@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common": "16.1.0",
-    "@codingame/monaco-vscode-ad89fae6-94f0-5ac2-a185-22dea4b68ee0-common": "16.1.0",
-    "@codingame/monaco-vscode-api": "16.1.0",
-    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "16.1.0",
-    "@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common": "16.1.0",
-    "@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common": "16.1.0",
-    "@codingame/monaco-vscode-d7f659f5-da33-5ea8-a3b8-9b94f2cf5f33-common": "16.1.0",
-    "@codingame/monaco-vscode-e67a0dae-5b2c-54e6-8d61-90102c78362d-common": "16.1.0",
-    "@codingame/monaco-vscode-eb7d5efd-2e60-59f8-9ba4-9a8ae8cb2957-common": "16.1.0",
-    "@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common": "16.1.0",
-    "@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common": "16.1.0",
-    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "16.1.0",
-    "@codingame/monaco-vscode-fdf643f9-94dd-5510-b97a-408abf26ad92-common": "16.1.0",
-    "@codingame/monaco-vscode-files-service-override": "16.1.0"
+    "@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common": "17.0.0",
+    "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common": "17.0.0",
+    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "17.0.0",
+    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "17.0.0",
+    "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common": "17.0.0",
+    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "17.0.0",
+    "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common": "17.0.0",
+    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "17.0.0",
+    "@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common": "17.0.0",
+    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "17.0.0",
+    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "17.0.0",
+    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "17.0.0",
+    "@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common": "17.0.0",
+    "@codingame/monaco-vscode-api": "17.0.0",
+    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "17.0.0",
+    "@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common": "17.0.0",
+    "@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common": "17.0.0",
+    "@codingame/monaco-vscode-c3c61c00-c254-5856-9dc9-d7929c1f9062-common": "17.0.0",
+    "@codingame/monaco-vscode-c8227507-8e59-53d6-b50b-71c0ab384cf4-common": "17.0.0",
+    "@codingame/monaco-vscode-d7f659f5-da33-5ea8-a3b8-9b94f2cf5f33-common": "17.0.0",
+    "@codingame/monaco-vscode-e67a0dae-5b2c-54e6-8d61-90102c78362d-common": "17.0.0",
+    "@codingame/monaco-vscode-eb7d5efd-2e60-59f8-9ba4-9a8ae8cb2957-common": "17.0.0",
+    "@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common": "17.0.0",
+    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "17.0.0",
+    "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common": "17.0.0",
+    "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common": "17.0.0",
+    "@codingame/monaco-vscode-files-service-override": "17.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLI.js

@@ -12,9 +12,9 @@ import { IExtensionManagementService, IExtensionGalleryService } from '@codingam
 import { getIdAndVersion, areSameExtensions, getGalleryExtensionId, getExtensionId } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionType, EXTENSION_CATEGORIES } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 
-const notFound = (id) => ( localize(1771, "Extension '{0}' not found.", id));
+const notFound = (id) => ( localize(1787, "Extension '{0}' not found.", id));
 const useId = ( localize(
-    1772,
+    1788,
     "Make sure you use the full extension ID, including the publisher, e.g.: {0}",
     'ms-dotnettools.csharp'
 ));
@@ -51,7 +51,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             return;
         }
         if (this.location) {
-            this.logger.info(( localize(1773, "Extensions installed on {0}:", this.location)));
+            this.logger.info(( localize(1789, "Extensions installed on {0}:", this.location)));
         }
         extensions = extensions.sort((e1, e2) => e1.identifier.id.localeCompare(e2.identifier.id));
         let lastId = undefined;
@@ -66,7 +66,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         const failed = [];
         try {
             if (extensions.length) {
-                this.logger.info(this.location ? ( localize(1774, "Installing extensions on {0}...", this.location)) : ( localize(1775, "Installing extensions...")));
+                this.logger.info(this.location ? ( localize(1790, "Installing extensions on {0}...", this.location)) : ( localize(1791, "Installing extensions...")));
             }
             const installVSIXInfos = [];
             const installExtensionInfos = [];
@@ -109,11 +109,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         catch (error) {
-            this.logger.error(( localize(1776, "Error while installing extensions: {0}", getErrorMessage(error))));
+            this.logger.error(( localize(1792, "Error while installing extensions: {0}", getErrorMessage(error))));
             throw error;
         }
         if (failed.length) {
-            throw ( new Error(( localize(1777, "Failed Installing Extensions: {0}", failed.join(', ')))));
+            throw ( new Error(( localize(1793, "Failed Installing Extensions: {0}", failed.join(', ')))));
         }
     }
     async updateExtensions(profileLocation) {
@@ -125,7 +125,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         this.logger.trace(( localize(
-            1778,
+            1794,
             "Fetching latest versions for {0} extensions",
             installedExtensionsQuery.length
         )));
@@ -142,11 +142,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         if (!extensionsToUpdate.length) {
-            this.logger.info(( localize(1779, "No extension to update")));
+            this.logger.info(( localize(1795, "No extension to update")));
             return;
         }
         this.logger.info(( localize(
-            1780,
+            1796,
             "Updating extensions: {0}",
             ( extensionsToUpdate.map(ext => ext.extension.identifier.id)).join(', ')
         )));
@@ -154,7 +154,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         for (const extensionResult of installationResult) {
             if (extensionResult.error) {
                 this.logger.error(( localize(
-                    1781,
+                    1797,
                     "Error while updating extension {0}: {1}",
                     extensionResult.identifier.id,
                     getErrorMessage(extensionResult.error)
@@ -162,7 +162,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             else {
                 this.logger.info(( localize(
-                    1782,
+                    1798,
                     "Extension '{0}' v{1} was successfully updated.",
                     extensionResult.identifier.id,
                     extensionResult.local?.manifest.version
@@ -177,7 +177,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (!force && (!version || (version === 'prerelease' && installedExtension.preRelease))) {
                     this.logger.info(( localize(
-                        1783,
+                        1799,
                         "Extension '{0}' v{1} is already installed. Use '--force' option to update to latest version or provide '@<version>' to install a specific version, for example: '{2}@1.2.3'.",
                         id,
                         installedExtension.manifest.version,
@@ -186,7 +186,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     return false;
                 }
                 if (version && installedExtension.manifest.version === version) {
-                    this.logger.info(( localize(1784, "Extension '{0}' is already installed.", `${id}@${version}`)));
+                    this.logger.info(( localize(1800, "Extension '{0}' is already installed.", `${id}@${version}`)));
                     return false;
                 }
                 if (installedExtension.preRelease && version !== 'prerelease') {
@@ -223,24 +223,24 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (gallery.version === installedExtension.manifest.version) {
                     this.logger.info(( localize(
-                        1784,
+                        1800,
                         "Extension '{0}' is already installed.",
                         version ? `${id}@${version}` : id
                     )));
                     return;
                 }
                 this.logger.info(( localize(
-                    1785,
+                    1801,
                     "Updating the extension '{0}' to the version {1}",
                     id,
                     gallery.version
                 )));
             }
             if (installOptions.isBuiltin) {
-                this.logger.info(version ? ( localize(1786, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1787, "Installing builtin extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1802, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1803, "Installing builtin extension '{0}'...", id)));
             }
             else {
-                this.logger.info(version ? ( localize(1788, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1789, "Installing extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1804, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1805, "Installing extension '{0}'...", id)));
             }
             extensionsToInstall.push({
                 extension: gallery,
@@ -252,7 +252,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             for (const extensionResult of installationResult) {
                 if (extensionResult.error) {
                     this.logger.error(( localize(
-                        1790,
+                        1806,
                         "Error while installing extension {0}: {1}",
                         extensionResult.identifier.id,
                         getErrorMessage(extensionResult.error)
@@ -261,7 +261,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 }
                 else {
                     this.logger.info(( localize(
-                        1791,
+                        1807,
                         "Extension '{0}' v{1} was successfully installed.",
                         extensionResult.identifier.id,
                         extensionResult.local?.manifest.version
@@ -280,11 +280,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         if (valid) {
             try {
                 await this.extensionManagementService.install(vsix, { ...installOptions, installGivenVersion: true });
-                this.logger.info(( localize(1792, "Extension '{0}' was successfully installed.", basename(vsix))));
+                this.logger.info(( localize(1808, "Extension '{0}' was successfully installed.", basename(vsix))));
             }
             catch (error) {
                 if (isCancellationError(error)) {
-                    this.logger.info(( localize(1793, "Cancelled installing extension '{0}'.", basename(vsix))));
+                    this.logger.info(( localize(1809, "Cancelled installing extension '{0}'.", basename(vsix))));
                 }
                 else {
                     throw error;
@@ -319,7 +319,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             const newer = installedExtensions.find(local => areSameExtensions(extensionIdentifier, local.identifier) && semverExports.gt(local.manifest.version, manifest.version));
             if (newer) {
                 this.logger.info(( localize(
-                    1794,
+                    1810,
                     "A newer version of extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.",
                     newer.identifier.id,
                     newer.manifest.version,
@@ -347,7 +347,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (( extensionsToUninstall.some(e => e.type === ExtensionType.System))) {
                 this.logger.info(( localize(
-                    1795,
+                    1811,
                     "Extension '{0}' is a Built-in extension and cannot be uninstalled",
                     id
                 )));
@@ -355,26 +355,26 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (!force && ( extensionsToUninstall.some(e => e.isBuiltin))) {
                 this.logger.info(( localize(
-                    1796,
+                    1812,
                     "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
                     id
                 )));
                 return;
             }
-            this.logger.info(( localize(1797, "Uninstalling {0}...", id)));
+            this.logger.info(( localize(1813, "Uninstalling {0}...", id)));
             for (const extensionToUninstall of extensionsToUninstall) {
                 await this.extensionManagementService.uninstall(extensionToUninstall, { profileLocation });
             }
             if (this.location) {
                 this.logger.info(( localize(
-                    1798,
+                    1814,
                     "Extension '{0}' was successfully uninstalled from {1}!",
                     id,
                     this.location
                 )));
             }
             else {
-                this.logger.info(( localize(1799, "Extension '{0}' was successfully uninstalled!", id)));
+                this.logger.info(( localize(1815, "Extension '{0}' was successfully uninstalled!", id)));
             }
         }
     }
@@ -392,7 +392,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         });
     }
     notInstalled(id) {
-        return this.location ? ( localize(1800, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1801, "Extension '{0}' is not installed.", id));
+        return this.location ? ( localize(1816, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1817, "Extension '{0}' is not installed.", id));
     }
 };
 ExtensionManagementCLI = ( __decorate([

package/vscode/src/vs/workbench/api/browser/mainThreadAiRelatedInformation.d.ts

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { MainThreadAiRelatedInformationShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { RelatedInformationType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHostTypes";
-import { RelatedInformationResult } from "@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common/vscode/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation";
+import { RelatedInformationResult } from "@codingame/monaco-vscode-quickaccess-service-override/vscode/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation";
 import { IAiRelatedInformationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 export declare class MainThreadAiRelatedInformation extends Disposable implements MainThreadAiRelatedInformationShape {

package/vscode/src/vs/workbench/api/browser/mainThreadAiSettingsSearch.d.ts

@@ -0,0 +1,14 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { AiSettingsSearchResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearch";
+import { IAiSettingsSearchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearch.service";
+import { MainThreadAiSettingsSearchShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+export declare class MainThreadAiSettingsSearch extends Disposable implements MainThreadAiSettingsSearchShape {
+    private readonly _settingsSearchService;
+    private readonly _proxy;
+    private readonly _registrations;
+    constructor(context: IExtHostContext, _settingsSearchService: IAiSettingsSearchService);
+    $registerAiSettingsSearchProvider(handle: number): void;
+    $unregisterAiSettingsSearchProvider(handle: number): void;
+    $handleSearchResult(handle: number, result: AiSettingsSearchResult): void;
+}

package/vscode/src/vs/workbench/api/browser/mainThreadAiSettingsSearch.js

@@ -0,0 +1,38 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { IAiSettingsSearchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearch.service';
+import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
+
+let MainThreadAiSettingsSearch = class MainThreadAiSettingsSearch extends Disposable {
+    constructor(context, _settingsSearchService) {
+        super();
+        this._settingsSearchService = _settingsSearchService;
+        this._registrations = this._register(( new DisposableMap()));
+        this._proxy = ( context.getProxy(ExtHostContext.ExtHostAiSettingsSearch));
+    }
+    $registerAiSettingsSearchProvider(handle) {
+        const provider = {
+            searchSettings: (query, option, token) => {
+                return this._proxy.$startSearch(handle, query, option, token);
+            }
+        };
+        this._registrations.set(handle, this._settingsSearchService.registerSettingsSearchProvider(provider));
+    }
+    $unregisterAiSettingsSearchProvider(handle) {
+        this._registrations.deleteAndDispose(handle);
+    }
+    $handleSearchResult(handle, result) {
+        if (!( this._registrations.has(handle))) {
+            throw ( new Error(`No AI settings search provider found`));
+        }
+        this._settingsSearchService.handleSearchResult(result);
+    }
+};
+MainThreadAiSettingsSearch = __decorate([
+    extHostNamedCustomer(MainContext.MainThreadAiSettingsSearch),
+    ( __param(1, IAiSettingsSearchService))
+], MainThreadAiSettingsSearch);
+
+export { MainThreadAiSettingsSearch };

package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js

@@ -39,7 +39,7 @@ class MainThreadAuthenticationProvider extends Disposable {
     }
     async removeSession(sessionId) {
         await this._proxy.$removeSession(this.id, sessionId);
-        this.notificationService.info(( localize(2363, "Successfully signed out.")));
+        this.notificationService.info(( localize(2381, "Successfully signed out.")));
     }
 }
 let MainThreadAuthentication = class MainThreadAuthentication extends Disposable {
@@ -106,7 +106,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         let message;
         if (provider.id.startsWith(INTERNAL_AUTH_PROVIDER_PREFIX)) {
             message = ( localize(
-                2364,
+                2382,
                 "The extension '{0}' wants to access the language models provided by {1}.",
                 extensionName,
                 provider.label
@@ -115,13 +115,13 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         else {
             message = recreatingSession
                 ? ( localize(
-                2365,
+                2383,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             ))
                 : ( localize(
-                2366,
+                2384,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
@@ -129,7 +129,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }
         const buttons = [
             {
-                label: ( localize(2367, "&&Allow")),
+                label: ( localize(2385, "&&Allow")),
                 run() {
                     return true;
                 },
@@ -137,7 +137,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         ];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(2368, "Learn more")),
+                label: ( localize(2386, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), { allowCommands: true });
@@ -156,9 +156,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2369, "Incorrect account detected")),
+            message: ( localize(2387, "Incorrect account detected")),
             detail: ( localize(
-                2370,
+                2388,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -167,11 +167,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             cancelButton: true,
             buttons: [
                 {
-                    label: ( localize(2371, 'Keep {0}', chosenAccountLabel)),
+                    label: ( localize(2389, 'Keep {0}', chosenAccountLabel)),
                     run: () => chosenAccountLabel
                 },
                 {
-                    label: ( localize(2372, 'Login with {0}', requestedAccountLabel)),
+                    label: ( localize(2390, 'Login with {0}', requestedAccountLabel)),
                     run: () => requestedAccountLabel
                 }
             ],

package/vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js

@@ -7,7 +7,7 @@ import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
+import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { CellEditType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 

package/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.js

@@ -92,7 +92,7 @@ let RemoteExtensionManagementCLI = class RemoteExtensionManagementCLI extends Ex
         if (!this._extensionManifestPropertiesService.canExecuteOnWorkspace(manifest)
             && !(isWeb && this._extensionManifestPropertiesService.canExecuteOnWeb(manifest))) {
             this.logger.info(( localize(
-                2373,
+                2391,
                 "Cannot install the '{0}' extension because it is declared to not run in this setup.",
                 getExtensionId(manifest.publisher, manifest.name)
             )));

package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.d.ts

@@ -7,6 +7,7 @@ import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
 import { IChatRelatedFileProviderMetadata } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
@@ -39,6 +40,7 @@ export declare class MainThreadChatAgents2 extends Disposable implements MainThr
     private readonly _instantiationService;
     private readonly _logService;
     private readonly _extensionService;
+    private readonly _uriIdentityService;
     private readonly _agents;
     private readonly _agentCompletionProviders;
     private readonly _agentIdsToCompletionProviders;
@@ -49,7 +51,7 @@ export declare class MainThreadChatAgents2 extends Disposable implements MainThr
     private _responsePartHandlePool;
     private readonly _activeTasks;
     private readonly _unresolvedAnchors;
-    constructor(extHostContext: IExtHostContext, _chatAgentService: IChatAgentService, _chatService: IChatService, _chatEditingService: IChatEditingService, _languageFeaturesService: ILanguageFeaturesService, _chatWidgetService: IChatWidgetService, _instantiationService: IInstantiationService, _logService: ILogService, _extensionService: IExtensionService);
+    constructor(extHostContext: IExtHostContext, _chatAgentService: IChatAgentService, _chatService: IChatService, _chatEditingService: IChatEditingService, _languageFeaturesService: ILanguageFeaturesService, _chatWidgetService: IChatWidgetService, _instantiationService: IInstantiationService, _logService: ILogService, _extensionService: IExtensionService, _uriIdentityService: IUriIdentityService);
     $unregisterAgent(handle: number): void;
     $transferActiveChatSession(toWorkspace: UriComponents): void;
     $registerAgent(handle: number, extension: ExtensionIdentifier, id: string, metadata: IExtensionChatAgentMetadata, dynamicProps: IDynamicChatAgentProps | undefined): Promise<void>;

package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js

@@ -14,19 +14,20 @@ import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs
 import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatInputPart } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
+import { ChatInputPart } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
-import { ChatRequestAgentPart } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
+import { ChatRequestAgentPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestParser } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { ChatMode, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { NotebookDto } from './mainThreadNotebookDto.js';
 import { addDynamicVariableActionId } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant';
-import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 
 class MainThreadChatTask {
     get onDidAddProgress() { return this._onDidAddProgress.event; }
@@ -52,7 +53,7 @@ class MainThreadChatTask {
     }
 }
 let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
-    constructor(extHostContext, _chatAgentService, _chatService, _chatEditingService, _languageFeaturesService, _chatWidgetService, _instantiationService, _logService, _extensionService) {
+    constructor(extHostContext, _chatAgentService, _chatService, _chatEditingService, _languageFeaturesService, _chatWidgetService, _instantiationService, _logService, _extensionService, _uriIdentityService) {
         super();
         this._chatAgentService = _chatAgentService;
         this._chatService = _chatService;
@@ -62,6 +63,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         this._instantiationService = _instantiationService;
         this._logService = _logService;
         this._extensionService = _extensionService;
+        this._uriIdentityService = _uriIdentityService;
         this._agents = this._register(( new DisposableMap()));
         this._agentCompletionProviders = this._register(( new DisposableMap()));
         this._agentIdsToCompletionProviders = this._register(( new DisposableMap()));
@@ -159,6 +161,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                 slashCommands: [],
                 disambiguation: [],
                 locations: [ChatAgentLocation.Panel],
+                modes: [ChatMode.Ask]
             }, impl);
         }
         else {
@@ -182,7 +185,14 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         this._chatAgentService.updateAgent(data.id, revive(metadataUpdate));
     }
     async $handleProgressChunk(requestId, progress, responsePartHandle) {
-        const revivedProgress = progress.kind === 'notebookEdit' ? ChatNotebookEdit.fromChatEdit(revive(progress)) : revive(progress);
+        const revivedProgress = progress.kind === 'notebookEdit'
+            ? ChatNotebookEdit.fromChatEdit(revive(progress))
+            : revive(progress);
+        if (revivedProgress.kind === 'notebookEdit'
+            || revivedProgress.kind === 'textEdit'
+            || revivedProgress.kind === 'codeblockUri') {
+            revivedProgress.uri = this._uriIdentityService.asCanonicalUri(revivedProgress.uri);
+        }
         if (revivedProgress.kind === 'progressTask') {
             const handle = ++this._responsePartHandlePool;
             const responsePartId = `${requestId}_${handle}`;
@@ -319,7 +329,8 @@ MainThreadChatAgents2 = __decorate([
     ( __param(5, IChatWidgetService)),
     ( __param(6, IInstantiationService)),
     ( __param(7, ILogService)),
-    ( __param(8, IExtensionService))
+    ( __param(8, IExtensionService)),
+    ( __param(9, IUriIdentityService))
 ], MainThreadChatAgents2);
 function computeCompletionRanges(model, position, reg) {
     const varWord = getWordAtText(position.column, reg, model.getLineContent(position.lineNumber), 0);

package/vscode/src/vs/workbench/api/browser/mainThreadChatCodeMapper.js

@@ -29,6 +29,8 @@ let MainThreadChatCodemapper = class MainThreadChatCodemapper extends Disposable
                     requestId,
                     codeBlocks: uiRequest.codeBlocks,
                     chatRequestId: uiRequest.chatRequestId,
+                    chatRequestModel: uiRequest.chatRequestModel,
+                    chatSessionId: uiRequest.chatSessionId,
                     location: uiRequest.location
                 };
                 try {