@lvce-editor/static-server 0.97.21 → 0.97.23

package/static/{e4aec39 → aca8733}/packages/renderer-worker/dist/rendererWorkerMain.js

@@ -95,7 +95,7 @@ const getAssetDir$2 = () => {
   // @ts-ignore
   {
     // @ts-ignore
-    return '/e4aec39';
+    return '/aca8733';
   }
 };
 const assetDir = getAssetDir$2();
@@ -3115,7 +3115,7 @@ const toggleFullScreen$1 = forward$2('ElectronWindow.toggleFullScreen');
 const zoomIn$1 = forward$2('ElectronWindow.zoomIn');
 const zoomOut$1 = forward$2('ElectronWindow.zoomOut');
 const zoomReset$1 = forward$2('ElectronWindow.zoomReset');
-const focus$8 = forward$2('ElectronWindow.focus');
+const focus$c = forward$2('ElectronWindow.focus');
 
 const reloadElectron = () => {
   return reload$3();
@@ -6263,19 +6263,44 @@ const hydrate$5 = async () => {
   setKeyBindings('extensions', keyBindings);
 };
 
+const mainAreaWorkerUrl = `${assetDir}/packages/main-area-worker/dist/mainAreaWorkerMain.js`;
+
+const launchMainAreaWorker = async () => {
+  const configuredWorkerUrl = getConfiguredWorkerUrl$1('develop.mainAreaWorkerPath', mainAreaWorkerUrl);
+  const ipc = await create$1a({
+    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
+    url: configuredWorkerUrl,
+    name: 'Main Area Worker'
+  });
+  handleIpc(ipc);
+  return ipc;
+};
+
+const {
+  invoke: invoke$z} = getOrCreateWorker(launchMainAreaWorker);
+
+const restoreMainFocus = async (invoke = invoke$z) => {
+  const mainInstance = getInstance(Main$2);
+  if (mainInstance) {
+    await invoke('MainArea.focus', mainInstance.state.uid);
+  }
+};
+
 const state$i = {
   isQuickPickOpen: false
 };
 const isQuickPickOpen = () => {
   return state$i.isQuickPickOpen;
 };
-const closeWidgetElectronQuickPick = async () => {
+const closeWidgetElectronQuickPick = async (restoreFocus = true) => {
   const id = QuickPick;
   state$i.isQuickPickOpen = false;
   remove$a(id);
   await disposeBrowserViewQuickPick();
-  // TODO restore focus to previously focused element
-  await focus$8();
+  await focus$c();
+  if (restoreFocus) {
+    await restoreMainFocus();
+  }
 };
 
 const getKeyBindingSetId = (instance, fallback) => {
@@ -6291,7 +6316,10 @@ const getTitle$4 = id => {
 const getDragData = () => {
   return invoke$I('Viewlet.getDragData');
 };
-const focus$7 = async id => {
+const focusSelector = (id, selector) => {
+  return invoke$I('Viewlet.focusSelector', id, selector);
+};
+const focus$b = async id => {
   const instance = getInstance(id);
   if (!instance) {
     return;
@@ -6624,7 +6652,12 @@ const closeWidget = async id => {
         await hide$5('quick-pick');
       }
     }
-    // TODO restore focus
+    if (hasSimpleBrowserOverlay) {
+      const mainInstance = getInstance(Main$2);
+      if (mainInstance) {
+        await executeViewletCommand(mainInstance.state.uid, 'focus');
+      }
+    }
   } catch (error) {
     throw new VError(error, `Failed to close widget ${id}`);
   }
@@ -6798,24 +6831,24 @@ const launchIconThemeWorker = async () => {
 };
 
 const {
-  invoke: invoke$z,
+  invoke: invoke$y,
   invokeAndTransfer: invokeAndTransfer$m
 } = getOrCreateWorker(launchIconThemeWorker);
 
 const getFileIcon$1 = file => {
-  return invoke$z('IconTheme.getFileIcon', file);
+  return invoke$y('IconTheme.getFileIcon', file);
 };
 const getFileIcons = fileNames => {
-  return invoke$z('IconTheme.getFileIcons', fileNames);
+  return invoke$y('IconTheme.getFileIcons', fileNames);
 };
 const getFolderIcon = folder => {
-  return invoke$z('IconTheme.getFolderIcon', folder);
+  return invoke$y('IconTheme.getFolderIcon', folder);
 };
 const getIcon = dirent => {
-  return invoke$z('IconTheme.getIcon', dirent);
+  return invoke$y('IconTheme.getIcon', dirent);
 };
 const getIcons = iconRequests => {
-  return invoke$z('IconTheme.getIcons', iconRequests);
+  return invoke$y('IconTheme.getIcons', iconRequests);
 };
 
 const getIconThemePlatform = (platform, assetDir) => {
@@ -6830,7 +6863,7 @@ const setIconTheme = async (iconThemeId, platform, assetDir) => {
     const extensions = await invoke$E('Extensions.getAllExtensions', assetDir, platform);
     const iconThemePlatform = getIconThemePlatform(platform, assetDir);
     const etag = getIconThemeEtag(iconThemeId);
-    await invoke$z('IconTheme.getIconThemeJson', extensions, iconThemeId, assetDir, iconThemePlatform, useCache, etag);
+    await invoke$y('IconTheme.getIconThemeJson', extensions, iconThemeId, assetDir, iconThemePlatform, useCache, etag);
     await handleIconThemeChange$1();
   } catch (error) {
     if (isTest()) ; else {
@@ -7161,7 +7194,7 @@ const hydrate$3 = async (platform, assetDir) => {
   const languages = await getLanguages(platform, assetDir);
   // TODO avoid side effect here, but how?
   // possible icon theme worker can ask for languages to be loaded, that way the dependency is reversed
-  await invoke$z('IconTheme.addLanguages', languages);
+  await invoke$y('IconTheme.addLanguages', languages);
   await addLanguages(languages);
   const useJsx = get$e('languages.jsFilesAsJsx');
   if (useJsx) {
@@ -7651,8 +7684,8 @@ const exit$1 = code => {
   return invoke$F('Exit.exit', code);
 };
 
-const version = '0.97.21';
-const commit$1 = 'e4aec39';
+const version = '0.97.23';
+const commit$1 = 'aca8733';
 const productNameLong = 'Lvce Editor - OSS';
 const getPid = () => {
   return invoke$F('Process.getPid');
@@ -7706,7 +7739,7 @@ const launchFileSystemWorker = async () => {
 };
 
 const {
-  invoke: invoke$y,
+  invoke: invoke$x,
   invokeAndTransfer: invokeAndTransfer$l} = getOrCreateWorker(launchFileSystemWorker);
 
 const getRemoteSrc = uri => {
@@ -7724,45 +7757,45 @@ const toUri = item => {
 const copy$3 = (source, target) => {
   source = toUri(source);
   target = toUri(target);
-  return invoke$y('FileSystem.copy', /* source */source, /* target */target);
+  return invoke$x('FileSystem.copy', /* source */source, /* target */target);
 };
 const readFile$e = (path, encoding) => {
   path = toUri(path);
-  return invoke$y('FileSystem.readFile', /* path */path, /* encoding */encoding);
+  return invoke$x('FileSystem.readFile', /* path */path, /* encoding */encoding);
 };
 const exists$2 = (path, encoding) => {
   path = toUri(path);
-  return invoke$y('FileSystem.exists', /* path */path);
+  return invoke$x('FileSystem.exists', /* path */path);
 };
 const readJson$5 = path => {
   path = toUri(path);
-  return invoke$y('FileSystem.readJson', /* path */path);
+  return invoke$x('FileSystem.readJson', /* path */path);
 };
 const remove$8 = path => {
   path = toUri(path);
-  return invoke$y('FileSystem.remove', /* path */path);
+  return invoke$x('FileSystem.remove', /* path */path);
 };
 const rename$6 = (oldUri, newUri) => {
   oldUri = toUri(oldUri);
   newUri = toUri(newUri);
-  return invoke$y('FileSystem.rename', /* oldPath */oldUri, /* newPath */newUri);
+  return invoke$x('FileSystem.rename', /* oldPath */oldUri, /* newPath */newUri);
 };
 const mkdir$8 = path => {
   path = toUri(path);
-  return invoke$y('FileSystem.mkdir', /* path */path);
+  return invoke$x('FileSystem.mkdir', /* path */path);
 };
 const writeFile$e = async (path, content, encoding) => {
   path = toUri(path);
-  await invoke$y(/* FileSystem.writeFile */'FileSystem.writeFile', /* path */path, /* content */content, /* encoding */encoding);
+  await invoke$x(/* FileSystem.writeFile */'FileSystem.writeFile', /* path */path, /* content */content, /* encoding */encoding);
 };
 const writeBlob = async (path, blob) => {
   path = toUri(path);
-  await invoke$y('FileSystem.writeBlob', path, blob);
+  await invoke$x('FileSystem.writeBlob', path, blob);
 };
 const ensureFile$1 = async () => {};
 const readDirWithFileTypes$8 = path => {
   path = toUri(path);
-  return invoke$y('FileSystem.readDirWithFileTypes', /* path */path);
+  return invoke$x('FileSystem.readDirWithFileTypes', /* path */path);
 };
 const getBlobUrl$3 = path => {
   if (!path.startsWith('/')) {
@@ -7771,7 +7804,7 @@ const getBlobUrl$3 = path => {
   return getRemoteSrc(path);
 };
 const getBlob$5 = async (path, type) => {
-  const content = await invoke$y('FileSystem.readFileAsBuffer', path);
+  const content = await invoke$x('FileSystem.readFileAsBuffer', path);
   const array = new Uint8Array(content.data);
   const blob = new Blob([array], {
     type
@@ -7782,26 +7815,26 @@ const getPathSeparator$8 = () => {
   if (getPlatform$2() === Web$1) {
     return Slash$1;
   }
-  return invoke$y('FileSystem.getPathSeparator');
+  return invoke$x('FileSystem.getPathSeparator');
 };
 const isReadonly$8 = path => {
   path = toUri(path);
-  return invoke$y('FileSystem.isReadonly', /* path */path);
+  return invoke$x('FileSystem.isReadonly', /* path */path);
 };
 const getRealPath = path => {
-  return invoke$y('FileSystem.getRealPath', /* path */path);
+  return invoke$x('FileSystem.getRealPath', /* path */path);
 };
 const stat$1 = path => {
   path = toUri(path);
-  return invoke$y('FileSystem.stat', /* path */path);
+  return invoke$x('FileSystem.stat', /* path */path);
 };
 const getFolderSize = path => {
   path = toUri(path);
-  return invoke$y('FileSystem.getFolderSize', /* path */path);
+  return invoke$x('FileSystem.getFolderSize', /* path */path);
 };
 const chmod$3 = (path, permissions) => {
   path = toUri(path);
-  return invoke$y('FileSystem.chmod', /* path */path, /* permissions */permissions);
+  return invoke$x('FileSystem.chmod', /* path */path, /* permissions */permissions);
 };
 const canBeRestored$4 = true;
 
@@ -8448,23 +8481,23 @@ const launchAuthWorker = async () => {
 };
 
 const {
-  invoke: invoke$x,
+  invoke: invoke$w,
   invokeAndTransfer: invokeAndTransfer$k} = getOrCreateWorker(launchAuthWorker);
 const initialize$1 = (backendUrl, platform, href) => {
-  return invoke$x('Auth.initialize', {
+  return invoke$w('Auth.initialize', {
     backendUrl,
     href,
     platform
   });
 };
 const signIn$1 = (backendUrl, platform) => {
-  return invoke$x('Auth.login', {
+  return invoke$w('Auth.login', {
     backendUrl,
     platform
   });
 };
 const signOut$1 = backendUrl => {
-  return invoke$x('Auth.logout', {
+  return invoke$w('Auth.logout', {
     backendUrl
   });
 };
@@ -9290,6 +9323,7 @@ const commandMap = {
   'Viewlet.dispose': lazy('Viewlet.dispose'),
   'Viewlet.executeViewletCommand': lazy('Viewlet.executeViewletCommand'),
   'Viewlet.focus': lazy('Viewlet.focus'),
+  'Viewlet.focusSelector': lazy('Viewlet.focusSelector'),
   'Viewlet.resize': lazy('Viewlet.resize'),
   'Viewlet.getAllStates': lazy('Viewlet.getAllStates'),
   'Viewlet.getDragData': lazy('Viewlet.getDragData'),
@@ -11124,12 +11158,12 @@ const normalizeUri = uri => {
 const readFile$8 = async uri => {
   uri = normalizeUri(uri);
   if (uri.startsWith('localhost:') || uri.startsWith(location.host)) {
-    return invoke$y('FileSystem.readFile', `${location.protocol}//${uri}`);
+    return invoke$x('FileSystem.readFile', `${location.protocol}//${uri}`);
   }
   if (uri.startsWith('http://') || uri.startsWith('https://')) {
-    return invoke$y('FileSystemFetch.readFile', uri);
+    return invoke$x('FileSystemFetch.readFile', uri);
   }
-  return invoke$y('FileSystem.readFile', uri);
+  return invoke$x('FileSystem.readFile', uri);
 };
 const exists = async uri => {
   try {
@@ -11142,12 +11176,12 @@ const exists = async uri => {
 const readJson$3 = async uri => {
   uri = normalizeUri(uri);
   if (uri.startsWith('localhost:') || uri.startsWith(location.host)) {
-    return invoke$y('FileSystem.readJson', `${location.protocol}//${uri}`);
+    return invoke$x('FileSystem.readJson', `${location.protocol}//${uri}`);
   }
   if (uri.startsWith('http://') || uri.startsWith('https://')) {
-    return invoke$y('FileSystem.readJson', uri);
+    return invoke$x('FileSystem.readJson', uri);
   }
-  return invoke$y('FileSystem.readJson', uri);
+  return invoke$x('FileSystem.readJson', uri);
 };
 const writeFile$8 = (uri, content) => {
   uri = normalizeUri(uri);
@@ -11169,7 +11203,7 @@ const remove$2 = uri => {
 };
 const readDirWithFileTypes$2 = async uri => {
   uri = normalizeUri(uri);
-  return invoke$y('FileSystem.readDirWithFileTypes', uri);
+  return invoke$x('FileSystem.readDirWithFileTypes', uri);
 };
 const chmod$1 = (path, permissions) => {
   path = normalizeUri(path);
@@ -11177,7 +11211,7 @@ const chmod$1 = (path, permissions) => {
 };
 const getBlob$3 = async (uri, type) => {
   uri = normalizeUri(uri);
-  return invoke$y('FileSystem.readFileAsBlob', uri, type);
+  return invoke$x('FileSystem.readFileAsBlob', uri, type);
 };
 
 const FileSystemFetch = {
@@ -11640,13 +11674,13 @@ const launchDebugWorker = async () => {
 };
 
 const {
-  invoke: invoke$w,
+  invoke: invoke$v,
   restart: restart$h
 } = getOrCreateWorker(launchDebugWorker);
 
 const name$2p = 'Debug';
 const readFile$6 = uri => {
-  return invoke$w('RunAndDebug.readFile', uri);
+  return invoke$v('RunAndDebug.readFile', uri);
 };
 const writeFile$6 = (uri, content) => {
   throw new Error('not implemented');
@@ -11734,11 +11768,11 @@ const launchAboutViewWorker = async () => {
 };
 
 const {
-  invoke: invoke$v
+  invoke: invoke$u
 } = getOrCreateWorker(launchAboutViewWorker);
 
 const showAbout = async () => {
-  await invoke$v('About.showAbout', getPlatform$2());
+  await invoke$u('About.showAbout', getPlatform$2());
 };
 
 const name$2o = 'About';
@@ -11905,7 +11939,7 @@ const launchUpdateWorker = async () => {
 };
 
 const {
-  invoke: invoke$u
+  invoke: invoke$t
 } = getOrCreateWorker(launchUpdateWorker);
 
 const getErrorMessage$2 = error => {
@@ -11938,7 +11972,7 @@ const checkForUpdates = async (updateSetting, silent = Boolean(updateSetting)) =
     getLatestVersion: getLatestVersion,
     notify: create$X,
     startUpdate: async (setting, repository) => {
-      await invoke$u('Update.checkForUpdates', setting, repository);
+      await invoke$t('Update.checkForUpdates', setting, repository);
     }
   });
 };
@@ -11998,25 +12032,9 @@ const launchEditorWorker = async () => {
 };
 
 const {
-  invoke: invoke$t,
+  invoke: invoke$s,
   invokeAndTransfer: invokeAndTransfer$j} = getOrCreateWorker(launchEditorWorker);
-const actualInvoke = invoke$t;
-
-const mainAreaWorkerUrl = `${assetDir}/packages/main-area-worker/dist/mainAreaWorkerMain.js`;
-
-const launchMainAreaWorker = async () => {
-  const configuredWorkerUrl = getConfiguredWorkerUrl$1('develop.mainAreaWorkerPath', mainAreaWorkerUrl);
-  const ipc = await create$1a({
-    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
-    url: configuredWorkerUrl,
-    name: 'Main Area Worker'
-  });
-  handleIpc(ipc);
-  return ipc;
-};
-
-const {
-  invoke: invoke$s} = getOrCreateWorker(launchMainAreaWorker);
+const actualInvoke = invoke$s;
 
 const getActiveEditorId = () => {
   const instance = getInstance(EditorText);
@@ -12034,7 +12052,7 @@ const getOpenEditorUrisWithInvoke = async invoke => {
   return savedState.layout.groups.flatMap(group => group.tabs.map(tab => tab.uri).filter(uri => typeof uri === 'string'));
 };
 const getOpenEditorUris = () => {
-  return getOpenEditorUrisWithInvoke(invoke$s);
+  return getOpenEditorUrisWithInvoke(invoke$z);
 };
 const updateDiagnosticsWithCommand = async executeCommand => {
   const instance = getInstance(EditorText);
@@ -12243,13 +12261,13 @@ const FileSystemHandle_ipc = {
 };
 
 const base64StringToBlob = base64String => {
-  return invoke$y('Blob.base64StringToBlob', base64String);
+  return invoke$x('Blob.base64StringToBlob', base64String);
 };
 const binaryStringToBlob = async (string, type) => {
-  return invoke$y('Blob.binaryStringToBlob', string, type);
+  return invoke$x('Blob.binaryStringToBlob', string, type);
 };
 const blobToBinaryString = async blob => {
-  return invoke$y('Blob.blobToBinaryString', blob);
+  return invoke$x('Blob.blobToBinaryString', blob);
 };
 
 const getSrc = uri => {
@@ -15258,7 +15276,8 @@ const Commands$1k = {
   2133: send,
   closeWidget: closeWidget,
   executeViewletCommand: executeViewletCommand,
-  focus: focus$7,
+  focus: focus$b,
+  focusSelector: focusSelector,
   getAllStates: getAllStates,
   getDragData: getDragData,
   getTitle: getTitle$4,
@@ -16949,10 +16968,10 @@ const loadContent$P = async state => {
   const {
     id
   } = state;
-  await invoke$v('About.create', id);
-  await invoke$v('About.loadContent2', id);
-  const diffResult = await invoke$v('About.diff2', id);
-  const commands = await invoke$v('About.render2', id, diffResult);
+  await invoke$u('About.create', id);
+  await invoke$u('About.loadContent2', id);
+  const diffResult = await invoke$u('About.diff2', id);
+  const commands = await invoke$u('About.render2', id, diffResult);
   return {
     ...state,
     commands
@@ -16961,9 +16980,9 @@ const loadContent$P = async state => {
 
 const wrapAboutCommand = key => {
   const fn = async (state, ...args) => {
-    await invoke$v(`About.${key}`, state.id, ...args);
-    const diffResult = await invoke$v(`About.diff2`, state.id);
-    const commands = await invoke$v('About.render2', state.id, diffResult);
+    await invoke$u(`About.${key}`, state.id, ...args);
+    const diffResult = await invoke$u(`About.diff2`, state.id);
+    const commands = await invoke$u('About.render2', state.id, diffResult);
     if (commands.length === 0) {
       return state;
     }
@@ -16977,7 +16996,7 @@ const wrapAboutCommand = key => {
 
 const Commands$K = {};
 const getCommands$s = async () => {
-  const commands = await invoke$v('About.getCommandIds');
+  const commands = await invoke$u('About.getCommandIds');
   for (const command of commands) {
     if (command === 'showAbout' || command === 'showAboutElectron') {
       continue;
@@ -16990,7 +17009,7 @@ const getCommands$s = async () => {
 const Css$J = ["/css/parts/ViewletAbout.css"];
 
 const getKeyBindings$r = () => {
-  return invoke$v('About.getKeyBindings');
+  return invoke$u('About.getKeyBindings');
 };
 
 const name$H = 'About';
@@ -17062,7 +17081,7 @@ const renderDialog$5 = {
 };
 const render$L = [renderDialog$5];
 const renderEventListeners$v = async () => {
-  const listeners = await invoke$v('About.renderEventListeners');
+  const listeners = await invoke$u('About.renderEventListeners');
   return listeners;
 };
 
@@ -17606,6 +17625,12 @@ const hotReload$l = async state => {
 const saveState$k = state => {
   return invoke$j('Chat.saveState', state.uid);
 };
+const focus$a = state => {
+  return {
+    ...state,
+    commands: [['Viewlet.focusSelector', '[name="composer"]']]
+  };
+};
 
 const wrapChatCommand = key => {
   const fn = async (state, ...args) => {
@@ -17630,6 +17655,7 @@ const getCommands$q = async () => {
     Commands$H[command] = wrapChatCommand(command);
   }
   Commands$H['hotReload'] = hotReload$l;
+  Commands$H['focus'] = focus$a;
   return Commands$H;
 };
 
@@ -17686,6 +17712,7 @@ const ViewletChat_ipc = {
   Commands: Commands$H,
   Css: Css$F,
   create: create$P,
+  focus: focus$a,
   getCommands: getCommands$q,
   getKeyBindings: getKeyBindings$p,
   getMenus: getMenus$g,
@@ -19360,7 +19387,7 @@ const resizeEffect$1 = async state => {
   const rows = state.rows || Math.max(2, Math.floor(state.height / 17));
   await invoke$f('Terminal.resize', state.uid, columns, rows);
 };
-const focus$6 = state => {
+const focus$9 = state => {
   return {
     ...state,
     focused: true
@@ -19402,7 +19429,7 @@ const ViewletTerminal2_ipc = {
   clear: clear$1,
   create: create$C,
   dispose: dispose$n,
-  focus: focus$6,
+  focus: focus$9,
   handleBlur: handleBlur$2,
   handleData,
   handleInput: handleInput$3,
@@ -20308,7 +20335,7 @@ const hasFunctionalRender$s = true;
 const hasFunctionalRootRender$r = true;
 const hasFunctionalEvents$o = true;
 const render$u = render$v;
-const focus$5 = state => {
+const focus$8 = state => {
   return {
     ...state,
     focused: true
@@ -20509,7 +20536,7 @@ const ViewletEditorText_ipc = {
   create: create$z,
   customErrorRenderer,
   dispose: dispose$m,
-  focus: focus$5,
+  focus: focus$8,
   getCommands: getCommands$k,
   getDynamicCss,
   getKeyBindings: getKeyBindings$g,
@@ -21751,6 +21778,12 @@ const loadContent$s = async (state, savedState) => {
   };
 };
 const dispose$i = () => {};
+const focus$7 = state => {
+  return {
+    ...state,
+    commands: [['Viewlet.focusSelector', '[name="extensions"]']]
+  };
+};
 
 // TODO lazyload this
 
@@ -21795,6 +21828,7 @@ const getCommands$h = async () => {
     Commands$p[command] = wrapExtensionSearchCommand(command);
   }
   Commands$p['hotReload'] = hotReload$d;
+  Commands$p['focus'] = focus$7;
   return Commands$p;
 };
 
@@ -21898,6 +21932,7 @@ const ViewletExtensions_ipc = {
   Css: Css$o,
   create: create$s,
   dispose: dispose$i,
+  focus: focus$7,
   getCommands: getCommands$h,
   getKeyBindings: getKeyBindings$d,
   getMenus: getMenus$a,
@@ -22517,7 +22552,7 @@ const ViewletKeyBindings_ipc = {
 
 const Deb = 'Deb';
 
-const commit = 'e4aec39';
+const commit = 'aca8733';
 
 const getAutoUpdateType = () => {
   return invoke$F('AutoUpdater.getAutoUpdateType');
@@ -23809,19 +23844,21 @@ const toggleSecondarySideBar = state => {
   // @ts-ignore
   return toggle(state, SecondarySideBar);
 };
-const openChat = async state => {
+const openChat = async (state, focus = false) => {
   if (state.secondarySideBarVisible && state.secondarySideBarView === Chat) {
+    const focusCommands = focus ? await getFocusCommands(Chat) : [];
     return {
       newState: state,
-      commands: []
+      commands: focusCommands
     };
   }
   // @ts-ignore
   const openResult = await openSecondarySideBarView(state, Chat);
   const showResult = await showSecondarySideBar(openResult.newState);
+  const focusCommands = focus ? await getFocusCommands(Chat) : [];
   return {
     newState: showResult.newState,
-    commands: [...openResult.commands, ...showResult.commands]
+    commands: [...openResult.commands, ...showResult.commands, ...focusCommands]
   };
 };
 const closeChat = state => {
@@ -25120,7 +25157,15 @@ const getSideBarPosition = state => {
   return state.sideBarLocation;
 };
 const openSideBarView = async (state, moduleId, focus = false, args) => {
-  return showSideBar(state, moduleId);
+  const result = await showSideBar(state, moduleId);
+  if (!focus) {
+    return result;
+  }
+  const focusCommands = await getFocusCommands(moduleId);
+  return {
+    newState: result.newState,
+    commands: [...result.commands, ...focusCommands]
+  };
 };
 const openSecondarySideBarView = async (state, moduleId, focus = false, args) => {
   const {
@@ -26544,15 +26589,15 @@ const create$m = (id, uri, x, y, width, height) => {
   };
 };
 const saveState$9 = async state => {
-  const saved = await invoke$s('MainArea.saveState', state.uid);
+  const saved = await invoke$z('MainArea.saveState', state.uid);
   return saved;
 };
 const loadContent$m = async (state, savedState) => {
   {
-    await invoke$s('MainArea.create', state.uid, '', state.x, state.y, state.width, state.height, null);
-    await invoke$s('MainArea.loadContent', state.uid, savedState);
-    const diffResult = await invoke$s('MainArea.diff2', state.uid);
-    const commands = await invoke$s('MainArea.render2', state.uid, diffResult);
+    await invoke$z('MainArea.create', state.uid, '', state.x, state.y, state.width, state.height, null);
+    await invoke$z('MainArea.loadContent', state.uid, savedState);
+    const diffResult = await invoke$z('MainArea.diff2', state.uid);
+    const commands = await invoke$z('MainArea.render2', state.uid, diffResult);
     return {
       ...state,
       commands
@@ -26560,10 +26605,10 @@ const loadContent$m = async (state, savedState) => {
   }
 };
 const hotReload$9 = async state => {
-  await invoke$s('MainArea.create', state.uid, '', state.x, state.y, state.width, state.height, null);
-  await invoke$s('MainArea.loadContent', state.uid, {});
-  const diffResult = await invoke$s('MainArea.diff2', state.uid);
-  const commands = await invoke$s('MainArea.render2', state.uid, diffResult);
+  await invoke$z('MainArea.create', state.uid, '', state.x, state.y, state.width, state.height, null);
+  await invoke$z('MainArea.loadContent', state.uid, {});
+  const diffResult = await invoke$z('MainArea.diff2', state.uid);
+  const commands = await invoke$z('MainArea.render2', state.uid, diffResult);
   return {
     ...state,
     commands
@@ -26577,7 +26622,7 @@ const executeEditorCommand = async (editor, commandId) => {
 const focusEditor = editor => {
   return executeEditorCommand(editor, 'focus');
 };
-const focus$4 = async state => {
+const focus$6 = async state => {
   const {
     editors,
     activeIndex
@@ -26609,18 +26654,18 @@ const shouldRenderLoadingState = key => {
   return commandsThatOpenEditors.has(key) && get$e('workbench.editor.showTabsWhileLoading') === true;
 };
 const renderPendingState = async uid => {
-  const diffResult = await invoke$s('MainArea.diff2', uid);
+  const diffResult = await invoke$z('MainArea.diff2', uid);
   if (diffResult.length === 0) {
     return;
   }
-  const commands = await invoke$s('MainArea.render2', uid, diffResult);
+  const commands = await invoke$z('MainArea.render2', uid, diffResult);
   if (commands.length === 0) {
     return;
   }
   await invoke$I('Viewlet.sendMultiple', commands);
 };
 const invokeMainAreaCommand = async (key, uid, args) => {
-  const commandPromise = invoke$s(`MainArea.${key}`, uid, ...args);
+  const commandPromise = invoke$z(`MainArea.${key}`, uid, ...args);
   if (!shouldRenderLoadingState(key)) {
     await commandPromise;
     return;
@@ -26641,7 +26686,7 @@ const invokeMainAreaCommand = async (key, uid, args) => {
 const wrapMainAreaCommand = key => {
   const fn = async (state, ...args) => {
     if (key === 'resize') {
-      const commands = await invoke$s(`MainArea.${key}`, state.uid, ...args);
+      const commands = await invoke$z(`MainArea.${key}`, state.uid, ...args);
       array(commands);
       return {
         ...state,
@@ -26649,11 +26694,11 @@ const wrapMainAreaCommand = key => {
       };
     }
     await invokeMainAreaCommand(key, state.uid, args);
-    const diffResult = await invoke$s('MainArea.diff2', state.uid);
+    const diffResult = await invoke$z('MainArea.diff2', state.uid);
     if (diffResult.length === 0) {
       return state;
     }
-    const commands = await invoke$s('MainArea.render2', state.uid, diffResult);
+    const commands = await invoke$z('MainArea.render2', state.uid, diffResult);
     if (commands.length === 0) {
       return state;
     }
@@ -26667,7 +26712,7 @@ const wrapMainAreaCommand = key => {
 
 const Commands$k = {};
 const getCommands$e = async () => {
-  const commands = await invoke$s('MainArea.getCommandIds');
+  const commands = await invoke$z('MainArea.getCommandIds');
   for (const command of commands) {
     Commands$k[command] = wrapMainAreaCommand(command);
   }
@@ -26721,12 +26766,12 @@ const getQuickPickMenuEntries = () => {
 const menus$a = [];
 const getMenus$8 = async () => {
   try {
-    const ids = await invoke$s('MainArea.getMenuIds');
+    const ids = await invoke$z('MainArea.getMenuIds');
     const adjusted = ids.map(id => {
       return {
         id,
         async getMenuEntries(...args) {
-          const entries = await invoke$s('MainArea.getMenuEntries', ...args);
+          const entries = await invoke$z('MainArea.getMenuEntries', ...args);
           return entries;
         }
       };
@@ -26750,7 +26795,7 @@ const renderItems$a = {
 };
 const render$j = [renderItems$a];
 const renderEventListeners$e = async () => {
-  const listeners = await invoke$s('MainArea.renderEventListeners');
+  const listeners = await invoke$z('MainArea.renderEventListeners');
   return listeners;
 };
 
@@ -26825,7 +26870,7 @@ const ViewletMain_ipc = {
   Variables: Variables$5,
   create: create$m,
   dispose: dispose$f,
-  focus: focus$4,
+  focus: focus$6,
   getCommands: getCommands$e,
   getKeyBindings: getKeyBindings$9,
   getMenus: getMenus$8,
@@ -27881,11 +27926,11 @@ const create$d = (id, uri, x, y, width, height, args, parentUid) => {
 };
 const loadContent$d = async (state, savedState) => {
   const isTest$1 = isTest();
-  await invoke$w('RunAndDebug.create', state.uid, state.uri, state.x, state.y, state.width, state.height);
-  await invoke$w('RunAndDebug.loadContent', state.uid, isTest$1, savedState);
-  const diffResult = await invoke$w('RunAndDebug.diff2', state.uid);
-  const commands = await invoke$w('RunAndDebug.render2', state.uid, diffResult);
-  const actionsDom = await invoke$w('RunAndDebug.renderActions', state.uid);
+  await invoke$v('RunAndDebug.create', state.uid, state.uri, state.x, state.y, state.width, state.height);
+  await invoke$v('RunAndDebug.loadContent', state.uid, isTest$1, savedState);
+  const diffResult = await invoke$v('RunAndDebug.diff2', state.uid);
+  const commands = await invoke$v('RunAndDebug.render2', state.uid, diffResult);
+  const actionsDom = await invoke$v('RunAndDebug.renderActions', state.uid);
   const debugId = isTest$1 ? 'test-debug' : 'node-debug'; // TODO
   return {
     ...state,
@@ -27906,17 +27951,17 @@ const hotReload$5 = 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$w('RunAndDebug.saveState', state.uid);
+  const savedState = await invoke$v('RunAndDebug.saveState', state.uid);
   await restart$h('RunAndDebug.terminate');
   const oldState = {
     ...state,
     items: []
   };
-  await invoke$w('RunAndDebug.create', state.uid, state.uri, state.x, state.y, state.width, state.height, null, state.parentUid, state.platform);
-  await invoke$w('RunAndDebug.loadContent', state.uid, state.isTest, savedState);
-  await invoke$w('RunAndDebug.loadContentLater', state.uid);
-  const diffResult = await invoke$w('RunAndDebug.diff2', state.uid);
-  const commands = await invoke$w('RunAndDebug.render2', state.uid, diffResult);
+  await invoke$v('RunAndDebug.create', state.uid, state.uri, state.x, state.y, state.width, state.height, null, state.parentUid, state.platform);
+  await invoke$v('RunAndDebug.loadContent', state.uid, state.isTest, savedState);
+  await invoke$v('RunAndDebug.loadContentLater', state.uid);
+  const diffResult = await invoke$v('RunAndDebug.diff2', state.uid);
+  const commands = await invoke$v('RunAndDebug.render2', state.uid, diffResult);
   return {
     ...oldState,
     commands,
@@ -27929,6 +27974,12 @@ const contentLoaded = async () => {
   // await Debug.start(debugId)
   return [];
 };
+const focus$5 = state => {
+  return {
+    ...state,
+    commands: [['Viewlet.focusSelector', '.RunAndDebug']]
+  };
+};
 
 // TODO maybe store scope chain elements as tree
 // TODO when collapsing, store collapsed elements by parent id in cache
@@ -27971,19 +28022,19 @@ const resize$a = (state, dimensions) => {
   };
 };
 const saveState$3 = async state => {
-  const savedState = await invoke$w('RunAndDebug.saveState', state.uid);
+  const savedState = await invoke$v('RunAndDebug.saveState', state.uid);
   return savedState;
 };
 
 const wrapRunAndDebugCommand = key => {
   const fn = async (state, ...args) => {
-    await invoke$w(`RunAndDebug.${key}`, state.uid, ...args);
-    const diffResult = await invoke$w('RunAndDebug.diff2', state.uid);
+    await invoke$v(`RunAndDebug.${key}`, state.uid, ...args);
+    const diffResult = await invoke$v('RunAndDebug.diff2', state.uid);
     if (diffResult.length === 0) {
       return state;
     }
-    const commands = await invoke$w('RunAndDebug.render2', state.uid, diffResult);
-    const actionsDom = await invoke$w('RunAndDebug.renderActions', state.uid);
+    const commands = await invoke$v('RunAndDebug.render2', state.uid, diffResult);
+    const actionsDom = await invoke$v('RunAndDebug.renderActions', state.uid);
     if (commands.length === 0) {
       return state;
     }
@@ -28000,11 +28051,12 @@ const wrapRunAndDebugCommand = key => {
 
 const Commands$b = {};
 const getCommands$7 = async () => {
-  const commands = await invoke$w('RunAndDebug.getCommandIds');
+  const commands = await invoke$v('RunAndDebug.getCommandIds');
   for (const command of commands) {
     Commands$b[command] = wrapRunAndDebugCommand(command);
   }
   Commands$b['hotReload'] = hotReload$5;
+  Commands$b['focus'] = focus$5;
   return Commands$b;
 };
 
@@ -28014,13 +28066,13 @@ const Variables$2 = ['TitleBarForeground', 'DebugSectionHeaderBackground', 'Side
 const Events$2 = {};
 
 const getKeyBindings$5 = () => {
-  return invoke$w('RunAndDebug.getKeyBindings');
+  return invoke$v('RunAndDebug.getKeyBindings');
 };
 
 const menus$7 = [];
 const getMenus$6 = async () => {
   try {
-    const modules = await invoke$w('RunAndDebug.getMenuEntries');
+    const modules = await invoke$v('RunAndDebug.getMenuEntries');
     const adjusted = modules.map(module => {
       return {
         ...module,
@@ -28047,7 +28099,7 @@ const renderItems$5 = {
 };
 const render$d = [renderItems$5];
 const renderEventListeners$8 = async () => {
-  const listeners = await invoke$w('RunAndDebug.renderEventListeners');
+  const listeners = await invoke$v('RunAndDebug.renderEventListeners');
   return listeners;
 };
 
@@ -28072,6 +28124,7 @@ const ViewletRunAndDebug_ipc = {
   contentLoaded,
   create: create$d,
   dispose: dispose$9,
+  focus: focus$5,
   getCommands: getCommands$7,
   getKeyBindings: getKeyBindings$5,
   getMenus: getMenus$6,
@@ -29045,7 +29098,7 @@ const resize$7 = async (state, dimensions) => {
     commands
   };
 };
-const focus$3 = async state => {
+const focus$4 = async state => {
   const {
     currentViewletId
   } = state;
@@ -29072,7 +29125,7 @@ const handleUpdateStateChange$1 = state => {
 
 // prettier-ignore
 const Commands$7 = {
-  focus: focus$3,
+  focus: focus$4,
   openViewlet: openViewlet$1,
   show: openViewlet$1,
   open: openViewlet$1,
@@ -29149,7 +29202,7 @@ const ViewletSideBar_ipc = {
   close: close$1,
   create: create$8,
   dispose: dispose$5,
-  focus: focus$3,
+  focus: focus$4,
   handleClickAction: handleClickAction$1,
   handleSideBarViewletChange,
   handleUpdateStateChange: handleUpdateStateChange$1,
@@ -29272,7 +29325,7 @@ const resize$6 = async (state, dimensions) => {
   await resize$n(currentViewletUid, childDimensions);
   return newState;
 };
-const focus$2 = async state => {
+const focus$3 = async state => {
   const {
     currentViewletId
   } = state;
@@ -29289,7 +29342,7 @@ const handleUpdateStateChange = state => {
 
 // prettier-ignore
 const Commands$6 = {
-  focus: focus$2,
+  focus: focus$3,
   openViewlet: openViewlet,
   show: openViewlet,
   open: openViewlet,
@@ -29334,7 +29387,7 @@ const ViewletSecondarySideBar_ipc = {
   close,
   create: create$7,
   dispose: dispose$4,
-  focus: focus$2,
+  focus: focus$3,
   handleClickAction: handleClickAction$1,
   handleSecondarySideBarViewletChange,
   handleUpdateStateChange,
@@ -29426,7 +29479,7 @@ const resizeWebContentsView = async (id, x, y, width, height) => {
 const setIframeSrc = async (id, iframeSrc) => {
   return invoke$1('ElectronWebContentsView.setIframeSrc', id, iframeSrc);
 };
-const focus$1 = id => {
+const focus$2 = id => {
   return invoke$1('ElectronWebContentsView.focus', id);
 };
 const capturePage = id => {
@@ -29765,7 +29818,7 @@ const go = state => {
   const iframeSrc = toIframeSrc(inputValue, shortcuts);
   // TODO await promises
   void setIframeSrc(browserViewId, iframeSrc);
-  void focus$1(browserViewId);
+  void focus$2(browserViewId);
   return {
     ...state,
     iframeSrc,
@@ -30282,6 +30335,12 @@ const handleInput = (state, text) => {
     inputValue: text
   };
 };
+const focus$1 = state => {
+  return {
+    ...state,
+    commands: [['Viewlet.focusSelector', '.SourceControlHeader input']]
+  };
+};
 const updateIcon = displayItem => {
   if (displayItem.type === File$1) {
     return {
@@ -30420,6 +30479,7 @@ const getCommands$3 = async () => {
   Commands$4['getInfo'] = ({
     uid
   }) => invoke$l('SourceControl.getInfo', uid);
+  Commands$4['focus'] = focus$1;
   return Commands$4;
 };
 
@@ -30500,6 +30560,7 @@ const ViewletSourceControl_ipc = {
   Events,
   create: create$5,
   dispose: dispose$1,
+  focus: focus$1,
   getCommands: getCommands$3,
   getKeyBindings: getKeyBindings$1,
   getMenus: getMenus$2,