@lvce-editor/static-server 0.48.1 → 0.48.3

package/static/{b61a0dd → a66f6c1}/packages/renderer-worker/dist/rendererWorkerMain.js

@@ -110,7 +110,7 @@ const getAssetDir = () => {
   // @ts-ignore
   {
     // @ts-ignore
-    return '/b61a0dd';
+    return '/a66f6c1';
   }
 };
 const assetDir = getAssetDir();
@@ -514,7 +514,7 @@ const EditorError = 16;
 const ErrorHandling = 18;
 const ExtensionHostCode = 19;
 const ExtensionMeta = 20;
-const Extensions$3 = 21;
+const Extensions$2 = 21;
 const FileSystem = 22;
 const Format = 23;
 const IconTheme = 24;
@@ -681,7 +681,7 @@ const getModuleId$1 = commandId => {
     case 'ExtensionMeta':
       return ExtensionMeta;
     case 'Extensions':
-      return Extensions$3;
+      return Extensions$2;
     case 'FilePicker':
       return FilePicker;
     case 'FileSystem':
@@ -3101,7 +3101,6 @@ const FocusActivityBar = 5;
 const FocusDebugInput = 6;
 const FocusDialog = 7;
 const FocusEditorRename = 11;
-const FocusExtensions = 15;
 const FocusFindWidget = 16;
 const FocusMenu = 18;
 const FocusProblems = 19;
@@ -3565,7 +3564,7 @@ const Error$3 = 'Error';
 const EmptyEditor = 'EmptyEditor';
 const Explorer$1 = 'Explorer';
 const ExtensionDetail = 'ExtensionDetail';
-const Extensions$2 = 'Extensions';
+const Extensions$1 = 'Extensions';
 const Iframe = 'Iframe';
 const Implementations = 'Implementations';
 const KeyBindings = 'KeyBindings';
@@ -3632,7 +3631,7 @@ const ViewletModuleId = {
   Error: Error$3,
   Explorer: Explorer$1,
   ExtensionDetail,
-  Extensions: Extensions$2,
+  Extensions: Extensions$1,
   Iframe,
   IframeInspector,
   Implementations,
@@ -5363,7 +5362,7 @@ const load$3 = moduleId => {
       return Promise.resolve().then(function () { return ExtensionHostCore_ipc; });
     case ExtensionMeta:
       return Promise.resolve().then(function () { return ExtensionMeta_ipc; });
-    case Extensions$3:
+    case Extensions$2:
       return Promise.resolve().then(function () { return Extensions_ipc; });
     case FilePicker:
       return Promise.resolve().then(function () { return FilePicker_ipc; });
@@ -5919,7 +5918,7 @@ const map = {
   [EmptyEditor]: () => Promise.resolve().then(function () { return ViewletEmptyEditor_ipc; }),
   [Explorer$1]: () => Promise.resolve().then(function () { return ViewletExplorer_ipc; }),
   [ExtensionDetail]: () => Promise.resolve().then(function () { return ViewletExtensionDetail_ipc; }),
-  [Extensions$2]: () => Promise.resolve().then(function () { return ViewletExtensions_ipc; }),
+  [Extensions$1]: () => Promise.resolve().then(function () { return ViewletExtensions_ipc; }),
   [Implementations]: () => Promise.resolve().then(function () { return ViewletImplementations_ipc; }),
   [InlineDiffEditor$1]: () => Promise.resolve().then(function () { return ViewletInlineDiffEditor_ipc; }),
   [KeyBindings]: () => Promise.resolve().then(function () { return ViewletKeyBindings_ipc; }),
@@ -5974,6 +5973,20 @@ const getWatchConfig = () => {
       command: 'ExtensionDetail.hotReload'
     });
   }
+  const extensionSearchViewWorkerPath = get$d('develop.extensionSearchViewWorkerPath');
+  if (extensionDetail) {
+    watchConfig.push({
+      path: extensionSearchViewWorkerPath,
+      command: 'Extensions.hotReload'
+    });
+  }
+  const iframeInspector = get$d('develop.iframeInspectorWorkerPath');
+  if (iframeInspector) {
+    watchConfig.push({
+      path: iframeInspector,
+      command: 'IframeInspector.hotReload'
+    });
+  }
   const keyBindings = get$d('develop.keyBindingsViewWorkerPath');
   if (keyBindings) {
     watchConfig.push({
@@ -10106,7 +10119,7 @@ const openFile$3 = () => {
       return openFileElectron();
   }
 };
-const handleClick$8 = async index => {
+const handleClick$7 = async index => {
   // @ts-ignore
   const {
     options
@@ -10143,7 +10156,7 @@ const showMessage = async (message, options) => {
       // TODO can this even happen?
       return;
     }
-    await handleClick$8(index);
+    await handleClick$7(index);
   } else {
     await openWidget(Dialog, message, options);
   }
@@ -10153,7 +10166,7 @@ const name$1_ = 'Dialog';
 const Commands$1U = {
   // @ts-ignore
   close: undefined,
-  handleClick: handleClick$8,
+  handleClick: handleClick$7,
   openFile: openFile$3,
   openFolder: openFolder$4,
   showMessage: showMessage
@@ -10659,7 +10672,7 @@ const ClearAll = 'ClearAll';
 const CollapseAll$1 = 'CollapseAll';
 const DebugAlt2 = 'DebugAlt2';
 const Ellipsis = 'Ellipsis';
-const Extensions$1 = 'Extensions';
+const Extensions = 'Extensions';
 const Files = 'Files';
 const Refresh$1 = 'Refresh';
 const RecordKey = 'RecordKey';
@@ -10688,7 +10701,7 @@ const getFileIcon = uri => {
     return `MaskIcon${RecordKey}`;
   }
   if (uri.startsWith('extension-detail://')) {
-    return `MaskIcon${Extensions$1}`;
+    return `MaskIcon${Extensions}`;
   }
   const baseName = pathBaseName(uri);
   const icon = getFileIcon$1({
@@ -11031,7 +11044,7 @@ const hydrate = async () => {
   // TODO send menu items to electron
   // TODO add listener for when menu items change
 };
-const handleClick$7 = async label => {
+const handleClick$6 = async label => {
   const commandPair = state$g.commandMap[label];
   if (!commandPair) {
     throw new Error(`no command found for ${label}`);
@@ -11047,7 +11060,7 @@ const name$1X = 'ElectronApplicationMenu';
 
 // prettier-ignore
 const Commands$1Q = {
-  handleClick: handleClick$7,
+  handleClick: handleClick$6,
   hydrate: hydrate
 };
 
@@ -11153,7 +11166,7 @@ const getCommandsFromExtension = extension => {
 const getCommandsFromExtensions = extensions => {
   return extensions.flatMap(getCommandsFromExtension);
 };
-const getCommands$7 = async () => {
+const getCommands$8 = async () => {
   const extensions = await getExtensions$1();
   const commands = getCommandsFromExtensions(extensions);
   return commands;
@@ -11218,7 +11231,7 @@ const name$1Q = 'ExtensionHost';
 // prettier-ignore
 const Commands$1J = {
   loadWebExtension: loadWebExtension,
-  getCommands: getCommands$7,
+  getCommands: getCommands$8,
   executeCommand: executeCommand,
   searchFileWithFetch: searchFileWithFetch,
   searchFileWithHtml: searchFileWithHtml,
@@ -12929,7 +12942,7 @@ const showWithOptions = async (type, text, options) => {
   });
   await invoke$h(/* Notification.createWithOptions */993, /* type */type, /* text */text, /* options */options);
 };
-const handleClick$6 = index => {
+const handleClick$5 = index => {
   console.log('handle click');
   const notification = state$8.notifications[0];
   if (!notification.options) {
@@ -12950,7 +12963,7 @@ const name$1y = 'Notification';
 const Commands$1q = {
   create: create$S,
   dispose: dispose$t,
-  handleClick: handleClick$6,
+  handleClick: handleClick$5,
   showWithOptions: showWithOptions
 };
 
@@ -14198,7 +14211,6 @@ const None$e = 0;
 const About = FocusAbout;
 const ActivityBar$2 = FocusActivityBar;
 const Confirm = FocusConfirm;
-const Extensions = FocusExtensions;
 const Problems = FocusProblems;
 const SourceControlInput = FocusSourceControlInput;
 
@@ -14261,7 +14273,7 @@ const wrapAboutCommand = key => {
 };
 
 const Commands$E = {};
-const getCommands$6 = async () => {
+const getCommands$7 = async () => {
   const commands = await invoke$d('About.getCommandIds');
   for (const command of commands) {
     Commands$E[command] = wrapAboutCommand(command);
@@ -14293,6 +14305,9 @@ const apply = (oldState, newState) => {
     if (command[0] === 'Viewlet.focusSelector') {
       return ['Viewlet.focusSelector', newState.uid, ...command.slice(1)];
     }
+    if (command[0] === 'Viewlet.setValueByName') {
+      return ['Viewlet.setValueByName', newState.uid, ...command.slice(1)];
+    }
     if (command[0] === 'Viewlet.create' || command[0] === 'Viewlet.send' || command[0] === 'Viewlet.createFunctionalRoot' || command[0] === 'Viewlet.setDom2') {
       return command;
     }
@@ -14324,7 +14339,7 @@ const ViewletAbout_ipc = {
   create: create$Q,
   focusNext: focusNext$6,
   focusPrevious: focusPrevious$6,
-  getCommands: getCommands$6,
+  getCommands: getCommands$7,
   getKeyBindings: getKeyBindings$i,
   handleClickClose: handleClickClose$3,
   handleClickCopy,
@@ -14426,9 +14441,9 @@ const getActivityBarItems = () => {
     flags: Tab | Enabled,
     keyShortcuts: 'Control+Shift+D'
   }, {
-    id: Extensions$2,
+    id: Extensions$1,
     title: extensions(),
-    icon: Extensions$1,
+    icon: Extensions,
     flags: Tab | Enabled,
     keyShortcuts: 'Control+Shift+X'
   },
@@ -14622,7 +14637,7 @@ const Commands$D = {
 };
 
 // prettier-ignore
-const LazyCommands$9 = {
+const LazyCommands$8 = {
   focus: () => Promise.resolve().then(function () { return ViewletActivityBarFocus; }),
   focusFirst: () => Promise.resolve().then(function () { return ViewletActivityBarFocusFirst; }),
   focusIndex: () => Promise.resolve().then(function () { return ViewletActivityBarFocusIndex; }),
@@ -15045,7 +15060,7 @@ const ViewletActivityBar_ipc = {
   Commands: Commands$D,
   Css: Css$F,
   Events: Events$6,
-  LazyCommands: LazyCommands$9,
+  LazyCommands: LazyCommands$8,
   Variables: Variables$8,
   create: create$P,
   focus: focus$6,
@@ -15400,13 +15415,13 @@ const loadContent$F = async state => {
     text: ''
   };
 };
-const handleInput$3 = (state, value) => {
+const handleInput$2 = (state, value) => {
   return {
     ...state,
     inputValue: value
   };
 };
-const handleFocus$4 = state => {
+const handleFocus$3 = state => {
   setFocus(FocusDebugConsoleInput);
   return state;
 };
@@ -15428,8 +15443,8 @@ const clear$2 = state => {
 };
 
 const Commands$z = {
-  handleInput: handleInput$3,
-  handleFocus: handleFocus$4,
+  handleInput: handleInput$2,
+  handleFocus: handleFocus$3,
   evaluate: evaluate,
   clear: clear$2
 };
@@ -15658,8 +15673,8 @@ const ViewletDebugConsole_ipc = {
   evaluate,
   getKeyBindings: getKeyBindings$f,
   getQuickPickMenuEntries: getQuickPickMenuEntries$3,
-  handleFocus: handleFocus$4,
-  handleInput: handleInput$3,
+  handleFocus: handleFocus$3,
+  handleInput: handleInput$2,
   hasFunctionalRender: hasFunctionalRender$z,
   loadContent: loadContent$F,
   name: name$H,
@@ -15873,7 +15888,7 @@ const loadContent$D = (state, savedState, ...args) => {
   };
 };
 const dispose$p = async state => {};
-const handleClick$5 = async (state, index) => {
+const handleClick$4 = async (state, index) => {
   const {
     options
   } = state;
@@ -15892,7 +15907,7 @@ const handleClick$5 = async (state, index) => {
 
 const Commands$x = {
   close: dispose$p,
-  handleClick: handleClick$5
+  handleClick: handleClick$4
 };
 
 const Css$z = ["/css/parts/ViewletDialog.css", "/css/parts/LegacyDialog.css"];
@@ -15948,7 +15963,7 @@ const ViewletDialog_ipc = {
   Css: Css$z,
   create: create$I,
   dispose: dispose$p,
-  handleClick: handleClick$5,
+  handleClick: handleClick$4,
   hasFunctionalRender: hasFunctionalRender$x,
   loadContent: loadContent$D,
   name: name$G,
@@ -15980,7 +15995,8 @@ const launchIframeInspectorWorker = async () => {
 };
 
 const {
-  invoke: invoke$9
+  invoke: invoke$9,
+  restart: restart$7
 } = getOrCreateWorker(launchIframeInspectorWorker);
 
 const create$H = (id, uri, x, y, width, height) => {
@@ -16003,6 +16019,29 @@ const loadContent$C = async state => {
     commands
   };
 };
+const hotReload$6 = async state => {
+  if (state.isHotReloading) {
+    return state;
+  }
+  // TODO avoid mutation
+  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$9('IframeInspector.saveState', state.uid);
+  await restart$7('IframeInspector.terminate');
+  const oldState = {
+    ...state,
+    items: []
+  };
+  await invoke$9('IframeInspector.create', state.id, state.x, state.y, state.width, state.height);
+  await invoke$9('IframeInspector.loadContent', state.id, savedState);
+  const commands = await invoke$9('IframeInspector.render', oldState.id);
+  return {
+    ...oldState,
+    commands,
+    isHotReloading: false
+  };
+};
 
 const wrapIframeInspectorCommand = key => {
   const fn = async (state, ...args) => {
@@ -16020,12 +16059,12 @@ const wrapIframeInspectorCommand = key => {
 };
 
 const Commands$w = {};
-const getCommands$5 = async () => {
-  // TODO
+const getCommands$6 = async () => {
   const commands = await invoke$9('IframeInspector.getCommandIds');
   for (const command of commands) {
     Commands$w[command] = wrapIframeInspectorCommand(command);
   }
+  Commands$w['hotReload'] = hotReload$6;
   return Commands$w;
 };
 
@@ -16058,11 +16097,12 @@ const ViewletIframeInspector_ipc = {
   Commands: Commands$w,
   Css: Css$y,
   create: create$H,
-  getCommands: getCommands$5,
+  getCommands: getCommands$6,
   getKeyBindings: getKeyBindings$e,
   hasFunctionalEvents: hasFunctionalEvents$6,
   hasFunctionalRender: hasFunctionalRender$w,
   hasFunctionalRootRender: hasFunctionalRootRender$i,
+  hotReload: hotReload$6,
   loadContent: loadContent$C,
   name: name$F,
   render: render$z,
@@ -16397,7 +16437,7 @@ const loadContent$B = async (state, savedState) => {
 const Commands$v = {};
 
 // prettier-ignore
-const LazyCommands$8 = {
+const LazyCommands$7 = {
   setDeltaY: () => Promise.resolve().then(function () { return VirtualListSetDeltaY; }),
   handleWheel: () => Promise.resolve().then(function () { return VirtualListHandleWheel; })
 };
@@ -16833,7 +16873,7 @@ const ViewletDiffEditor_ipc = {
   __proto__: null,
   Commands: Commands$v,
   Css: Css$w,
-  LazyCommands: LazyCommands$8,
+  LazyCommands: LazyCommands$7,
   create: create$F,
   getDynamicCss,
   hasFunctionalRender: hasFunctionalRender$v,
@@ -17158,7 +17198,7 @@ const runAll = state => {
   console.log('run all');
   return state;
 };
-const handleContextMenu$7 = async (state, button, x, y) => {
+const handleContextMenu$6 = async (state, button, x, y) => {
   const index = getIndex$1(state.y, y);
   // @ts-ignore
   state.index = index;
@@ -17184,7 +17224,7 @@ const Commands$t = {
   handleClickAt: handleClickAt$2,
   handleLoad: handleLoad,
   runAll: runAll,
-  handleContextMenu: handleContextMenu$7,
+  handleContextMenu: handleContextMenu$6,
   openInNewTab: openInNewTab
 };
 
@@ -17317,7 +17357,7 @@ const ViewletE2eTests_ipc = {
   executeTest,
   getKeyBindings: getKeyBindings$c,
   handleClickAt: handleClickAt$2,
-  handleContextMenu: handleContextMenu$7,
+  handleContextMenu: handleContextMenu$6,
   handleLoad,
   hasFunctionalRender: hasFunctionalRender$t,
   hasFunctionalRootRender: hasFunctionalRootRender$f,
@@ -18053,7 +18093,7 @@ const launchExplorerWorker = async () => {
 
 const {
   invoke: invoke$6,
-  restart: restart$5
+  restart: restart$6
 } = getOrCreateWorker(launchExplorerWorker);
 
 // TODO viewlet should only have create and refresh functions
@@ -18126,7 +18166,7 @@ const resize$k = (state, dimensions) => {
     maxLineY
   };
 };
-const hotReload$4 = async state => {
+const hotReload$5 = async state => {
   if (state.isHotReloading) {
     return state;
   }
@@ -18135,7 +18175,7 @@ const hotReload$4 = async state => {
   // possible TODO race condition during hot reload
   // there could still be pending promises when the worker is disposed
   const savedState = await invoke$6('Explorer.saveState', state.uid);
-  await restart$5('Explorer.terminate');
+  await restart$6('Explorer.terminate');
   const oldState = {
     ...state,
     items: []
@@ -18165,8 +18205,8 @@ const wrapExplorerCommand = key => {
 };
 
 const Commands$q = {};
-Commands$q['hotReload'] = hotReload$4;
-const getCommands$4 = async () => {
+Commands$q['hotReload'] = hotReload$5;
+const getCommands$5 = async () => {
   const commands = await invoke$6('Explorer.getCommandIds');
   for (const command of commands) {
     Commands$q[command] = wrapExplorerCommand(command);
@@ -18318,14 +18358,14 @@ const ViewletExplorer_ipc = {
   Events: Events$4,
   create: create$w,
   dispose: dispose$m,
-  getCommands: getCommands$4,
+  getCommands: getCommands$5,
   getDisplayName: getDisplayName$1,
   getKeyBindings: getKeyBindings$a,
   hasFunctionalEvents: hasFunctionalEvents$5,
   hasFunctionalRender: hasFunctionalRender$r,
   hasFunctionalResize: hasFunctionalResize$f,
   hasFunctionalRootRender: hasFunctionalRootRender$e,
-  hotReload: hotReload$4,
+  hotReload: hotReload$5,
   loadContent: loadContent$w,
   menus: menus$8,
   name: name$z,
@@ -18364,7 +18404,7 @@ const launchExtensionDetailViewWorker = async () => {
 
 const {
   invoke: invoke$5,
-  restart: restart$4
+  restart: restart$5
 } = getOrCreateWorker(launchExtensionDetailViewWorker);
 
 const None$9 = 0;
@@ -18414,7 +18454,7 @@ const loadContent$v = async (state, savedState) => {
     dom
   };
 };
-const hotReload$3 = async state => {
+const hotReload$4 = async state => {
   if (state.isHotReloading) {
     return state;
   }
@@ -18422,7 +18462,7 @@ const hotReload$3 = async state => {
   state.isHotReloading = true;
   // possible TODO race condition during hot reload
   // there could still be pending promises when the worker is disposed
-  await restart$4('ExtensionDetail.terminate');
+  await restart$5('ExtensionDetail.terminate');
   await invoke$5('ExtensionDetail.create', state.uid, state.uri, state.x, state.y, state.width, state.height, 0, assetDir);
   await invoke$5('ExtensionDetail.loadContent', state.uid, {});
   const dom = await invoke$5('ExtensionDetail.getVirtualDom2', state.uid);
@@ -18469,7 +18509,7 @@ const Commands$p = {
   handleIconError: wrapExtensionDetailCommand('handleIconError'),
   handleReadmeContextMenu: wrapExtensionDetailCommand('handleReadmeContextMenu'),
   handleTabsClick: wrapExtensionDetailCommand('handleTabsClick'),
-  hotReload: hotReload$3,
+  hotReload: hotReload$4,
   selectTab: wrapExtensionDetailCommand('selectTab')
 };
 
@@ -18526,7 +18566,7 @@ const ViewletExtensionDetail_ipc = {
   hasFunctionalRender: hasFunctionalRender$q,
   hasFunctionalResize: hasFunctionalResize$e,
   hasFunctionalRootRender: hasFunctionalRootRender$d,
-  hotReload: hotReload$3,
+  hotReload: hotReload$4,
   loadContent: loadContent$v,
   menus: menus$7,
   name: name$y,
@@ -18536,8 +18576,6 @@ const ViewletExtensionDetail_ipc = {
   saveState: saveState$c
 };
 
-const ExtensionListItemHeight = 72;
-
 const extensionSearchViewWorkerUrl = `${assetDir}/packages/extension-search-view-worker/dist/extensionSearchViewWorkerMain.js`;
 
 const getConfiguredWorkerUrl$3 = () => {
@@ -18563,188 +18601,37 @@ const launchExtensionSearchViewWorker = async () => {
 };
 
 const {
-  invoke: invoke$4} = getOrCreateWorker(launchExtensionSearchViewWorker);
-
-const getFinalDeltaY = (height, itemHeight, itemsLength) => {
-  const contentHeight = itemsLength * itemHeight;
-  const finalDeltaY = Math.max(contentHeight - height, 0);
-  return finalDeltaY;
-};
-
-const searchExtensions = async (extensions, value) => {
-  const filteredExtensions = await invoke$4('SearchExtensions.searchExtensions', extensions, value);
-  return filteredExtensions;
-};
-
-const getListHeight$1 = state => {
-  const {
-    height,
-    headerHeight
-  } = state;
-  return height - headerHeight;
-};
-
-/**
- * @enum {string}
- */
-const UiStrings$c = {
-  NoExtensionsFound: 'No extensions found.',
-  Refresh: 'Refresh',
-  Enable: 'Enable',
-  Disable: 'Disable',
-  Uninstall: 'Uninstall',
-  InstallAnotherVersion: 'Install Another Version',
-  SearchExtensionsInMarketplace: 'Search Extensions in Marketplace',
-  ViewsAndMoreActions: 'Views and more Actions...'};
-const noExtensionsFound = () => {
-  return i18nString(UiStrings$c.NoExtensionsFound);
-};
-const refresh$2 = () => {
-  return i18nString(UiStrings$c.Refresh);
-};
-const enable = () => {
-  return i18nString(UiStrings$c.Enable);
-};
-const disable = () => {
-  return i18nString(UiStrings$c.Disable);
-};
-const uninstall = () => {
-  return i18nString(UiStrings$c.Uninstall);
-};
-const installAnotherVersion = () => {
-  return i18nString(UiStrings$c.InstallAnotherVersion);
-};
-const searchExtensionsInMarketPlace = () => {
-  return i18nString(UiStrings$c.SearchExtensionsInMarketplace);
-};
-const viewsAndMoreActions = () => {
-  return i18nString(UiStrings$c.ViewsAndMoreActions);
-};
-
-// TODO debounce
-const handleInput$2 = async (state, value) => {
-  try {
-    const {
-      allExtensions,
-      itemHeight,
-      minimumSliderSize,
-      height
-    } = state;
-    // TODO cancel ongoing requests
-    // TODO handle errors
-    const items = await searchExtensions(allExtensions, value);
-    if (items.length === 0) {
-      return {
-        ...state,
-        items,
-        minLineY: 0,
-        deltaY: 0,
-        allExtensions,
-        maxLineY: 0,
-        scrollBarHeight: 0,
-        finalDeltaY: 0,
-        message: noExtensionsFound(),
-        searchValue: value,
-        placeholder: searchExtensionsInMarketPlace()
-      };
-    }
-    const listHeight = getListHeight$1(state);
-    const total = items.length;
-    const contentHeight = total * itemHeight;
-    const scrollBarHeight = getScrollBarSize(height, contentHeight, minimumSliderSize);
-    const numberOfVisible = getNumberOfVisibleItems(listHeight, itemHeight);
-    const maxLineY = Math.min(numberOfVisible, total);
-    const finalDeltaY = getFinalDeltaY(listHeight, itemHeight, total);
-    return {
-      ...state,
-      items,
-      minLineY: 0,
-      deltaY: 0,
-      allExtensions,
-      maxLineY,
-      scrollBarHeight,
-      finalDeltaY,
-      message: '',
-      searchValue: value,
-      placeholder: searchExtensionsInMarketPlace()
-    };
-
-    // TODO handle out of order responses (a bit complicated)
-    // for now just assume everything comes back in order
-  } catch (error) {
-    await handleError$2(error);
-    return {
-      ...state,
-      searchValue: value,
-      message: `${error}`
-    };
-  }
-};
-
-const ViewletExtensionsHandleInput = {
-  __proto__: null,
-  handleInput: handleInput$2
-};
-
-const SUGGESTIONS = ['@builtin', '@disabled', '@enabled', '@installed', '@outdated', '@sort:installs', '@id:', '@category'];
+  invoke: invoke$4,
+  restart: restart$4
+} = getOrCreateWorker(launchExtensionSearchViewWorker);
 
 // then state can be recycled by Viewlet when there is only a single ViewletExtensions instance
 
-const saveState$b = state => {
-  const {
-    searchValue
-  } = state;
-  return {
-    searchValue
-  };
+const saveState$b = async state => {
+  const savedState = await invoke$4('SearchExtensions.saveState', state.id);
+  return savedState;
 };
 const create$u = (id, uri, x, y, width, height) => {
   return {
+    id,
     uid: id,
     searchValue: '',
-    suggestionState: /* Closed */0,
-    disposed: false,
     width,
     height,
-    handleOffset: 0,
     x,
     y,
-    message: '',
-    focused: false,
-    size: None$9,
-    ...create$G({
-      itemHeight: ExtensionListItemHeight,
-      minimumSliderSize: minimumSliderSize,
-      headerHeight: 41
-    }),
-    allExtensions: [],
-    placeholder: ''
+    platform: platform,
+    assetDir: assetDir
   };
 };
-const getSavedValue = savedState => {
-  if (savedState && savedState.searchValue) {
-    return savedState.searchValue;
-  }
-  return '';
-};
 const loadContent$u = async (state, savedState) => {
-  const {
-    width
-  } = state;
-  const searchValue = getSavedValue(savedState);
-  // TODO just get local extensions on demand (not when query string is already different)
-  const allExtensions = await getAllExtensions();
-  const size = getViewletSize(width);
-  const newState = await handleInput$2({
+  await invoke$4('SearchExtensions.create', state.id, state.uri, state.x, state.y, state.width, state.height, state.platform, state.assetDir);
+  await invoke$4('SearchExtensions.loadContent', state.id, savedState);
+  const commands = await invoke$4('SearchExtensions.render2', state.id);
+  return {
     ...state,
-    allExtensions,
-    size
-  }, searchValue);
-  const commands = await invoke$4('SearchExtensions.render', state, newState);
-  newState.commands = commands;
-  return newState;
-  // TODO get installed extensions from extension host
-  // TODO just get local extensions on demand (not when query string is already different)
+    commands
+  };
 };
 const dispose$l = () => {};
 
@@ -18752,30 +18639,30 @@ const dispose$l = () => {};
 
 // TODO show error / warning  when installment fails / times out
 const handleInstall = async (state, id) => {
-  await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$2, /* method */'setExtensionState', /* id */id, /* state */'installing');
+  await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$1, /* method */'setExtensionState', /* id */id, /* state */'installing');
   try {
     await install(/* id */id);
   } catch (error) {
     // TODO have multi send command
-    await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$2, /* method */'setExtensionState', /* id */id, /* state */'uninstalled');
+    await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$1, /* method */'setExtensionState', /* id */id, /* state */'uninstalled');
     // TODO use command.execute
     handleError$2(error);
     return;
   }
-  await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$2, /* method */'setExtensionState', /* id */id, /* state */'installed');
+  await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$1, /* method */'setExtensionState', /* id */id, /* state */'installed');
 };
 
 // TODO lazyload this
 const handleUninstall = async (state, id) => {
-  await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$2, /* method */'setExtensionState', /* id */id, /* state */'uninstalling');
+  await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$1, /* method */'setExtensionState', /* id */id, /* state */'uninstalling');
   try {
     await uninstall$1(id);
   } catch (error) {
-    await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$2, /* method */'setExtensionState', /* id */id, /* state */'installed');
+    await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$1, /* method */'setExtensionState', /* id */id, /* state */'installed');
     handleError$2(error);
     return;
   }
-  await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$2, /* method */'setExtensionState', /* id */id, /* state */'uninstalled');
+  await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$1, /* method */'setExtensionState', /* id */id, /* state */'uninstalled');
 };
 
 // TODO lazyload this
@@ -18783,11 +18670,11 @@ const handleEnable = async (state, id) => {
   try {
     await enable$1(id);
   } catch (error) {
-    await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$2, /* method */'setExtensionState', /* id */id, /* state */'disabled');
+    await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$1, /* method */'setExtensionState', /* id */id, /* state */'disabled');
     handleError$2(error);
     return;
   }
-  await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$2, /* method */'setExtensionState', /* id */id, /* state */'enabled');
+  await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$1, /* method */'setExtensionState', /* id */id, /* state */'enabled');
 };
 
 // TODO lazyload this
@@ -18799,26 +18686,16 @@ const handleDisable = async (state, id) => {
     handleError$2(error);
     return;
   }
-  await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$2, /* method */'setExtensionState', /* id */id, /* state */'disabled');
+  await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$1, /* method */'setExtensionState', /* id */id, /* state */'disabled');
 };
 const openSuggest = async state => {
-  const filteredSuggestions = SUGGESTIONS;
-  state.suggestionState = /* Open */1;
-  await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$2, /* method */'openSuggest', /* suggestions */filteredSuggestions);
+  // TODO
 };
 const closeSuggest = async state => {
-  state.suggestionState = /* Closed */0;
-  await invoke$h(/* viewletSend */'Viewlet.send', /* id */Extensions$2, /* method */'closeSuggest');
+  // TODO
 };
 const toggleSuggest = async state => {
-  switch (state.suggestionState) {
-    case /* Closed */0:
-      await openSuggest(state);
-      break;
-    case /* Open */1:
-      await closeSuggest(state);
-      break;
-  }
+  // TODO
 };
 const handleBlur$3 = state => {
   return {
@@ -18826,68 +18703,51 @@ const handleBlur$3 = state => {
     focused: false
   };
 };
-
-const LazyCommands$7 = {
-  focusFirst: () => Promise.resolve().then(function () { return VirtualListFocusFirst; }),
-  focusIndex: () => Promise.resolve().then(function () { return VirtualListFocusIndex; }),
-  focusLast: () => Promise.resolve().then(function () { return VirtualListFocusLast; }),
-  focusNext: () => Promise.resolve().then(function () { return VirtualListFocusNext; }),
-  focusNextPage: () => Promise.resolve().then(function () { return VirtualListFocusNextPage; }),
-  focusPrevious: () => Promise.resolve().then(function () { return VirtualListFocusPrevious; }),
-  focusPreviousPage: () => Promise.resolve().then(function () { return VirtualListFocusPreviousPage; }),
-  handleTouchEnd: () => Promise.resolve().then(function () { return VirtualListHandleTouchEnd; }),
-  handleTouchMove: () => Promise.resolve().then(function () { return VirtualListHandleTouchMove; }),
-  handleTouchStart: () => Promise.resolve().then(function () { return VirtualListHandleTouchStart; }),
-  handleWheel: () => Promise.resolve().then(function () { return VirtualListHandleWheel; }),
-  handleScrollBarMove: () => Promise.resolve().then(function () { return VirtualListHandleScrollBarMove; }),
-  handleScrollBarThumbPointerMove: () => Promise.resolve().then(function () { return VirtualListHandleScrollBarMove; }),
-  handleScrollBarClick: () => Promise.resolve().then(function () { return VirtualListHandleScrollBarClick; }),
-  handleScrollBarCaptureLost: () => Promise.resolve().then(function () { return VirtualListHandleScrollBarCaptureLost; }),
-  handleClickAt: () => Promise.resolve().then(function () { return VirtualListHandleClickAt; }),
-  scrollDown: () => Promise.resolve().then(function () { return VirtualListScrollDown; })
-};
-
-// prettier-ignore
-const Commands$o = {
-  closeSuggest: closeSuggest,
-  handleInstall: handleInstall,
-  handleUninstall: handleUninstall,
-  openSuggest: openSuggest,
-  toggleSuggest: toggleSuggest
+const hotReload$3 = async state => {
+  if (state.isHotReloading) {
+    return state;
+  }
+  // TODO avoid mutation
+  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$4('SearchExtensions.saveState', state.uid);
+  await restart$4('SearchExtensions.terminate');
+  const oldState = {
+    ...state,
+    items: []
+  };
+  await invoke$4('SearchExtensions.create', state.id, state.uri, state.x, state.y, state.width, state.height, state.platform, state.assetDir);
+  await invoke$4('SearchExtensions.loadContent', state.id, savedState);
+  const commands = await invoke$4('SearchExtensions.render2', oldState.id);
+  return {
+    ...oldState,
+    commands,
+    isHotReloading: false
+  };
 };
 
-// prettier-ignore
-const LazyCommands$6 = {
-  handleClick: () => Promise.resolve().then(function () { return ViewletExtensionsHandleClick; }),
-  handleClickCurrent: () => Promise.resolve().then(function () { return ViewletExtensionsHandleClickCurrent; }),
-  handleClickCurrentButKeepFocus: () => Promise.resolve().then(function () { return ViewletExtensionsHandleClickCurrentButKeepFocus; }),
-  handleContextMenu: () => Promise.resolve().then(function () { return ViewletExtensionsHandleContextMenu; }),
-  clearSearchResults: () => Promise.resolve().then(function () { return ViewletExtensionsClearSearchResults; }),
-  handleInput: () => Promise.resolve().then(function () { return ViewletExtensionsHandleInput; }),
-  handleFocus: () => Promise.resolve().then(function () { return ViewletExtensionsHandleFocus; }),
-  ...LazyCommands$7
-};
-const wrapCommand = fn => {
+const wrapExtensionSearchCommand = key => {
   const wrapped = async (state, ...args) => {
-    const newState = await fn(state, ...args);
-    const commands = await invoke$4('SearchExtensions.render', state, newState);
-    newState.commands = commands;
-    return newState;
-  };
-  return wrapped;
-};
-for (const [key, value] of Object.entries(Commands$o)) {
-  Commands$o[key] = wrapCommand(value);
-}
-for (const [key, value] of Object.entries(LazyCommands$6)) {
-  LazyCommands$6[key] = async () => {
-    const module = await value();
-    const fn = module[key];
+    await invoke$4(`SearchExtensions.${key}`, state.uid, ...args);
+    const commands = await invoke$4('SearchExtensions.render2', state.uid);
     return {
-      [key]: wrapCommand(fn)
+      ...state,
+      commands
     };
   };
-}
+  return wrapped;
+};
+
+const Commands$o = {};
+const getCommands$4 = async () => {
+  const commands = await invoke$4('SearchExtensions.getCommandIds');
+  for (const command of commands) {
+    Commands$o[command] = wrapExtensionSearchCommand(command);
+  }
+  Commands$o['hotReload'] = hotReload$3;
+  return Commands$o;
+};
 
 const Css$q = ["/css/parts/ViewletExtensions.css"];
 
@@ -18895,6 +18755,35 @@ const getKeyBindings$9 = () => {
   return invoke$4('SearchExtensions.getKeyBindings');
 };
 
+/**
+ * @enum {string}
+ */
+const UiStrings$c = {
+  Refresh: 'Refresh',
+  Enable: 'Enable',
+  Disable: 'Disable',
+  Uninstall: 'Uninstall',
+  InstallAnotherVersion: 'Install Another Version',
+  ViewsAndMoreActions: 'Views and more Actions...'};
+const refresh$2 = () => {
+  return i18nString(UiStrings$c.Refresh);
+};
+const enable = () => {
+  return i18nString(UiStrings$c.Enable);
+};
+const disable = () => {
+  return i18nString(UiStrings$c.Disable);
+};
+const uninstall = () => {
+  return i18nString(UiStrings$c.Uninstall);
+};
+const installAnotherVersion = () => {
+  return i18nString(UiStrings$c.InstallAnotherVersion);
+};
+const viewsAndMoreActions = () => {
+  return i18nString(UiStrings$c.ViewsAndMoreActions);
+};
+
 const getMenuEntries$b = () => {
   return [{
     id: 'enable',
@@ -18981,34 +18870,27 @@ const renderTitle$3 = {
 
 const hasFunctionalResize$d = true;
 const resize$i = (state, dimensions) => {
-  const {
-    itemHeight,
-    minLineY,
-    items
-  } = state;
-  // TODO should just return new state, render function can take old state and new state and return render commands
-  const listHeight = getListHeight$1({
-    ...state,
-    ...dimensions
-  });
-  const maxLineY = Math.min(minLineY + getNumberOfVisibleItems(listHeight, itemHeight), items.length);
-  const size = getViewletSize(dimensions.width);
-  return {
-    ...state,
-    ...dimensions,
-    maxLineY,
-    size
-  };
+  return state;
+  // // TODO should just return new state, render function can take old state and new state and return render commands
+  // const listHeight = getListHeight({ ...state, ...dimensions })
+  // const maxLineY = Math.min(minLineY + GetNumberOfVisibleItems.getNumberOfVisibleItems(listHeight, itemHeight), items.length)
+  // const size = GetViewletSize.getViewletSize(dimensions.width)
+  // return {
+  //   ...state,
+  //   ...dimensions,
+  //   maxLineY,
+  //   size,
+  // }
 };
 
 const ViewletExtensions_ipc = {
   __proto__: null,
   Commands: Commands$o,
   Css: Css$q,
-  LazyCommands: LazyCommands$6,
   closeSuggest,
   create: create$u,
   dispose: dispose$l,
+  getCommands: getCommands$4,
   getKeyBindings: getKeyBindings$9,
   handleBlur: handleBlur$3,
   handleDisable,
@@ -19017,6 +18899,7 @@ const ViewletExtensions_ipc = {
   handleUninstall,
   hasFunctionalRender: hasFunctionalRender$p,
   hasFunctionalResize: hasFunctionalResize$d,
+  hotReload: hotReload$3,
   loadContent: loadContent$u,
   menus: menus$6,
   name: name$x,
@@ -19605,7 +19488,7 @@ const loadContent$r = async (state, savedState) => {
 const Commands$m = {};
 
 // prettier-ignore
-const LazyCommands$5 = {
+const LazyCommands$6 = {
   setDeltaY: () => Promise.resolve().then(function () { return VirtualListSetDeltaY; }),
   handleWheel: () => Promise.resolve().then(function () { return VirtualListHandleWheel; })
 };
@@ -19768,7 +19651,7 @@ const ViewletInlineDiffEditor_ipc = {
   __proto__: null,
   Commands: Commands$m,
   Css: Css$p,
-  LazyCommands: LazyCommands$5,
+  LazyCommands: LazyCommands$6,
   create: create$r,
   getDynamicCss,
   hasFunctionalRender: hasFunctionalRender$n,
@@ -20874,7 +20757,7 @@ const handleFocusChange$2 = (state, isFocused) => {
     commands
   };
 };
-const handleFocus$3 = state => {
+const handleFocus$2 = state => {
   return handleFocusChange$2(state, true);
 };
 const showE2eTests = async state => {
@@ -21041,7 +20924,7 @@ const CommandsWithSideEffects$1 = {
   moveSideBarRight: moveSideBarRight,
   toggleSideBarPosition: toggleSideBarPosition,
   handleBlur: handleBlur$2,
-  handleFocus: handleFocus$3,
+  handleFocus: handleFocus$2,
   showE2eTests: showE2eTests
 };
 
@@ -21561,7 +21444,7 @@ const ViewletLayout_ipc = {
   getPoints,
   getQuickPickMenuEntries: getQuickPickMenuEntries$1,
   handleBlur: handleBlur$2,
-  handleFocus: handleFocus$3,
+  handleFocus: handleFocus$2,
   handleResize,
   handleSashDoubleClick,
   handleSashPointerDown,
@@ -23085,7 +22968,7 @@ const CommandsWithSideEffectsLazy = {
   handleDropFilePath: () => Promise.resolve().then(function () { return ViewletMainHandleDropFilePath; }),
   splitRight: () => Promise.resolve().then(function () { return ViewletMainSplitRight; })
 };
-const LazyCommands$4 = {
+const LazyCommands$5 = {
   handleTabsWheel: () => Promise.resolve().then(function () { return ViewletMainHandleTabsWheel; }),
   handleTabClick: () => Promise.resolve().then(function () { return ViewletMainFocusIndex; }),
   handleTabsPointerOver: () => Promise.resolve().then(function () { return ViewletMainHandleTabsPointerOver; }),
@@ -23471,7 +23354,7 @@ const ViewletMain_ipc = {
   CommandsWithSideEffects,
   CommandsWithSideEffectsLazy,
   Css: Css$m,
-  LazyCommands: LazyCommands$4,
+  LazyCommands: LazyCommands$5,
   Variables: Variables$7,
   contentLoaded: contentLoaded$5,
   create: create$o,
@@ -24227,7 +24110,7 @@ const handleEditorChange = async editor => {
   const problems = await getProblems();
   await execute$4('Problems.setProblems', problems);
 };
-const handleContextMenu$6 = async (state, eventX, eventY) => {
+const handleContextMenu$5 = async (state, eventX, eventY) => {
   await show$a(eventX, eventY, Problems$2);
   return state;
 };
@@ -24407,7 +24290,7 @@ const Commands$e = {
   getBadgeCount: getBadgeCount,
   handleClickAt: handleClickAt$1,
   handleBlur: handleBlur$1,
-  handleContextMenu: handleContextMenu$6,
+  handleContextMenu: handleContextMenu$5,
   handleFilterInput: handleFilterInput,
   handleArrowLeft: handleArrowLeft$1,
   handleArrowRight: handleArrowRight$1,
@@ -25014,7 +24897,7 @@ const ViewletProblems_ipc = {
   handleArrowRight: handleArrowRight$1,
   handleBlur: handleBlur$1,
   handleClickAt: handleClickAt$1,
-  handleContextMenu: handleContextMenu$6,
+  handleContextMenu: handleContextMenu$5,
   handleFilterInput,
   handleIconThemeChange: handleIconThemeChange$1,
   hasFunctionalRender: hasFunctionalRender$h,
@@ -28039,7 +27922,7 @@ const Commands$8 = {
   handleWillNavigate: handleWillNavigate,
   handleKeyBinding: handleKeyBinding
 };
-const LazyCommands$3 = {
+const LazyCommands$4 = {
   openExternal: () => Promise.resolve().then(function () { return ViewletSimpleBrowserOpenExternal; }),
   openBackgroundTab: () => Promise.resolve().then(function () { return ViewletSimpleBrowserOpenBackgroundTab; }),
   handleContextMenu: () => Promise.resolve().then(function () { return ViewletSimpleBrowserHandleContextMenu; }),
@@ -28291,7 +28174,7 @@ const ViewletSimpleBrowser_ipc = {
   Commands: Commands$8,
   Css: Css$c,
   Events: Events$2,
-  LazyCommands: LazyCommands$3,
+  LazyCommands: LazyCommands$4,
   backgroundLoadContent,
   create: create$c,
   dispose: dispose$4,
@@ -28347,6 +28230,12 @@ const getSourceControlActions = async (providerId, groupId, type) => {
   return value;
 };
 
+const getFinalDeltaY = (height, itemHeight, itemsLength) => {
+  const contentHeight = itemsLength * itemHeight;
+  const finalDeltaY = Math.max(contentHeight - height, 0);
+  return finalDeltaY;
+};
+
 const getListHeight = (itemsLength, itemHeight, maxHeight) => {
   number$1(itemsLength);
   number$1(itemHeight);
@@ -28639,6 +28528,26 @@ const handleMouseOut = (state, index) => {
   return state;
 };
 
+const LazyCommands$3 = {
+  focusFirst: () => Promise.resolve().then(function () { return VirtualListFocusFirst; }),
+  focusIndex: () => Promise.resolve().then(function () { return VirtualListFocusIndex; }),
+  focusLast: () => Promise.resolve().then(function () { return VirtualListFocusLast; }),
+  focusNext: () => Promise.resolve().then(function () { return VirtualListFocusNext; }),
+  focusNextPage: () => Promise.resolve().then(function () { return VirtualListFocusNextPage; }),
+  focusPrevious: () => Promise.resolve().then(function () { return VirtualListFocusPrevious; }),
+  focusPreviousPage: () => Promise.resolve().then(function () { return VirtualListFocusPreviousPage; }),
+  handleTouchEnd: () => Promise.resolve().then(function () { return VirtualListHandleTouchEnd; }),
+  handleTouchMove: () => Promise.resolve().then(function () { return VirtualListHandleTouchMove; }),
+  handleTouchStart: () => Promise.resolve().then(function () { return VirtualListHandleTouchStart; }),
+  handleWheel: () => Promise.resolve().then(function () { return VirtualListHandleWheel; }),
+  handleScrollBarMove: () => Promise.resolve().then(function () { return VirtualListHandleScrollBarMove; }),
+  handleScrollBarThumbPointerMove: () => Promise.resolve().then(function () { return VirtualListHandleScrollBarMove; }),
+  handleScrollBarClick: () => Promise.resolve().then(function () { return VirtualListHandleScrollBarClick; }),
+  handleScrollBarCaptureLost: () => Promise.resolve().then(function () { return VirtualListHandleScrollBarCaptureLost; }),
+  handleClickAt: () => Promise.resolve().then(function () { return VirtualListHandleClickAt; }),
+  scrollDown: () => Promise.resolve().then(function () { return VirtualListScrollDown; })
+};
+
 // prettier-ignore
 const Commands$7 = {
   handleInput: handleInput,
@@ -28651,7 +28560,7 @@ const LazyCommands$2 = {
   handleButtonClick: () => Promise.resolve().then(function () { return ViewletSourceControlHandleButtonClick; }),
   acceptInput: () => Promise.resolve().then(function () { return ViewletSourceControlAcceptInput; }),
   handleFocus: () => Promise.resolve().then(function () { return ViewletSourceControlHandleFocus; }),
-  ...LazyCommands$7
+  ...LazyCommands$3
 };
 
 const Css$b = ["/css/parts/ViewletSourceControl.css"];
@@ -29208,7 +29117,7 @@ const itemRightUpdate = (state, newItem) => {
     statusBarItemsRight: newStatusBarItemsRight
   };
 };
-const handleClick$4 = (state, name) => {
+const handleClick$3 = (state, name) => {
   console.log({
     name
   });
@@ -29219,7 +29128,7 @@ const handleClick$4 = (state, name) => {
 
 const Commands$6 = {
   updateStatusBarItems: updateStatusBarItems,
-  handleClick: handleClick$4
+  handleClick: handleClick$3
 };
 
 const Css$a = [];
@@ -29288,7 +29197,7 @@ const ViewletStatusBar_ipc = {
   Variables: Variables$3,
   contentLoadedEffects,
   create: create$a,
-  handleClick: handleClick$4,
+  handleClick: handleClick$3,
   hasFunctionalRender: hasFunctionalRender$9,
   hasFunctionalResize: hasFunctionalResize$6,
   itemLeftCreate,
@@ -31464,7 +31373,7 @@ const handleClickOther = async (state, x, y, viewletId) => {
   }
   return state;
 };
-const handleClick$3 = async (state, button, index, x, y) => {
+const handleClick$2 = async (state, button, index, x, y) => {
   if (button !== LeftClick) {
     return state;
   }
@@ -31485,7 +31394,7 @@ const handleClick$3 = async (state, button, index, x, y) => {
 
 const ViewletActivityBarHandleClick = {
   __proto__: null,
-  handleClick: handleClick$3
+  handleClick: handleClick$2
 };
 
 const getPosition = (state, index) => {
@@ -31514,7 +31423,7 @@ const selectCurrent = state => {
     return;
   }
   const position = getPosition(state, state.focusedIndex);
-  return handleClick$3(state, LeftClick, state.focusedIndex, position.x, position.y);
+  return handleClick$2(state, LeftClick, state.focusedIndex, position.x, position.y);
 };
 
 const ViewletActivityBarSelectCurrent = {
@@ -31522,24 +31431,24 @@ const ViewletActivityBarSelectCurrent = {
   selectCurrent
 };
 
-const handleFocus$2 = state => {
+const handleFocus$1 = state => {
   setFocus(ActivityBar$2);
   return state;
 };
 
 const ViewletActivityBarHandleFocus = {
   __proto__: null,
-  handleFocus: handleFocus$2
+  handleFocus: handleFocus$1
 };
 
-const handleContextMenu$5 = async (state, button, x, y) => {
+const handleContextMenu$4 = async (state, button, x, y) => {
   await show$a(x, y, ActivityBar$4);
   return state;
 };
 
 const ViewletActivityBarHandleContextMenu = {
   __proto__: null,
-  handleContextMenu: handleContextMenu$5
+  handleContextMenu: handleContextMenu$4
 };
 
 const setDeltaY = (state, value) => {
@@ -31584,448 +31493,6 @@ const VirtualListHandleWheel = {
   handleWheel
 };
 
-const focusIndexScrollUp = (state, index, listHeight, itemHeight, itemsLength) => {
-  const newMinLineY = index;
-  const fittingItems = getNumberOfVisibleItems(listHeight, itemHeight);
-  const newMaxLineY = Math.min(newMinLineY + fittingItems, itemsLength);
-  const newDeltaY = newMinLineY * itemHeight;
-  return {
-    ...state,
-    focusedIndex: index,
-    minLineY: newMinLineY,
-    maxLineY: newMaxLineY,
-    focused: true,
-    deltaY: newDeltaY
-  };
-};
-const focusIndexScrollDown = (state, index, listHeight, itemHeight, itemsLength) => {
-  const newMaxLineY = Math.min(index + 1, itemsLength);
-  const fittingItems = getNumberOfVisibleItems(listHeight, itemHeight);
-  const newMinLineY = Math.max(newMaxLineY - fittingItems, 0);
-  const newDeltaY = itemsLength < fittingItems ? 0 : newMinLineY * itemHeight - listHeight % itemHeight + itemHeight;
-  return {
-    ...state,
-    focusedIndex: index,
-    minLineY: newMinLineY,
-    maxLineY: newMaxLineY,
-    focused: true,
-    deltaY: newDeltaY
-  };
-};
-const focusIndex = (state, index) => {
-  const {
-    itemHeight,
-    minLineY,
-    maxLineY,
-    headerHeight,
-    height,
-    items
-  } = state;
-  const itemsLength = items.length;
-  if (itemsLength === 0) {
-    return state;
-  }
-  number$1(itemHeight);
-  if (index === -1) {
-    return {
-      ...state,
-      focusedIndex: -1,
-      focused: true
-    };
-  }
-  const listHeight = height - headerHeight;
-  if (index < minLineY + 1) {
-    return focusIndexScrollUp(state, index, listHeight, itemHeight, itemsLength);
-  }
-  if (index >= maxLineY - 1) {
-    return focusIndexScrollDown(state, index, listHeight, itemHeight, itemsLength);
-  }
-  return {
-    ...state,
-    focusedIndex: index,
-    focused: true
-  };
-};
-
-const VirtualListFocusIndex = {
-  __proto__: null,
-  focusIndex
-};
-
-const focusFirst = state => {
-  const firstIndex = first();
-  return focusIndex(state, firstIndex);
-};
-
-const VirtualListFocusFirst = {
-  __proto__: null,
-  focusFirst
-};
-
-const focusLast = state => {
-  const {
-    items
-  } = state;
-  const lastIndex = last(items);
-  return focusIndex(state, lastIndex);
-};
-
-const VirtualListFocusLast = {
-  __proto__: null,
-  focusLast
-};
-
-const focusNext = state => {
-  const {
-    focusedIndex,
-    items
-  } = state;
-  const nextIndex = next(items, focusedIndex);
-  return focusIndex(state, nextIndex);
-};
-
-const VirtualListFocusNext = {
-  __proto__: null,
-  focusNext
-};
-
-const focusNextPage = state => {
-  const {
-    focusedIndex,
-    items,
-    maxLineY,
-    minLineY
-  } = state;
-  if (isLastIndex(items, focusedIndex)) {
-    return state;
-  }
-  const indexNextPage = Math.min(maxLineY + (maxLineY - minLineY) - 2, lastIndex(items));
-  return focusIndex(state, indexNextPage);
-};
-
-const VirtualListFocusNextPage = {
-  __proto__: null,
-  focusNextPage
-};
-
-const focusPrevious = state => {
-  const {
-    focusedIndex,
-    items
-  } = state;
-  if (focusedIndex === 0 || focusedIndex === -1) {
-    return state;
-  }
-  const previousIndex = previous(items, focusedIndex);
-  return focusIndex(state, previousIndex);
-};
-
-const VirtualListFocusPrevious = {
-  __proto__: null,
-  focusPrevious
-};
-
-const focusPreviousPage = state => {
-  const {
-    focusedIndex,
-    minLineY,
-    maxLineY
-  } = state;
-  if (focusedIndex === 0 || focusedIndex === -1) {
-    return state;
-  }
-  const indexPreviousPage = Math.max(minLineY - (maxLineY - minLineY) + 1, 0);
-  return focusIndex(state, indexPreviousPage);
-};
-
-const VirtualListFocusPreviousPage = {
-  __proto__: null,
-  focusPreviousPage
-};
-
-const applyInertia = async touchDifference => {
-  let inertia = touchDifference;
-  while (Math.abs(inertia) > 1.5) {
-    inertia /= 1.03;
-    await sleep(10);
-    const newState = getState$1('Extensions');
-    if (!newState) {
-      break;
-    }
-    const newDeltaY = newState.deltaY - inertia;
-    await setState('Extensions', setDeltaY(newState, newDeltaY));
-  }
-};
-const handleTouchEnd = (state, touches) => {
-  if (touches.length === 0) {
-    return state;
-  }
-  const {
-    touchDifference
-  } = state;
-  void applyInertia(touchDifference);
-  // const touch = touches[0]
-  // const newTouchOffsetY = touch.clientY
-  // const diff = newTouchOffsetY - touchOffsetY
-  // console.log({ touchDifference })
-  // let inertia = touchDifference
-  // let i = 0
-  // while (Math.abs(inertia) > 1.5) {
-  //   console.log({ inertia })
-  //   inertia /= 1.03
-  //   await new Promise((r) => setTimeout(r, 10))
-  //   const newState = ViewletStates.getState('Extensions')
-  //   if (!newState) {
-  //     break
-  //   }
-  //   const newDeltaY = newState.deltaY - inertia
-  //   await Viewlet.setState('Extensions', setDeltaY(newState, newDeltaY))
-  // }
-  // console.log('return state')
-  return state;
-};
-
-const VirtualListHandleTouchEnd = {
-  __proto__: null,
-  handleTouchEnd
-};
-
-const handleTouchMove = (state, timeStamp, touches) => {
-  number$1(timeStamp);
-  array(touches);
-  if (touches.length === 0) {
-    return state;
-  }
-  const {
-    touchOffsetY,
-    deltaY
-  } = state;
-  const touch = touches[0];
-  const {
-    y
-  } = touch;
-  number$1(y);
-  const newTouchOffsetY = y;
-  const touchDifference = newTouchOffsetY - touchOffsetY;
-  const newDeltaY = deltaY - touchDifference;
-  return {
-    ...setDeltaY(state, newDeltaY),
-    touchOffsetY: newTouchOffsetY,
-    touchDifference
-  };
-};
-
-const VirtualListHandleTouchMove = {
-  __proto__: null,
-  handleTouchMove
-};
-
-const handleTouchStart = (state, timeStamp, touches) => {
-  number$1(timeStamp);
-  array(touches);
-  if (touches.length === 0) {
-    return state;
-  }
-  const touch = touches[0];
-  const {
-    y
-  } = touch;
-  number$1(y);
-  return {
-    ...state,
-    touchOffsetY: y
-  };
-};
-
-const VirtualListHandleTouchStart = {
-  __proto__: null,
-  handleTouchStart
-};
-
-const getNewPercent = (contentHeight, scrollBarHeight, relativeY) => {
-  if (relativeY <= contentHeight - scrollBarHeight / 2) {
-    // clicked in middle
-    return relativeY / (contentHeight - scrollBarHeight);
-  }
-  // clicked at bottom
-  return 1;
-};
-const handleScrollBarMove = (state, eventY) => {
-  const {
-    y,
-    headerHeight,
-    handleOffset,
-    finalDeltaY,
-    height,
-    scrollBarHeight
-  } = state;
-  const relativeY = eventY - y - headerHeight - handleOffset;
-  const contentHeight = height - headerHeight;
-  const newPercent = getNewPercent(contentHeight, scrollBarHeight, relativeY);
-  const newDeltaY = newPercent * finalDeltaY;
-  return setDeltaY(state, newDeltaY);
-};
-const handleScrollBarThumbPointerMove = handleScrollBarMove;
-
-const VirtualListHandleScrollBarMove = {
-  __proto__: null,
-  handleScrollBarMove,
-  handleScrollBarThumbPointerMove
-};
-
-const handleScrollBarClick = (state, eventY) => {
-  const {
-    y,
-    deltaY,
-    headerHeight,
-    finalDeltaY,
-    scrollBarHeight,
-    height
-  } = state;
-  const contentHeight = height - headerHeight;
-  const relativeY = eventY - y - headerHeight;
-  const currentScrollBarY = getScrollBarY(deltaY, finalDeltaY, contentHeight, scrollBarHeight);
-  const diff = relativeY - currentScrollBarY;
-  if (diff >= 0 && diff < scrollBarHeight) {
-    return {
-      ...state,
-      handleOffset: diff,
-      scrollBarActive: true
-    };
-  }
-  const {
-    percent,
-    handleOffset
-  } = getNewDeltaPercent(contentHeight, scrollBarHeight, relativeY);
-  const newDeltaY = percent * finalDeltaY;
-  return {
-    ...setDeltaY(state, newDeltaY),
-    handleOffset,
-    scrollBarActive: true
-  };
-};
-
-const VirtualListHandleScrollBarClick = {
-  __proto__: null,
-  handleScrollBarClick
-};
-
-const handleScrollBarCaptureLost = state => {
-  return {
-    ...state,
-    scrollBarActive: false
-  };
-};
-
-const VirtualListHandleScrollBarCaptureLost = {
-  __proto__: null,
-  handleScrollBarCaptureLost
-};
-
-const handleClickAt = async (state, eventX, eventY) => {
-  const {
-    x,
-    y,
-    itemHeight,
-    uid,
-    deltaY
-  } = state;
-  const index = getListIndex(eventX, eventY, x, y, deltaY, itemHeight);
-  await executeViewletCommand(uid, 'selectIndex', index);
-  return state;
-};
-
-const VirtualListHandleClickAt = {
-  __proto__: null,
-  handleClickAt
-};
-
-const scrollDown = state => {
-  const {
-    finalDeltaY,
-    deltaY
-  } = state;
-  const newDeltaY = Math.min(deltaY + 20, finalDeltaY);
-  return setDeltaY(state, newDeltaY);
-};
-
-const VirtualListScrollDown = {
-  __proto__: null,
-  scrollDown
-};
-
-const handleClick$2 = async (state, index) => {
-  const {
-    items,
-    minLineY
-  } = state;
-  const actualIndex = index + minLineY;
-  const extension = items[actualIndex];
-  const uri = `extension-detail://${extension.id}`;
-  await execute$4('Main.openUri', uri);
-  return focusIndex(state, actualIndex);
-};
-
-const ViewletExtensionsHandleClick = {
-  __proto__: null,
-  handleClick: handleClick$2
-};
-
-const handleClickCurrent = state => {
-  const {
-    focusedIndex
-  } = state;
-  return handleClick$2(state, focusedIndex);
-};
-
-const ViewletExtensionsHandleClickCurrent = {
-  __proto__: null,
-  handleClickCurrent
-};
-
-const handleClickCurrentButKeepFocus = state => {
-  const {
-    focusedIndex
-  } = state;
-  return handleClick$2(state, focusedIndex);
-};
-
-const ViewletExtensionsHandleClickCurrentButKeepFocus = {
-  __proto__: null,
-  handleClickCurrentButKeepFocus
-};
-
-// TODO pass index instead
-const handleContextMenu$4 = async (state, button, x, y) => {
-  // TODO use focused index when when context menu button is -1 (keyboard)
-  await show$a(x, y, ManageExtension);
-  return state;
-};
-
-const ViewletExtensionsHandleContextMenu = {
-  __proto__: null,
-  handleContextMenu: handleContextMenu$4
-};
-
-const clearSearchResults = state => {
-  return handleInput$2(state, '');
-};
-
-const ViewletExtensionsClearSearchResults = {
-  __proto__: null,
-  clearSearchResults
-};
-
-const handleFocus$1 = state => {
-  setFocus(Extensions);
-  return state;
-};
-
-const ViewletExtensionsHandleFocus = {
-  __proto__: null,
-  handleFocus: handleFocus$1
-};
-
 const closeTabsLeft = state => {
   const commands = [];
   // @ts-ignore
@@ -32830,7 +32297,7 @@ const prefixIdWithExt = item => {
 const getExtensionPicks = async () => {
   try {
     // TODO don't call this every time
-    const extensionPicks = await getCommands$7();
+    const extensionPicks = await getCommands$8();
     if (!extensionPicks) {
       return [];
     }
@@ -33385,6 +32852,376 @@ const ViewletSimpleBrowserCancelNavigation = {
   cancelNavigation
 };
 
+const focusIndexScrollUp = (state, index, listHeight, itemHeight, itemsLength) => {
+  const newMinLineY = index;
+  const fittingItems = getNumberOfVisibleItems(listHeight, itemHeight);
+  const newMaxLineY = Math.min(newMinLineY + fittingItems, itemsLength);
+  const newDeltaY = newMinLineY * itemHeight;
+  return {
+    ...state,
+    focusedIndex: index,
+    minLineY: newMinLineY,
+    maxLineY: newMaxLineY,
+    focused: true,
+    deltaY: newDeltaY
+  };
+};
+const focusIndexScrollDown = (state, index, listHeight, itemHeight, itemsLength) => {
+  const newMaxLineY = Math.min(index + 1, itemsLength);
+  const fittingItems = getNumberOfVisibleItems(listHeight, itemHeight);
+  const newMinLineY = Math.max(newMaxLineY - fittingItems, 0);
+  const newDeltaY = itemsLength < fittingItems ? 0 : newMinLineY * itemHeight - listHeight % itemHeight + itemHeight;
+  return {
+    ...state,
+    focusedIndex: index,
+    minLineY: newMinLineY,
+    maxLineY: newMaxLineY,
+    focused: true,
+    deltaY: newDeltaY
+  };
+};
+const focusIndex = (state, index) => {
+  const {
+    itemHeight,
+    minLineY,
+    maxLineY,
+    headerHeight,
+    height,
+    items
+  } = state;
+  const itemsLength = items.length;
+  if (itemsLength === 0) {
+    return state;
+  }
+  number$1(itemHeight);
+  if (index === -1) {
+    return {
+      ...state,
+      focusedIndex: -1,
+      focused: true
+    };
+  }
+  const listHeight = height - headerHeight;
+  if (index < minLineY + 1) {
+    return focusIndexScrollUp(state, index, listHeight, itemHeight, itemsLength);
+  }
+  if (index >= maxLineY - 1) {
+    return focusIndexScrollDown(state, index, listHeight, itemHeight, itemsLength);
+  }
+  return {
+    ...state,
+    focusedIndex: index,
+    focused: true
+  };
+};
+
+const VirtualListFocusIndex = {
+  __proto__: null,
+  focusIndex
+};
+
+const focusFirst = state => {
+  const firstIndex = first();
+  return focusIndex(state, firstIndex);
+};
+
+const VirtualListFocusFirst = {
+  __proto__: null,
+  focusFirst
+};
+
+const focusLast = state => {
+  const {
+    items
+  } = state;
+  const lastIndex = last(items);
+  return focusIndex(state, lastIndex);
+};
+
+const VirtualListFocusLast = {
+  __proto__: null,
+  focusLast
+};
+
+const focusNext = state => {
+  const {
+    focusedIndex,
+    items
+  } = state;
+  const nextIndex = next(items, focusedIndex);
+  return focusIndex(state, nextIndex);
+};
+
+const VirtualListFocusNext = {
+  __proto__: null,
+  focusNext
+};
+
+const focusNextPage = state => {
+  const {
+    focusedIndex,
+    items,
+    maxLineY,
+    minLineY
+  } = state;
+  if (isLastIndex(items, focusedIndex)) {
+    return state;
+  }
+  const indexNextPage = Math.min(maxLineY + (maxLineY - minLineY) - 2, lastIndex(items));
+  return focusIndex(state, indexNextPage);
+};
+
+const VirtualListFocusNextPage = {
+  __proto__: null,
+  focusNextPage
+};
+
+const focusPrevious = state => {
+  const {
+    focusedIndex,
+    items
+  } = state;
+  if (focusedIndex === 0 || focusedIndex === -1) {
+    return state;
+  }
+  const previousIndex = previous(items, focusedIndex);
+  return focusIndex(state, previousIndex);
+};
+
+const VirtualListFocusPrevious = {
+  __proto__: null,
+  focusPrevious
+};
+
+const focusPreviousPage = state => {
+  const {
+    focusedIndex,
+    minLineY,
+    maxLineY
+  } = state;
+  if (focusedIndex === 0 || focusedIndex === -1) {
+    return state;
+  }
+  const indexPreviousPage = Math.max(minLineY - (maxLineY - minLineY) + 1, 0);
+  return focusIndex(state, indexPreviousPage);
+};
+
+const VirtualListFocusPreviousPage = {
+  __proto__: null,
+  focusPreviousPage
+};
+
+const applyInertia = async touchDifference => {
+  let inertia = touchDifference;
+  while (Math.abs(inertia) > 1.5) {
+    inertia /= 1.03;
+    await sleep(10);
+    const newState = getState$1('Extensions');
+    if (!newState) {
+      break;
+    }
+    const newDeltaY = newState.deltaY - inertia;
+    await setState('Extensions', setDeltaY(newState, newDeltaY));
+  }
+};
+const handleTouchEnd = (state, touches) => {
+  if (touches.length === 0) {
+    return state;
+  }
+  const {
+    touchDifference
+  } = state;
+  void applyInertia(touchDifference);
+  // const touch = touches[0]
+  // const newTouchOffsetY = touch.clientY
+  // const diff = newTouchOffsetY - touchOffsetY
+  // console.log({ touchDifference })
+  // let inertia = touchDifference
+  // let i = 0
+  // while (Math.abs(inertia) > 1.5) {
+  //   console.log({ inertia })
+  //   inertia /= 1.03
+  //   await new Promise((r) => setTimeout(r, 10))
+  //   const newState = ViewletStates.getState('Extensions')
+  //   if (!newState) {
+  //     break
+  //   }
+  //   const newDeltaY = newState.deltaY - inertia
+  //   await Viewlet.setState('Extensions', setDeltaY(newState, newDeltaY))
+  // }
+  // console.log('return state')
+  return state;
+};
+
+const VirtualListHandleTouchEnd = {
+  __proto__: null,
+  handleTouchEnd
+};
+
+const handleTouchMove = (state, timeStamp, touches) => {
+  number$1(timeStamp);
+  array(touches);
+  if (touches.length === 0) {
+    return state;
+  }
+  const {
+    touchOffsetY,
+    deltaY
+  } = state;
+  const touch = touches[0];
+  const {
+    y
+  } = touch;
+  number$1(y);
+  const newTouchOffsetY = y;
+  const touchDifference = newTouchOffsetY - touchOffsetY;
+  const newDeltaY = deltaY - touchDifference;
+  return {
+    ...setDeltaY(state, newDeltaY),
+    touchOffsetY: newTouchOffsetY,
+    touchDifference
+  };
+};
+
+const VirtualListHandleTouchMove = {
+  __proto__: null,
+  handleTouchMove
+};
+
+const handleTouchStart = (state, timeStamp, touches) => {
+  number$1(timeStamp);
+  array(touches);
+  if (touches.length === 0) {
+    return state;
+  }
+  const touch = touches[0];
+  const {
+    y
+  } = touch;
+  number$1(y);
+  return {
+    ...state,
+    touchOffsetY: y
+  };
+};
+
+const VirtualListHandleTouchStart = {
+  __proto__: null,
+  handleTouchStart
+};
+
+const getNewPercent = (contentHeight, scrollBarHeight, relativeY) => {
+  if (relativeY <= contentHeight - scrollBarHeight / 2) {
+    // clicked in middle
+    return relativeY / (contentHeight - scrollBarHeight);
+  }
+  // clicked at bottom
+  return 1;
+};
+const handleScrollBarMove = (state, eventY) => {
+  const {
+    y,
+    headerHeight,
+    handleOffset,
+    finalDeltaY,
+    height,
+    scrollBarHeight
+  } = state;
+  const relativeY = eventY - y - headerHeight - handleOffset;
+  const contentHeight = height - headerHeight;
+  const newPercent = getNewPercent(contentHeight, scrollBarHeight, relativeY);
+  const newDeltaY = newPercent * finalDeltaY;
+  return setDeltaY(state, newDeltaY);
+};
+const handleScrollBarThumbPointerMove = handleScrollBarMove;
+
+const VirtualListHandleScrollBarMove = {
+  __proto__: null,
+  handleScrollBarMove,
+  handleScrollBarThumbPointerMove
+};
+
+const handleScrollBarClick = (state, eventY) => {
+  const {
+    y,
+    deltaY,
+    headerHeight,
+    finalDeltaY,
+    scrollBarHeight,
+    height
+  } = state;
+  const contentHeight = height - headerHeight;
+  const relativeY = eventY - y - headerHeight;
+  const currentScrollBarY = getScrollBarY(deltaY, finalDeltaY, contentHeight, scrollBarHeight);
+  const diff = relativeY - currentScrollBarY;
+  if (diff >= 0 && diff < scrollBarHeight) {
+    return {
+      ...state,
+      handleOffset: diff,
+      scrollBarActive: true
+    };
+  }
+  const {
+    percent,
+    handleOffset
+  } = getNewDeltaPercent(contentHeight, scrollBarHeight, relativeY);
+  const newDeltaY = percent * finalDeltaY;
+  return {
+    ...setDeltaY(state, newDeltaY),
+    handleOffset,
+    scrollBarActive: true
+  };
+};
+
+const VirtualListHandleScrollBarClick = {
+  __proto__: null,
+  handleScrollBarClick
+};
+
+const handleScrollBarCaptureLost = state => {
+  return {
+    ...state,
+    scrollBarActive: false
+  };
+};
+
+const VirtualListHandleScrollBarCaptureLost = {
+  __proto__: null,
+  handleScrollBarCaptureLost
+};
+
+const handleClickAt = async (state, eventX, eventY) => {
+  const {
+    x,
+    y,
+    itemHeight,
+    uid,
+    deltaY
+  } = state;
+  const index = getListIndex(eventX, eventY, x, y, deltaY, itemHeight);
+  await executeViewletCommand(uid, 'selectIndex', index);
+  return state;
+};
+
+const VirtualListHandleClickAt = {
+  __proto__: null,
+  handleClickAt
+};
+
+const scrollDown = state => {
+  const {
+    finalDeltaY,
+    deltaY
+  } = state;
+  const newDeltaY = Math.min(deltaY + 20, finalDeltaY);
+  return setDeltaY(state, newDeltaY);
+};
+
+const VirtualListScrollDown = {
+  __proto__: null,
+  scrollDown
+};
+
 const handleContextMenu$1 = async (state, button, x, y) => {
   await show$a(x, y, SourceControl$1);
   return state;