@lvce-editor/static-server 0.79.4 → 0.80.2

package/static/{43d8c9f → be2da82}/packages/renderer-worker/dist/rendererWorkerMain.js

@@ -108,7 +108,7 @@ const getAssetDir$1 = () => {
   // @ts-ignore
   {
     // @ts-ignore
-    return '/43d8c9f';
+    return '/be2da82';
   }
 };
 const assetDir = getAssetDir$1();
@@ -832,7 +832,7 @@ const listen$1 = async () => {
 const invoke$F = (method, ...params) => {
   return state$C.rpc.invoke(method, ...params);
 };
-const invokeAndTransfer$r = (method, ...params) => {
+const invokeAndTransfer$s = (method, ...params) => {
   return state$C.rpc.invokeAndTransfer(method, ...params);
 };
 
@@ -1517,7 +1517,7 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
 const invoke$E = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
-const invokeAndTransfer$q = (ipc, method, ...params) => {
+const invokeAndTransfer$r = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, true);
 };
 
@@ -1536,7 +1536,7 @@ const getOrCreateWorker = fn => {
     },
     async invokeAndTransfer(method, ...params) {
       const ipc = await getOrCreate$2(fn);
-      return invokeAndTransfer$q(ipc, method, ...params);
+      return invokeAndTransfer$r(ipc, method, ...params);
     },
     async dispose() {
       const promise = workers$1.get(fn);
@@ -1699,7 +1699,7 @@ const launchErrorWorker = async () => {
 
 const {
   invoke: invoke$D,
-  invokeAndTransfer: invokeAndTransfer$p
+  invokeAndTransfer: invokeAndTransfer$q
 } = getOrCreateWorker(launchErrorWorker);
 
 const serializeError = error => {
@@ -2036,11 +2036,11 @@ const invoke$C = async (method, ...params) => {
   const result = await invoke$E(ipc, method, ...params);
   return result;
 };
-const invokeAndTransfer$o = async (method, ...params) => {
+const invokeAndTransfer$p = async (method, ...params) => {
   const {
     ipc
   } = state$x;
-  const result = await invokeAndTransfer$q(ipc, method, ...params);
+  const result = await invokeAndTransfer$r(ipc, method, ...params);
   return result;
 };
 
@@ -2153,7 +2153,7 @@ const launchExtensionManagementWorker = async () => {
 
 const {
   invoke: invoke$B,
-  invokeAndTransfer: invokeAndTransfer$n} = getOrCreateWorker(launchExtensionManagementWorker);
+  invokeAndTransfer: invokeAndTransfer$o} = getOrCreateWorker(launchExtensionManagementWorker);
 
 // TODO make storage configurable via settings as localstorage or indexeddb
 // also allow disabling caching via settings
@@ -3388,7 +3388,7 @@ const create$15 = async ({
     port1,
     port2
   } = getPortTuple(port);
-  await invokeAndTransfer$r('IpcParent.create', {
+  await invokeAndTransfer$s('IpcParent.create', {
     method: ModuleWorkerWithMessagePort,
     url,
     name,
@@ -3464,7 +3464,7 @@ const getConfig = () => {
 
 const objects = Object.create(null);
 const transferToRendererProcess = async (objectId, transferable) => {
-  await invokeAndTransfer$r('Transferrable.transfer', transferable, objectId);
+  await invokeAndTransfer$s('Transferrable.transfer', transferable, objectId);
 };
 const transfer = (objectId, transferable) => {
   number(objectId);
@@ -3505,7 +3505,7 @@ const launchExtensionHostWorker = async () => {
 
 const {
   invoke: invoke$A,
-  invokeAndTransfer: invokeAndTransfer$m
+  invokeAndTransfer: invokeAndTransfer$n
 } = getOrCreateWorker(launchExtensionHostWorker);
 
 const ActivityBar$3 = 'ActivityBar';
@@ -4926,7 +4926,7 @@ const launchIconThemeWorker = async () => {
 
 const {
   invoke: invoke$y,
-  invokeAndTransfer: invokeAndTransfer$l
+  invokeAndTransfer: invokeAndTransfer$m
 } = getOrCreateWorker(launchIconThemeWorker);
 
 const getFileIcon$1 = file => {
@@ -6071,7 +6071,7 @@ const launchAuthWorker = async () => {
 
 const {
   invoke: invoke$x,
-  invokeAndTransfer: invokeAndTransfer$k} = getOrCreateWorker(launchAuthWorker);
+  invokeAndTransfer: invokeAndTransfer$l} = getOrCreateWorker(launchAuthWorker);
 const initialize = (backendUrl, platform, href) => {
   return invoke$x('Auth.initialize', {
     backendUrl,
@@ -6868,6 +6868,7 @@ const commandMap = {
   'Layout.togglePanel': lazy('Layout.togglePanel'),
   'Layout.togglePreview': lazy('Layout.togglePreview'),
   'Layout.toggleSideBar': lazy('Layout.toggleSideBar'),
+  'Layout.toggleSideBarView': lazy('Layout.toggleSideBarView'),
   'Layout.toggleSecondarySideBar': lazy('Layout.toggleSecondarySideBar'),
   'Layout.toggleSideBarPosition': lazy('Layout.toggleSideBarPosition'),
   'Layout.toggleStatusBar': lazy('Layout.toggleStatusBar'),
@@ -6930,7 +6931,7 @@ const getPort = async ipcId => {
     port2
   } = getPortTuple();
   // TODO call sendMessagePortToElectron function
-  const webContentsId = await invokeAndTransfer$r('IpcParent.create', {
+  const webContentsId = await invokeAndTransfer$s('IpcParent.create', {
     method: Electron,
     port: port1,
     ipcId
@@ -7410,7 +7411,7 @@ const IpcParentWithNode = {
 const sendMessagePortToElectron = async (port, initialCommand, ipcId) => {
   object(port);
   string(initialCommand);
-  await invokeAndTransfer$o(initialCommand, port, ipcId);
+  await invokeAndTransfer$p(initialCommand, port, ipcId);
 };
 
 const create$X = async options => {
@@ -7795,9 +7796,26 @@ const executeProvider = async ({
   return result;
 };
 
-const readFile$e = uri => {
+const getProviderProtocolAndPath = uri => {
   const protocol = getProtocol(uri);
-  const path = getPath$5(protocol, uri);
+  if (protocol !== ExtensionHost) {
+    return {
+      protocol,
+      path: getPath$5(protocol, uri)
+    };
+  }
+  const providerUri = getPath$5(protocol, uri);
+  const providerProtocol = getProtocol(providerUri);
+  return {
+    protocol: providerProtocol,
+    path: getPath$5(providerProtocol, providerUri)
+  };
+};
+const readFile$e = uri => {
+  const {
+    protocol,
+    path
+  } = getProviderProtocolAndPath(uri);
   // TODO there shouldn't be multiple file system providers for the same protocol
   return executeProvider({
     event: `onFileSystem:${protocol}`,
@@ -7807,8 +7825,10 @@ const readFile$e = uri => {
   });
 };
 const remove$8 = uri => {
-  const protocol = getProtocol(uri);
-  const path = getPath$5(protocol, uri);
+  const {
+    protocol,
+    path
+  } = getProviderProtocolAndPath(uri);
   return executeProvider({
     event: `onFileSystem:${protocol}`,
     method: FileSystemRemove,
@@ -7823,9 +7843,13 @@ const remove$8 = uri => {
  * @param {string} newUri
  */
 const rename$6 = (oldUri, newUri) => {
-  const protocol = getProtocol(oldUri);
-  const oldPath = getPath$5(protocol, oldUri);
-  const newPath = getPath$5(protocol, newUri);
+  const {
+    protocol,
+    path: oldPath
+  } = getProviderProtocolAndPath(oldUri);
+  const {
+    path: newPath
+  } = getProviderProtocolAndPath(newUri);
   return executeProvider({
     event: `onFileSystem:${protocol}`,
     method: FileSystemRename,
@@ -7834,8 +7858,10 @@ const rename$6 = (oldUri, newUri) => {
   });
 };
 const mkdir$8 = uri => {
-  const protocol = getProtocol(uri);
-  const path = getPath$5(protocol, uri);
+  const {
+    protocol,
+    path
+  } = getProviderProtocolAndPath(uri);
   return executeProvider({
     event: `onFileSystem:${protocol}`,
     method: FileSystemMkdir,
@@ -7844,8 +7870,10 @@ const mkdir$8 = uri => {
   });
 };
 const createFile$1 = uri => {
-  const protocol = getProtocol(uri);
-  const path = getPath$5(protocol, uri);
+  const {
+    protocol,
+    path
+  } = getProviderProtocolAndPath(uri);
   return executeProvider({
     event: `onFileSystem:${protocol}`,
     method: FileSystemWriteFile,
@@ -7854,8 +7882,10 @@ const createFile$1 = uri => {
   });
 };
 const createFolder$1 = uri => {
-  const protocol = getProtocol(uri);
-  const path = getPath$5(protocol, uri);
+  const {
+    protocol,
+    path
+  } = getProviderProtocolAndPath(uri);
   return executeProvider({
     event: `onFileSystem:${protocol}`,
     method: FileSystemCreateFolder,
@@ -7864,8 +7894,10 @@ const createFolder$1 = uri => {
   });
 };
 const writeFile$e = (uri, content) => {
-  const protocol = getProtocol(uri);
-  const path = getPath$5(protocol, uri);
+  const {
+    protocol,
+    path
+  } = getProviderProtocolAndPath(uri);
   return executeProvider({
     event: `onFileSystem:${protocol}`,
     method: FileSystemWriteFile,
@@ -7874,8 +7906,10 @@ const writeFile$e = (uri, content) => {
   });
 };
 const readDirWithFileTypes$8 = uri => {
-  const protocol = getProtocol(uri);
-  const path = getPath$5(protocol, uri);
+  const {
+    protocol,
+    path
+  } = getProviderProtocolAndPath(uri);
   return executeProvider({
     event: `onFileSystem:${protocol}`,
     method: FileSystemReadDirWithFileTypes,
@@ -7884,7 +7918,9 @@ const readDirWithFileTypes$8 = uri => {
   });
 };
 const getPathSeparator$8 = async uri => {
-  const protocol = getProtocol(uri);
+  const {
+    protocol
+  } = getProviderProtocolAndPath(uri);
   const pathSeparator = await executeProvider({
     event: `onFileSystem:${protocol}`,
     method: FileSystemGetPathSeparator,
@@ -8424,7 +8460,7 @@ const launchFileSystemWorker = async () => {
 
 const {
   invoke: invoke$w,
-  invokeAndTransfer: invokeAndTransfer$j} = getOrCreateWorker(launchFileSystemWorker);
+  invokeAndTransfer: invokeAndTransfer$k} = getOrCreateWorker(launchFileSystemWorker);
 
 // TODO move all of this to an extension
 
@@ -9799,7 +9835,7 @@ const launchClipBoardWorker = async () => {
 
 const {
   invoke: invoke$s,
-  invokeAndTransfer: invokeAndTransfer$i} = getOrCreateWorker(launchClipBoardWorker);
+  invokeAndTransfer: invokeAndTransfer$j} = getOrCreateWorker(launchClipBoardWorker);
 
 const readText = async () => {
   return await invoke$s('ClipBoard.readText');
@@ -10157,8 +10193,8 @@ const attachDebugger = async pid => {
   await invoke$C('AttachDebugger.attachDebugger', pid);
 };
 
-const version = '0.79.4';
-const commit$1 = '43d8c9f';
+const version = '0.80.2';
+const commit$1 = 'be2da82';
 const productNameLong = 'Lvce Editor - OSS';
 const getPid = () => {
   return invoke$C('Process.getPid');
@@ -12487,7 +12523,7 @@ const launchTerminalWorker = async () => {
 
 const {
   invoke: invoke$q,
-  invokeAndTransfer: invokeAndTransfer$h
+  invokeAndTransfer: invokeAndTransfer$i
 } = getOrCreateWorker(launchTerminalWorker);
 
 const previewWorkerUrl = `${assetDir}/packages/preview-worker/dist/previewWorkerMain.js`;
@@ -12505,7 +12541,7 @@ const launchPreviewWorker = async () => {
 
 const {
   invoke: invoke$p,
-  invokeAndTransfer: invokeAndTransfer$g,
+  invokeAndTransfer: invokeAndTransfer$h,
   restart: restart$g
 } = getOrCreateWorker(launchPreviewWorker);
 
@@ -12525,12 +12561,12 @@ const create2 = async (canvasId, width, height) => {
 };
 const createForTerminal = async (canvasId, callbackId) => {
   const canvas = await create$U(canvasId);
-  await invokeAndTransfer$h('OffscreenCanvas.handleResult', callbackId, canvas);
+  await invokeAndTransfer$i('OffscreenCanvas.handleResult', callbackId, canvas);
 };
 const createForPreview = async (callbackId, width, height) => {
   const canvasId = create$16();
   const canvas = await create2(canvasId, width, height);
-  await invokeAndTransfer$g('Preview.executeCallback', callbackId, canvas, canvasId);
+  await invokeAndTransfer$h('Preview.executeCallback', callbackId, canvas, canvasId);
 };
 
 const name$16 = 'OffscreenCanvas';
@@ -12814,7 +12850,7 @@ const ExtensionHostClosingTagCompletion_ipc = {
 const sendMessagePortToRendererProcess$1 = async (port, initialCommand) => {
   object(port);
   string(initialCommand);
-  await invokeAndTransfer$r(initialCommand, port);
+  await invokeAndTransfer$s(initialCommand, port);
 };
 
 const name$W = 'SendMessagePortToRendererProcess';
@@ -12869,7 +12905,7 @@ const launchChatCoordinatorWorker = async () => {
 };
 
 const {
-  invokeAndTransfer: invokeAndTransfer$f} = getOrCreateWorker(launchChatCoordinatorWorker);
+  invokeAndTransfer: invokeAndTransfer$g} = getOrCreateWorker(launchChatCoordinatorWorker);
 
 const chatMathWorkerUrl = `${assetDir}/packages/chat-math-worker/dist/chatMathWorkerMain.js`;
 
@@ -12885,7 +12921,7 @@ const launchChatMathWorker = async () => {
 };
 
 const {
-  invokeAndTransfer: invokeAndTransfer$e} = getOrCreateWorker(launchChatMathWorker);
+  invokeAndTransfer: invokeAndTransfer$f} = getOrCreateWorker(launchChatMathWorker);
 
 const chatMessageParsingWorkerUrl = `${assetDir}/packages/chat-message-parsing-worker/dist/chatMessageParsingWorkerMain.js`;
 
@@ -12901,7 +12937,7 @@ const launchChatMessageParsingWorker = async () => {
 };
 
 const {
-  invokeAndTransfer: invokeAndTransfer$d} = getOrCreateWorker(launchChatMessageParsingWorker);
+  invokeAndTransfer: invokeAndTransfer$e} = getOrCreateWorker(launchChatMessageParsingWorker);
 
 const chatNetworkWorkerUrl = `${assetDir}/packages/chat-network-worker/dist/chatNetworkWorkerMain.js`;
 
@@ -12917,7 +12953,25 @@ const launchChatNetworkWorker = async () => {
 };
 
 const {
-  invokeAndTransfer: invokeAndTransfer$c} = getOrCreateWorker(launchChatNetworkWorker);
+  invokeAndTransfer: invokeAndTransfer$d} = getOrCreateWorker(launchChatNetworkWorker);
+
+const diffWorkerUrl = `${assetDir}/packages/diff-worker/dist/diffWorkerMain.js`;
+
+const launchDiffWorker = async () => {
+  const name = 'Diff Worker';
+  const ipc = await create$17({
+    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
+    name,
+    url: getConfiguredWorkerUrl$1('develop.diffWorkerPath', diffWorkerUrl)
+  });
+  handleIpc(ipc);
+  return ipc;
+};
+
+const {
+  invoke: invoke$o,
+  invokeAndTransfer: invokeAndTransfer$c
+} = getOrCreateWorker(launchDiffWorker);
 
 const chatStorageWorkerUrl = `${assetDir}/packages/chat-storage-worker/dist/chatStorageWorkerMain.js`;
 
@@ -12981,9 +13035,9 @@ const launchEditorWorker = async () => {
 };
 
 const {
-  invoke: invoke$o,
+  invoke: invoke$n,
   invokeAndTransfer: invokeAndTransfer$9} = getOrCreateWorker(launchEditorWorker);
-const actualInvoke = invoke$o;
+const actualInvoke = invoke$n;
 
 const fileSearchWorkerUrl = `${assetDir}/packages/file-search-worker/dist/fileSearchWorkerMain.js`;
 
@@ -13022,7 +13076,7 @@ const launchIframeWorker = async () => {
 };
 
 const {
-  invoke: invoke$n,
+  invoke: invoke$m,
   invokeAndTransfer: invokeAndTransfer$7
 } = getOrCreateWorker(launchIframeWorker);
 
@@ -13040,7 +13094,7 @@ const launchMarkdownWorker = async () => {
 };
 
 const {
-  invoke: invoke$m,
+  invoke: invoke$l,
   invokeAndTransfer: invokeAndTransfer$6
 } = getOrCreateWorker(launchMarkdownWorker);
 
@@ -13092,7 +13146,7 @@ const launchSourceControlWorker = async () => {
 };
 
 const {
-  invoke: invoke$l,
+  invoke: invoke$k,
   invokeAndTransfer: invokeAndTransfer$3,
   restart: restart$f
 } = getOrCreateWorker(launchSourceControlWorker);
@@ -13133,7 +13187,7 @@ const launchTextSearchWorker = async () => {
 };
 
 const {
-  invoke: invoke$k,
+  invoke: invoke$j,
   invokeAndTransfer: invokeAndTransfer$1,
   restart: restart$e
 } = getOrCreateWorker(launchTextSearchWorker);
@@ -13141,27 +13195,27 @@ const {
 const sendMessagePortToExtensionHostWorker = async (port, initialCommand, rpcId) => {
   object(port);
   string(initialCommand);
-  await invokeAndTransfer$m(initialCommand, port, rpcId);
+  await invokeAndTransfer$n(initialCommand, port, rpcId);
 };
 const sendMessagePortToSharedProcess = async (port, initialCommand, rpcId) => {
   object(port);
   string(initialCommand);
-  await invokeAndTransfer$o(initialCommand, port, rpcId);
+  await invokeAndTransfer$p(initialCommand, port, rpcId);
 };
 const sendMessagePortToTerminalProcess = async (port, initialCommand, rpcId) => {
   object(port);
   string(initialCommand);
-  await invokeAndTransfer$o(initialCommand, port, rpcId);
+  await invokeAndTransfer$p(initialCommand, port, rpcId);
 };
 const sendMessagePortToErrorWorker = async (port, initialCommand, rpcId) => {
   object(port);
   string(initialCommand);
-  await invokeAndTransfer$p(initialCommand, port, rpcId);
+  await invokeAndTransfer$q(initialCommand, port, rpcId);
 };
 const sendMessagePortToAuthWorker = async (port, initialCommand, rpcId) => {
   object(port);
   string(initialCommand);
-  await invokeAndTransfer$k(initialCommand, port, rpcId);
+  await invokeAndTransfer$l(initialCommand, port, rpcId);
 };
 const sendMessagePortToEditorWorker = async (port, initialCommand, rpcId) => {
   object(port);
@@ -13171,7 +13225,7 @@ const sendMessagePortToEditorWorker = async (port, initialCommand, rpcId) => {
 const sendMessagePortToRendererProcess = async (port, initialCommand, rpcId) => {
   object(port);
   string(initialCommand);
-  await invokeAndTransfer$r(initialCommand, port, rpcId);
+  await invokeAndTransfer$s(initialCommand, port, rpcId);
 };
 const sendMessagePortToMarkdownWorker = async (port, initialCommand, rpcId) => {
   object(port);
@@ -13181,7 +13235,7 @@ const sendMessagePortToMarkdownWorker = async (port, initialCommand, rpcId) => {
 const sendMessagePortToClipBoardWorker = async (port, initialCommand, rpcId) => {
   object(port);
   string(initialCommand);
-  await invokeAndTransfer$i(initialCommand, port, rpcId);
+  await invokeAndTransfer$j(initialCommand, port, rpcId);
 };
 const sendMessagePortToMainAreaWorker = async (port, initialCommand, rpcId) => {
   object(port);
@@ -13191,12 +13245,12 @@ const sendMessagePortToMainAreaWorker = async (port, initialCommand, rpcId) => {
 const sendMessagePortToFileSystemWorker = async (port, initialCommand, rpcId) => {
   object(port);
   string(initialCommand);
-  await invokeAndTransfer$j(initialCommand, port, rpcId);
+  await invokeAndTransfer$k(initialCommand, port, rpcId);
 };
 const sendMessagePortToIconThemeWorker = async (port, initialCommand, rpcId) => {
   object(port);
   string(initialCommand);
-  await invokeAndTransfer$l(initialCommand, port, rpcId);
+  await invokeAndTransfer$m(initialCommand, port, rpcId);
 };
 const sendMessagePortToTextMeasurementWorker = async (port, initialCommand, rpcId) => {
   object(port);
@@ -13216,7 +13270,7 @@ const sendMessagePortToSourceControlWorker = async (port, initialCommand, rpcId)
 const sendMessagePortToExtensionManagementWorker = async (port, initialCommand, rpcId) => {
   object(port);
   string(initialCommand);
-  await invokeAndTransfer$n(initialCommand, port, rpcId);
+  await invokeAndTransfer$o(initialCommand, port, rpcId);
 };
 const sendMessagePortToIframeWorker = async (port, initialCommand, rpcId) => {
   object(port);
@@ -13241,17 +13295,17 @@ const sendMessagePortToPreviewSandBoxWorker = async (port, initialCommand, rpcId
 const sendMessagePortToChatNetworkWorker = async (port, initialCommand, rpcId) => {
   object(port);
   string(initialCommand);
-  await invokeAndTransfer$c(initialCommand, port, rpcId);
+  await invokeAndTransfer$d(initialCommand, port, rpcId);
 };
 const sendMessagePortToChatMathWorker = async (port, initialCommand, rpcId) => {
   object(port);
   string(initialCommand);
-  await invokeAndTransfer$e(initialCommand, port, rpcId);
+  await invokeAndTransfer$f(initialCommand, port, rpcId);
 };
 const sendMessagePortToChatMessageParsingWorker = async (port, initialCommand, rpcId) => {
   object(port);
   string(initialCommand);
-  await invokeAndTransfer$d(initialCommand, port, rpcId);
+  await invokeAndTransfer$e(initialCommand, port, rpcId);
 };
 const sendMessagePortToChatStorageWorker = async (port, initialCommand, rpcId) => {
   object(port);
@@ -13261,13 +13315,18 @@ const sendMessagePortToChatStorageWorker = async (port, initialCommand, rpcId) =
 const sendMessagePortToChatCoordinatorWorker = async (port, initialCommand, rpcId) => {
   object(port);
   string(initialCommand);
-  await invokeAndTransfer$f(initialCommand, port, rpcId);
+  await invokeAndTransfer$g(initialCommand, port, rpcId);
 };
 const sendMessagePortToChatToolWorker = async (port, initialCommand, rpcId) => {
   object(port);
   string(initialCommand);
   await invokeAndTransfer$a(initialCommand, port, rpcId);
 };
+const sendMessagePortToDiffWorker = async (port, initialCommand, rpcId) => {
+  object(port);
+  string(initialCommand);
+  await invokeAndTransfer$c(initialCommand, port, rpcId);
+};
 
 // TODO add only one function sendMessagePortToRpc(rpcId) which sends it to the matching rpc module
 
@@ -13281,6 +13340,7 @@ const Commands$W = {
   sendMessagePortToChatStorageWorker: sendMessagePortToChatStorageWorker,
   sendMessagePortToChatToolWorker: sendMessagePortToChatToolWorker,
   sendMessagePortToClipBoardWorker: sendMessagePortToClipBoardWorker,
+  sendMessagePortToDiffWorker: sendMessagePortToDiffWorker,
   sendMessagePortToEditorWorker: sendMessagePortToEditorWorker,
   sendMessagePortToErrorWorker: sendMessagePortToErrorWorker,
   sendMessagePortToExtensionHostWorker: sendMessagePortToExtensionHostWorker,
@@ -13407,7 +13467,7 @@ getHost().endsWith('.gitpod.io');
 const WebView = 'lvce-oss-webview';
 
 const setPort = async (uid, port, origin, portType) => {
-  await invokeAndTransfer$r('WebView.setPort', uid, port, origin, portType);
+  await invokeAndTransfer$s('WebView.setPort', uid, port, origin, portType);
 };
 
 /**
@@ -13423,7 +13483,7 @@ const getSecret = key => {
   return get$e(key);
 };
 const registerInterceptor = async (id, port) => {
-  await invokeAndTransfer$m('WebView.registerInterceptor', id, port);
+  await invokeAndTransfer$n('WebView.registerInterceptor', id, port);
 };
 const unregisterInterceptor = async id => {
   await invoke$A('WebView.unregisterInterceptor', id);
@@ -13436,10 +13496,10 @@ const compat = {
     return invoke$F(...args);
   },
   rendererProcessInvokeAndTransfer(...args) {
-    return invokeAndTransfer$r(...args);
+    return invokeAndTransfer$s(...args);
   },
   extensionHostWorkerInvokeAndTransfer(...args) {
-    return invokeAndTransfer$m(...args);
+    return invokeAndTransfer$n(...args);
   },
   extensionHostWorkerInvoke(...args) {
     return invoke$A(...args);
@@ -13499,14 +13559,14 @@ const getOrCreate$1 = () => {
   }
   return state$5.ipc;
 };
-const invoke$j = async (method, ...params) => {
+const invoke$i = async (method, ...params) => {
   const ipc = await getOrCreate$1();
   return invoke$E(ipc, method, ...params);
 };
 
 const name$P = 'SearchProcess';
 const Commands$R = {
-  invoke: invoke$j
+  invoke: invoke$i
 };
 
 const SearchProcess_ipc = {
@@ -13683,10 +13743,10 @@ const ExtensionManagement_ipc = {
 };
 
 const getVirtualDom$1 = html => {
-  return invoke$m('Markdown.getMarkDownVirtualDom', html);
+  return invoke$l('Markdown.getMarkDownVirtualDom', html);
 };
 const renderMarkdown = (markdown, options) => {
-  return invoke$m('Markdown.renderMarkdown', markdown, options);
+  return invoke$l('Markdown.renderMarkdown', markdown, options);
 };
 
 const name$J = 'Markdown';
@@ -13874,7 +13934,7 @@ const launchActivityBarWorker = async () => {
 };
 
 const {
-  invoke: invoke$i,
+  invoke: invoke$h,
   restart: restart$d
 } = getOrCreateWorker(launchActivityBarWorker);
 
@@ -13906,10 +13966,10 @@ const create$S = (id, uri, x, y, width, height) => {
 };
 const loadContent$N = async state => {
   const savedState = {};
-  await invoke$i('ActivityBar.create', state.uid, '', state.x, state.y, state.width, state.height, null);
-  await invoke$i('ActivityBar.loadContent', state.uid, savedState);
-  const diffResult = await invoke$i('ActivityBar.diff2', state.uid);
-  const commands = await invoke$i('ActivityBar.render2', state.uid, diffResult);
+  await invoke$h('ActivityBar.create', state.uid, '', state.x, state.y, state.width, state.height, null);
+  await invoke$h('ActivityBar.loadContent', state.uid, savedState);
+  const diffResult = await invoke$h('ActivityBar.diff2', state.uid);
+  const commands = await invoke$h('ActivityBar.render2', state.uid, diffResult);
   return {
     ...state,
     commands
@@ -13923,12 +13983,12 @@ const hotReload$j = async state => {
   state.isHotReloading = true;
   // possible TODO race condition during hot reload
   // there could still be pending promises when the worker is disposed
-  const savedState = await invoke$i('ActivityBar.saveState', state.uid);
+  const savedState = await invoke$h('ActivityBar.saveState', state.uid);
   await restart$d('ActivityBar.terminate');
-  await invoke$i('ActivityBar.create', state.uid, '', state.x, state.y, state.width, state.height, null);
-  await invoke$i('ActivityBar.loadContent', state.uid, savedState);
-  const diffResult = await invoke$i('ActivityBar.diff2', state.uid);
-  const commands = await invoke$i('ActivityBar.render2', state.uid, diffResult);
+  await invoke$h('ActivityBar.create', state.uid, '', state.x, state.y, state.width, state.height, null);
+  await invoke$h('ActivityBar.loadContent', state.uid, savedState);
+  const diffResult = await invoke$h('ActivityBar.diff2', state.uid);
+  const commands = await invoke$h('ActivityBar.render2', state.uid, diffResult);
   state.isHotReloading = false;
   return {
     ...state,
@@ -13938,12 +13998,12 @@ const hotReload$j = async state => {
 
 const wrapActivityBarCommand = key => {
   const fn = async (state, ...args) => {
-    await invoke$i(`ActivityBar.${key}`, state.uid, ...args);
-    const diffResult = await invoke$i('ActivityBar.diff2', state.uid);
+    await invoke$h(`ActivityBar.${key}`, state.uid, ...args);
+    const diffResult = await invoke$h('ActivityBar.diff2', state.uid);
     if (diffResult.length === 0) {
       return state;
     }
-    const commands = await invoke$i('ActivityBar.render2', state.uid, diffResult);
+    const commands = await invoke$h('ActivityBar.render2', state.uid, diffResult);
     if (commands.length === 0) {
       return state;
     }
@@ -13957,7 +14017,7 @@ const wrapActivityBarCommand = key => {
 
 const Commands$I = {};
 const getCommands$m = async () => {
-  const commands = await invoke$i('ActivityBar.getCommandIds');
+  const commands = await invoke$h('ActivityBar.getCommandIds');
   for (const command of commands) {
     Commands$I[command] = wrapActivityBarCommand(command);
   }
@@ -14044,12 +14104,12 @@ const getKeyBindings$m = () => {
 const menus$h = [];
 const getMenus$d = async () => {
   try {
-    const ids = await invoke$i('ActivityBar.getMenuEntryIds');
+    const ids = await invoke$h('ActivityBar.getMenuEntryIds');
     const adjusted = ids.map(id => {
       return {
         id,
         async getMenuEntries(...args) {
-          const entries = await invoke$i('ActivityBar.getMenuEntries', ...args);
+          const entries = await invoke$h('ActivityBar.getMenuEntries', ...args);
           return entries;
         }
       };
@@ -14093,7 +14153,7 @@ const renderItems$f = {
 };
 const render$J = [renderItems$f];
 const renderEventListeners$n = async () => {
-  const listeners = await invoke$i('ActivityBar.renderEventListeners');
+  const listeners = await invoke$h('ActivityBar.renderEventListeners');
   return listeners;
 };
 
@@ -14406,7 +14466,7 @@ const launchChatViewWorker = async () => {
 };
 
 const {
-  invoke: invoke$h,
+  invoke: invoke$g,
   restart: restart$c
 } = getOrCreateWorker(launchChatViewWorker);
 
@@ -14429,10 +14489,10 @@ const loadContent$K = async (state, savedState) => {
     width,
     height
   } = state;
-  await invoke$h('Chat.create', id, x, y, width, height, state.platform);
-  await invoke$h('Chat.loadContent2', id, savedState);
-  const diffResult = await invoke$h('Chat.diff2', id);
-  const commands = await invoke$h('Chat.render2', id, diffResult);
+  await invoke$g('Chat.create', id, x, y, width, height, state.platform);
+  await invoke$g('Chat.loadContent2', id, savedState);
+  const diffResult = await invoke$g('Chat.diff2', id);
+  const commands = await invoke$g('Chat.render2', id, diffResult);
   return {
     ...state,
     commands
@@ -14446,12 +14506,12 @@ const hotReload$i = async state => {
   state.isHotReloading = true;
   // possible TODO race condition during hot reload
   // there could still be pending promises when the worker is disposed
-  const savedState = await invoke$h('Chat.saveState', state.uid);
+  const savedState = await invoke$g('Chat.saveState', state.uid);
   await restart$c('Chat.terminate');
-  await invoke$h('Chat.create', state.uid, state.x, state.y, state.width, state.height, state.platform);
-  await invoke$h('Chat.loadContent', state.uid, savedState);
-  const diffResult = await invoke$h('Chat.diff2', state.uid);
-  const commands = await invoke$h('Chat.render2', state.uid, diffResult);
+  await invoke$g('Chat.create', state.uid, state.x, state.y, state.width, state.height, state.platform);
+  await invoke$g('Chat.loadContent', state.uid, savedState);
+  const diffResult = await invoke$g('Chat.diff2', state.uid);
+  const commands = await invoke$g('Chat.render2', state.uid, diffResult);
   state.isHotReloading = false;
   return {
     ...state,
@@ -14459,14 +14519,14 @@ const hotReload$i = async state => {
   };
 };
 const saveState$j = state => {
-  return invoke$h('Chat.saveState', state.uid);
+  return invoke$g('Chat.saveState', state.uid);
 };
 
 const wrapChatCommand = key => {
   const fn = async (state, ...args) => {
-    await invoke$h(`Chat.${key}`, state.id, ...args);
-    const diffResult = await invoke$h(`Chat.diff2`, state.id);
-    const commands = await invoke$h('Chat.render2', state.id, diffResult);
+    await invoke$g(`Chat.${key}`, state.id, ...args);
+    const diffResult = await invoke$g(`Chat.diff2`, state.id);
+    const commands = await invoke$g('Chat.render2', state.id, diffResult);
     if (commands.length === 0) {
       return state;
     }
@@ -14480,7 +14540,7 @@ const wrapChatCommand = key => {
 
 const Commands$G = {};
 const getCommands$l = async () => {
-  const commands = await invoke$h('Chat.getCommandIds');
+  const commands = await invoke$g('Chat.getCommandIds');
   for (const command of commands) {
     Commands$G[command] = wrapChatCommand(command);
   }
@@ -14491,7 +14551,7 @@ const getCommands$l = async () => {
 const Css$F = [];
 
 const getKeyBindings$l = () => {
-  return invoke$h('Chat.getKeyBindings');
+  return invoke$g('Chat.getKeyBindings');
 };
 
 const name$E = 'Chat';
@@ -14509,23 +14569,23 @@ const renderDialog$3 = {
 };
 const render$G = [renderDialog$3];
 const renderEventListeners$m = async () => {
-  const listeners = await invoke$h('Chat.renderEventListeners');
+  const listeners = await invoke$g('Chat.renderEventListeners');
   return listeners;
 };
 
 const menus$g = [];
 const getQuickPickMenuEntries$4 = async () => {
-  const entries = await invoke$h('Chat.getQuickPickMenuEntries');
+  const entries = await invoke$g('Chat.getQuickPickMenuEntries');
   return entries;
 };
 const getMenus$c = async () => {
   try {
-    const ids = await invoke$h('Chat.getMenuEntryIds');
+    const ids = await invoke$g('Chat.getMenuEntryIds');
     const adjusted = ids.map(id => {
       return {
         id,
         async getMenuEntries(...args) {
-          const entries = await invoke$h('Chat.getMenuEntries', ...args);
+          const entries = await invoke$g('Chat.getMenuEntries', ...args);
           return entries;
         }
       };
@@ -14573,7 +14633,7 @@ const launchChatDebugViewWorker = async () => {
 };
 
 const {
-  invoke: invoke$g,
+  invoke: invoke$f,
   restart: restart$b
 } = getOrCreateWorker(launchChatDebugViewWorker);
 
@@ -14592,10 +14652,10 @@ const create$O = (id, uri, x, y, width, height) => {
 };
 const loadContent$J = async state => {
   const savedState = {};
-  await invoke$g('ChatDebug.create', state.uid, state.uri, state.x, state.y, state.width, state.height, state.platform, state.assetDir);
-  await invoke$g('ChatDebug.loadContent', state.uid, savedState);
-  const diffResult = await invoke$g('ChatDebug.diff2', state.uid);
-  const commands = await invoke$g('ChatDebug.render2', state.uid, diffResult);
+  await invoke$f('ChatDebug.create', state.uid, state.uri, state.x, state.y, state.width, state.height, state.platform, state.assetDir);
+  await invoke$f('ChatDebug.loadContent', state.uid, savedState);
+  const diffResult = await invoke$f('ChatDebug.diff2', state.uid);
+  const commands = await invoke$f('ChatDebug.render2', state.uid, diffResult);
   return {
     ...state,
     commands
@@ -14609,12 +14669,12 @@ const hotReload$h = async state => {
   state.isHotReloading = true;
   // possible TODO race condition during hot reload
   // there could still be pending promises when the worker is disposed
-  const savedState = await invoke$g('ChatDebug.saveState', state.uid);
+  const savedState = await invoke$f('ChatDebug.saveState', state.uid);
   await restart$b('ChatDebug.terminate');
-  await invoke$g('ChatDebug.create', state.uid, state.uri, state.x, state.y, state.width, state.height, null);
-  await invoke$g('ChatDebug.loadContent', state.uid, savedState);
-  const diffResult = await invoke$g('ChatDebug.diff2', state.uid);
-  const commands = await invoke$g('ChatDebug.render2', state.uid, diffResult);
+  await invoke$f('ChatDebug.create', state.uid, state.uri, state.x, state.y, state.width, state.height, null);
+  await invoke$f('ChatDebug.loadContent', state.uid, savedState);
+  const diffResult = await invoke$f('ChatDebug.diff2', state.uid);
+  const commands = await invoke$f('ChatDebug.render2', state.uid, diffResult);
   state.isHotReloading = false;
   return {
     ...state,
@@ -14624,9 +14684,9 @@ const hotReload$h = async state => {
 
 const wrapChatDebugCommand = key => {
   const fn = async (state, ...args) => {
-    await invoke$g(`ChatDebug.${key}`, state.uid, ...args);
-    const diffResult = await invoke$g(`ChatDebug.diff2`, state.uid);
-    const commands = await invoke$g('ChatDebug.render2', state.uid, diffResult);
+    await invoke$f(`ChatDebug.${key}`, state.uid, ...args);
+    const diffResult = await invoke$f(`ChatDebug.diff2`, state.uid);
+    const commands = await invoke$f('ChatDebug.render2', state.uid, diffResult);
     if (commands.length === 0) {
       return state;
     }
@@ -14640,7 +14700,7 @@ const wrapChatDebugCommand = key => {
 
 const Commands$F = {};
 const getCommands$k = async () => {
-  const commands = await invoke$g('ChatDebug.getCommandIds');
+  const commands = await invoke$f('ChatDebug.getCommandIds');
   for (const command of commands) {
     Commands$F[command] = wrapChatDebugCommand(command);
   }
@@ -14663,13 +14723,13 @@ const renderItems$e = {
 };
 const render$F = [renderItems$e];
 const renderEventListeners$l = async () => {
-  const listeners = await invoke$g('ChatDebug.renderEventListeners');
+  const listeners = await invoke$f('ChatDebug.renderEventListeners');
   return listeners;
 };
 const resize$l = async (state, dimensions) => {
-  await invoke$g('ChatDebug.resize', state.uid, dimensions);
-  const diffResult = await invoke$g('ChatDebug.diff2', state.uid);
-  const commands = await invoke$g('ChatDebug.render2', state.uid, diffResult);
+  await invoke$f('ChatDebug.resize', state.uid, dimensions);
+  const diffResult = await invoke$f('ChatDebug.diff2', state.uid);
+  const commands = await invoke$f('ChatDebug.render2', state.uid, diffResult);
   return {
     ...state,
     commands
@@ -14677,7 +14737,7 @@ const resize$l = async (state, dimensions) => {
 };
 
 const saveState$i = state => {
-  return invoke$g('ChatDebug.saveState', state.uid);
+  return invoke$f('ChatDebug.saveState', state.uid);
 };
 
 const name$D = 'StatusBar';
@@ -15365,22 +15425,6 @@ const ViewletDialog_ipc = {
   render: render$B
 };
 
-const diffWorkerUrl = `${assetDir}/packages/diff-worker/dist/diffWorkerMain.js`;
-
-const launchDiffWorker = async () => {
-  const name = 'Diff Worker';
-  const ipc = await create$17({
-    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
-    name,
-    url: getConfiguredWorkerUrl$1('develop.diffWorkerPath', diffWorkerUrl)
-  });
-  handleIpc(ipc);
-  return ipc;
-};
-
-const {
-  invoke: invoke$f} = getOrCreateWorker(launchDiffWorker);
-
 /**
  *
  * @param {string[]} linesA
@@ -15388,7 +15432,7 @@ const {
  * @returns
  */
 const diff = (linesA, linesB) => {
-  return invoke$f('Diff.diff', linesA, linesB);
+  return invoke$o('Diff.diff', linesA, linesB);
 };
 
 const getDiffEditorContents = async (left, right) => {
@@ -18891,7 +18935,7 @@ const ViewletImplementations_ipc = {
 };
 
 const getInlineDiffChanges = (linesLeft, linesRight) => {
-  return invoke$f('Diff.diffInline', linesLeft, linesRight);
+  return invoke$o('Diff.diffInline', linesLeft, linesRight);
 };
 
 const create$o = (id, uri, x, y, width, height) => {
@@ -19325,7 +19369,7 @@ const ViewletKeyBindings_ipc = {
   saveState: saveState$a
 };
 
-const commit = '43d8c9f';
+const commit = 'be2da82';
 
 const getDefaultTitleBarHeight = () => {
   switch (getPlatform$1()) {
@@ -20154,8 +20198,10 @@ const show$4 = async (state, module, currentViewletId) => {
   if (module === Preview$1 && state.previewUri) {
     uri = state.previewUri;
   }
-  const commands = await load$5({
+  const viewlet = {
+    disposed: false,
     getModule: load$3,
+    args: module === SideBar && currentViewletId ? [currentViewletId] : [],
     id: moduleId,
     type: 0,
     // @ts-ignore
@@ -20168,7 +20214,8 @@ const show$4 = async (state, module, currentViewletId) => {
     height,
     parentUid: uid,
     uid: childUid
-  }, false, true, undefined);
+  };
+  const commands = await load$5(viewlet, false, true, undefined);
 
   // TODO component might already be hidden again at this point
   const resizeCommands = await getResizeCommands(state, intermediateState);
@@ -20181,6 +20228,57 @@ const show$4 = async (state, module, currentViewletId) => {
     commands
   };
 };
+const renderSideBarActivityBarCommands = async (activityBarId, sideBarView, sideBarVisible) => {
+  await invoke$h('ActivityBar.handleSideBarStateChange', activityBarId, sideBarView, sideBarVisible);
+  const diffResult = await invoke$h('ActivityBar.diff2', activityBarId);
+  const activityBarCommands = await invoke$h('ActivityBar.render2', activityBarId, diffResult);
+  return activityBarCommands;
+};
+const toggle = (state, module, moduleId) => {
+  const {
+    kVisible
+  } = module;
+  if (state[kVisible]) {
+    return hide$2(state, module);
+  }
+  return show$4(state, module, moduleId);
+};
+const showSideBar = async (state, moduleId = state.sideBarView) => {
+  const sideBarView = moduleId || state.sideBarView || Explorer$1;
+  if (state.sideBarVisible) {
+    const switchResult = state.sideBarView === sideBarView ? {
+      newState: state,
+      commands: []
+    } : await callGlobalEvent(state, 'handleSideBarViewletChange', sideBarView);
+    const newState = {
+      ...switchResult.newState,
+      sideBarView,
+      sideBarVisible: true
+    };
+    const activityBarCommands = await renderSideBarActivityBarCommands(newState.activityBarId, sideBarView, true);
+    return {
+      newState,
+      commands: [...switchResult.commands, ...activityBarCommands]
+    };
+  }
+  const sideBarState = sideBarView === state.sideBarView ? state : {
+    ...state,
+    sideBarView
+  };
+  const {
+    newState,
+    commands
+  } = await show$4(sideBarState, SideBar, sideBarView);
+  const activityBarCommands = await renderSideBarActivityBarCommands(newState.activityBarId, sideBarView, true);
+  return {
+    newState: {
+      ...newState,
+      sideBarView,
+      sideBarVisible: true
+    },
+    commands: [...commands, ...activityBarCommands]
+  };
+};
 const hide$2 = async (state, module) => {
   const {
     kVisible,
@@ -20193,8 +20291,7 @@ const hide$2 = async (state, module) => {
   // TODO save state to local storage after rending (in background)
   await saveViewletState(moduleId);
   // TODO also resize other viewlets if necessary
-  const instanceState = getState$1(moduleId);
-  const commands = disposeFunctional(instanceState.uid);
+  const commands = disposeFunctional(moduleId);
   const resizeCommands = await getResizeCommands(state, newState);
   commands.push(...resizeCommands);
 
@@ -20207,37 +20304,6 @@ const hide$2 = async (state, module) => {
     commands
   };
 };
-const toggle = (state, module, moduleId) => {
-  const {
-    kVisible
-  } = module;
-  if (state[kVisible]) {
-    return hide$2(state, module);
-  }
-  return show$4(state, module);
-};
-const showSideBar = async state => {
-  const {
-    sideBarView
-  } = state;
-  const {
-    newState,
-    commands
-  } = await show$4(state, SideBar);
-  const {
-    activityBarId
-  } = newState;
-  await invoke$i('ActivityBar.handleSideBarViewletChange', activityBarId, sideBarView);
-  const diffResult = await invoke$i('ActivityBar.diff2', activityBarId);
-  const activityBarCommands = await invoke$i('ActivityBar.render2', activityBarId, diffResult);
-  return {
-    newState: {
-      ...newState,
-      sideBarVisible: true
-    },
-    commands: [...commands, ...activityBarCommands]
-  };
-};
 const hideSideBar = async state => {
   const {
     newState,
@@ -20246,10 +20312,7 @@ const hideSideBar = async state => {
   const {
     activityBarId
   } = newState;
-  // TODO instead of this, call handleSidebarViewChange. activity bar then can get active view if needed
-  await invoke$i('ActivityBar.handleSideBarHidden', activityBarId);
-  const diffResult = await invoke$i('ActivityBar.diff2', activityBarId);
-  const activityBarCommands = await invoke$i('ActivityBar.render2', activityBarId, diffResult);
+  const activityBarCommands = await renderSideBarActivityBarCommands(activityBarId, newState.sideBarView, false);
   return {
     newState: {
       ...newState,
@@ -20262,6 +20325,13 @@ const toggleSideBar = state => {
   // @ts-ignore
   return toggle(state, SideBar);
 };
+const toggleSideBarView = async (state, moduleId) => {
+  const sideBarView = moduleId || state.sideBarView || Explorer$1;
+  if (state.sideBarVisible && state.sideBarView === sideBarView) {
+    return hideSideBar(state);
+  }
+  return showSideBar(state, sideBarView);
+};
 const showSecondarySideBar = state => {
   // @ts-ignore
   return show$4(state, SecondarySideBar);
@@ -20299,7 +20369,7 @@ const hidePanel = state => {
   return hide$2(state, Panel);
 };
 const togglePanel = (state, moduleId = None$9) => {
-  return toggle(state, Panel);
+  return toggle(state, Panel, moduleId);
 };
 const showActivityBar = state => {
   // @ts-ignore
@@ -21166,17 +21236,7 @@ const getSideBarPosition = state => {
   return state.sideBarLocation;
 };
 const openSideBarView = async (state, moduleId, focus = false, args) => {
-  const {
-    newState,
-    commands
-  } = await callGlobalEvent(state, 'handleSideBarViewletChange', moduleId);
-  return {
-    newState: {
-      ...newState,
-      sideBarView: moduleId
-    },
-    commands
-  };
+  return showSideBar(state, moduleId);
 };
 const openSecondarySideBarView = async (state, moduleId, focus = false, args) => {
   const {
@@ -21283,6 +21343,7 @@ const CommandsWithSideEffects = {
   showSecondarySideBar: showSecondarySideBar,
   showStatusBar: showStatusBar,
   showTitleBar: showTitleBar,
+  toggleSideBarView: toggleSideBarView,
   toggleActivityBar: toggleActivityBar,
   toggleMain: toggleMain,
   togglePanel: togglePanel,
@@ -22271,6 +22332,7 @@ const ViewletLayout_ipc = {
   toggleSecondarySideBar,
   toggleSideBar,
   toggleSideBarPosition,
+  toggleSideBarView,
   toggleStatusBar,
   toggleTitleBar
 };
@@ -24088,14 +24150,14 @@ const doCreate = async state => {
   const itemHeight = 22;
   const value = '';
   const replacement = '';
-  await invoke$k('TextSearch.create', state.uid, state.x, state.y, state.width, state.height, state$o.workspacePath, state.assetDir, itemHeight, value, replacement, state.platform);
+  await invoke$j('TextSearch.create', state.uid, state.x, state.y, state.width, state.height, state$o.workspacePath, state.assetDir, itemHeight, value, replacement, state.platform);
 };
 const loadContent$b = async (state, savedState) => {
   await doCreate(state);
-  await invoke$k('TextSearch.loadContent', state.uid, savedState);
-  const diffResult = await invoke$k('TextSearch.diff2', state.uid);
-  const commands = await invoke$k('TextSearch.render2', state.uid, diffResult);
-  const actionsDom = await invoke$k('TextSearch.renderActions', state.uid);
+  await invoke$j('TextSearch.loadContent', state.uid, savedState);
+  const diffResult = await invoke$j('TextSearch.diff2', state.uid);
+  const commands = await invoke$j('TextSearch.render2', state.uid, diffResult);
+  const actionsDom = await invoke$j('TextSearch.renderActions', state.uid);
   return {
     ...state,
     commands,
@@ -24115,12 +24177,12 @@ const hotReload$4 = async state => {
   state.isHotReloading = true;
   // possible TODO race condition during hot reload
   // there could still be pending promises when the worker is disposed
-  const savedState = await invoke$k('TextSearch.saveState', state.uid);
+  const savedState = await invoke$j('TextSearch.saveState', state.uid);
   await restart$e('TextSearch.terminate');
   await doCreate(state);
-  await invoke$k('TextSearch.loadContent', state.uid, savedState);
-  const diffResult = await invoke$k('TextSearch.diff2', state.uid);
-  const commands = await invoke$k('TextSearch.render2', state.uid, diffResult);
+  await invoke$j('TextSearch.loadContent', state.uid, savedState);
+  const diffResult = await invoke$j('TextSearch.diff2', state.uid);
+  const commands = await invoke$j('TextSearch.render2', state.uid, diffResult);
   state.commands = commands;
   state.isHotReloading = false;
   return {
@@ -24140,12 +24202,12 @@ const hotReload$4 = async state => {
 
 const wrapTextSearchCommand = key => {
   const fn = async (state, ...args) => {
-    await invoke$k(`TextSearch.${key}`, state.uid, ...args);
-    const diffResult = await invoke$k(`TextSearch.diff2`, state.uid, ...args);
+    await invoke$j(`TextSearch.${key}`, state.uid, ...args);
+    const diffResult = await invoke$j(`TextSearch.diff2`, state.uid, ...args);
     if (diffResult.length === 0) {
       return state;
     }
-    const commands = await invoke$k('TextSearch.render2', state.uid, diffResult);
+    const commands = await invoke$j('TextSearch.render2', state.uid, diffResult);
     return {
       ...state,
       commands
@@ -24156,7 +24218,7 @@ const wrapTextSearchCommand = key => {
 
 const Commands$a = {};
 const getCommands$5 = async () => {
-  const commands = await invoke$k('TextSearch.getCommandIds');
+  const commands = await invoke$j('TextSearch.getCommandIds');
   for (const command of commands) {
     Commands$a[command] = wrapTextSearchCommand(command);
   }
@@ -24164,25 +24226,25 @@ const getCommands$5 = async () => {
   return Commands$a;
 };
 const saveState$2 = state => {
-  return invoke$k(`TextSearch.saveState`, state.uid);
+  return invoke$j(`TextSearch.saveState`, state.uid);
 };
 
 const Css$b = ["/css/parts/ViewletSearch.css"];
 
 const getKeyBindings$4 = async () => {
-  const keyBindings = await invoke$k('TextSearch.getKeyBindings');
+  const keyBindings = await invoke$j('TextSearch.getKeyBindings');
   return keyBindings;
 };
 
 const menus$4 = [];
 const getMenus$3 = async () => {
   try {
-    const ids = await invoke$k('TextSearch.getMenuEntryIds');
+    const ids = await invoke$j('TextSearch.getMenuEntryIds');
     const adjusted = ids.map(id => {
       return {
         id,
         async getMenuEntries(...args) {
-          const entries = await invoke$k('TextSearch.getMenuEntries', ...args);
+          const entries = await invoke$j('TextSearch.getMenuEntries', ...args);
           return entries;
         }
       };
@@ -24207,7 +24269,7 @@ const renderItems$4 = {
 };
 const render$b = [renderItems$4];
 const renderEventListeners$5 = async () => {
-  const listeners = await invoke$k('TextSearch.renderEventListeners');
+  const listeners = await invoke$j('TextSearch.renderEventListeners');
   return listeners;
 };
 
@@ -24452,6 +24514,7 @@ const create$9 = (id, uri, x, y, width, height) => {
   return {
     uid: id,
     currentViewletId: '',
+    currentViewletRequestId: 0,
     x,
     y,
     width,
@@ -24482,9 +24545,9 @@ const create$9 = (id, uri, x, y, width, height) => {
 //   return ViewletModuleId.Explorer
 // }
 
-const loadContent$9 = async (state, savedState) => {
+const loadContent$9 = async (state, savedState, targetViewletId) => {
   // TODO get it from layout state
-  let savedViewletId = await execute$3('Layout.getActiveSideBarView');
+  let savedViewletId = targetViewletId || (await execute$3('Layout.getActiveSideBarView'));
   if (!savedViewletId) {
     savedViewletId = Explorer$1;
   }
@@ -24546,7 +24609,9 @@ const handleSideBarViewletChange = async (state, moduleId) => {
     currentViewletId,
     titleAreaHeight
   } = state;
+  const requestId = state.currentViewletRequestId + 1;
   const savePromise = saveViewletState(currentViewletId);
+  state.currentViewletRequestId = requestId;
   state.currentViewletId = moduleId;
   const childDimensions = getContentDimensions$1(state, titleAreaHeight);
   const uid = state.uid;
@@ -24570,6 +24635,11 @@ const handleSideBarViewletChange = async (state, moduleId) => {
     uid: childUid,
     shouldRenderEvents: false
   }, false, true);
+  if (state.currentViewletRequestId !== requestId || state.currentViewletId !== moduleId) {
+    disposeFunctional(childUid);
+    await savePromise;
+    return state;
+  }
   let actionsDom = [];
   let actionsUid = -1;
   if (commands) {
@@ -24582,6 +24652,11 @@ const handleSideBarViewletChange = async (state, moduleId) => {
     const events = commands[eventsIndex][2];
     actionsUid = create$16();
     commands.push(['Viewlet.createFunctionalRoot', moduleId, actionsUid, true], ['Viewlet.registerEventListeners', actionsUid, events], ['Viewlet.setDom2', actionsUid, actionsDom], ['Viewlet.setUid', actionsUid, childUid]);
+    if (state.currentViewletRequestId !== requestId || state.currentViewletId !== moduleId) {
+      disposeFunctional(childUid);
+      await savePromise;
+      return state;
+    }
     await invoke$F('Viewlet.sendMultiple', commands);
   }
 
@@ -24590,6 +24665,7 @@ const handleSideBarViewletChange = async (state, moduleId) => {
   await savePromise;
   return {
     ...state,
+    currentViewletRequestId: requestId,
     currentViewletId: moduleId,
     childUid,
     actionsUid
@@ -25768,14 +25844,14 @@ const loadContent$6 = async (state, savedState) => {
     platform,
     assetDir
   } = state;
-  await invoke$l('SourceControl.create2', state.uid, state.uri, state.x, state.y, state.width, state.height, state$o.workspacePath,
+  await invoke$k('SourceControl.create2', state.uid, state.uri, state.x, state.y, state.width, state.height, state$o.workspacePath,
   // TODO use workspace uri
   platform, assetDir);
-  await invoke$l('SourceControl.loadContent', state.uid, savedState);
-  const diffResult = await invoke$l('SourceControl.diff2', state.uid);
-  const commands = await invoke$l('SourceControl.render2', state.uid, diffResult);
-  const actionsDom = await invoke$l('SourceControl.renderActions2', state.uid);
-  const badgeCount = await invoke$l('SourceControl.getBadgeCount', state.uid);
+  await invoke$k('SourceControl.loadContent', state.uid, savedState);
+  const diffResult = await invoke$k('SourceControl.diff2', state.uid);
+  const commands = await invoke$k('SourceControl.render2', state.uid, diffResult);
+  const actionsDom = await invoke$k('SourceControl.renderActions2', state.uid);
+  const badgeCount = await invoke$k('SourceControl.getBadgeCount', state.uid);
   // if (badgeCount > 0) {
   //   const newState = {
   //     ...state,
@@ -25872,18 +25948,18 @@ const hotReload$2 = async state => {
   state.isHotReloading = true;
   // possible TODO race condition during hot reload
   // there could still be pending promises when the worker is disposed
-  const savedState = await invoke$l('SourceControl.saveState', state.uid);
+  const savedState = await invoke$k('SourceControl.saveState', state.uid);
   await restart$f('SourceControl.terminate');
   const oldState = {
     ...state,
     items: []
   };
-  await invoke$l('SourceControl.create2', state.uid, state.uri, state.x, state.y, state.width, state.height, state$o.workspacePath,
+  await invoke$k('SourceControl.create2', state.uid, state.uri, state.x, state.y, state.width, state.height, state$o.workspacePath,
   // TODO use workspace uri
   state.platform, state.assetDir);
-  await invoke$l('SourceControl.loadContent', state.uid, savedState);
-  const diffResult = await invoke$l('SourceControl.diff2', state.uid);
-  const commands = await invoke$l('SourceControl.render2', oldState.uid, diffResult);
+  await invoke$k('SourceControl.loadContent', state.uid, savedState);
+  const diffResult = await invoke$k('SourceControl.diff2', state.uid);
+  const commands = await invoke$k('SourceControl.render2', oldState.uid, diffResult);
   return {
     ...oldState,
     commands,
@@ -25893,13 +25969,13 @@ const hotReload$2 = async state => {
 
 const wrapSourceControlCommand = key => {
   const fn = async (state, ...args) => {
-    await invoke$l(`SourceControl.${key}`, state.uid, ...args);
-    const diffResult = await invoke$l('SourceControl.diff2', state.uid);
+    await invoke$k(`SourceControl.${key}`, state.uid, ...args);
+    const diffResult = await invoke$k('SourceControl.diff2', state.uid);
     if (diffResult.length === 0) {
       return state;
     }
-    const commands = await invoke$l('SourceControl.render2', state.uid, diffResult);
-    const badgeCount = await invoke$l('SourceControl.getBadgeCount', state.uid, diffResult);
+    const commands = await invoke$k('SourceControl.render2', state.uid, diffResult);
+    const badgeCount = await invoke$k('SourceControl.getBadgeCount', state.uid, diffResult);
     if (commands.length === 0) {
       return state;
     }
@@ -25924,14 +26000,14 @@ const wrapSourceControlCommand = key => {
 
 const Commands$5 = {};
 const getCommands$3 = async () => {
-  const commands = await invoke$l('SourceControl.getCommandIds');
+  const commands = await invoke$k('SourceControl.getCommandIds');
   for (const command of commands) {
     Commands$5[command] = wrapSourceControlCommand(command);
   }
   Commands$5['hotReload'] = hotReload$2;
   Commands$5['getInfo'] = ({
     uid
-  }) => invoke$l('SourceControl.getInfo', uid);
+  }) => invoke$k('SourceControl.getInfo', uid);
   return Commands$5;
 };
 
@@ -25940,13 +26016,13 @@ const Css$6 = ["/css/parts/SourceControlListItem.css", "/css/parts/ViewletSource
 const menus$1 = [];
 const getMenus$1 = async () => {
   try {
-    const ids = await invoke$l('SourceControl.getMenuIds');
+    const ids = await invoke$k('SourceControl.getMenuIds');
     const adjusted = ids.map(id => {
       return {
         id,
         async getMenuEntries(...args) {
           // TODO pass menu id also
-          const entries = await invoke$l('SourceControl.getMenuEntries2', ...args);
+          const entries = await invoke$k('SourceControl.getMenuEntries2', ...args);
           return entries;
         }
       };
@@ -25971,7 +26047,7 @@ const renderSourceControl = {
 };
 const render$6 = [renderSourceControl];
 const renderEventListeners$3 = async () => {
-  const listeners = await invoke$l('SourceControl.renderEventListeners');
+  const listeners = await invoke$k('SourceControl.renderEventListeners');
   return listeners;
 };
 
@@ -25995,7 +26071,7 @@ const resize$5 = (state, dimensions) => {
 
 const getKeyBindings$1 = async () => {
   try {
-    return await invoke$l('SourceControl.getKeyBindings');
+    return await invoke$k('SourceControl.getKeyBindings');
   } catch {
     return [];
   }
@@ -26957,10 +27033,10 @@ const create = (id, uri, x, y, width, height) => {
 const loadContent = async state => {
   const savedState = {};
   const realUri = await getRealUri(state.uri);
-  await invoke$n('WebView.create4', state.id, realUri, state.x, state.y, state.width, state.height, state.platform, state.assetDir, state.webViewScheme);
-  await invoke$n('WebView.loadContent', state.id, savedState);
-  const diffResult = await invoke$n('WebView.diff2', state.id);
-  const commands = await invoke$n('WebView.render2', state.id, diffResult);
+  await invoke$m('WebView.create4', state.id, realUri, state.x, state.y, state.width, state.height, state.platform, state.assetDir, state.webViewScheme);
+  await invoke$m('WebView.loadContent', state.id, savedState);
+  const diffResult = await invoke$m('WebView.diff2', state.id);
+  const commands = await invoke$m('WebView.render2', state.id, diffResult);
   return {
     ...state,
     commands
@@ -26979,12 +27055,12 @@ const dispose = async state => {
 
 const wrapIframeCommand = key => {
   const fn = async (state, ...args) => {
-    await invoke$n(`WebView.${key}`, state.uid, ...args);
-    const diffResult = await invoke$n('WebView.diff2', state.uid);
+    await invoke$m(`WebView.${key}`, state.uid, ...args);
+    const diffResult = await invoke$m('WebView.diff2', state.uid);
     if (diffResult.length === 0) {
       return state;
     }
-    const commands = await invoke$n('WebView.render2', state.uid, diffResult);
+    const commands = await invoke$m('WebView.render2', state.uid, diffResult);
     if (commands.length === 0) {
       return state;
     }
@@ -26998,7 +27074,7 @@ const wrapIframeCommand = key => {
 
 const Commands = {};
 const getCommands = async () => {
-  const commands = await invoke$n('WebView.getCommandIds');
+  const commands = await invoke$m('WebView.getCommandIds');
   for (const command of commands) {
     Commands[command] = wrapIframeCommand(command);
   }
@@ -27023,7 +27099,7 @@ const renderItems = {
 };
 const render = [renderItems];
 const renderEventListeners = async () => {
-  const listeners = await invoke$n('WebView.renderEventListeners');
+  const listeners = await invoke$m('WebView.renderEventListeners');
   return listeners;
 };