@lvce-editor/static-server 0.59.6 → 0.60.0

package/static/{710e33b → bb5da46}/packages/extension-host-worker/dist/extensionHostWorkerMain.js

@@ -764,16 +764,16 @@ const setConfigurations = preferences => {
   state$b.configuration = preferences;
 };
 
+const DebugWorker$1 = 55;
+
 const rpcs$2 = Object.create(null);
-const set$g = (id, rpc) => {
+const set$c = (id, rpc) => {
   rpcs$2[id] = rpc;
 };
 const get$b = id => {
   return rpcs$2[id];
 };
 
-/* eslint-disable  @typescript-eslint/explicit-function-return-type */
-
 const create$a = rpcId => {
   return {
     // @ts-ignore
@@ -789,7 +789,7 @@ const create$a = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$g(rpcId, rpc);
+      set$c(rpcId, rpc);
     },
     async dispose() {
       const rpc = get$b(rpcId);
@@ -797,808 +797,391 @@ const create$a = rpcId => {
     }
   };
 };
-const DebugWorker$1 = 55;
-const {
-  invoke: invoke$d} = create$a(DebugWorker$1);
-const DebugWorker = {
-  __proto__: null,
-  invoke: invoke$d};
 
 const {
-  invoke: invoke$3
-} = DebugWorker;
+  invoke: invoke$4,
+  invokeAndTransfer: invokeAndTransfer$3,
+  set: set$b,
+  dispose
+} = create$a(DebugWorker$1);
 
-const state$a = {
-  debugProviderMap: Object.create(null)
-};
-const getDebugProvider = id => {
-  const provider = state$a.debugProviderMap[id];
-  if (!provider) {
-    // @ts-ignore
-    throw new VError(`no debug provider "${id}" found`);
-  }
-  return provider;
+const DebugWorker = {
+  __proto__: null,
+  dispose,
+  invoke: invoke$4,
+  invokeAndTransfer: invokeAndTransfer$3,
+  set: set$b
 };
-const registerDebugProvider = debugProvider => {
-  if (!debugProvider.id) {
-    throw new Error('Failed to register debug system provider: missing id');
-  }
-  state$a.debugProviderMap[debugProvider.id] = debugProvider;
+
+const isMessagePort = value => {
+  return value && value instanceof MessagePort;
 };
-const handlePaused = async params => {
-  // @ts-ignore
-  await invoke$3('Debug.paused', params);
+const isMessagePortMain = value => {
+  return value && value.constructor && value.constructor.name === 'MessagePortMain';
 };
-const handleResumed = async () => {
-  // @ts-ignore
-  await invoke$3('Debug.resumed');
+const isOffscreenCanvas = value => {
+  return typeof OffscreenCanvas !== 'undefined' && value instanceof OffscreenCanvas;
 };
-const handleScriptParsed = async parsedScript => {
-  // @ts-ignore
-  await invoke$3('Debug.scriptParsed', parsedScript);
+const isInstanceOf = (value, constructorName) => {
+  return value?.constructor?.name === constructorName;
 };
-const handleChange = async params => {
-  object(params);
-  // @ts-ignore
-  await invoke$3('Debug.handleChange', params);
+const isSocket = value => {
+  return isInstanceOf(value, 'Socket');
 };
-const start = async (protocol, path) => {
-  try {
-    const provider = getDebugProvider(protocol);
-    const emitter = {
-      handlePaused,
-      handleResumed,
-      handleScriptParsed,
-      handleChange
-    };
-    await provider.start(emitter, path);
-  } catch (error) {
-    throw new VError(error, 'Failed to execute debug provider');
+const transferrables = [isMessagePort, isMessagePortMain, isOffscreenCanvas, isSocket];
+const isTransferrable = value => {
+  for (const fn of transferrables) {
+    if (fn(value)) {
+      return true;
+    }
   }
+  return false;
 };
-const listProcesses = async (protocol, path) => {
-  try {
-    const provider = getDebugProvider(protocol);
-    const processes = await provider.listProcesses(path);
-    array(processes);
-    return processes;
-  } catch (error) {
-    throw new VError(error, 'Failed to execute debug provider');
+const walkValue = (value, transferrables, isTransferrable) => {
+  if (!value) {
+    return;
   }
-};
-const resume = async protocol => {
-  try {
-    const provider = getDebugProvider(protocol);
-    return await provider.resume();
-  } catch (error) {
-    throw new VError(error, 'Failed to execute debug provider');
+  if (isTransferrable(value)) {
+    transferrables.push(value);
+    return;
   }
-};
-const pause = async protocol => {
-  try {
-    const provider = getDebugProvider(protocol);
-    return await provider.pause();
-  } catch (error) {
-    throw new VError(error, 'Failed to execute debug provider');
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      walkValue(item, transferrables, isTransferrable);
+    }
+    return;
   }
-};
-const getScriptSource = async (protocol, scriptId) => {
-  try {
-    const provider = getDebugProvider(protocol);
-    return await provider.getScriptSource(scriptId);
-  } catch (error) {
-    throw new VError(error, 'Failed to execute debug provider');
+  if (typeof value === 'object') {
+    for (const property of Object.values(value)) {
+      walkValue(property, transferrables, isTransferrable);
+    }
+    return;
   }
 };
-
-// TODO create direct connection from debug worker to extension, not needing extension host worker apis
-
-const getStatus = async protocol => {
-  try {
-    const provider = getDebugProvider(protocol);
-    return await provider.getStatus();
-  } catch (error) {
-    throw new VError(error, 'Failed to execute debug provider');
-  }
+const getTransferrables = value => {
+  const transferrables = [];
+  walkValue(value, transferrables, isTransferrable);
+  return transferrables;
 };
-const getCallStack = async protocol => {
-  try {
-    const provider = getDebugProvider(protocol);
-    return await provider.getCallStack();
-  } catch (error) {
-    throw new VError(error, 'Failed to execute debug provider');
-  }
+const attachEvents = that => {
+  const handleMessage = (...args) => {
+    const data = that.getData(...args);
+    that.dispatchEvent(new MessageEvent('message', {
+      data
+    }));
+  };
+  that.onMessage(handleMessage);
+  const handleClose = event => {
+    that.dispatchEvent(new Event('close'));
+  };
+  that.onClose(handleClose);
 };
-const getScopeChain = async protocol => {
-  try {
-    const provider = getDebugProvider(protocol);
-    return await provider.getScopeChain();
-  } catch (error) {
-    throw new VError(error, 'Failed to execute debug provider');
+class Ipc extends EventTarget {
+  constructor(rawIpc) {
+    super();
+    this._rawIpc = rawIpc;
+    attachEvents(this);
   }
+}
+const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE';
+const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON';
+const ERR_MODULE_NOT_FOUND = 'ERR_MODULE_NOT_FOUND';
+const NewLine$2 = '\n';
+const joinLines$1 = lines => {
+  return lines.join(NewLine$2);
 };
-const getScripts = async protocol => {
-  try {
-    const provider = getDebugProvider(protocol);
-    return await provider.getScripts();
-  } catch (error) {
-    throw new VError(error, 'Failed to execute debug provider');
-  }
+const RE_AT = /^\s+at/;
+const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
+const isNormalStackLine = line => {
+  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line);
 };
-const getPausedStatus = async protocol => {
-  try {
-    const provider = getDebugProvider(protocol);
-    return await provider.getStatus();
-  } catch (error) {
-    throw new VError(error, 'Failed to execute debug provider');
+const getDetails = lines => {
+  const index = lines.findIndex(isNormalStackLine);
+  if (index === -1) {
+    return {
+      actualMessage: joinLines$1(lines),
+      rest: []
+    };
   }
-};
-const stepInto = async protocol => {
-  try {
-    const provider = getDebugProvider(protocol);
-    return await provider.stepInto();
-  } catch (error) {
-    throw new VError(error, 'Failed to execute debug provider');
+  let lastIndex = index - 1;
+  while (++lastIndex < lines.length) {
+    if (!isNormalStackLine(lines[lastIndex])) {
+      break;
+    }
   }
+  return {
+    actualMessage: lines[index - 1],
+    rest: lines.slice(index, lastIndex)
+  };
 };
-const stepOut = async protocol => {
-  try {
-    const provider = getDebugProvider(protocol);
-    return await provider.stepOut();
-  } catch (error) {
-    throw new VError(error, 'Failed to execute debug provider');
-  }
+const splitLines$2 = lines => {
+  return lines.split(NewLine$2);
 };
-const stepOver = async protocol => {
-  try {
-    const provider = getDebugProvider(protocol);
-    return await provider.stepOver();
-  } catch (error) {
-    throw new VError(error, 'Failed to execute debug provider');
-  }
+const RE_MESSAGE_CODE_BLOCK_START = /^Error: The module '.*'$/;
+const RE_MESSAGE_CODE_BLOCK_END = /^\s* at/;
+const isMessageCodeBlockStartIndex = line => {
+  return RE_MESSAGE_CODE_BLOCK_START.test(line);
 };
-const setPauseOnException = async (protocol, value) => {
-  try {
-    const provider = getDebugProvider(protocol);
-    return await provider.setPauseOnExceptions(value);
-  } catch (error) {
-    throw new VError(error, 'Failed to execute debug provider');
-  }
+const isMessageCodeBlockEndIndex = line => {
+  return RE_MESSAGE_CODE_BLOCK_END.test(line);
 };
-const getProperties = async (protocol, objectId) => {
-  try {
-    const provider = getDebugProvider(protocol);
-    return await provider.getProperties(objectId);
-  } catch (error) {
-    throw new VError(error, 'Failed to execute debug provider');
-  }
+const getMessageCodeBlock = stderr => {
+  const lines = splitLines$2(stderr);
+  const startIndex = lines.findIndex(isMessageCodeBlockStartIndex);
+  const endIndex = startIndex + lines.slice(startIndex).findIndex(isMessageCodeBlockEndIndex, startIndex);
+  const relevantLines = lines.slice(startIndex, endIndex);
+  const relevantMessage = relevantLines.join(' ').slice('Error: '.length);
+  return relevantMessage;
 };
-const evaluate = async (protocol, expression, callFrameId) => {
-  try {
-    const provider = getDebugProvider(protocol);
-    return await provider.evaluate(expression, callFrameId);
-  } catch (error) {
-    throw new VError(error, 'Failed to execute debug provider');
-  }
+const isModuleNotFoundMessage = line => {
+  return line.includes('[ERR_MODULE_NOT_FOUND]');
 };
-const setPauseOnExceptions = async (protocol, value) => {
-  try {
-    const provider = getDebugProvider(protocol);
-    return await provider.setPauseOnExceptions(value);
-  } catch (error) {
-    throw new VError(error, 'Failed to execute setPauseOnExceptions');
-  }
+const getModuleNotFoundError = stderr => {
+  const lines = splitLines$2(stderr);
+  const messageIndex = lines.findIndex(isModuleNotFoundMessage);
+  const message = lines[messageIndex];
+  return {
+    message,
+    code: ERR_MODULE_NOT_FOUND
+  };
 };
-
-const {
-  registerDefinitionProvider,
-  executeDefinitionProvider} = create$b({
-  name: 'Definition',
-  resultShape: {
-    allowUndefined: true,
-    type: Object$1,
-    properties: {
-      uri: {
-        type: String$1
-      },
-      startOffset: {
-        type: Number
-      },
-      endOffset: {
-        type: Number
-      }
-    }
-  }
-});
-
-const {
-  registerDiagnosticProvider,
-  executeDiagnosticProvider
-} = create$b({
-  name: 'Diagnostic',
-  resultShape: {
-    type: Array$1,
-    items: {
-      type: Object$1
-    }
+const isModuleNotFoundError = stderr => {
+  if (!stderr) {
+    return false;
   }
-});
-
-const RendererWorker = 1;
-
-const invoke$2 = (method, ...params) => {
-  const rpc = get$b(RendererWorker);
-  return rpc.invoke(method, ...params);
+  return stderr.includes('ERR_MODULE_NOT_FOUND');
 };
-const invokeAndTransfer$2 = (method, ...params) => {
-  const rpc = get$b(RendererWorker);
-  return rpc.invokeAndTransfer(method, ...params);
+const isModulesSyntaxError = stderr => {
+  if (!stderr) {
+    return false;
+  }
+  return stderr.includes('SyntaxError: Cannot use import statement outside a module');
 };
-
-const showInformationMessage = message => {
-  string(message);
-  const result = invoke$2('ExtensionHostDialog.showInformationMessage', message);
-  return result;
+const RE_NATIVE_MODULE_ERROR = /^innerError Error: Cannot find module '.*.node'/;
+const RE_NATIVE_MODULE_ERROR_2 = /was compiled against a different Node.js version/;
+const isUnhelpfulNativeModuleError = stderr => {
+  return RE_NATIVE_MODULE_ERROR.test(stderr) && RE_NATIVE_MODULE_ERROR_2.test(stderr);
 };
-
-const env = {};
-
-const exec = async (command, args, options) => {
-  throw new DepecratedError(`vscode.exec is deprecated, use createNodeRpc instead`);
+const getNativeModuleErrorMessage = stderr => {
+  const message = getMessageCodeBlock(stderr);
+  return {
+    message: `Incompatible native node module: ${message}`,
+    code: E_INCOMPATIBLE_NATIVE_MODULE
+  };
 };
-
-const fileSystemProviderMap = Object.create(null);
-const get$a = protocol => {
-  const provider = fileSystemProviderMap[protocol];
-  if (!provider) {
-    // @ts-ignore
-    throw new VError(`no file system provider for protocol "${protocol}" found`);
-  }
-  return provider;
+const getModuleSyntaxError = () => {
+  return {
+    message: `ES Modules are not supported in electron`,
+    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
+  };
 };
-const set$a = (id, provider) => {
-  if (!id) {
-    throw new Error('Failed to register file system provider: missing id');
+const getHelpfulChildProcessError = (stdout, stderr) => {
+  if (isUnhelpfulNativeModuleError(stderr)) {
+    return getNativeModuleErrorMessage(stderr);
   }
-  fileSystemProviderMap[id] = provider;
-};
-
-const registerFileSystemProvider = fileSystemProvider => {
-  if (!fileSystemProvider.id) {
-    throw new Error('Failed to register file system provider: missing id');
+  if (isModulesSyntaxError(stderr)) {
+    return getModuleSyntaxError();
   }
-  set$a(fileSystemProvider.id, fileSystemProvider);
-};
-const readDirWithFileTypes$2 = async (protocol, path) => {
-  try {
-    const provider = get$a(protocol);
-    return await provider.readDirWithFileTypes(path);
-  } catch (error) {
-    throw new VError(error, 'Failed to execute file system provider');
+  if (isModuleNotFoundError(stderr)) {
+    return getModuleNotFoundError(stderr);
   }
+  const lines = splitLines$2(stderr);
+  const {
+    actualMessage,
+    rest
+  } = getDetails(lines);
+  return {
+    message: actualMessage,
+    code: '',
+    stack: rest
+  };
 };
-const readFile$2 = async (protocol, path) => {
-  try {
-    const provider = get$a(protocol);
-    return await provider.readFile(path);
-  } catch (error) {
-    throw new VError(error, 'Failed to execute file system provider');
+class IpcError extends VError {
+  // @ts-ignore
+  constructor(betterMessage, stdout = '', stderr = '') {
+    if (stdout || stderr) {
+      // @ts-ignore
+      const {
+        message,
+        code,
+        stack
+      } = getHelpfulChildProcessError(stdout, stderr);
+      const cause = new Error(message);
+      // @ts-ignore
+      cause.code = code;
+      cause.stack = stack;
+      super(cause, betterMessage);
+    } else {
+      super(betterMessage);
+    }
+    // @ts-ignore
+    this.name = 'IpcError';
+    // @ts-ignore
+    this.stdout = stdout;
+    // @ts-ignore
+    this.stderr = stderr;
   }
+}
+const readyMessage = 'ready';
+const getData$2 = event => {
+  return event.data;
 };
-const readFileExternal = async path => {
-  // TODO when file is local,
-  // don't ask renderer worker
-  // instead read file directly from shared process
-  // this avoid parsing the potentially large message
-  // and improve performance by not blocking the renderer worker
-  // when reading / writing large files
-  const content = await invoke$2('FileSystem.readFile', path);
-  return content;
-};
-const existsExternal = async uri => {
-  return await invoke$2('FileSystem.exists', uri);
+const listen$8 = ({
+  port
+}) => {
+  return port;
 };
-const readDirWithFileTypesExternal = async path => {
-  // TODO when file is local,
-  // don't ask renderer worker
-  // instead read file directly from shared process
-  // this avoid parsing the potentially large message
-  // and improve performance by not blocking the renderer worker
-  // when reading / writing large files
-  const content = await invoke$2('FileSystem.readDirWithFileTypes', path);
-  return content;
+const signal$9 = port => {
+  port.postMessage(readyMessage);
 };
-const remove$4 = async (protocol, path) => {
-  try {
-    const provider = get$a(protocol);
-    return await provider.remove(path);
-  } catch (error) {
-    throw new VError(error, 'Failed to execute file system provider');
+class IpcChildWithMessagePort extends Ipc {
+  getData(event) {
+    return getData$2(event);
   }
-};
-const rename$1 = async (protocol, oldUri, newUri) => {
-  try {
-    const provider = get$a(protocol);
-    return await provider.rename(oldUri, newUri);
-  } catch (error) {
-    throw new VError(error, 'Failed to execute file system provider');
+  send(message) {
+    this._rawIpc.postMessage(message);
   }
-};
-const writeFile$3 = async (protocol, uri, content) => {
-  try {
-    const provider = get$a(protocol);
-    return await provider.writeFile(uri, content);
-  } catch (error) {
-    throw new VError(error, 'Failed to execute file system provider');
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    this._rawIpc.postMessage(message, transfer);
   }
-};
-const getPathSeparator = protocol => {
-  try {
-    const provider = get$a(protocol);
-    return provider.pathSeparator;
-  } catch (error) {
-    throw new VError(error, 'Failed to execute file system provider');
+  dispose() {
+    // ignore
   }
-};
-
-const {
-  registerFormattingProvider,
-  executeFormattingProvider} = create$b({
-  name: 'Formatting',
-  executeKey: 'format',
-  resultShape: {
-    allowUndefined: true,
-    type: Array$1,
-    items: {
-      type: Object$1,
-      properties: {
-        startOffset: {
-          type: Number
-        },
-        endOffset: {
-          type: Number
-        },
-        inserted: {
-          type: String$1
-        }
-      }
-    }
+  onClose(callback) {
+    // ignore
   }
-});
-
-const getOffset = (textDocument, position) => {
-  let offset = 0;
-  let rowIndex = 0;
-  while (rowIndex++ < position.rowIndex) {
-    const newLineIndex = textDocument.text.indexOf('\n', offset);
-    offset = newLineIndex + 1;
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+    this._rawIpc.start();
   }
-  offset += position.columnIndex;
-  return offset;
+}
+const wrap$g = port => {
+  return new IpcChildWithMessagePort(port);
 };
-
-const getPosition = (textDocument, offset) => {
-  let index = 0;
-  let rowIndex = 0;
-  let newLineIndex = 0;
-  const {
-    text
-  } = textDocument;
-  while (index < offset) {
-    newLineIndex = text.indexOf('\n', index);
-    if (newLineIndex === -1) {
-      break;
-    }
-    const newIndex = newLineIndex + 1;
-    if (newIndex > offset) {
-      break;
-    }
-    index = newIndex;
-    rowIndex++;
-  }
-  const columnIndex = offset - index;
-  return {
-    rowIndex,
-    columnIndex
-  };
+const IpcChildWithMessagePort$1 = {
+  __proto__: null,
+  listen: listen$8,
+  signal: signal$9,
+  wrap: wrap$g
 };
-
-const {
-  registerHoverProvider,
-  executeHoverProvider} = create$b({
-  name: 'Hover',
-  resultShape: {
-    allowUndefined: true,
-    type: Object$1,
-    properties: {}
-  }
-});
-
-const {
-  registerImplementationProvider,
-  executeImplementationProvider} = create$b({
-  name: 'Implementation',
-  resultShape: {
-    type: Array$1,
-    items: {
-      type: Object$1
-    }
+const listen$7 = () => {
+  // @ts-ignore
+  if (typeof WorkerGlobalScope === 'undefined') {
+    throw new TypeError('module is not in web worker scope');
   }
-});
-
-const WebSocket$1 = 5;
-const ElectronMessagePort = 6;
-const ModuleWorkerAndWorkaroundForChromeDevtoolsBug$1 = 7;
-
-const isMessagePort = value => {
-  return value && value instanceof MessagePort;
-};
-const isMessagePortMain = value => {
-  return value && value.constructor && value.constructor.name === 'MessagePortMain';
-};
-const isOffscreenCanvas = value => {
-  return typeof OffscreenCanvas !== 'undefined' && value instanceof OffscreenCanvas;
-};
-const isInstanceOf = (value, constructorName) => {
-  return value?.constructor?.name === constructorName;
+  return globalThis;
 };
-const isSocket = value => {
-  return isInstanceOf(value, 'Socket');
+const signal$8 = global => {
+  global.postMessage(readyMessage);
 };
-const transferrables = [isMessagePort, isMessagePortMain, isOffscreenCanvas, isSocket];
-const isTransferrable = value => {
-  for (const fn of transferrables) {
-    if (fn(value)) {
-      return true;
-    }
+class IpcChildWithModuleWorker extends Ipc {
+  getData(event) {
+    return getData$2(event);
   }
-  return false;
-};
-const walkValue = (value, transferrables, isTransferrable) => {
-  if (!value) {
-    return;
+  send(message) {
+    // @ts-ignore
+    this._rawIpc.postMessage(message);
   }
-  if (isTransferrable(value)) {
-    transferrables.push(value);
-    return;
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    // @ts-ignore
+    this._rawIpc.postMessage(message, transfer);
   }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      walkValue(item, transferrables, isTransferrable);
-    }
-    return;
+  dispose() {
+    // ignore
   }
-  if (typeof value === 'object') {
-    for (const property of Object.values(value)) {
-      walkValue(property, transferrables, isTransferrable);
-    }
-    return;
+  onClose(callback) {
+    // ignore
   }
-};
-const getTransferrables = value => {
-  const transferrables = [];
-  walkValue(value, transferrables, isTransferrable);
-  return transferrables;
-};
-const attachEvents = that => {
-  const handleMessage = (...args) => {
-    const data = that.getData(...args);
-    that.dispatchEvent(new MessageEvent('message', {
-      data
-    }));
-  };
-  that.onMessage(handleMessage);
-  const handleClose = event => {
-    that.dispatchEvent(new Event('close'));
-  };
-  that.onClose(handleClose);
-};
-class Ipc extends EventTarget {
-  constructor(rawIpc) {
-    super();
-    this._rawIpc = rawIpc;
-    attachEvents(this);
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
   }
 }
-const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE';
-const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON';
-const ERR_MODULE_NOT_FOUND = 'ERR_MODULE_NOT_FOUND';
-const NewLine$2 = '\n';
-const joinLines$1 = lines => {
-  return lines.join(NewLine$2);
+const wrap$f = global => {
+  return new IpcChildWithModuleWorker(global);
 };
-const RE_AT = /^\s+at/;
-const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
-const isNormalStackLine = line => {
-  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line);
+const waitForFirstMessage = async port => {
+  const {
+    resolve,
+    promise
+  } = Promise.withResolvers();
+  port.addEventListener('message', resolve, {
+    once: true
+  });
+  const event = await promise;
+  // @ts-ignore
+  return event.data;
 };
-const getDetails = lines => {
-  const index = lines.findIndex(isNormalStackLine);
-  if (index === -1) {
-    return {
-      actualMessage: joinLines$1(lines),
-      rest: []
-    };
+const listen$6 = async () => {
+  const parentIpcRaw = listen$7();
+  signal$8(parentIpcRaw);
+  const parentIpc = wrap$f(parentIpcRaw);
+  const firstMessage = await waitForFirstMessage(parentIpc);
+  if (firstMessage.method !== 'initialize') {
+    throw new IpcError('unexpected first message');
   }
-  let lastIndex = index - 1;
-  while (++lastIndex < lines.length) {
-    if (!isNormalStackLine(lines[lastIndex])) {
-      break;
-    }
+  const type = firstMessage.params[0];
+  if (type === 'message-port') {
+    parentIpc.send({
+      jsonrpc: '2.0',
+      id: firstMessage.id,
+      result: null
+    });
+    parentIpc.dispose();
+    const port = firstMessage.params[1];
+    return port;
   }
-  return {
-    actualMessage: lines[index - 1],
-    rest: lines.slice(index, lastIndex)
-  };
+  return globalThis;
 };
-const splitLines$2 = lines => {
-  return lines.split(NewLine$2);
+class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
+  getData(event) {
+    return getData$2(event);
+  }
+  send(message) {
+    this._rawIpc.postMessage(message);
+  }
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    this._rawIpc.postMessage(message, transfer);
+  }
+  dispose() {
+    if (this._rawIpc.close) {
+      this._rawIpc.close();
+    }
+  }
+  onClose(callback) {
+    // ignore
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+    this._rawIpc.start();
+  }
+}
+const wrap$e = port => {
+  return new IpcChildWithModuleWorkerAndMessagePort(port);
 };
-const RE_MESSAGE_CODE_BLOCK_START = /^Error: The module '.*'$/;
-const RE_MESSAGE_CODE_BLOCK_END = /^\s* at/;
-const isMessageCodeBlockStartIndex = line => {
-  return RE_MESSAGE_CODE_BLOCK_START.test(line);
+const IpcChildWithModuleWorkerAndMessagePort$1 = {
+  __proto__: null,
+  listen: listen$6,
+  wrap: wrap$e
 };
-const isMessageCodeBlockEndIndex = line => {
-  return RE_MESSAGE_CODE_BLOCK_END.test(line);
+const Error$3 = 1;
+const Open = 2;
+const Close = 3;
+const addListener = (emitter, type, callback) => {
+  if ('addEventListener' in emitter) {
+    emitter.addEventListener(type, callback);
+  } else {
+    emitter.on(type, callback);
+  }
 };
-const getMessageCodeBlock = stderr => {
-  const lines = splitLines$2(stderr);
-  const startIndex = lines.findIndex(isMessageCodeBlockStartIndex);
-  const endIndex = startIndex + lines.slice(startIndex).findIndex(isMessageCodeBlockEndIndex, startIndex);
-  const relevantLines = lines.slice(startIndex, endIndex);
-  const relevantMessage = relevantLines.join(' ').slice('Error: '.length);
-  return relevantMessage;
-};
-const isModuleNotFoundMessage = line => {
-  return line.includes('[ERR_MODULE_NOT_FOUND]');
-};
-const getModuleNotFoundError = stderr => {
-  const lines = splitLines$2(stderr);
-  const messageIndex = lines.findIndex(isModuleNotFoundMessage);
-  const message = lines[messageIndex];
-  return {
-    message,
-    code: ERR_MODULE_NOT_FOUND
-  };
-};
-const isModuleNotFoundError = stderr => {
-  if (!stderr) {
-    return false;
-  }
-  return stderr.includes('ERR_MODULE_NOT_FOUND');
-};
-const isModulesSyntaxError = stderr => {
-  if (!stderr) {
-    return false;
-  }
-  return stderr.includes('SyntaxError: Cannot use import statement outside a module');
-};
-const RE_NATIVE_MODULE_ERROR = /^innerError Error: Cannot find module '.*.node'/;
-const RE_NATIVE_MODULE_ERROR_2 = /was compiled against a different Node.js version/;
-const isUnhelpfulNativeModuleError = stderr => {
-  return RE_NATIVE_MODULE_ERROR.test(stderr) && RE_NATIVE_MODULE_ERROR_2.test(stderr);
-};
-const getNativeModuleErrorMessage = stderr => {
-  const message = getMessageCodeBlock(stderr);
-  return {
-    message: `Incompatible native node module: ${message}`,
-    code: E_INCOMPATIBLE_NATIVE_MODULE
-  };
-};
-const getModuleSyntaxError = () => {
-  return {
-    message: `ES Modules are not supported in electron`,
-    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
-  };
-};
-const getHelpfulChildProcessError = (stdout, stderr) => {
-  if (isUnhelpfulNativeModuleError(stderr)) {
-    return getNativeModuleErrorMessage(stderr);
-  }
-  if (isModulesSyntaxError(stderr)) {
-    return getModuleSyntaxError();
-  }
-  if (isModuleNotFoundError(stderr)) {
-    return getModuleNotFoundError(stderr);
-  }
-  const lines = splitLines$2(stderr);
-  const {
-    actualMessage,
-    rest
-  } = getDetails(lines);
-  return {
-    message: actualMessage,
-    code: '',
-    stack: rest
-  };
-};
-class IpcError extends VError {
-  // @ts-ignore
-  constructor(betterMessage, stdout = '', stderr = '') {
-    if (stdout || stderr) {
-      // @ts-ignore
-      const {
-        message,
-        code,
-        stack
-      } = getHelpfulChildProcessError(stdout, stderr);
-      const cause = new Error(message);
-      // @ts-ignore
-      cause.code = code;
-      cause.stack = stack;
-      super(cause, betterMessage);
-    } else {
-      super(betterMessage);
-    }
-    // @ts-ignore
-    this.name = 'IpcError';
-    // @ts-ignore
-    this.stdout = stdout;
-    // @ts-ignore
-    this.stderr = stderr;
-  }
-}
-const readyMessage = 'ready';
-const getData$2 = event => {
-  return event.data;
-};
-const listen$8 = ({
-  port
-}) => {
-  return port;
-};
-const signal$9 = port => {
-  port.postMessage(readyMessage);
-};
-class IpcChildWithMessagePort extends Ipc {
-  getData(event) {
-    return getData$2(event);
-  }
-  send(message) {
-    this._rawIpc.postMessage(message);
-  }
-  sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
-    this._rawIpc.postMessage(message, transfer);
-  }
-  dispose() {
-    // ignore
-  }
-  onClose(callback) {
-    // ignore
-  }
-  onMessage(callback) {
-    this._rawIpc.addEventListener('message', callback);
-    this._rawIpc.start();
-  }
-}
-const wrap$g = port => {
-  return new IpcChildWithMessagePort(port);
-};
-const IpcChildWithMessagePort$1 = {
-  __proto__: null,
-  listen: listen$8,
-  signal: signal$9,
-  wrap: wrap$g
-};
-const listen$7 = () => {
-  // @ts-ignore
-  if (typeof WorkerGlobalScope === 'undefined') {
-    throw new TypeError('module is not in web worker scope');
-  }
-  return globalThis;
-};
-const signal$8 = global => {
-  global.postMessage(readyMessage);
-};
-class IpcChildWithModuleWorker extends Ipc {
-  getData(event) {
-    return getData$2(event);
-  }
-  send(message) {
-    // @ts-ignore
-    this._rawIpc.postMessage(message);
-  }
-  sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
-    // @ts-ignore
-    this._rawIpc.postMessage(message, transfer);
-  }
-  dispose() {
-    // ignore
-  }
-  onClose(callback) {
-    // ignore
-  }
-  onMessage(callback) {
-    this._rawIpc.addEventListener('message', callback);
-  }
-}
-const wrap$f = global => {
-  return new IpcChildWithModuleWorker(global);
-};
-const waitForFirstMessage = async port => {
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  port.addEventListener('message', resolve, {
-    once: true
-  });
-  const event = await promise;
-  // @ts-ignore
-  return event.data;
-};
-const listen$6 = async () => {
-  const parentIpcRaw = listen$7();
-  signal$8(parentIpcRaw);
-  const parentIpc = wrap$f(parentIpcRaw);
-  const firstMessage = await waitForFirstMessage(parentIpc);
-  if (firstMessage.method !== 'initialize') {
-    throw new IpcError('unexpected first message');
-  }
-  const type = firstMessage.params[0];
-  if (type === 'message-port') {
-    parentIpc.send({
-      jsonrpc: '2.0',
-      id: firstMessage.id,
-      result: null
-    });
-    parentIpc.dispose();
-    const port = firstMessage.params[1];
-    return port;
-  }
-  return globalThis;
-};
-class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
-  getData(event) {
-    return getData$2(event);
-  }
-  send(message) {
-    this._rawIpc.postMessage(message);
-  }
-  sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
-    this._rawIpc.postMessage(message, transfer);
-  }
-  dispose() {
-    if (this._rawIpc.close) {
-      this._rawIpc.close();
-    }
-  }
-  onClose(callback) {
-    // ignore
-  }
-  onMessage(callback) {
-    this._rawIpc.addEventListener('message', callback);
-    this._rawIpc.start();
-  }
-}
-const wrap$e = port => {
-  return new IpcChildWithModuleWorkerAndMessagePort(port);
-};
-const IpcChildWithModuleWorkerAndMessagePort$1 = {
-  __proto__: null,
-  listen: listen$6,
-  wrap: wrap$e
-};
-const Error$3 = 1;
-const Open = 2;
-const Close = 3;
-const addListener = (emitter, type, callback) => {
-  if ('addEventListener' in emitter) {
-    emitter.addEventListener(type, callback);
-  } else {
-    emitter.on(type, callback);
-  }
-};
-const removeListener = (emitter, type, callback) => {
-  if ('removeEventListener' in emitter) {
-    emitter.removeEventListener(type, callback);
-  } else {
-    emitter.off(type, callback);
-  }
+const removeListener = (emitter, type, callback) => {
+  if ('removeEventListener' in emitter) {
+    emitter.removeEventListener(type, callback);
+  } else {
+    emitter.off(type, callback);
+  }
 };
 const getFirstEvent = (eventEmitter, eventMap) => {
   const {
@@ -1750,13 +1333,13 @@ const create$4$2 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$9 = (id, fn) => {
+const set$a = (id, fn) => {
   callbacks[id] = fn;
 };
-const get$9 = id => {
+const get$a = id => {
   return callbacks[id];
 };
-const remove$3 = id => {
+const remove$4 = id => {
   delete callbacks[id];
 };
 let id$1 = 0;
@@ -1769,7 +1352,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$9(id, resolve);
+  set$a(id, resolve);
   return {
     id,
     promise
@@ -1934,14 +1517,14 @@ const warn$1 = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$9(id);
+  const fn = get$a(id);
   if (!fn) {
     console.log(response);
     warn$1(`callback ${id} may already be disposed`);
     return;
   }
   fn(response);
-  remove$3(id);
+  remove$4(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -1991,326 +1574,752 @@ const create$1$1 = (id, error) => {
     error
   };
 };
-const getErrorResponse = (id, error, preparePrettyError, logError) => {
-  const prettyError = preparePrettyError(error);
-  logError(error, prettyError);
-  const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$1(id, errorProperty);
+const getErrorResponse = (id, error, preparePrettyError, logError) => {
+  const prettyError = preparePrettyError(error);
+  logError(error, prettyError);
+  const errorProperty = getErrorProperty(error, prettyError);
+  return create$1$1(id, errorProperty);
+};
+const create$8 = (message, result) => {
+  return {
+    jsonrpc: Two,
+    id: message.id,
+    result: result ?? null
+  };
+};
+const getSuccessResponse = (message, result) => {
+  const resultProperty = result ?? null;
+  return create$8(message, resultProperty);
+};
+const getErrorResponseSimple = (id, error) => {
+  return {
+    jsonrpc: Two,
+    id,
+    error: {
+      code: Custom,
+      // @ts-ignore
+      message: error.message,
+      data: error
+    }
+  };
+};
+const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
+  try {
+    const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
+    return getSuccessResponse(message, result);
+  } catch (error) {
+    if (ipc.canUseSimpleErrorResponse) {
+      return getErrorResponseSimple(message.id, error);
+    }
+    return getErrorResponse(message.id, error, preparePrettyError, logError);
+  }
+};
+const defaultPreparePrettyError = error => {
+  return error;
+};
+const defaultLogError = () => {
+  // ignore
+};
+const defaultRequiresSocket = () => {
+  return false;
+};
+const defaultResolve = resolve;
+
+// TODO maybe remove this in v6 or v7, only accept options object to simplify the code
+const normalizeParams = args => {
+  if (args.length === 1) {
+    const options = args[0];
+    return {
+      ipc: options.ipc,
+      message: options.message,
+      execute: options.execute,
+      resolve: options.resolve || defaultResolve,
+      preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
+      logError: options.logError || defaultLogError,
+      requiresSocket: options.requiresSocket || defaultRequiresSocket
+    };
+  }
+  return {
+    ipc: args[0],
+    message: args[1],
+    execute: args[2],
+    resolve: args[3],
+    preparePrettyError: args[4],
+    logError: args[5],
+    requiresSocket: args[6]
+  };
+};
+const handleJsonRpcMessage = async (...args) => {
+  const options = normalizeParams(args);
+  const {
+    message,
+    ipc,
+    execute,
+    resolve,
+    preparePrettyError,
+    logError,
+    requiresSocket
+  } = options;
+  if ('id' in message) {
+    if ('method' in message) {
+      const response = await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
+      try {
+        ipc.send(response);
+      } catch (error) {
+        const errorResponse = getErrorResponse(message.id, error, preparePrettyError, logError);
+        ipc.send(errorResponse);
+      }
+      return;
+    }
+    resolve(message.id, message);
+    return;
+  }
+  if ('method' in message) {
+    await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
+    return;
+  }
+  throw new JsonRpcError('unexpected message');
+};
+const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
+  const {
+    message,
+    promise
+  } = create$2$2(method, params);
+  if (useSendAndTransfer && ipc.sendAndTransfer) {
+    ipc.sendAndTransfer(message);
+  } else {
+    ipc.send(message);
+  }
+  const responseMessage = await promise;
+  return unwrapJsonRpcResult(responseMessage);
+};
+const send$1 = (transport, method, ...params) => {
+  const message = create$4$2(method, params);
+  transport.send(message);
+};
+const invoke$3 = (ipc, method, ...params) => {
+  return invokeHelper(ipc, method, params, false);
+};
+const invokeAndTransfer$2 = (ipc, method, ...params) => {
+  return invokeHelper(ipc, method, params, true);
+};
+
+class CommandNotFoundError extends Error {
+  constructor(command) {
+    super(`Command not found ${command}`);
+    this.name = 'CommandNotFoundError';
+  }
+}
+const commands = Object.create(null);
+const register$1 = commandMap => {
+  Object.assign(commands, commandMap);
+};
+const getCommand = key => {
+  return commands[key];
+};
+const execute = (command, ...args) => {
+  const fn = getCommand(command);
+  if (!fn) {
+    throw new CommandNotFoundError(command);
+  }
+  return fn(...args);
+};
+
+const createRpc$1 = ipc => {
+  const rpc = {
+    // @ts-ignore
+    ipc,
+    /**
+     * @deprecated
+     */
+    send(method, ...params) {
+      send$1(ipc, method, ...params);
+    },
+    invoke(method, ...params) {
+      return invoke$3(ipc, method, ...params);
+    },
+    invokeAndTransfer(method, ...params) {
+      return invokeAndTransfer$2(ipc, method, ...params);
+    },
+    async dispose() {
+      await ipc?.dispose();
+    }
+  };
+  return rpc;
+};
+const requiresSocket = () => {
+  return false;
+};
+const preparePrettyError = error => {
+  return error;
+};
+const logError = () => {
+  // handled by renderer worker
+};
+const handleMessage = event => {
+  const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
+  const actualExecute = event?.target?.execute || execute;
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError, actualRequiresSocket);
+};
+const handleIpc = ipc => {
+  if ('addEventListener' in ipc) {
+    ipc.addEventListener('message', handleMessage);
+  } else if ('on' in ipc) {
+    // deprecated
+    ipc.on('message', handleMessage);
+  }
+};
+const listen$1 = async (module, options) => {
+  const rawIpc = await module.listen(options);
+  if (module.signal) {
+    module.signal(rawIpc);
+  }
+  const ipc = module.wrap(rawIpc);
+  return ipc;
+};
+const create$f = async ({
+  commandMap,
+  messagePort
+}) => {
+  // TODO create a commandMap per rpc instance
+  register$1(commandMap);
+  const ipc = await listen$1(IpcChildWithMessagePort$1, {
+    port: messagePort
+  });
+  handleIpc(ipc);
+  const rpc = createRpc$1(ipc);
+  return rpc;
+};
+const MessagePortRpcClient = {
+  __proto__: null,
+  create: create$f
+};
+const create$e = async ({
+  commandMap,
+  messagePort,
+  isMessagePortOpen
+}) => {
+  // TODO create a commandMap per rpc instance
+  register$1(commandMap);
+  const rawIpc = await IpcParentWithMessagePort$1.create({
+    messagePort,
+    isMessagePortOpen
+  });
+  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
+  handleIpc(ipc);
+  const rpc = createRpc$1(ipc);
+  return rpc;
+};
+const MessagePortRpcParent = {
+  __proto__: null,
+  create: create$e
+};
+const create$5$1 = async ({
+  commandMap,
+  messagePort
+}) => {
+  // TODO create a commandMap per rpc instance
+  register$1(commandMap);
+  const rawIpc = await IpcParentWithMessagePort$1.create({
+    messagePort,
+    isMessagePortOpen: true
+  });
+  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
+  handleIpc(ipc);
+  const rpc = createRpc$1(ipc);
+  messagePort.start();
+  return rpc;
+};
+const create$4$1 = async ({
+  commandMap,
+  messagePort
+}) => {
+  return create$5$1({
+    commandMap,
+    messagePort
+  });
+};
+const PlainMessagePortRpcParent = {
+  __proto__: null,
+  create: create$4$1
+};
+const create$3$1 = async ({
+  commandMap,
+  send
+}) => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  await send(port1);
+  return create$5$1({
+    commandMap,
+    messagePort: port2
+  });
+};
+const TransferMessagePortRpcParent = {
+  __proto__: null,
+  create: create$3$1
+};
+const create$2$1 = async ({
+  commandMap,
+  webSocket
+}) => {
+  // TODO create a commandMap per rpc instance
+  register$1(commandMap);
+  const rawIpc = await IpcParentWithWebSocket$1$1.create({
+    webSocket
+  });
+  const ipc = IpcParentWithWebSocket$1$1.wrap(rawIpc);
+  handleIpc(ipc);
+  const rpc = createRpc$1(ipc);
+  return rpc;
+};
+const WebSocketRpcParent = {
+  __proto__: null,
+  create: create$2$1
+};
+const create$7 = async ({
+  commandMap
+}) => {
+  // TODO create a commandMap per rpc instance
+  register$1(commandMap);
+  const ipc = await listen$1(IpcChildWithModuleWorkerAndMessagePort$1);
+  handleIpc(ipc);
+  const rpc = createRpc$1(ipc);
+  return rpc;
+};
+const WebWorkerRpcClient = {
+  __proto__: null,
+  create: create$7
+};
+
+const {
+  invoke: invoke$2
+} = DebugWorker;
+
+const state$a = {
+  debugProviderMap: Object.create(null)
+};
+const getDebugProvider = id => {
+  const provider = state$a.debugProviderMap[id];
+  if (!provider) {
+    // @ts-ignore
+    throw new VError(`no debug provider "${id}" found`);
+  }
+  return provider;
+};
+const registerDebugProvider = debugProvider => {
+  if (!debugProvider.id) {
+    throw new Error('Failed to register debug system provider: missing id');
+  }
+  state$a.debugProviderMap[debugProvider.id] = debugProvider;
+};
+const handlePaused = async params => {
+  // @ts-ignore
+  await invoke$2('Debug.paused', params);
+};
+const handleResumed = async () => {
+  // @ts-ignore
+  await invoke$2('Debug.resumed');
+};
+const handleScriptParsed = async parsedScript => {
+  // @ts-ignore
+  await invoke$2('Debug.scriptParsed', parsedScript);
+};
+const handleChange = async params => {
+  object(params);
+  // @ts-ignore
+  await invoke$2('Debug.handleChange', params);
+};
+const start = async (protocol, path) => {
+  try {
+    const provider = getDebugProvider(protocol);
+    const emitter = {
+      handlePaused,
+      handleResumed,
+      handleScriptParsed,
+      handleChange
+    };
+    await provider.start(emitter, path);
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
+  }
+};
+const listProcesses = async (protocol, path) => {
+  try {
+    const provider = getDebugProvider(protocol);
+    const processes = await provider.listProcesses(path);
+    array(processes);
+    return processes;
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
+  }
+};
+const resume = async protocol => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.resume();
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
+  }
 };
-const create$8 = (message, result) => {
-  return {
-    jsonrpc: Two,
-    id: message.id,
-    result: result ?? null
-  };
+const pause = async protocol => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.pause();
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
+  }
 };
-const getSuccessResponse = (message, result) => {
-  const resultProperty = result ?? null;
-  return create$8(message, resultProperty);
+const getScriptSource = async (protocol, scriptId) => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.getScriptSource(scriptId);
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
+  }
 };
-const getErrorResponseSimple = (id, error) => {
-  return {
-    jsonrpc: Two,
-    id,
-    error: {
-      code: Custom,
-      // @ts-ignore
-      message: error.message,
-      data: error
-    }
-  };
+
+// TODO create direct connection from debug worker to extension, not needing extension host worker apis
+
+const getStatus = async protocol => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.getStatus();
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
+  }
 };
-const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
+const getCallStack = async protocol => {
   try {
-    const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
-    return getSuccessResponse(message, result);
+    const provider = getDebugProvider(protocol);
+    return await provider.getCallStack();
   } catch (error) {
-    if (ipc.canUseSimpleErrorResponse) {
-      return getErrorResponseSimple(message.id, error);
-    }
-    return getErrorResponse(message.id, error, preparePrettyError, logError);
+    throw new VError(error, 'Failed to execute debug provider');
   }
 };
-const defaultPreparePrettyError = error => {
-  return error;
+const getScopeChain = async protocol => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.getScopeChain();
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
+  }
 };
-const defaultLogError = () => {
-  // ignore
+const getScripts = async protocol => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.getScripts();
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
+  }
 };
-const defaultRequiresSocket = () => {
-  return false;
+const getPausedStatus = async protocol => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.getStatus();
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
+  }
 };
-const defaultResolve = resolve;
-
-// TODO maybe remove this in v6 or v7, only accept options object to simplify the code
-const normalizeParams = args => {
-  if (args.length === 1) {
-    const options = args[0];
-    return {
-      ipc: options.ipc,
-      message: options.message,
-      execute: options.execute,
-      resolve: options.resolve || defaultResolve,
-      preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
-      logError: options.logError || defaultLogError,
-      requiresSocket: options.requiresSocket || defaultRequiresSocket
-    };
+const stepInto = async protocol => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.stepInto();
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
   }
-  return {
-    ipc: args[0],
-    message: args[1],
-    execute: args[2],
-    resolve: args[3],
-    preparePrettyError: args[4],
-    logError: args[5],
-    requiresSocket: args[6]
-  };
 };
-const handleJsonRpcMessage = async (...args) => {
-  const options = normalizeParams(args);
-  const {
-    message,
-    ipc,
-    execute,
-    resolve,
-    preparePrettyError,
-    logError,
-    requiresSocket
-  } = options;
-  if ('id' in message) {
-    if ('method' in message) {
-      const response = await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
-      try {
-        ipc.send(response);
-      } catch (error) {
-        const errorResponse = getErrorResponse(message.id, error, preparePrettyError, logError);
-        ipc.send(errorResponse);
-      }
-      return;
-    }
-    resolve(message.id, message);
-    return;
+const stepOut = async protocol => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.stepOut();
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
   }
-  if ('method' in message) {
-    await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
-    return;
+};
+const stepOver = async protocol => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.stepOver();
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
   }
-  throw new JsonRpcError('unexpected message');
 };
-const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
-  const {
-    message,
-    promise
-  } = create$2$2(method, params);
-  if (useSendAndTransfer && ipc.sendAndTransfer) {
-    ipc.sendAndTransfer(message);
-  } else {
-    ipc.send(message);
+const setPauseOnException = async (protocol, value) => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.setPauseOnExceptions(value);
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
   }
-  const responseMessage = await promise;
-  return unwrapJsonRpcResult(responseMessage);
 };
-const send$1 = (transport, method, ...params) => {
-  const message = create$4$2(method, params);
-  transport.send(message);
+const getProperties = async (protocol, objectId) => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.getProperties(objectId);
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
+  }
 };
-const invoke$1 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, false);
+const evaluate = async (protocol, expression, callFrameId) => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.evaluate(expression, callFrameId);
+  } catch (error) {
+    throw new VError(error, 'Failed to execute debug provider');
+  }
 };
-const invokeAndTransfer$1 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, true);
+const setPauseOnExceptions = async (protocol, value) => {
+  try {
+    const provider = getDebugProvider(protocol);
+    return await provider.setPauseOnExceptions(value);
+  } catch (error) {
+    throw new VError(error, 'Failed to execute setPauseOnExceptions');
+  }
 };
 
-class CommandNotFoundError extends Error {
-  constructor(command) {
-    super(`Command not found ${command}`);
-    this.name = 'CommandNotFoundError';
+const {
+  registerDefinitionProvider,
+  executeDefinitionProvider} = create$b({
+  name: 'Definition',
+  resultShape: {
+    allowUndefined: true,
+    type: Object$1,
+    properties: {
+      uri: {
+        type: String$1
+      },
+      startOffset: {
+        type: Number
+      },
+      endOffset: {
+        type: Number
+      }
+    }
   }
-}
-const commands = Object.create(null);
-const register$1 = commandMap => {
-  Object.assign(commands, commandMap);
-};
-const getCommand = key => {
-  return commands[key];
-};
-const execute = (command, ...args) => {
-  const fn = getCommand(command);
-  if (!fn) {
-    throw new CommandNotFoundError(command);
+});
+
+const {
+  registerDiagnosticProvider,
+  executeDiagnosticProvider
+} = create$b({
+  name: 'Diagnostic',
+  resultShape: {
+    type: Array$1,
+    items: {
+      type: Object$1
+    }
   }
-  return fn(...args);
-};
+});
 
-const createRpc$1 = ipc => {
-  const rpc = {
-    // @ts-ignore
-    ipc,
-    /**
-     * @deprecated
-     */
-    send(method, ...params) {
-      send$1(ipc, method, ...params);
-    },
-    invoke(method, ...params) {
-      return invoke$1(ipc, method, ...params);
-    },
-    invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer$1(ipc, method, ...params);
-    },
-    async dispose() {
-      await ipc?.dispose();
-    }
-  };
-  return rpc;
-};
-const requiresSocket = () => {
-  return false;
+const RendererWorker = 1;
+
+const invoke$1 = (method, ...params) => {
+  const rpc = get$b(RendererWorker);
+  return rpc.invoke(method, ...params);
 };
-const preparePrettyError = error => {
-  return error;
+const invokeAndTransfer$1 = (method, ...params) => {
+  const rpc = get$b(RendererWorker);
+  return rpc.invokeAndTransfer(method, ...params);
 };
-const logError = () => {
-  // handled by renderer worker
+
+const showInformationMessage = message => {
+  string(message);
+  const result = invoke$1('ExtensionHostDialog.showInformationMessage', message);
+  return result;
 };
-const handleMessage = event => {
-  const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
-  const actualExecute = event?.target?.execute || execute;
-  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError, actualRequiresSocket);
+
+const env = {};
+
+const exec = async (command, args, options) => {
+  throw new DepecratedError(`vscode.exec is deprecated, use createNodeRpc instead`);
 };
-const handleIpc = ipc => {
-  if ('addEventListener' in ipc) {
-    ipc.addEventListener('message', handleMessage);
-  } else if ('on' in ipc) {
-    // deprecated
-    ipc.on('message', handleMessage);
+
+const fileSystemProviderMap = Object.create(null);
+const get$9 = protocol => {
+  const provider = fileSystemProviderMap[protocol];
+  if (!provider) {
+    // @ts-ignore
+    throw new VError(`no file system provider for protocol "${protocol}" found`);
   }
+  return provider;
 };
-const listen$1 = async (module, options) => {
-  const rawIpc = await module.listen(options);
-  if (module.signal) {
-    module.signal(rawIpc);
+const set$9 = (id, provider) => {
+  if (!id) {
+    throw new Error('Failed to register file system provider: missing id');
   }
-  const ipc = module.wrap(rawIpc);
-  return ipc;
-};
-const create$f = async ({
-  commandMap,
-  messagePort
-}) => {
-  // TODO create a commandMap per rpc instance
-  register$1(commandMap);
-  const ipc = await listen$1(IpcChildWithMessagePort$1, {
-    port: messagePort
-  });
-  handleIpc(ipc);
-  const rpc = createRpc$1(ipc);
-  return rpc;
+  fileSystemProviderMap[id] = provider;
 };
-const MessagePortRpcClient = {
-  __proto__: null,
-  create: create$f
+
+const registerFileSystemProvider = fileSystemProvider => {
+  if (!fileSystemProvider.id) {
+    throw new Error('Failed to register file system provider: missing id');
+  }
+  set$9(fileSystemProvider.id, fileSystemProvider);
 };
-const create$e = async ({
-  commandMap,
-  messagePort,
-  isMessagePortOpen
-}) => {
-  // TODO create a commandMap per rpc instance
-  register$1(commandMap);
-  const rawIpc = await IpcParentWithMessagePort$1.create({
-    messagePort,
-    isMessagePortOpen
-  });
-  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
-  handleIpc(ipc);
-  const rpc = createRpc$1(ipc);
-  return rpc;
+const readDirWithFileTypes$2 = async (protocol, path) => {
+  try {
+    const provider = get$9(protocol);
+    return await provider.readDirWithFileTypes(path);
+  } catch (error) {
+    throw new VError(error, 'Failed to execute file system provider');
+  }
 };
-const MessagePortRpcParent = {
-  __proto__: null,
-  create: create$e
+const readFile$2 = async (protocol, path) => {
+  try {
+    const provider = get$9(protocol);
+    return await provider.readFile(path);
+  } catch (error) {
+    throw new VError(error, 'Failed to execute file system provider');
+  }
 };
-const create$5$1 = async ({
-  commandMap,
-  messagePort
-}) => {
-  // TODO create a commandMap per rpc instance
-  register$1(commandMap);
-  const rawIpc = await IpcParentWithMessagePort$1.create({
-    messagePort,
-    isMessagePortOpen: true
-  });
-  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
-  handleIpc(ipc);
-  const rpc = createRpc$1(ipc);
-  messagePort.start();
-  return rpc;
+const readFileExternal = async path => {
+  // TODO when file is local,
+  // don't ask renderer worker
+  // instead read file directly from shared process
+  // this avoid parsing the potentially large message
+  // and improve performance by not blocking the renderer worker
+  // when reading / writing large files
+  const content = await invoke$1('FileSystem.readFile', path);
+  return content;
 };
-const create$4$1 = async ({
-  commandMap,
-  messagePort
-}) => {
-  return create$5$1({
-    commandMap,
-    messagePort
-  });
+const existsExternal = async uri => {
+  return await invoke$1('FileSystem.exists', uri);
 };
-const PlainMessagePortRpcParent = {
-  __proto__: null,
-  create: create$4$1
+const readDirWithFileTypesExternal = async path => {
+  // TODO when file is local,
+  // don't ask renderer worker
+  // instead read file directly from shared process
+  // this avoid parsing the potentially large message
+  // and improve performance by not blocking the renderer worker
+  // when reading / writing large files
+  const content = await invoke$1('FileSystem.readDirWithFileTypes', path);
+  return content;
 };
-const create$3$1 = async ({
-  commandMap,
-  send
-}) => {
-  const {
-    port1,
-    port2
-  } = new MessageChannel();
-  await send(port1);
-  return create$5$1({
-    commandMap,
-    messagePort: port2
-  });
+const remove$3 = async (protocol, path) => {
+  try {
+    const provider = get$9(protocol);
+    return await provider.remove(path);
+  } catch (error) {
+    throw new VError(error, 'Failed to execute file system provider');
+  }
 };
-const TransferMessagePortRpcParent = {
-  __proto__: null,
-  create: create$3$1
+const rename$1 = async (protocol, oldUri, newUri) => {
+  try {
+    const provider = get$9(protocol);
+    return await provider.rename(oldUri, newUri);
+  } catch (error) {
+    throw new VError(error, 'Failed to execute file system provider');
+  }
 };
-const create$2$1 = async ({
-  commandMap,
-  webSocket
-}) => {
-  // TODO create a commandMap per rpc instance
-  register$1(commandMap);
-  const rawIpc = await IpcParentWithWebSocket$1$1.create({
-    webSocket
-  });
-  const ipc = IpcParentWithWebSocket$1$1.wrap(rawIpc);
-  handleIpc(ipc);
-  const rpc = createRpc$1(ipc);
-  return rpc;
+const writeFile$3 = async (protocol, uri, content) => {
+  try {
+    const provider = get$9(protocol);
+    return await provider.writeFile(uri, content);
+  } catch (error) {
+    throw new VError(error, 'Failed to execute file system provider');
+  }
 };
-const WebSocketRpcParent = {
-  __proto__: null,
-  create: create$2$1
+const getPathSeparator = protocol => {
+  try {
+    const provider = get$9(protocol);
+    return provider.pathSeparator;
+  } catch (error) {
+    throw new VError(error, 'Failed to execute file system provider');
+  }
 };
-const create$7 = async ({
-  commandMap
-}) => {
-  // TODO create a commandMap per rpc instance
-  register$1(commandMap);
-  const ipc = await listen$1(IpcChildWithModuleWorkerAndMessagePort$1);
-  handleIpc(ipc);
-  const rpc = createRpc$1(ipc);
-  return rpc;
+
+const {
+  registerFormattingProvider,
+  executeFormattingProvider} = create$b({
+  name: 'Formatting',
+  executeKey: 'format',
+  resultShape: {
+    allowUndefined: true,
+    type: Array$1,
+    items: {
+      type: Object$1,
+      properties: {
+        startOffset: {
+          type: Number
+        },
+        endOffset: {
+          type: Number
+        },
+        inserted: {
+          type: String$1
+        }
+      }
+    }
+  }
+});
+
+const getOffset = (textDocument, position) => {
+  let offset = 0;
+  let rowIndex = 0;
+  while (rowIndex++ < position.rowIndex) {
+    const newLineIndex = textDocument.text.indexOf('\n', offset);
+    offset = newLineIndex + 1;
+  }
+  offset += position.columnIndex;
+  return offset;
 };
-const WebWorkerRpcClient = {
-  __proto__: null,
-  create: create$7
+
+const getPosition = (textDocument, offset) => {
+  let index = 0;
+  let rowIndex = 0;
+  let newLineIndex = 0;
+  const {
+    text
+  } = textDocument;
+  while (index < offset) {
+    newLineIndex = text.indexOf('\n', index);
+    if (newLineIndex === -1) {
+      break;
+    }
+    const newIndex = newLineIndex + 1;
+    if (newIndex > offset) {
+      break;
+    }
+    index = newIndex;
+    rowIndex++;
+  }
+  const columnIndex = offset - index;
+  return {
+    rowIndex,
+    columnIndex
+  };
 };
 
+const {
+  registerHoverProvider,
+  executeHoverProvider} = create$b({
+  name: 'Hover',
+  resultShape: {
+    allowUndefined: true,
+    type: Object$1,
+    properties: {}
+  }
+});
+
+const {
+  registerImplementationProvider,
+  executeImplementationProvider} = create$b({
+  name: 'Implementation',
+  resultShape: {
+    type: Array$1,
+    items: {
+      type: Object$1
+    }
+  }
+});
+
+const WebSocket$1 = 5;
+const ElectronMessagePort = 6;
+const ModuleWorkerAndWorkaroundForChromeDevtoolsBug$1 = 7;
+
 const getPortTuple = () => {
   const {
     port1,
@@ -2329,7 +2338,7 @@ const sendPort = async ({
   name,
   port
 }) => {
-  await invokeAndTransfer$2('IpcParent.create', {
+  await invokeAndTransfer$1('IpcParent.create', {
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
     url,
     name,
@@ -2370,7 +2379,7 @@ const IpcParentWithModuleWorkerAndWorkaroundForChromeDevtoolsBug = {
 };
 
 const sendMessagePortToElectron = async (port, initialCommand) => {
-  await invokeAndTransfer$2('SendMessagePortToElectron.sendMessagePortToElectron', port, initialCommand);
+  await invokeAndTransfer$1('SendMessagePortToElectron.sendMessagePortToElectron', port, initialCommand);
 };
 
 const getPort = async type => {
@@ -2530,7 +2539,7 @@ const createNodeRpc = async ({
 
 const send = async port => {
   const initialCommand = 'FileSystem.handleMessagePort';
-  await invokeAndTransfer$2('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, initialCommand);
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, initialCommand);
 };
 const launchFileSystemProcess = async () => {
   const rpc = await TransferMessagePortRpcParent.create({
@@ -2611,7 +2620,7 @@ const getEnabledProviders = () => {
 
 const confirm = message => {
   string(message);
-  const result = invoke$2('ConfirmPrompt.prompt', message);
+  const result = invoke$1('ConfirmPrompt.prompt', message);
   return result;
 };
 
@@ -2623,7 +2632,7 @@ const showQuickPick = async ({
 }) => {
   const rawPicks = await getPicks();
   const picks = rawPicks.map(toPick);
-  return invoke$2(ExtensionHostQuickPickShow, picks);
+  return invoke$1(ExtensionHostQuickPickShow, picks);
 };
 
 const {
@@ -2683,13 +2692,13 @@ const {
 });
 
 const getExtensionHostSubWorkerUrl = () => {
-  return '/710e33b/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
+  return '/bb5da46/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
 };
 const extensionHostSubWorkerUrl = getExtensionHostSubWorkerUrl();
 
 const set$8 = async (url, contentSecurityPolicy) => {
   const pathName = new URL(url).pathname;
-  await invoke$2('ExtensionHostWorkerContentSecurityPolicy.set', pathName, contentSecurityPolicy);
+  await invoke$1('ExtensionHostWorkerContentSecurityPolicy.set', pathName, contentSecurityPolicy);
 };
 
 /**
@@ -2770,82 +2779,266 @@ const getOrCreateRpc = async (id, commandMap, execute) => {
   if (!rpc) {
     set$7(id, createRpcWithId$1(id, commandMap, execute));
   }
-  return get$7(id);
+  return get$7(id);
+};
+const createRpcWithId = ({
+  id,
+  commandMap,
+  execute
+}) => {
+  string(id);
+  register(id, commandMap);
+  const lazyRpc = {
+    async invoke(method, ...params) {
+      const rpc = await getOrCreateRpc(id, commandMap, execute);
+      return rpc.invoke(method, ...params);
+    }
+  };
+  return lazyRpc;
+};
+
+const createRpc = ({
+  id,
+  url,
+  name,
+  commandMap,
+  contentSecurityPolicy,
+  execute
+}) => {
+  try {
+    if (execute && !commandMap) {
+      // eslint-disable-next-line no-console
+      console.info(`[extension-host-worker] The rpc execute function is deprecated. Use the commandMap property instead.`);
+    }
+    commandMap ||= {};
+    if (id) {
+      string(id);
+      return createRpcWithId({
+        id,
+        execute,
+        commandMap
+      });
+    }
+    return createLegacyRpc({
+      url,
+      name,
+      execute,
+      commandMap,
+      contentSecurityPolicy
+    });
+  } catch (error) {
+    throw new VError(error, `Failed to create webworker rpc`);
+  }
+};
+
+const {
+  registerSelectionProvider,
+  executeSelectionProvider} = create$b({
+  name: 'Selection',
+  resultShape: {
+    allowUndefined: true,
+    type: Array$1,
+    items: {
+      type: 'number'
+    }
+  }
+});
+
+const RE_PROTOCOL = /^([a-z-]+):\/\//;
+const getProtocol = uri => {
+  const protocolMatch = uri.match(RE_PROTOCOL);
+  if (protocolMatch) {
+    return protocolMatch[1];
+  }
+  return '';
+};
+
+const createWebViewIpc = async webView => {
+  const {
+    uid,
+    origin
+  } = webView;
+  const {
+    port1,
+    port2
+  } = getPortTuple();
+  const rpcPromise = MessagePortRpcParent.create({
+    messagePort: port2,
+    isMessagePortOpen: false,
+    commandMap: {}
+  });
+  const portType = 'test';
+  await invokeAndTransfer$1('WebView.setPort', uid, port1, origin, portType);
+  // TODO maybe don't send a message port only to get object url?
+  // TODO dispose rpc to avoid memory leak
+  const rpc = await rpcPromise;
+  return rpc;
+};
+
+const webViews = Object.create(null);
+const webViewProviders = Object.create(null);
+const getProvider = providerId => {
+  return webViewProviders[providerId];
+};
+const setProvider = (providerId, provider) => {
+  webViewProviders[providerId] = provider;
+};
+const getWebView = id => {
+  return webViews[id];
+};
+const setWebView = (id, webView) => {
+  webViews[id] = webView;
+};
+const getWebViews$1 = () => {
+  return webViews;
+};
+
+// TODO if webViewId is provided,
+// 1. read file as blob
+// 2. send blob to webview
+// 3. create objecturl in webview
+// 4. send back objecturl to extension host worker
+// 5. provide objectUrl to extension
+
+const getRemoteUrlForWebView = async (uri, options = {}) => {
+  // TODO webviews should be stored in iframe worker
+  const webView = getWebView(options.webViewId);
+  if (!webView) {
+    throw new Error(`webview ${options.webViewId} not found`);
+  }
+  const [rpc, blob] = await Promise.all([createWebViewIpc(webView), invoke$1('FileSystem.getBlob', uri)]);
+  const objectUrl = await rpc.invoke('createObjectUrl', blob);
+  return objectUrl;
+};
+
+const isFileProtocol = protocol => {
+  return !protocol || protocol === 'file';
+};
+const getRemoteUrlSync = uri => {
+  const protocol = getProtocol(uri);
+  const withoutPrefix = uri.startsWith('file://') ? uri.slice('file://'.length) : uri;
+  if (platform === Remote && isFileProtocol(protocol)) {
+    if (uri.startsWith('/')) {
+      return `/remote${withoutPrefix}`;
+    }
+    return `/remote/${withoutPrefix}`;
+  }
+  if (platform === Electron && isFileProtocol(protocol)) {
+    if (uri.startsWith('/')) {
+      return `/remote${withoutPrefix}`;
+    }
+    return `/remote/${withoutPrefix}`;
+  }
+  return '';
+};
+const getRemoteUrl$1 = async (uri, options = {}) => {
+  // TODO uri should always have protocol
+  // then ask file system provider for remote url, for example disk file system provider or html file system provider
+  const syncUrl = getRemoteUrlSync(uri);
+  if (syncUrl) {
+    return syncUrl;
+  }
+  if (options.webViewId) {
+    return getRemoteUrlForWebView(uri, options);
+  }
+  if (uri.startsWith('html://')) {
+    const url = await invoke$1('Blob.getSrc', uri);
+    return url;
+  }
+  throw new Error(`unsupported platform for remote url`);
+};
+
+const state$9 = {
+  webExtensions: []
+};
+
+const getJson = async url => {
+  try {
+    const response = await fetch(url);
+    if (!response.ok) {
+      throw new Error(response.statusText);
+    }
+    const json = await response.json();
+    return json;
+  } catch (error) {
+    throw new VError(error, `Failed to get json`);
+  }
+};
+
+const getAssetDir = () => {
+  // @ts-ignore
+  if (typeof '/bb5da46' !== 'undefined') {
+    // @ts-ignore
+    return '/bb5da46';
+  }
+  if (platform === Electron) {
+    return '../../../../..';
+  }
+  return '';
+};
+const assetDir = getAssetDir();
+
+const extensionsUrl = `${assetDir}/config/extensions.json`;
+
+const getWebExtensions = async () => {
+  return getJson(extensionsUrl);
+};
+
+const getSharedProcessExtensions = () => {
+  return invoke$1(/* ExtensionManagement.getExtensions */'ExtensionManagement.getExtensions');
+};
+const doGetExtensions = async () => {
+  const meta = state$9.webExtensions;
+  if (platform === Web) {
+    const webExtensions = await getWebExtensions();
+    return [...webExtensions, ...meta];
+  }
+  if (platform === Remote) {
+    const sharedProcessExtensions = await getSharedProcessExtensions();
+    return [...sharedProcessExtensions, ...meta];
+  }
+  const extensions = await getSharedProcessExtensions();
+  return extensions;
 };
-const createRpcWithId = ({
-  id,
-  commandMap,
-  execute
-}) => {
-  string(id);
-  register(id, commandMap);
-  const lazyRpc = {
-    async invoke(method, ...params) {
-      const rpc = await getOrCreateRpc(id, commandMap, execute);
-      return rpc.invoke(method, ...params);
-    }
-  };
-  return lazyRpc;
+
+const getExtensions$1 = async () => {
+  return doGetExtensions();
 };
 
-const createRpc = ({
-  id,
-  url,
-  name,
-  commandMap,
-  contentSecurityPolicy,
-  execute
-}) => {
-  try {
-    if (execute && !commandMap) {
-      // eslint-disable-next-line no-console
-      console.info(`[extension-host-worker] The rpc execute function is deprecated. Use the commandMap property instead.`);
-    }
-    commandMap ||= {};
-    if (id) {
-      string(id);
-      return createRpcWithId({
-        id,
-        execute,
-        commandMap
-      });
-    }
-    return createLegacyRpc({
-      url,
-      name,
-      execute,
-      commandMap,
-      contentSecurityPolicy
-    });
-  } catch (error) {
-    throw new VError(error, `Failed to create webworker rpc`);
-  }
+const cache = Object.create(null);
+const id = 1;
+const get$6 = () => {
+  return cache[id];
+};
+const has = () => {
+  return id in cache;
+};
+const set$6 = value => {
+  cache[id] = value;
+};
+const clear = () => {
+  delete cache[id];
 };
 
-const {
-  registerSelectionProvider,
-  executeSelectionProvider} = create$b({
-  name: 'Selection',
-  resultShape: {
-    allowUndefined: true,
-    type: Array$1,
-    items: {
-      type: 'number'
-    }
+// TODO getExtensions is still called 6 times on startup instead of 1
+const getExtensions = () => {
+  if (!has()) {
+    set$6(getExtensions$1());
   }
-});
+  return get$6();
+};
 
-const state$9 = {
+const state$8 = {
   providers: Object.create(null)
 };
 const registerSourceControlProvider = provider => {
-  state$9.providers[provider.id] = provider;
+  state$8.providers[provider.id] = provider;
 };
 const getFilesFromProvider = provider => {
   return provider.getChangedFiles();
 };
 const getChangedFiles = async providerId => {
-  const provider = state$9.providers[providerId];
+  const provider = state$8.providers[providerId];
   if (!provider) {
     throw new Error('no source control provider found');
   }
@@ -2856,7 +3049,7 @@ const getChangedFiles = async providerId => {
 const getFileBefore = async (providerId, uri) => {
   string(providerId);
   string(uri);
-  const provider = state$9.providers[providerId];
+  const provider = state$8.providers[providerId];
   if (!provider) {
     throw new Error('no source control provider found');
   }
@@ -2878,7 +3071,7 @@ const getGroupsFromProvider = async (provider, cwd) => {
   throw new Error('source control provider is missing required function getGroups');
 };
 const getGroups = async (providerId, cwd) => {
-  const provider = state$9.providers[providerId];
+  const provider = state$8.providers[providerId];
   if (!provider) {
     throw new Error('no source control provider found');
   }
@@ -2886,14 +3079,14 @@ const getGroups = async (providerId, cwd) => {
   return groups;
 };
 const acceptInput = async (providerId, value) => {
-  const provider = state$9.providers[providerId];
+  const provider = state$8.providers[providerId];
   if (!provider) {
     throw new Error('no source control provider found');
   }
   await provider.acceptInput(value);
 };
 const add = async path => {
-  const provider = Object.values(state$9.providers)[0];
+  const provider = Object.values(state$8.providers)[0];
   if (!provider) {
     return;
   }
@@ -2901,7 +3094,7 @@ const add = async path => {
   await provider.add(path);
 };
 const discard = async path => {
-  const provider = Object.values(state$9.providers)[0];
+  const provider = Object.values(state$8.providers)[0];
   if (!provider) {
     return;
   }
@@ -2911,7 +3104,7 @@ const discard = async path => {
 const getEnabledProviderIds = async (scheme, root) => {
   string(scheme);
   string(root);
-  const providers = Object.values(state$9.providers);
+  const providers = Object.values(state$8.providers);
   const enabledIds = [];
   for (const provider of providers) {
     // @ts-ignore
@@ -2927,6 +3120,21 @@ const getEnabledProviderIds = async (scheme, root) => {
   }
   return enabledIds;
 };
+const getIconDefinitions = async providerId => {
+  const extensions = await getExtensions();
+  for (const extension of extensions) {
+    const id = extension.id.split('.');
+    const shortId = id[1];
+    if (shortId === providerId && extension['source-control-icons'] && Array.isArray(extension['source-control-icons'])) {
+      const baseIcons = extension['source-control-icons'];
+      const absoluteUris = baseIcons.map(icon => `${extension.uri}/${icon}`);
+      const remoteUris = absoluteUris.map(icon => getRemoteUrlSync(icon));
+      return remoteUris;
+    }
+  }
+  // TODO return warning that no icons were found?
+  return [];
+};
 
 const {
   registerTabCompletionProvider,
@@ -2938,7 +3146,7 @@ const {
   }
 });
 
-const state$8 = {
+const state$7 = {
   textSearchProviders: Object.create(null)
 };
 const registerTextSearchProvider = textSearchProvider => {
@@ -2949,14 +3157,14 @@ const registerTextSearchProvider = textSearchProvider => {
     if (!textSearchProvider.scheme) {
       throw new Error('textSearchProvider is missing scheme');
     }
-    state$8.textSearchProviders[textSearchProvider.scheme] = textSearchProvider;
+    state$7.textSearchProviders[textSearchProvider.scheme] = textSearchProvider;
   } catch (error) {
     throw new VError(error, 'Failed to register text search provider');
   }
 };
 const executeTextSearchProvider = async (scheme, query) => {
   try {
-    const textSearchProvider = state$8.textSearchProviders[scheme];
+    const textSearchProvider = state$7.textSearchProviders[scheme];
     if (!textSearchProvider) {
       throw new Error(`No text search provider for ${scheme} found`);
     }
@@ -2988,99 +3196,6 @@ const {
   }
 });
 
-const RE_PROTOCOL = /^([a-z-]+):\/\//;
-const getProtocol = uri => {
-  const protocolMatch = uri.match(RE_PROTOCOL);
-  if (protocolMatch) {
-    return protocolMatch[1];
-  }
-  return '';
-};
-
-const createWebViewIpc = async webView => {
-  const {
-    uid,
-    origin
-  } = webView;
-  const {
-    port1,
-    port2
-  } = getPortTuple();
-  const rpcPromise = MessagePortRpcParent.create({
-    messagePort: port2,
-    isMessagePortOpen: false,
-    commandMap: {}
-  });
-  const portType = 'test';
-  await invokeAndTransfer$2('WebView.setPort', uid, port1, origin, portType);
-  // TODO maybe don't send a message port only to get object url?
-  // TODO dispose rpc to avoid memory leak
-  const rpc = await rpcPromise;
-  return rpc;
-};
-
-const webViews = Object.create(null);
-const webViewProviders = Object.create(null);
-const getProvider = providerId => {
-  return webViewProviders[providerId];
-};
-const setProvider = (providerId, provider) => {
-  webViewProviders[providerId] = provider;
-};
-const getWebView = id => {
-  return webViews[id];
-};
-const setWebView = (id, webView) => {
-  webViews[id] = webView;
-};
-const getWebViews$1 = () => {
-  return webViews;
-};
-
-// TODO if webViewId is provided,
-// 1. read file as blob
-// 2. send blob to webview
-// 3. create objecturl in webview
-// 4. send back objecturl to extension host worker
-// 5. provide objectUrl to extension
-
-const getRemoteUrlForWebView = async (uri, options = {}) => {
-  // TODO webviews should be stored in iframe worker
-  const webView = getWebView(options.webViewId);
-  if (!webView) {
-    throw new Error(`webview ${options.webViewId} not found`);
-  }
-  const [rpc, blob] = await Promise.all([createWebViewIpc(webView), invoke$2('FileSystem.getBlob', uri)]);
-  const objectUrl = await rpc.invoke('createObjectUrl', blob);
-  return objectUrl;
-};
-
-const getRemoteUrl$1 = async (uri, options = {}) => {
-  // TODO uri should always have protocol
-  // then ask file system provider for remote url, for example disk file system provider or html file system provider
-  const protocol = getProtocol(uri);
-  if (platform === Remote && !protocol) {
-    if (uri.startsWith('/')) {
-      return `/remote${uri}`;
-    }
-    return `/remote/${uri}`;
-  }
-  if (platform === Electron && !protocol) {
-    if (uri.startsWith('/')) {
-      return `/remote${uri}`;
-    }
-    return `/remote/${uri}`;
-  }
-  if (options.webViewId) {
-    return getRemoteUrlForWebView(uri, options);
-  }
-  if (uri.startsWith('html://')) {
-    const url = await invoke$2('Blob.getSrc', uri);
-    return url;
-  }
-  throw new Error(`unsupported platform for remote url`);
-};
-
 // TODO pass uuid to allow having multiple webviews open at the same time
 
 /**
@@ -3156,14 +3271,14 @@ const createWorker = async ({
   return rpc;
 };
 
-const state$7 = {
+const state$6 = {
   workspacePath: ''
 };
 const setWorkspacePath = path => {
-  state$7.workspacePath = path;
+  state$6.workspacePath = path;
 };
 const getWorkspaceFolder = path => {
-  return state$7.workspacePath;
+  return state$6.workspacePath;
 };
 
 class FormattingError extends Error {
@@ -3319,17 +3434,17 @@ const handleUnhandledRejection = event => {
   console.error(output);
 };
 
-const state$6 = {
+const state$5 = {
   errors: []
 };
 const addError = error => {
-  state$6.errors = [...state$6.errors, error];
+  state$5.errors = [...state$5.errors, error];
 };
 const hasRecentErrors = () => {
-  return state$6.errors.length > 0;
+  return state$5.errors.length > 0;
 };
 const getRecentError = () => {
-  state$6.errors.at(-1);
+  state$5.errors.at(-1);
 };
 
 const handleContentSecurityPolicyViolation = event => {
@@ -3380,7 +3495,7 @@ const isCanceled = token => {
 };
 
 const modules = Object.create(null);
-const set$6 = (extensionId, module) => {
+const set$5 = (extensionId, module) => {
   modules[extensionId] = module;
 };
 const acquire = extensionId => {
@@ -3420,10 +3535,10 @@ const isImportError = error => {
 };
 
 const states = Object.create(null);
-const set$5 = status => {
+const set$4 = status => {
   states[status.id] = status;
 };
-const get$6 = extensionId => {
+const get$5 = extensionId => {
   return states[extensionId];
 };
 const update = (id, update) => {
@@ -3474,19 +3589,6 @@ class BabelParseError extends SyntaxError {
   }
 }
 
-const getAssetDir = () => {
-  // @ts-ignore
-  if (typeof '/710e33b' !== 'undefined') {
-    // @ts-ignore
-    return '/710e33b';
-  }
-  if (platform === Electron) {
-    return '../../../../..';
-  }
-  return '';
-};
-const assetDir = getAssetDir();
-
 const loadBabelParser = () => {
   const url = `${assetDir}/js/babel-parser.js`;
   return import(url);
@@ -3888,7 +3990,7 @@ const activateExtension = async (extension, absolutePath, activationEvent) => {
     string(extension.browser);
     string(absolutePath);
     const startTime = performance.now();
-    set$5({
+    set$4({
       activationEndTime: 0,
       activationEvent: activationEvent,
       activationStartTime: startTime,
@@ -3932,38 +4034,6 @@ const activateExtension = async (extension, absolutePath, activationEvent) => {
   // console.info('activated', path)
 };
 
-const state$5 = {
-  webExtensions: []
-};
-
-const cache = Object.create(null);
-const id = 1;
-const get$5 = () => {
-  return cache[id];
-};
-const has = () => {
-  return id in cache;
-};
-const set$4 = value => {
-  cache[id] = value;
-};
-const clear = () => {
-  delete cache[id];
-};
-
-const getJson = async url => {
-  try {
-    const response = await fetch(url);
-    if (!response.ok) {
-      throw new Error(response.statusText);
-    }
-    const json = await response.json();
-    return json;
-  } catch (error) {
-    throw new VError(error, `Failed to get json`);
-  }
-};
-
 const NewLine = '\n';
 const Slash$1 = '/';
 
@@ -3995,7 +4065,7 @@ const addWebExtension = async path => {
   const manifestPath = getWebManifestPath(path);
   const manifest = await getWebExtensionManifest(path, manifestPath);
   // TODO avoid mutation if possible
-  state$5.webExtensions.push(manifest);
+  state$9.webExtensions.push(manifest);
   clear();
   return manifest;
 };
@@ -4011,7 +4081,7 @@ const applyBulkReplacement = async (files, ranges, replacement) => {
 };
 
 const addCssStyleSheet = (id, css) => {
-  return invoke$2('Css.addCssStyleSheet', id, css);
+  return invoke$1('Css.addCssStyleSheet', id, css);
 };
 
 const warn = (...args) => {
@@ -4446,10 +4516,10 @@ const GetColorThemeCssCachedIndexedDb = {
 };
 
 const getText$1 = key => {
-  return invoke$2('LocalStorage.getText', key);
+  return invoke$1('LocalStorage.getText', key);
 };
 const setText = (key, value) => {
-  return invoke$2('LocalStorage.setText', key, value);
+  return invoke$1('LocalStorage.setText', key, value);
 };
 
 const getCacheKey = colorThemeId => {
@@ -4484,7 +4554,7 @@ const GetColorThemeCssCachedNoop = {
 };
 
 const get = key => {
-  return invoke$2('Preferences.get', key);
+  return invoke$1('Preferences.get', key);
 };
 
 const getCacheFn = config => {
@@ -4510,7 +4580,7 @@ const getColorThemeCssCached = async (colorThemeId, getData) => {
 };
 
 const readJson = url => {
-  return invoke$2('FileSystem.readJson', url);
+  return invoke$1('FileSystem.readJson', url);
 };
 
 const dirname = (pathSeparator, path) => {
@@ -4547,41 +4617,6 @@ const getColorThemeUri = (extensions, colorThemeId) => {
   return '';
 };
 
-const extensionsUrl = `${assetDir}/config/extensions.json`;
-
-const getWebExtensions = async () => {
-  return getJson(extensionsUrl);
-};
-
-const getSharedProcessExtensions = () => {
-  return invoke$2(/* ExtensionManagement.getExtensions */'ExtensionManagement.getExtensions');
-};
-const doGetExtensions = async () => {
-  const meta = state$5.webExtensions;
-  if (platform === Web) {
-    const webExtensions = await getWebExtensions();
-    return [...webExtensions, ...meta];
-  }
-  if (platform === Remote) {
-    const sharedProcessExtensions = await getSharedProcessExtensions();
-    return [...sharedProcessExtensions, ...meta];
-  }
-  const extensions = await getSharedProcessExtensions();
-  return extensions;
-};
-
-const getExtensions$1 = async () => {
-  return doGetExtensions();
-};
-
-// TODO getExtensions is still called 6 times on startup instead of 1
-const getExtensions = () => {
-  if (!has()) {
-    set$4(getExtensions$1());
-  }
-  return get$5();
-};
-
 const getColorThemeJson$2 = async colorThemeId => {
   const extensions = await getExtensions();
   const colorThemeUri = getColorThemeUri(extensions, colorThemeId);
@@ -4624,7 +4659,7 @@ const getMetaThemeColor = colorThemeJson => {
 };
 
 const setThemeColor = async themeColor => {
-  await invoke$2(/* Meta.setThemeColor */'Meta.setThemeColor', /* color */themeColor);
+  await invoke$1(/* Meta.setThemeColor */'Meta.setThemeColor', /* color */themeColor);
 };
 
 // TODO by default color theme should come from local storage, session storage, cache storage, indexeddb or blob url -> fast initial load
@@ -4660,7 +4695,7 @@ const watch = async id => {
     return;
   }
   state$2.watchedTheme = id;
-  await invoke$2('ExtensionHost.watchColorTheme', id);
+  await invoke$1('ExtensionHost.watchColorTheme', id);
 };
 const getPreferredColorTheme = () => {
   const preferredColorTheme = get('workbench.colorTheme');
@@ -4702,20 +4737,20 @@ const create = () => {
 };
 
 const iframeWorkerCommandMap = {
-  'WebView.compatExtensionHostWorkerInvoke': (...args) => invoke$2('WebView.compatExtensionHostWorkerInvoke', ...args),
-  'WebView.compatExtensionHostWorkerInvokeAndTransfer': (...args) => invokeAndTransfer$2('WebView.compatExtensionHostWorkerInvokeAndTransfer', ...args),
-  'WebView.compatRendererProcessInvoke': (...args) => invoke$2('WebView.compatRendererProcessInvoke', ...args),
-  'WebView.compatRendererProcessInvokeAndTransfer': (...args) => invokeAndTransfer$2('WebView.compatRendererProcessInvokeAndTransfer', ...args),
+  'WebView.compatExtensionHostWorkerInvoke': (...args) => invoke$1('WebView.compatExtensionHostWorkerInvoke', ...args),
+  'WebView.compatExtensionHostWorkerInvokeAndTransfer': (...args) => invokeAndTransfer$1('WebView.compatExtensionHostWorkerInvokeAndTransfer', ...args),
+  'WebView.compatRendererProcessInvoke': (...args) => invoke$1('WebView.compatRendererProcessInvoke', ...args),
+  'WebView.compatRendererProcessInvokeAndTransfer': (...args) => invokeAndTransfer$1('WebView.compatRendererProcessInvokeAndTransfer', ...args),
   // @ts-ignore
-  'WebView.compatRendererWorkerInvokeAndTransfer': (...args) => invokeAndTransfer$2(...args),
+  'WebView.compatRendererWorkerInvokeAndTransfer': (...args) => invokeAndTransfer$1(...args),
   // @ts-ignore
-  'WebView.compatRendererWorkerInvoke': (...args) => invoke$2(...args),
-  'WebView.compatSharedProcessInvoke': (...args) => invoke$2('WebView.compatSharedProcessInvoke', ...args),
-  'WebView.getSavedState': (...args) => invoke$2('WebView.getSavedState', ...args),
-  'WebView.getWebViewInfo': (...args) => invoke$2('WebView.getWebViewInfo', ...args),
-  'WebView.getWebViews': (...args) => invoke$2('WebView.getWebViews', ...args),
-  'WebView.setPort': (...args) => invoke$2('WebView.setPort', ...args),
-  'ExtensionHostManagement.activateByEvent': (...args) => invoke$2('ExtensionHostManagement.activateByEvent', ...args),
+  'WebView.compatRendererWorkerInvoke': (...args) => invoke$1(...args),
+  'WebView.compatSharedProcessInvoke': (...args) => invoke$1('WebView.compatSharedProcessInvoke', ...args),
+  'WebView.getSavedState': (...args) => invoke$1('WebView.getSavedState', ...args),
+  'WebView.getWebViewInfo': (...args) => invoke$1('WebView.getWebViewInfo', ...args),
+  'WebView.getWebViews': (...args) => invoke$1('WebView.getWebViews', ...args),
+  'WebView.setPort': (...args) => invoke$1('WebView.setPort', ...args),
+  'ExtensionHostManagement.activateByEvent': (...args) => invoke$1('ExtensionHostManagement.activateByEvent', ...args),
   'WebView.getRemoteUrl': options => getRemoteUrlForWebView(options.uri, options)
 };
 
@@ -4781,7 +4816,7 @@ const createWebViewWorkerRpc2 = async (rpcInfo, port) => {
 
   // TODO have a way so that the worker already includes the webview api and the extension
   // host subworker doesn't need to import the other file
-  await invokeAndTransfer$2('IpcParent.create', {
+  await invokeAndTransfer$1('IpcParent.create', {
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
     url: rpcInfo.url,
     name: rpcInfo.name,
@@ -4802,7 +4837,7 @@ const createWebViewWorkerRpc = async (rpcInfo, port) => {
 
   // TODO have a way so that the worker already includes the webview api and the extension
   // host subworker doesn't need to import the other file
-  await invokeAndTransfer$2('IpcParent.create', {
+  await invokeAndTransfer$1('IpcParent.create', {
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
     url: extensionHostSubWorkerUrl,
     name: rpcInfo.name,
@@ -4812,7 +4847,7 @@ const createWebViewWorkerRpc = async (rpcInfo, port) => {
 };
 
 const executeExternalCommand = (method, ...params) => {
-  return invoke$2(method, ...params);
+  return invoke$1(method, ...params);
 };
 
 const BraceCompletionExecuteBraceCompletionProvider = 'ExtensionHostBraceCompletion.executeBraceCompletionProvider';
@@ -4874,7 +4909,7 @@ const mockExec = () => {
   try {
     // @ts-ignore
     api.exec = async (command, args, options) => {
-      const result = await invoke$2('Test.executeMockExecFunction', command, args, options);
+      const result = await invoke$1('Test.executeMockExecFunction', command, args, options);
       const {
         stdout,
         stderr,
@@ -4900,7 +4935,7 @@ const mockRpc = () => {
     try {
       return {
         async invoke(method, ...params) {
-          const result = await invoke$2('Test.executeMockRpcFunction', options.name, method, ...params);
+          const result = await invoke$1('Test.executeMockRpcFunction', options.name, method, ...params);
           return result;
         }
       };
@@ -4911,7 +4946,7 @@ const mockRpc = () => {
 };
 
 const getStatusBarItems = async () => {
-  const providers = Object.values(state$9.providers);
+  const providers = Object.values(state$8.providers);
   const statusBarItems = [];
   for (const provider of providers) {
     // @ts-ignore
@@ -5297,7 +5332,7 @@ const getIconThemeJson$1 = async iconThemeId => {
       extensionPath: `${assetDir}/extensions/builtin.${iconThemeId}`
     };
   }
-  for (const webExtension of state$5.webExtensions) {
+  for (const webExtension of state$9.webExtensions) {
     if (webExtension.iconThemes) {
       for (const iconTheme of webExtension.iconThemes) {
         // TODO handle error when icon theme path is not of type string
@@ -5347,7 +5382,7 @@ const emptyStatus = {
   importTime: 0
 };
 const getRuntimeStatus = extensionId => {
-  return get$6(extensionId) || emptyStatus;
+  return get$5(extensionId) || emptyStatus;
 };
 
 const getWebViewInfo2 = providerId => {
@@ -5401,7 +5436,7 @@ const handleMessagePort2 = async (port, rpcId) => {
     commandMap: {}
   });
   if (rpcId) {
-    set$g(rpcId, rpc);
+    set$c(rpcId, rpc);
   }
 };
 
@@ -5411,12 +5446,12 @@ const handleMessagePort = async (port, rpcId) => {
     commandMap: {}
   });
   if (rpcId) {
-    set$g(rpcId, rpc);
+    set$c(rpcId, rpc);
   }
 };
 
 const handleIconThemeChange = async () => {
-  await invoke$2('IconTheme.handleIconThemeChange');
+  await invoke$1('IconTheme.handleIconThemeChange');
 };
 
 const initialIconTheme = undefined;
@@ -5460,7 +5495,7 @@ const importExtension = async (extensionId, absolutePath, activationEvent) => {
   try {
     string(absolutePath);
     const startTime = performance.now();
-    set$5({
+    set$4({
       activationEvent: activationEvent,
       id: extensionId,
       activationStartTime: performance.now(),
@@ -5475,7 +5510,7 @@ const importExtension = async (extensionId, absolutePath, activationEvent) => {
       const module = await importScript(absolutePath);
       const endTime = performance.now();
       const time = endTime - startTime;
-      set$6(extensionId, module);
+      set$5(extensionId, module);
       update(extensionId, {
         importEndTime: endTime,
         importTime: time
@@ -6010,7 +6045,7 @@ const textSearch2 = async (scheme, root, query, options, assetDir) => {
     }
   }
   return {
-    results: allResults,
+    results: options.limit ? allResults.slice(0, options.limit) : allResults,
     limitHit: allResults.length > options.limit
   };
 };
@@ -6023,7 +6058,6 @@ const unregisterInterceptor = async id => {
 };
 
 const commandMap = {
-  'Extensions.invalidateExtensionsCache': invalidateExtensionsCache,
   'BulkReplacement.applyBulkReplacement': applyBulkReplacement,
   'ColorTheme.getColorThemeCssFromJson': getColorThemeCssFromJson,
   'ColorTheme.getColorThemeJson': getColorThemeJson,
@@ -6053,6 +6087,7 @@ const commandMap = {
   'ExtensionHostDebug.stepOver': stepOver,
   'ExtensionHostRename.executeprepareRenameProvider': executeprepareRenameProvider,
   'ExtensionHostRename.executeRenameProvider': executeRenameProvider,
+  'ExtensionHostSourceControl.getIconDefinitions': getIconDefinitions,
   'ExtensionHostWebView.create': createWebView,
   'ExtensionHostWebView.dispose': disposeWebView,
   'ExtensionHostWebView.getWebViewInfo': getWebViewInfo,
@@ -6061,6 +6096,7 @@ const commandMap = {
   'Extensions.addWebExtension': addWebExtension,
   'Extensions.getExtension': getExtension,
   'Extensions.getExtensions': getExtensions,
+  'Extensions.invalidateExtensionsCache': invalidateExtensionsCache,
   'FileSystemFetch.chmod': chmod$1,
   'FileSystemFetch.getBlob': getBlob$1,
   'FileSystemFetch.mkdir': mkdir$1,
@@ -6069,8 +6105,8 @@ const commandMap = {
   'FileSystemFetch.remove': remove$2,
   'FileSystemFetch.writeFile': writeFile$1,
   'FileSystemMemory.chmod': chmod,
-  'FileSystemMemory.exists': exists,
   'FileSystemMemory.copy': copy,
+  'FileSystemMemory.exists': exists,
   'FileSystemMemory.getBlob': getBlob,
   'FileSystemMemory.getBlobUrl': getBlobUrl,
   'FileSystemMemory.getFiles': getFiles,
@@ -6125,7 +6161,7 @@ const commandMap = {
   [FileSystemReadFile]: readFile$2,
   [FileSystemRename]: rename$1,
   [FileSystemWriteFile]: writeFile$3,
-  [FileSystemRemove]: remove$4,
+  [FileSystemRemove]: remove$3,
   [FormattingExecuteFormmattingProvider]: executeFormattingProvider,
   [HoverExecute]: executeHoverProvider,
   [ImplementationExecuteImplementationProvider]: executeImplementationProvider,
@@ -6158,7 +6194,7 @@ const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  set$g(RendererWorker, rpc);
+  set$c(RendererWorker, rpc);
 };
 
 const main = async () => {