@codingame/monaco-vscode-extensions-service-override 38.1.2 → 39.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (61) hide show
  1. package/index.js +1 -0
  2. package/package.json +3 -3
  3. package/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLI.js +29 -29
  4. package/vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js +1 -1
  5. package/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.d.ts +1 -1
  6. package/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.js +5 -1
  7. package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js +33 -31
  8. package/vscode/src/vs/workbench/api/browser/mainThreadBrowserTunnelProxy.d.ts +19 -13
  9. package/vscode/src/vs/workbench/api/browser/mainThreadBrowserTunnelProxy.js +57 -27
  10. package/vscode/src/vs/workbench/api/browser/mainThreadBrowsers.js +13 -2
  11. package/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.js +1 -1
  12. package/vscode/src/vs/workbench/api/browser/mainThreadComments.js +1 -1
  13. package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js +2 -2
  14. package/vscode/src/vs/workbench/api/browser/mainThreadDataChannels.js +6 -6
  15. package/vscode/src/vs/workbench/api/browser/mainThreadDebugService.d.ts +0 -1
  16. package/vscode/src/vs/workbench/api/browser/mainThreadDebugService.js +1 -8
  17. package/vscode/src/vs/workbench/api/browser/mainThreadDiagnostics.d.ts +2 -7
  18. package/vscode/src/vs/workbench/api/browser/mainThreadDiagnostics.js +9 -2
  19. package/vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js +1 -1
  20. package/vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js +8 -0
  21. package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js +11 -11
  22. package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js +20 -20
  23. package/vscode/src/vs/workbench/api/browser/mainThreadGitExtensionService.d.ts +2 -1
  24. package/vscode/src/vs/workbench/api/browser/mainThreadGitExtensionService.js +7 -0
  25. package/vscode/src/vs/workbench/api/browser/mainThreadGitHub.d.ts +36 -0
  26. package/vscode/src/vs/workbench/api/browser/mainThreadGitHub.js +370 -0
  27. package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.d.ts +1 -0
  28. package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.js +9 -1
  29. package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js +5 -5
  30. package/vscode/src/vs/workbench/api/browser/mainThreadOutputService.js +3 -3
  31. package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js +2 -2
  32. package/vscode/src/vs/workbench/api/browser/mainThreadQuickOpen.js +9 -7
  33. package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js +1 -1
  34. package/vscode/src/vs/workbench/api/browser/mainThreadSpeech.d.ts +1 -0
  35. package/vscode/src/vs/workbench/api/browser/mainThreadSpeech.js +7 -0
  36. package/vscode/src/vs/workbench/api/browser/mainThreadTask.d.ts +4 -1
  37. package/vscode/src/vs/workbench/api/browser/mainThreadTask.js +46 -7
  38. package/vscode/src/vs/workbench/api/browser/mainThreadTerminalService.d.ts +1 -0
  39. package/vscode/src/vs/workbench/api/browser/mainThreadTerminalService.js +12 -2
  40. package/vscode/src/vs/workbench/api/browser/mainThreadTimeline.d.ts +9 -3
  41. package/vscode/src/vs/workbench/api/browser/mainThreadTimeline.js +49 -9
  42. package/vscode/src/vs/workbench/api/browser/mainThreadTreeViews.js +6 -0
  43. package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js +2 -2
  44. package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js +7 -6
  45. package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js +1 -1
  46. package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js +5 -5
  47. package/vscode/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.d.ts +1 -1
  48. package/vscode/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.js +1 -1
  49. package/vscode/src/vs/workbench/contrib/git/common/gitService.d.ts +12 -0
  50. package/vscode/src/vs/workbench/services/extensionManagement/browser/extensionBisect.js +23 -23
  51. package/vscode/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.js +2 -2
  52. package/vscode/src/vs/workbench/services/extensions/browser/extensionService.js +1 -0
  53. package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js +13 -13
  54. package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js +2 -1
  55. package/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.js +1 -1
  56. package/vscode/src/vs/workbench/services/extensions/common/extensionsUtil.js +4 -4
  57. package/vscode/src/vs/workbench/services/extensions/common/remoteExtensionHost.d.ts +3 -0
  58. package/vscode/src/vs/workbench/services/extensions/common/remoteExtensionHost.js +1 -0
  59. package/vscode/src/vs/workbench/services/themes/browser/cssExtensionPoint.js +5 -5
  60. package/vscode/src/vs/workbench/api/common/shared/tasks.d.ts +0 -158
  61. package/vscode/src/vs/workbench/api/common/shared/tasks.js +0 -20
package/index.js CHANGED
@@ -117,6 +117,7 @@ import './vscode/src/vs/workbench/api/browser/mainThreadDownloadService.js';
117
117
  import './vscode/src/vs/workbench/api/browser/mainThreadUrls.js';
118
118
  import './vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js';
119
119
  import './vscode/src/vs/workbench/api/browser/mainThreadWindow.js';
120
+ import './vscode/src/vs/workbench/api/browser/mainThreadGitHub.js';
120
121
  import './vscode/src/vs/workbench/api/browser/mainThreadPower.js';
121
122
  import './vscode/src/vs/workbench/api/browser/mainThreadWebviewManager.js';
122
123
  import './vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-extensions-service-override",
3
- "version": "38.1.2",
3
+ "version": "39.0.0",
4
4
  "private": false,
5
5
  "description": "VSCode public API plugged on the monaco editor - extensions service-override",
6
6
  "keywords": [],
@@ -15,8 +15,8 @@
15
15
  },
16
16
  "type": "module",
17
17
  "dependencies": {
18
- "@codingame/monaco-vscode-api": "38.1.2",
19
- "@codingame/monaco-vscode-files-service-override": "38.1.2"
18
+ "@codingame/monaco-vscode-api": "39.0.0",
19
+ "@codingame/monaco-vscode-files-service-override": "39.0.0"
20
20
  },
21
21
  "main": "index.js",
22
22
  "module": "index.js",
@@ -13,9 +13,9 @@ import { getIdAndVersion, areSameExtensions, getGalleryExtensionId, getExtension
13
13
  import { ExtensionType, EXTENSION_CATEGORIES } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
14
14
  import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
15
15
 
16
- const notFound = id => ( localize(2636, "Extension '{0}' not found.", id));
16
+ const notFound = id => ( localize(2841, "Extension '{0}' not found.", id));
17
17
  const useId = ( localize(
18
- 2637,
18
+ 2842,
19
19
  "Make sure you use the full extension ID, including the publisher, e.g.: {0}",
20
20
  "ms-dotnettools.csharp"
21
21
  ));
@@ -62,7 +62,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
62
62
  return;
63
63
  }
64
64
  if (this.location) {
65
- this.logger.info(( localize(2638, "Extensions installed on {0}:", this.location)));
65
+ this.logger.info(( localize(2843, "Extensions installed on {0}:", this.location)));
66
66
  }
67
67
  extensions = extensions.sort((e1, e2) => e1.identifier.id.localeCompare(e2.identifier.id));
68
68
  let lastId = undefined;
@@ -77,7 +77,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
77
77
  const failed = [];
78
78
  try {
79
79
  if (extensions.length) {
80
- this.logger.info(this.location ? ( localize(2639, "Installing extensions on {0}...", this.location)) : ( localize(2640, "Installing extensions...")));
80
+ this.logger.info(this.location ? ( localize(2844, "Installing extensions on {0}...", this.location)) : ( localize(2845, "Installing extensions...")));
81
81
  }
82
82
  const installVSIXInfos = [];
83
83
  const installExtensionInfos = [];
@@ -142,11 +142,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
142
142
  failed.push(...failedGalleryExtensions);
143
143
  }
144
144
  } catch (error) {
145
- this.logger.error(( localize(2641, "Error while installing extensions: {0}", getErrorMessage(error))));
145
+ this.logger.error(( localize(2846, "Error while installing extensions: {0}", getErrorMessage(error))));
146
146
  throw error;
147
147
  }
148
148
  if (failed.length) {
149
- throw ( new Error(( localize(2642, "Failed Installing Extensions: {0}", failed.join(", ")))));
149
+ throw ( new Error(( localize(2847, "Failed Installing Extensions: {0}", failed.join(", ")))));
150
150
  }
151
151
  }
152
152
  async updateExtensions(profileLocation) {
@@ -161,7 +161,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
161
161
  }
162
162
  }
163
163
  this.logger.trace(( localize(
164
- 2643,
164
+ 2848,
165
165
  "Fetching latest versions for {0} extensions",
166
166
  installedExtensionsQuery.length
167
167
  )));
@@ -185,11 +185,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
185
185
  }
186
186
  }
187
187
  if (!extensionsToUpdate.length) {
188
- this.logger.info(( localize(2644, "No extension to update")));
188
+ this.logger.info(( localize(2849, "No extension to update")));
189
189
  return;
190
190
  }
191
191
  this.logger.info(( localize(
192
- 2645,
192
+ 2850,
193
193
  "Updating extensions: {0}",
194
194
  extensionsToUpdate.map(ext => ext.extension.identifier.id).join(", ")
195
195
  )));
@@ -197,14 +197,14 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
197
197
  for (const extensionResult of installationResult) {
198
198
  if (extensionResult.error) {
199
199
  this.logger.error(( localize(
200
- 2646,
200
+ 2851,
201
201
  "Error while updating extension {0}: {1}",
202
202
  extensionResult.identifier.id,
203
203
  getErrorMessage(extensionResult.error)
204
204
  )));
205
205
  } else {
206
206
  this.logger.info(( localize(
207
- 2647,
207
+ 2852,
208
208
  "Extension '{0}' v{1} was successfully updated.",
209
209
  extensionResult.identifier.id,
210
210
  extensionResult.local?.manifest.version
@@ -230,7 +230,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
230
230
  }
231
231
  if (!force && (!version || (version === "prerelease" && installedExtension.preRelease))) {
232
232
  this.logger.info(( localize(
233
- 2648,
233
+ 2853,
234
234
  "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'.",
235
235
  id,
236
236
  installedExtension.manifest.version,
@@ -239,7 +239,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
239
239
  return false;
240
240
  }
241
241
  if (version && installedExtension.manifest.version === version) {
242
- this.logger.info(( localize(2649, "Extension '{0}' is already installed.", `${id}@${version}`)));
242
+ this.logger.info(( localize(2854, "Extension '{0}' is already installed.", `${id}@${version}`)));
243
243
  return false;
244
244
  }
245
245
  if (installedExtension.preRelease && version !== "prerelease") {
@@ -281,23 +281,23 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
281
281
  if (installedExtension) {
282
282
  if (gallery.version === installedExtension.manifest.version) {
283
283
  this.logger.info(( localize(
284
- 2649,
284
+ 2854,
285
285
  "Extension '{0}' is already installed.",
286
286
  version ? `${id}@${version}` : id
287
287
  )));
288
288
  return;
289
289
  }
290
290
  this.logger.info(( localize(
291
- 2650,
291
+ 2855,
292
292
  "Updating the extension '{0}' to the version {1}",
293
293
  id,
294
294
  gallery.version
295
295
  )));
296
296
  }
297
297
  if (installOptions.isBuiltin) {
298
- this.logger.info(version ? ( localize(2651, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(2652, "Installing builtin extension '{0}'...", id)));
298
+ this.logger.info(version ? ( localize(2856, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(2857, "Installing builtin extension '{0}'...", id)));
299
299
  } else {
300
- this.logger.info(version ? ( localize(2653, "Installing extension '{0}' v{1}...", id, version)) : ( localize(2654, "Installing extension '{0}'...", id)));
300
+ this.logger.info(version ? ( localize(2858, "Installing extension '{0}' v{1}...", id, version)) : ( localize(2859, "Installing extension '{0}'...", id)));
301
301
  }
302
302
  extensionsToInstall.push({
303
303
  extension: gallery,
@@ -313,7 +313,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
313
313
  for (const extensionResult of installationResult) {
314
314
  if (extensionResult.error) {
315
315
  this.logger.error(( localize(
316
- 2655,
316
+ 2860,
317
317
  "Error while installing extension {0}: {1}",
318
318
  extensionResult.identifier.id,
319
319
  getErrorMessage(extensionResult.error)
@@ -321,7 +321,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
321
321
  failed.push(extensionResult.identifier.id);
322
322
  } else {
323
323
  this.logger.info(( localize(
324
- 2656,
324
+ 2861,
325
325
  "Extension '{0}' v{1} was successfully installed.",
326
326
  extensionResult.identifier.id,
327
327
  extensionResult.local?.manifest.version
@@ -343,10 +343,10 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
343
343
  ...installOptions,
344
344
  installGivenVersion: true
345
345
  });
346
- this.logger.info(( localize(2657, "Extension '{0}' was successfully installed.", basename(vsix))));
346
+ this.logger.info(( localize(2862, "Extension '{0}' was successfully installed.", basename(vsix))));
347
347
  } catch (error) {
348
348
  if (isCancellationError(error)) {
349
- this.logger.info(( localize(2658, "Cancelled installing extension '{0}'.", basename(vsix))));
349
+ this.logger.info(( localize(2863, "Cancelled installing extension '{0}'.", basename(vsix))));
350
350
  } else {
351
351
  throw error;
352
352
  }
@@ -393,7 +393,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
393
393
  if (!force) {
394
394
  if (semverExports.gt(existingExtension.manifest.version, manifest.version)) {
395
395
  this.logger.info(( localize(
396
- 2659,
396
+ 2864,
397
397
  "A newer version of extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.",
398
398
  existingExtension.identifier.id,
399
399
  existingExtension.manifest.version,
@@ -424,7 +424,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
424
424
  }
425
425
  if (( extensionsToUninstall.some(e => e.type === ExtensionType.System))) {
426
426
  this.logger.info(( localize(
427
- 2660,
427
+ 2865,
428
428
  "Extension '{0}' is a Built-in extension and cannot be uninstalled",
429
429
  id
430
430
  )));
@@ -432,13 +432,13 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
432
432
  }
433
433
  if (!force && ( extensionsToUninstall.some(e => e.isBuiltin))) {
434
434
  this.logger.info(( localize(
435
- 2661,
435
+ 2866,
436
436
  "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
437
437
  id
438
438
  )));
439
439
  return;
440
440
  }
441
- this.logger.info(( localize(2662, "Uninstalling {0}...", id)));
441
+ this.logger.info(( localize(2867, "Uninstalling {0}...", id)));
442
442
  for (const extensionToUninstall of extensionsToUninstall) {
443
443
  await this.extensionManagementService.uninstall(extensionToUninstall, {
444
444
  profileLocation
@@ -446,13 +446,13 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
446
446
  }
447
447
  if (this.location) {
448
448
  this.logger.info(( localize(
449
- 2663,
449
+ 2868,
450
450
  "Extension '{0}' was successfully uninstalled from {1}!",
451
451
  id,
452
452
  this.location
453
453
  )));
454
454
  } else {
455
- this.logger.info(( localize(2664, "Extension '{0}' was successfully uninstalled!", id)));
455
+ this.logger.info(( localize(2869, "Extension '{0}' was successfully uninstalled!", id)));
456
456
  }
457
457
  }
458
458
  }
@@ -470,12 +470,12 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
470
470
  });
471
471
  }
472
472
  notInstalled(id) {
473
- return this.location ? ( localize(2665, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(2666, "Extension '{0}' is not installed.", id));
473
+ return this.location ? ( localize(2870, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(2871, "Extension '{0}' is not installed.", id));
474
474
  }
475
475
  validateBuiltinExtensionEnabledWithAutoUpdates(extension) {
476
476
  if (extension.isBuiltin && ( this.productService.builtInExtensionsEnabledWithAutoUpdates.some(e => e.toLowerCase() === extension.identifier.id.toLowerCase())) && !extension.forceAutoUpdate) {
477
477
  return localize(
478
- 2667,
478
+ 2872,
479
479
  "Extension '{0}' is a built-in extension and not allowed to be updated in the current product quality '{1}'.",
480
480
  extension.identifier.id,
481
481
  this.productService.quality
@@ -40,7 +40,7 @@ let ExtensionResourceLoaderService = class ExtensionResourceLoaderService extend
40
40
  }
41
41
  const requestInit = {};
42
42
  if (await this.isExtensionGalleryResource(uri)) {
43
- requestInit.headers = await this.getExtensionGalleryRequestHeaders();
43
+ requestInit.headers = await this.getExtensionGalleryRequestHeaders(uri);
44
44
  requestInit.mode = "cors";
45
45
  }
46
46
  const response = await fetch(( uri.toString(true)), requestInit);
@@ -34,7 +34,7 @@ export declare abstract class AbstractExtensionResourceLoaderService extends Dis
34
34
  }, path?: string): Promise<URI | undefined>;
35
35
  abstract readExtensionResource(uri: URI): Promise<string>;
36
36
  isExtensionGalleryResource(uri: URI): Promise<boolean>;
37
- protected getExtensionGalleryRequestHeaders(): Promise<Record<string, string>>;
37
+ protected getExtensionGalleryRequestHeaders(resource: URI): Promise<Record<string, string>>;
38
38
  private _serviceMachineIdPromise;
39
39
  private _getServiceMachineId;
40
40
  private _getExtensionGalleryAuthority;
@@ -91,7 +91,7 @@ class AbstractExtensionResourceLoaderService extends Disposable {
91
91
  await this._initPromise;
92
92
  return !!this._extensionGalleryAuthority && this._extensionGalleryAuthority === this._getExtensionGalleryAuthority(uri);
93
93
  }
94
- async getExtensionGalleryRequestHeaders() {
94
+ async getExtensionGalleryRequestHeaders(resource) {
95
95
  const headers = {
96
96
  "X-Client-Name": `${this._productService.applicationName}${isWeb ? "-web" : ""}`,
97
97
  "X-Client-Version": this._productService.version
@@ -102,6 +102,10 @@ class AbstractExtensionResourceLoaderService extends Disposable {
102
102
  if (this._productService.commit) {
103
103
  headers["X-Client-Commit"] = this._productService.commit;
104
104
  }
105
+ const accessToken = await this._extensionGalleryManifestService.getAccessToken(( resource.toString(true)));
106
+ if (accessToken) {
107
+ headers.Authorization = `Bearer ${accessToken}`;
108
+ }
105
109
  return headers;
106
110
  }
107
111
  _getServiceMachineId() {
@@ -209,9 +209,10 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
209
209
  serverMetadata,
210
210
  resource,
211
211
  overrideClientId,
212
- overrideClientSecret
212
+ overrideClientSecret,
213
+ providerId
213
214
  ) => {
214
- const authProviderId = getDynamicAuthenticationProviderId(authorizationServer, resource);
215
+ const authProviderId = providerId ?? getDynamicAuthenticationProviderId(authorizationServer, resource);
215
216
  const clientDetails = await this.dynamicAuthProviderStorageService.getClientRegistration(authProviderId);
216
217
  let clientId = overrideClientId ?? clientDetails?.clientId;
217
218
  const clientSecret = overrideClientId ? overrideClientSecret : (overrideClientSecret ?? clientDetails?.clientSecret);
@@ -227,7 +228,8 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
227
228
  resource,
228
229
  clientId,
229
230
  clientSecret,
230
- initialTokens
231
+ initialTokens,
232
+ authProviderId
231
233
  );
232
234
  },
233
235
  createXaa: async issuer => {
@@ -335,8 +337,8 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
335
337
  return await deferredPromise.p;
336
338
  }
337
339
  $showContinueNotification(message) {
338
- const yes = ( localize(6357, "Yes"));
339
- const no = ( localize(6358, "No"));
340
+ const yes = ( localize(7748, "Yes"));
341
+ const no = ( localize(7749, "No"));
340
342
  const deferredPromise = ( new DeferredPromise());
341
343
  let result = false;
342
344
  const handle = this.notificationService.prompt(Severity.Warning, message, [{
@@ -396,26 +398,26 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
396
398
  message = customMessage;
397
399
  } else {
398
400
  message = recreatingSession ? ( localize(
399
- 6359,
401
+ 7750,
400
402
  "The extension '{0}' wants you to sign in again using {1}.",
401
403
  extensionName,
402
404
  provider.label
403
405
  )) : ( localize(
404
- 6360,
406
+ 7751,
405
407
  "The extension '{0}' wants to sign in using {1}.",
406
408
  extensionName,
407
409
  provider.label
408
410
  ));
409
411
  }
410
412
  const buttons = [{
411
- label: ( localize(6361, "&&Allow")),
413
+ label: ( localize(7752, "&&Allow")),
412
414
  run() {
413
415
  return true;
414
416
  }
415
417
  }];
416
418
  if (options?.learnMore) {
417
419
  buttons.push({
418
- label: ( localize(6362, "Learn more")),
420
+ label: ( localize(7753, "Learn more")),
419
421
  run: async () => {
420
422
  const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
421
423
  await this.openerService.open(URI.revive(options.learnMore), {
@@ -438,9 +440,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
438
440
  }
439
441
  async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
440
442
  const result = await this.dialogService.prompt({
441
- message: ( localize(6363, "Incorrect account detected")),
443
+ message: ( localize(7754, "Incorrect account detected")),
442
444
  detail: ( localize(
443
- 6364,
445
+ 7755,
444
446
  "The chosen account, {0}, does not match the requested account, {1}.",
445
447
  chosenAccountLabel,
446
448
  requestedAccountLabel
@@ -448,10 +450,10 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
448
450
  type: Severity.Warning,
449
451
  cancelButton: true,
450
452
  buttons: [{
451
- label: ( localize(6365, "Keep {0}", chosenAccountLabel)),
453
+ label: ( localize(7756, "Keep {0}", chosenAccountLabel)),
452
454
  run: () => chosenAccountLabel
453
455
  }, {
454
- label: ( localize(6366, "Login with {0}", requestedAccountLabel)),
456
+ label: ( localize(7757, "Login with {0}", requestedAccountLabel)),
455
457
  run: () => requestedAccountLabel
456
458
  }]
457
459
  });
@@ -617,15 +619,15 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
617
619
  result
618
620
  } = await this.dialogService.prompt({
619
621
  type: Severity.Info,
620
- message: ( localize(6367, "Device Code Authentication")),
622
+ message: ( localize(7758, "Device Code Authentication")),
621
623
  detail: ( localize(
622
- 6368,
624
+ 7759,
623
625
  "Your code: {0}\n\nTo complete authentication, navigate to {1} and enter the code above.",
624
626
  userCode,
625
627
  verificationUri
626
628
  )),
627
629
  buttons: [{
628
- label: ( localize(6369, "Copy & Continue")),
630
+ label: ( localize(7760, "Copy & Continue")),
629
631
  run: () => true
630
632
  }],
631
633
  cancelButton: true
@@ -635,7 +637,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
635
637
  await this.clipboardService.writeText(userCode);
636
638
  return await this.openerService.open(( URI.parse(verificationUri)));
637
639
  } catch (error) {
638
- this.notificationService.error(( localize(6370, "Failed to open {0}", verificationUri)));
640
+ this.notificationService.error(( localize(7761, "Failed to open {0}", verificationUri)));
639
641
  }
640
642
  }
641
643
  return false;
@@ -644,44 +646,44 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
644
646
  const redirectUrls = "http://127.0.0.1:33418\nhttps://vscode.dev/redirect";
645
647
  const result = await this.dialogService.prompt({
646
648
  type: Severity.Info,
647
- message: ( localize(6371, "Dynamic Client Registration not supported")),
649
+ message: ( localize(7762, "Dynamic Client Registration not supported")),
648
650
  detail: ( localize(
649
- 6372,
651
+ 7763,
650
652
  "The authorization server '{0}' does not support automatic client registration. Do you want to proceed by manually providing a client registration (client ID)?\n\nNote: When registering your OAuth application, make sure to include these redirect URIs:\n{1}",
651
653
  authorizationServerUrl,
652
654
  redirectUrls
653
655
  )),
654
656
  buttons: [{
655
- label: ( localize(6373, "Copy URIs & Proceed")),
657
+ label: ( localize(7764, "Copy URIs & Proceed")),
656
658
  run: async () => {
657
659
  try {
658
660
  await this.clipboardService.writeText(redirectUrls);
659
661
  } catch (error) {
660
- this.notificationService.error(( localize(6374, "Failed to copy redirect URIs to clipboard.")));
662
+ this.notificationService.error(( localize(7765, "Failed to copy redirect URIs to clipboard.")));
661
663
  }
662
664
  return true;
663
665
  }
664
666
  }],
665
667
  cancelButton: {
666
- label: ( localize(6375, "Cancel")),
668
+ label: ( localize(7766, "Cancel")),
667
669
  run: () => false
668
670
  }
669
671
  });
670
672
  if (!result) {
671
673
  return undefined;
672
674
  }
673
- const sharedTitle = ( localize(6376, "Add Client Registration Details"));
675
+ const sharedTitle = ( localize(7767, "Add Client Registration Details"));
674
676
  const clientId = await this.quickInputService.input({
675
677
  title: sharedTitle,
676
678
  prompt: ( localize(
677
- 6377,
679
+ 7768,
678
680
  "Enter an existing client ID that has been registered with the following redirect URIs: http://127.0.0.1:33418, https://vscode.dev/redirect"
679
681
  )),
680
- placeHolder: ( localize(6378, "OAuth client ID (azye39d...)")),
682
+ placeHolder: ( localize(7769, "OAuth client ID (azye39d...)")),
681
683
  ignoreFocusLost: true,
682
684
  validateInput: async value => {
683
685
  if (!value || value.trim().length === 0) {
684
- return localize(6379, "Client ID is required");
686
+ return localize(7770, "Client ID is required");
685
687
  }
686
688
  return undefined;
687
689
  }
@@ -692,11 +694,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
692
694
  const clientSecret = await this.quickInputService.input({
693
695
  title: sharedTitle,
694
696
  prompt: ( localize(
695
- 6380,
697
+ 7771,
696
698
  "(optional) Enter an existing client secret associated with the client id '{0}' or leave this field blank",
697
699
  clientId
698
700
  )),
699
- placeHolder: ( localize(6381, "OAuth client secret (wer32o50f...) or leave it blank")),
701
+ placeHolder: ( localize(7772, "OAuth client secret (wer32o50f...) or leave it blank")),
700
702
  password: true,
701
703
  ignoreFocusLost: true
702
704
  });
@@ -707,14 +709,14 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
707
709
  }
708
710
  async $promptForResourceClientSecret(resourceClientId, resource) {
709
711
  const value = await this.quickInputService.input({
710
- title: ( localize(6382, "Resource Client Secret Required")),
712
+ title: ( localize(7773, "Resource Client Secret Required")),
711
713
  prompt: ( localize(
712
- 6383,
714
+ 7774,
713
715
  "The resource at '{0}' uses a per-resource client identifier '{1}'. Enter the matching client secret (leave blank if none). The value is saved in OS secret storage; manage it later via the 'Set Client Secret' code lens in mcp.json.",
714
716
  resource,
715
717
  resourceClientId
716
718
  )),
717
- placeHolder: ( localize(6384, "Resource client secret")),
719
+ placeHolder: ( localize(7775, "Resource client secret")),
718
720
  password: true,
719
721
  ignoreFocusLost: true
720
722
  });
@@ -1,23 +1,29 @@
1
+ import { VSBuffer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
1
2
  import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
2
- import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
3
- import { ITunnelProxyInfo } from "@codingame/monaco-vscode-api/vscode/vs/platform/tunnel/common/tunnelProxy";
3
+ import { IAgentHostConnectionsService } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostConnectionsService.service";
4
4
  import { IBrowserViewWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/browserView/common/browserView.service";
5
- import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
6
5
  import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
7
6
  import { MainThreadBrowserTunnelProxyShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
8
7
  /**
9
- * Renderer-side bridge for the local extension host tunnel proxy. Gates the
10
- * ext host proxy by the remote-proxy setting (and the presence of a remote
11
- * authority) and forwards the resolved proxy info to the main process so it
12
- * can be applied to the window's remote browser view Electron sessions.
8
+ * Renderer-side bridge for the browser proxies the local extension host runs,
9
+ * one per remote network browsers use (see {@link IBrowserViewWorkbenchService.registerNetworkProxyProvider}).
10
+ * Proxies of agent host networks open their destination connections here, as
11
+ * TCP streams on the renderer's agent host connections.
13
12
  */
14
13
  export declare class MainThreadBrowserTunnelProxy extends Disposable implements MainThreadBrowserTunnelProxyShape {
15
- private readonly _configurationService;
16
- private readonly _environmentService;
17
14
  private readonly _browserViewWorkbenchService;
15
+ private readonly _agentHostConnectionsService;
18
16
  private readonly _proxy;
19
- constructor(extHostContext: IExtHostContext, _configurationService: IConfigurationService, _environmentService: IWorkbenchEnvironmentService, _browserViewWorkbenchService: IBrowserViewWorkbenchService);
20
- private _isEnabled;
21
- private _updateEnabled;
22
- $updateProxyInfo(info: ITunnelProxyInfo | undefined): void;
17
+ /** Only the local extension host runs browser proxies, so only it may open connections on agent host networks. */
18
+ private readonly _isProxyHost;
19
+ /** Destination connections opened on agent host networks. The extension host closes each when its proxy no longer uses it. */
20
+ private readonly _networkConnections;
21
+ private _nextNetworkConnectionId;
22
+ constructor(extHostContext: IExtHostContext, _browserViewWorkbenchService: IBrowserViewWorkbenchService, _agentHostConnectionsService: IAgentHostConnectionsService);
23
+ $openNetworkConnection(authority: string, host: string, port: number): Promise<number>;
24
+ $readNetworkConnection(id: number): Promise<VSBuffer | undefined>;
25
+ $writeNetworkConnection(id: number, data: VSBuffer): Promise<void>;
26
+ $endNetworkConnection(id: number): Promise<void>;
27
+ $closeNetworkConnection(id: number): void;
28
+ private _getNetworkConnection;
23
29
  }
@@ -1,47 +1,77 @@
1
1
 
2
2
  import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
3
- import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
4
- import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
3
+ import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
4
+ import { IAgentHostConnectionsService } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostConnectionsService.service';
5
5
  import { IBrowserViewWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/browserView/common/browserView.service';
6
- import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
7
6
  import { extHostNamedCustomer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers';
7
+ import { ExtensionHostKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostKind';
8
8
  import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
9
9
 
10
- const browserRemoteProxyEnabledSettingId = "workbench.browser.enableRemoteProxy";
11
10
  let MainThreadBrowserTunnelProxy = class MainThreadBrowserTunnelProxy extends Disposable {
12
- constructor(
13
- extHostContext,
14
- _configurationService,
15
- _environmentService,
16
- _browserViewWorkbenchService
17
- ) {
11
+ constructor(extHostContext, _browserViewWorkbenchService, _agentHostConnectionsService) {
18
12
  super();
19
- this._configurationService = _configurationService;
20
- this._environmentService = _environmentService;
21
13
  this._browserViewWorkbenchService = _browserViewWorkbenchService;
14
+ this._agentHostConnectionsService = _agentHostConnectionsService;
15
+ this._networkConnections = this._register(( new DisposableMap()));
16
+ this._nextNetworkConnectionId = 0;
22
17
  this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostBrowserTunnelProxy));
23
- this._updateEnabled();
24
- this._register(this._configurationService.onDidChangeConfiguration(e => {
25
- if (e.affectsConfiguration(browserRemoteProxyEnabledSettingId)) {
26
- this._updateEnabled();
27
- }
28
- }));
18
+ this._isProxyHost = extHostContext.extensionHostKind === ExtensionHostKind.LocalProcess;
19
+ if (this._isProxyHost) {
20
+ this._register(this._browserViewWorkbenchService.registerNetworkProxyProvider({
21
+ acquire: authority => this._proxy.$acquireNetworkProxy(authority),
22
+ release: authority => this._proxy.$releaseNetworkProxy(authority)
23
+ }));
24
+ }
29
25
  }
30
- _isEnabled() {
31
- return !!this._environmentService.remoteAuthority && this._configurationService.getValue(browserRemoteProxyEnabledSettingId) === true;
26
+ async $openNetworkConnection(authority, host, port) {
27
+ if (!this._isProxyHost) {
28
+ throw ( new Error("Only the local extension host can open browser network connections"));
29
+ }
30
+ const connection = this._agentHostConnectionsService.getConnectionByAuthority(authority);
31
+ if (!connection) {
32
+ throw ( new Error(`Agent host network ${authority} is not connected`));
33
+ }
34
+ if (!connection.openTcpConnection) {
35
+ throw ( new Error(`Agent host network ${authority} does not support TCP connections`));
36
+ }
37
+ const stream = await connection.openTcpConnection({
38
+ host,
39
+ port
40
+ });
41
+ if (this._store.isDisposed) {
42
+ stream.dispose();
43
+ throw ( new Error("Browser network connection closed"));
44
+ }
45
+ const id = this._nextNetworkConnectionId++;
46
+ this._networkConnections.set(id, stream);
47
+ return id;
32
48
  }
33
- _updateEnabled() {
34
- this._proxy.$setEnabled(this._isEnabled());
49
+ $readNetworkConnection(id) {
50
+ return this._getNetworkConnection(id).read();
35
51
  }
36
- $updateProxyInfo(info) {
37
- this._browserViewWorkbenchService.setRemoteProxyInfo(info);
52
+ $writeNetworkConnection(id, data) {
53
+ return this._getNetworkConnection(id).write(data);
54
+ }
55
+ async $endNetworkConnection(id) {
56
+ const connection = this._getNetworkConnection(id);
57
+ await connection.end();
58
+ await connection.drain();
59
+ }
60
+ $closeNetworkConnection(id) {
61
+ this._networkConnections.deleteAndDispose(id);
62
+ }
63
+ _getNetworkConnection(id) {
64
+ const connection = this._networkConnections.get(id);
65
+ if (!connection) {
66
+ throw ( new Error("Browser network connection is closed"));
67
+ }
68
+ return connection;
38
69
  }
39
70
  };
40
71
  MainThreadBrowserTunnelProxy = __decorate([
41
72
  extHostNamedCustomer(MainContext.MainThreadBrowserTunnelProxy),
42
- ( __param(1, IConfigurationService)),
43
- ( __param(2, IWorkbenchEnvironmentService)),
44
- ( __param(3, IBrowserViewWorkbenchService))
73
+ ( __param(1, IBrowserViewWorkbenchService)),
74
+ ( __param(2, IAgentHostConnectionsService))
45
75
  ], MainThreadBrowserTunnelProxy);
46
76
 
47
77
  export { MainThreadBrowserTunnelProxy };