@codingame/monaco-vscode-api 17.1.0 → 17.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "17.1.0",
+  "version": "17.1.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
@@ -15,13 +15,13 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-base-service-override": "17.1.0",
-    "@codingame/monaco-vscode-environment-service-override": "17.1.0",
-    "@codingame/monaco-vscode-extensions-service-override": "17.1.0",
-    "@codingame/monaco-vscode-files-service-override": "17.1.0",
-    "@codingame/monaco-vscode-host-service-override": "17.1.0",
-    "@codingame/monaco-vscode-layout-service-override": "17.1.0",
-    "@codingame/monaco-vscode-quickaccess-service-override": "17.1.0",
+    "@codingame/monaco-vscode-base-service-override": "17.1.1",
+    "@codingame/monaco-vscode-environment-service-override": "17.1.1",
+    "@codingame/monaco-vscode-extensions-service-override": "17.1.1",
+    "@codingame/monaco-vscode-files-service-override": "17.1.1",
+    "@codingame/monaco-vscode-host-service-override": "17.1.1",
+    "@codingame/monaco-vscode-layout-service-override": "17.1.1",
+    "@codingame/monaco-vscode-quickaccess-service-override": "17.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
     "jschardet": "3.1.4",
     "marked": "14.0.0"

package/services.js

@@ -182,10 +182,10 @@ export { IKeybindingService } from './vscode/src/vs/platform/keybinding/common/k
 export { ISecretStorageService } from './vscode/src/vs/platform/secrets/common/secrets.service.js';
 export { ConfigurationTarget } from './vscode/src/vs/platform/configuration/common/configuration.js';
 
-if (window.monacoVscodeApiBuildId != null && window.monacoVscodeApiBuildId !== "1.100.1-0f07d6f8-0479-4299-83fe-9015dfa6437f") {
-    throw new Error(`Another version of monaco-vscode-api has already been loaded. Trying to load ${"1.100.1-0f07d6f8-0479-4299-83fe-9015dfa6437f"}, ${window.monacoVscodeApiBuildId} is already loaded`);
+if (window.monacoVscodeApiBuildId != null && window.monacoVscodeApiBuildId !== "1.100.2-71b00727-b59a-4f1f-85a0-4d406e3dda87") {
+    throw new Error(`Another version of monaco-vscode-api has already been loaded. Trying to load ${"1.100.2-71b00727-b59a-4f1f-85a0-4d406e3dda87"}, ${window.monacoVscodeApiBuildId} is already loaded`);
 }
-window.monacoVscodeApiBuildId = "1.100.1-0f07d6f8-0479-4299-83fe-9015dfa6437f";
+window.monacoVscodeApiBuildId = "1.100.2-71b00727-b59a-4f1f-85a0-4d406e3dda87";
 async function initialize(overrides, container = document.body, configuration = {}, env) {
     checkServicesNotInitialized();
     injectCss(container);

package/vscode/product.json.js

@@ -1,3 +1,3 @@
-var productJson = {nameShort:"Code - OSS",nameLong:"Code - OSS",applicationName:"code-oss",dataFolderName:".vscode-oss",win32MutexName:"vscodeoss",licenseName:"MIT",licenseUrl:"https://github.com/microsoft/vscode/blob/main/LICENSE.txt",serverLicenseUrl:"https://github.com/microsoft/vscode/blob/main/LICENSE.txt",serverGreeting:[],serverLicense:[],serverLicensePrompt:"",serverApplicationName:"code-server-oss",serverDataFolderName:".vscode-server-oss",tunnelApplicationName:"code-tunnel-oss",win32DirName:"Microsoft Code OSS",win32NameVersion:"Microsoft Code OSS",win32RegValueName:"CodeOSS",win32x64AppId:"{{D77B7E06-80BA-4137-BCF4-654B95CCEBC5}",win32arm64AppId:"{{D1ACE434-89C5-48D1-88D3-E2991DF85475}",win32x64UserAppId:"{{CC6B787D-37A0-49E8-AE24-8559A032BE0C}",win32arm64UserAppId:"{{3AEBF0C8-F733-4AD4-BADE-FDB816D53D7B}",win32AppUserModelId:"Microsoft.CodeOSS",win32ShellNameShort:"C&ode - OSS",win32TunnelServiceMutex:"vscodeoss-tunnelservice",win32TunnelMutex:"vscodeoss-tunnel",darwinBundleIdentifier:"com.visualstudio.code.oss",darwinProfileUUID:"47827DD9-4734-49A0-AF80-7E19B11495CC",darwinProfilePayloadUUID:"CF808BE7-53F3-46C6-A7E2-7EDB98A5E959",linuxIconName:"code-oss",licenseFileName:"LICENSE.txt",reportIssueUrl:"https://github.com/microsoft/vscode/issues/new",nodejsRepository:"https://nodejs.org",urlProtocol:"code-oss",webviewContentExternalBaseUrlTemplate:"https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/",builtInExtensions:[{name:"ms-vscode.js-debug-companion",version:"1.1.3",sha256:"7380a890787452f14b2db7835dfa94de538caf358ebc263f9d46dd68ac52de93",repo:"https://github.com/microsoft/vscode-js-debug-companion",metadata:{id:"99cb0b7f-7354-4278-b8da-6cc79972169d",publisherId:{publisherId:"5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",publisherName:"ms-vscode",displayName:"Microsoft",flags:"verified"},publisherDisplayName:"Microsoft"}},{name:"ms-vscode.js-debug",version:"1.100.0",sha256:"69c746edf41508510818991e1d1a7cbac9d474dd666595540163d3cab435aeb9",repo:"https://github.com/microsoft/vscode-js-debug",metadata:{id:"25629058-ddac-4e17-abba-74678e126c5d",publisherId:{publisherId:"5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",publisherName:"ms-vscode",displayName:"Microsoft",flags:"verified"},publisherDisplayName:"Microsoft"}},{name:"ms-vscode.vscode-js-profile-table",version:"1.0.10",sha256:"7361748ddf9fd09d8a2ed1f2a2d7376a2cf9aae708692820b799708385c38e08",repo:"https://github.com/microsoft/vscode-js-profile-visualizer",metadata:{id:"7e52b41b-71ad-457b-ab7e-0620f1fc4feb",publisherId:{publisherId:"5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",publisherName:"ms-vscode",displayName:"Microsoft",flags:"verified"},publisherDisplayName:"Microsoft"}}]};
+var productJson = {nameShort:"Code - OSS",nameLong:"Code - OSS",applicationName:"code-oss",dataFolderName:".vscode-oss",win32MutexName:"vscodeoss",licenseName:"MIT",licenseUrl:"https://github.com/microsoft/vscode/blob/main/LICENSE.txt",serverLicenseUrl:"https://github.com/microsoft/vscode/blob/main/LICENSE.txt",serverGreeting:[],serverLicense:[],serverLicensePrompt:"",serverApplicationName:"code-server-oss",serverDataFolderName:".vscode-server-oss",tunnelApplicationName:"code-tunnel-oss",win32DirName:"Microsoft Code OSS",win32NameVersion:"Microsoft Code OSS",win32RegValueName:"CodeOSS",win32x64AppId:"{{D77B7E06-80BA-4137-BCF4-654B95CCEBC5}",win32arm64AppId:"{{D1ACE434-89C5-48D1-88D3-E2991DF85475}",win32x64UserAppId:"{{CC6B787D-37A0-49E8-AE24-8559A032BE0C}",win32arm64UserAppId:"{{3AEBF0C8-F733-4AD4-BADE-FDB816D53D7B}",win32AppUserModelId:"Microsoft.CodeOSS",win32ShellNameShort:"C&ode - OSS",win32TunnelServiceMutex:"vscodeoss-tunnelservice",win32TunnelMutex:"vscodeoss-tunnel",darwinBundleIdentifier:"com.visualstudio.code.oss",darwinProfileUUID:"47827DD9-4734-49A0-AF80-7E19B11495CC",darwinProfilePayloadUUID:"CF808BE7-53F3-46C6-A7E2-7EDB98A5E959",linuxIconName:"code-oss",licenseFileName:"LICENSE.txt",reportIssueUrl:"https://github.com/microsoft/vscode/issues/new",nodejsRepository:"https://nodejs.org",urlProtocol:"code-oss",webviewContentExternalBaseUrlTemplate:"https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/",builtInExtensions:[{name:"ms-vscode.js-debug-companion",version:"1.1.3",sha256:"7380a890787452f14b2db7835dfa94de538caf358ebc263f9d46dd68ac52de93",repo:"https://github.com/microsoft/vscode-js-debug-companion",metadata:{id:"99cb0b7f-7354-4278-b8da-6cc79972169d",publisherId:{publisherId:"5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",publisherName:"ms-vscode",displayName:"Microsoft",flags:"verified"},publisherDisplayName:"Microsoft"}},{name:"ms-vscode.js-debug",version:"1.100.1",sha256:"8c2218df3422d45b95e96d9d28cdc4aa4426a2799aaaedd862d3f60ecab03844",repo:"https://github.com/microsoft/vscode-js-debug",metadata:{id:"25629058-ddac-4e17-abba-74678e126c5d",publisherId:{publisherId:"5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",publisherName:"ms-vscode",displayName:"Microsoft",flags:"verified"},publisherDisplayName:"Microsoft"}},{name:"ms-vscode.vscode-js-profile-table",version:"1.0.10",sha256:"7361748ddf9fd09d8a2ed1f2a2d7376a2cf9aae708692820b799708385c38e08",repo:"https://github.com/microsoft/vscode-js-profile-visualizer",metadata:{id:"7e52b41b-71ad-457b-ab7e-0620f1fc4feb",publisherId:{publisherId:"5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",publisherName:"ms-vscode",displayName:"Microsoft",flags:"verified"},publisherDisplayName:"Microsoft"}}]};
 
 export { productJson as default };

package/vscode/src/vs/platform/product/common/product.js

@@ -4,9 +4,9 @@ import productJson from '../../../../../product.json.js';
 var product = {
   ...productJson,
   quality: 'stable',
-  version: '1.100.1',
-  commit: '512333e1dda3ed8cc90d7893ba91b596765e71c0',
-  date: '2025-05-14T12:23:29.673Z',
+  version: '1.100.2',
+  commit: '848b80aeb52026648a8ff9f7c45a9b0a80641e2e',
+  date: '2025-05-20T09:24:53.245Z',
   ...(globalThis._VSCODE_PRODUCT_JSON ?? {})
 };
 

package/vscode/src/vs/workbench/api/common/extHostChatAgents2.js

@@ -8,7 +8,7 @@ import { Iterable } from '../../../base/common/iterator.js';
 import { toDisposable, Disposable, DisposableMap, DisposableStore } from '../../../base/common/lifecycle.js';
 import { revive } from '../../../base/common/marshalling.js';
 import { StopWatch } from '../../../base/common/stopwatch.js';
-import { assertType } from '../../../base/common/types.js';
+import { isDefined, assertType } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
@@ -332,7 +332,7 @@ class ExtHostChatAgents2 extends Disposable {
         }
         const { request, location, history } = await this._createRequest(requestDto, context, detector.extension);
         const model = await this.getModelForRequest(request, detector.extension);
-        const extRequest = ChatAgentRequest.to(request, location, model, this.getDiagnosticsWhenEnabled(detector.extension), this.getToolsForRequest(detector.extension, request), this.getTools2ForRequest(detector.extension, request), detector.extension);
+        const extRequest = ChatAgentRequest.to(request, location, model, this.getDiagnosticsWhenEnabled(detector.extension), this.getToolsForRequest(detector.extension, request), this.getTools2ForRequest(detector.extension, request), detector.extension, this._logService);
         return detector.provider.provideParticipantDetection(extRequest, { history }, { participants: options.participants, location: ChatLocation.to(options.location) }, token);
     }
     async _createRequest(requestDto, context, extension) {
@@ -398,7 +398,7 @@ class ExtHostChatAgents2 extends Disposable {
                 sessionDisposables
             ));
             const model = await this.getModelForRequest(request, agent.extension);
-            const extRequest = ChatAgentRequest.to(request, location, model, this.getDiagnosticsWhenEnabled(agent.extension), this.getToolsForRequest(agent.extension, request), this.getTools2ForRequest(agent.extension, request), agent.extension);
+            const extRequest = ChatAgentRequest.to(request, location, model, this.getDiagnosticsWhenEnabled(agent.extension), this.getToolsForRequest(agent.extension, request), this.getTools2ForRequest(agent.extension, request), agent.extension, this._logService);
             inFlightRequest = { requestId: requestDto.requestId, extRequest };
             this._inFlightRequests.add(inFlightRequest);
             const task = agent.invoke(extRequest, { history }, stream.apiObject, token);
@@ -480,8 +480,9 @@ class ExtHostChatAgents2 extends Disposable {
             const varsWithoutTools = ( h.request.variables.variables
                 .filter(v => v.kind !== 'tool')
                 .map(
-                v => ChatPromptReference.to(v, this.getDiagnosticsWhenEnabled(extension))
-            ));
+                v => ChatPromptReference.to(v, this.getDiagnosticsWhenEnabled(extension), this._logService)
+            ))
+                .filter(isDefined);
             const toolReferences = ( h.request.variables.variables
                 .filter(v => v.kind === 'tool')
                 .map(ChatLanguageModelToolReference.to));

package/vscode/src/vs/workbench/api/common/extHostTypeConverters.d.ts

@@ -38,6 +38,7 @@ import * as types from "./extHostTypes.js";
 import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
 import { AiSettingsSearchResult } from "../../services/aiSettingsSearch/common/aiSettingsSearch.js";
 import { McpServerLaunch } from "../../contrib/mcp/common/mcpTypes.js";
+import { ILogService } from "../../../platform/log/common/log.service.js";
 export declare namespace Command {
     interface ICommandsConverter {
         fromInternal(command: extHostProtocol.ICommandDto): vscode.Command | undefined;
@@ -522,7 +523,7 @@ export declare namespace ChatAgentRequest {
     function to(request: IChatAgentRequest, location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined, model: vscode.LanguageModelChat, diagnostics: readonly [
         vscode.Uri,
         readonly vscode.Diagnostic[]
-    ][], toolSelection: vscode.ChatRequestToolSelection | undefined, tools: Map<string, boolean>, extension: IRelaxedExtensionDescription): vscode.ChatRequest;
+    ][], toolSelection: vscode.ChatRequestToolSelection | undefined, tools: Map<string, boolean>, extension: IRelaxedExtensionDescription, logService: ILogService): vscode.ChatRequest;
 }
 export declare namespace ChatRequestDraft {
     function to(request: IChatRequestDraft): vscode.ChatRequestDraft;
@@ -535,7 +536,7 @@ export declare namespace ChatPromptReference {
     function to(variable: IChatRequestVariableEntry, diagnostics: readonly [
         vscode.Uri,
         readonly vscode.Diagnostic[]
-    ][]): vscode.ChatPromptReference;
+    ][], logService: ILogService): vscode.ChatPromptReference | undefined;
 }
 export declare namespace ChatLanguageModelToolReference {
     function to(variable: IChatRequestVariableEntry): vscode.ChatLanguageModelToolReference;

package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js

@@ -2777,7 +2777,7 @@ var ChatResponsePart;
 })(ChatResponsePart || (ChatResponsePart = {}));
 var ChatAgentRequest;
 (function (ChatAgentRequest) {
-    function to(request, location2, model, diagnostics, toolSelection, tools, extension) {
+    function to(request, location2, model, diagnostics, toolSelection, tools, extension, logService) {
         const toolReferences = request.variables.variables.filter(v => v.kind === 'tool');
         const variableReferences = request.variables.variables.filter(v => v.kind !== 'tool');
         const requestWithAllProps = {
@@ -2787,7 +2787,9 @@ var ChatAgentRequest;
             attempt: request.attempt ?? 0,
             enableCommandDetection: request.enableCommandDetection ?? true,
             isParticipantDetected: request.isParticipantDetected ?? false,
-            references: ( variableReferences.map(v => ChatPromptReference.to(v, diagnostics))),
+            references: ( variableReferences
+                .map(v => ChatPromptReference.to(v, diagnostics, logService)))
+                .filter(isDefined),
             toolReferences: ( toolReferences.map(ChatLanguageModelToolReference.to)),
             location: ChatLocation.to(request.location),
             acceptedConfirmationData: request.acceptedConfirmationData,
@@ -2850,10 +2852,18 @@ var ChatLocation;
 })(ChatLocation || (ChatLocation = {}));
 var ChatPromptReference;
 (function (ChatPromptReference) {
-    function to(variable, diagnostics) {
+    function to(variable, diagnostics, logService) {
         let value = variable.value;
         if (!value) {
-            throw ( new Error('Invalid value reference'));
+            let varStr;
+            try {
+                varStr = JSON.stringify(variable);
+            }
+            catch {
+                varStr = `kind=${variable.kind}, id=${variable.id}, name=${variable.name}`;
+            }
+            logService.error(`[ChatPromptReference] Ignoring invalid reference in variable: ${varStr}`);
+            return undefined;
         }
         if (isUriComponents(value)) {
             value = URI.revive(value);