@lvce-editor/static-server 0.111.8 → 0.111.10

package/static/{dba809d → 68ddb84}/packages/renderer-worker/dist/rendererWorkerMain.js

@@ -95,7 +95,7 @@ const getAssetDir$2 = () => {
   // @ts-ignore
   {
     // @ts-ignore
-    return '/dba809d';
+    return '/68ddb84';
   }
 };
 const assetDir = getAssetDir$2();
@@ -2777,7 +2777,7 @@ const getPreferences = async () => {
   const preferences = getPreferencesJson();
   return preferences;
 };
-const load$5 = async () => {
+const load$6 = async () => {
   const preferences = await getPreferences();
   setAll(preferences);
 };
@@ -2785,14 +2785,14 @@ const hydrate$e = async () => {
   try {
     // TODO should configuration be together with all other preferences (e.g. selecting color theme code is not needed on startup)
     // TODO probably not all preferences need to be kept in memory
-    await load$5();
+    await load$6();
   } catch (error) {
     logError(error);
   }
 };
 const reload$8 = async () => {
   try {
-    await load$5();
+    await load$6();
   } catch (error) {
     logError(error);
     return;
@@ -5366,7 +5366,7 @@ const getForModuleId = (id, moduleId) => {
 };
 
 const registry = Object.create(null);
-const add$2 = (uid, mouseActions) => {
+const add$3 = (uid, mouseActions) => {
   registry[uid] = mouseActions;
 };
 const matchesMouseAction = (item, button, modifiers) => {
@@ -7201,8 +7201,8 @@ const shouldTrace = (selectors, traceId) => {
   return selectors.has('*') || Boolean(traceId && selectors.has(traceId));
 };
 
-const version = '0.111.8';
-const commit$1 = 'dba809d';
+const version = '0.111.10';
+const commit$1 = '68ddb84';
 const productNameLong = 'Lvce Editor - OSS';
 const getPid = () => {
   return invoke$I('Process.getPid');
@@ -8145,7 +8145,7 @@ const state$h = {
 const getAll = () => {
   return state$h.menuEntries;
 };
-const add$1 = async menuEntries => {
+const add$2 = async menuEntries => {
   state$h.menuEntries = [...state$h.menuEntries, ...menuEntries];
   if (isCreated()) {
     await invoke$z('QuickPick.addMenuEntries', menuEntries);
@@ -8155,7 +8155,7 @@ const add$1 = async menuEntries => {
 const loadModule$2 = async (id, module) => {
   if (module.getQuickPickMenuEntries) {
     const entries = await module.getQuickPickMenuEntries();
-    add$1(entries);
+    add$2(entries);
   }
 };
 
@@ -8629,7 +8629,7 @@ const loadModule = (getModule, id) => {
  * @param {{getModule:()=>any, type:number, id:string, disposed:boolean }} viewlet
  * @returns
  */
-const load$4 = async (viewlet, focus = false, restore = false, restoreState = undefined) => {
+const load$5 = async (viewlet, focus = false, restore = false, restoreState = undefined) => {
   // console.time(`load/${viewlet.id}`)
   // TODO
   if (viewlet.id === 'Terminal' || viewlet.id === 'SideBar' || viewlet.id === 'TitleBar' || viewlet.id === 'Panel' || viewlet.id === 'ActivityBar' || viewlet.id === 'Main' || viewlet.id === 'StatusBar') {
@@ -8713,7 +8713,7 @@ const load$4 = async (viewlet, focus = false, restore = false, restoreState = un
     }
     if (module.Commands && module.Commands.getMouseActions) {
       const mouseActions = await module.Commands.getMouseActions(viewletUid);
-      add$2(viewletUid, mouseActions);
+      add$3(viewletUid, mouseActions);
     }
     if (module.getChildren) {
       const children = module.getChildren(newState);
@@ -8736,7 +8736,7 @@ const load$4 = async (viewlet, focus = false, restore = false, restoreState = un
           parentUid: viewletUid,
           setBounds: child.setBounds
         };
-        const childCommands = await load$4(childViewlet, false, true, undefined);
+        const childCommands = await load$5(childViewlet, false, true, undefined);
         // @ts-ignore
         extraCommands.push(...childCommands);
       }
@@ -8924,16 +8924,16 @@ const map$1 = Object.create(null);
 const registerAll = input => {
   Object.assign(map$1, input);
 };
-const load$3 = moduleId => {
+const load$4 = moduleId => {
   if (!map$1[moduleId]) {
     return {};
   }
   return map$1[moduleId]();
 };
 
-const load$2 = async moduleId => {
+const load$3 = async moduleId => {
   try {
-    return await load$3(moduleId);
+    return await load$4(moduleId);
   } catch (error) {
     const IsImportError$1 = await Promise.resolve().then(function () { return IsImportError; });
     if (IsImportError$1.isImportError(error)) {
@@ -8948,7 +8948,7 @@ const initialize$1 = async initData => {
   const viewlet = {
     disposed: false,
     focus: false,
-    getModule: load$2,
+    getModule: load$3,
     id: Layout,
     render: false,
     shouldRenderEvents: false,
@@ -8957,7 +8957,7 @@ const initialize$1 = async initData => {
     uid,
     uri: ''
   };
-  await load$4(viewlet, false, false, {
+  await load$5(viewlet, false, false, {
     ...initData,
     restore: false
   });
@@ -9832,8 +9832,8 @@ const openWidget = async (moduleId, ...args) => {
   const isOwnedWidget = moduleId === DefineKeyBinding && typeof args[0] === 'number';
   const disposeCommands = existingInstance && !isOwnedWidget ? disposeFunctional(existingInstance.state.uid) : [];
   const childUid = create$1g();
-  const commands = await load$4({
-    getModule: load$2,
+  const commands = await load$5({
+    getModule: load$3,
     id: moduleId,
     type: 0,
     // @ts-ignore
@@ -10201,7 +10201,7 @@ const mark$1 = event => {
   }
 };
 
-const load$1 = moduleId => {
+const load$2 = moduleId => {
   switch (moduleId) {
     case About$1:
       return Promise.resolve().then(function () { return About_ipc; });
@@ -10938,7 +10938,7 @@ const getFinalAssistantMessage = task => {
   }
   return '';
 };
-const getErrorMessage$2 = error => {
+const getErrorMessage$1 = error => {
   if (error instanceof Error) {
     return error.message;
   }
@@ -10993,7 +10993,7 @@ const run = async (promptOrOptions, authState) => {
     }
   } catch (error) {
     errorCode = typeof result?.errorCode === 'string' && result.errorCode ? result.errorCode : getErrorCode(error);
-    errorMessage = getErrorMessage$2(error);
+    errorMessage = getErrorMessage$1(error);
     await writeStderr(`${errorMessage}\n`);
   }
   try {
@@ -11013,8 +11013,8 @@ const run = async (promptOrOptions, authState) => {
     }
   } catch (error) {
     errorCode ||= getErrorCode(error);
-    errorMessage ||= getErrorMessage$2(error);
-    await writeStderr(`Failed to write agent trace: ${getErrorMessage$2(error)}\n`);
+    errorMessage ||= getErrorMessage$1(error);
+    await writeStderr(`Failed to write agent trace: ${getErrorMessage$1(error)}\n`);
   }
   await exit$1(errorMessage ? 1 : 0);
 };
@@ -11672,7 +11672,7 @@ const startup = async (platform, assetDir) => {
   onerror = handleUnhandledError;
   registerAll(map);
   registerAll$1(map$2);
-  setLoad(load$1);
+  setLoad(load$2);
   mark$1(Zero);
   mark(WillStartupWorkbench);
   await listen$1();
@@ -11732,11 +11732,11 @@ const startup = async (platform, assetDir) => {
   mark(DidLoadColorTheme);
   mark$1(Four);
   mark(WillShowLayout);
-  const layout = create$1a(load$2, Layout, 0, '', 0, 0, 0, 0);
+  const layout = create$1a(load$3, Layout, 0, '', 0, 0, 0, 0);
   layout.uid = create$1g();
   const layoutState = await getSavedViewletState(Layout);
-  const commands = await load$4({
-    getModule: load$2,
+  const commands = await load$5({
+    getModule: load$3,
     id: Layout,
     type: 0,
     // @ts-ignore
@@ -14001,7 +14001,7 @@ const {
   invoke: invoke$u
 } = getOrCreateWorker(launchUpdateWorker);
 
-const getErrorMessage$1 = error => {
+const getErrorMessage = error => {
   if (error && error.message) {
     return error.message;
   }
@@ -14023,7 +14023,7 @@ const checkForUpdatesWithDependencies = async (updateSetting, silent, dependenci
     await dependencies.notify('info', `Update ${latest.version} is available.`);
     await dependencies.startUpdate(updateSetting, repository);
   } catch (error) {
-    await dependencies.notify('error', `Failed to check for updates: ${getErrorMessage$1(error)}`);
+    await dependencies.notify('error', `Failed to check for updates: ${getErrorMessage(error)}`);
   }
 };
 const checkForUpdates = async (updateSetting, silent = Boolean(updateSetting)) => {
@@ -15469,7 +15469,7 @@ const Developer_ipc = {
   name: name$2b
 };
 
-const load = () => {
+const load$1 = () => {
   switch (getPlatform$4()) {
     case Web$1:
       return Promise.resolve().then(function () { return OpenFolderWeb; });
@@ -15483,7 +15483,7 @@ const load = () => {
 };
 
 const openFolder$3 = async () => {
-  const module = await load();
+  const module = await load$1();
   await module.openFolder();
 };
 
@@ -16318,7 +16318,7 @@ const getExtensionKeyBindings = async () => {
 };
 const maybeLoad = async id => {
   try {
-    return await load$2(id);
+    return await load$3(id);
   } catch {
     return {};
   }
@@ -17506,7 +17506,7 @@ const Timeout_ipc = {
 
 const name$1e = 'MouseActions';
 const Commands$1h = {
-  add: add$2,
+  add: add$3,
   get: get$a
 };
 
@@ -18915,7 +18915,7 @@ const getExtensionAbsolutePath = (id, isWeb, isBuiltin, path, relativePath, orig
   return new URL('/remote' + path + '/' + relativePath, origin).toString();
 };
 
-const getOrigin = () => {
+const getOrigin$1 = () => {
   return globalThis.location?.origin || 'http://localhost';
 };
 const getManifestView = (extension, viewId) => {
@@ -18927,7 +18927,7 @@ const getCss$1 = (extension, view) => {
   if (typeof css !== 'string' || css.length === 0) {
     return '';
   }
-  return getExtensionAbsolutePath(extension.id || view.extensionId, extension.isWeb === true, extension.builtin === true, extension.path || extension.uri || '', css, getOrigin(), getPlatform$4());
+  return getExtensionAbsolutePath(extension.id || view.extensionId, extension.isWeb === true, extension.builtin === true, extension.path || extension.uri || '', css, getOrigin$1(), getPlatform$4());
 };
 const mergeCss = (views, extensions) => {
   return views.map(view => {
@@ -19459,7 +19459,7 @@ const getFileDecorations = (providerId, uris) => {
 const getGroups = (providerId, path) => {
   return executeProvider(providerId, 'executeSourceControlGetGroups', path);
 };
-const add = (providerId, path) => {
+const add$1 = (providerId, path) => {
   return executeProvider(providerId, 'executeSourceControlAdd', path);
 };
 const discard = (providerId, path) => {
@@ -19474,7 +19474,7 @@ const name$V = 'ExtensionManagement';
 const Commands$Y = {
   'ExtensionHostManagement.activateByEvent': activateByEvent,
   'ExtensionHostSourceControl.acceptInput': acceptInput,
-  'ExtensionHostSourceControl.add': add,
+  'ExtensionHostSourceControl.add': add$1,
   'ExtensionHostSourceControl.discard': discard,
   'ExtensionHostSourceControl.generateCommitMessage': generateCommitMessage,
   'ExtensionHostSourceControl.getBadgeCount': getBadgeCount$1,
@@ -20329,7 +20329,7 @@ const focusIndex$2 = async (state, index) => {
     };
   }
   const instanceUid = create$1g();
-  const instance = create$1a(load$2, id, uid, editor.uri, x, y, width, contentHeight);
+  const instance = create$1a(load$3, id, uid, editor.uri, x, y, width, contentHeight);
   instance.show = false;
   instance.setBounds = false;
   instance.uid = instanceUid;
@@ -20337,7 +20337,7 @@ const focusIndex$2 = async (state, index) => {
   const resizeCommands = ['Viewlet.setBounds', instanceUid, x, tabHeight, width, contentHeight];
 
   // @ts-ignore
-  const commands = await load$4(instance);
+  const commands = await load$5(instance);
   // @ts-ignore
   commands.unshift(...disposeCommands);
   // @ts-ignore
@@ -20413,7 +20413,7 @@ const openUri = async (state, uri, focus = true, {
     disposeCommands = hideFunctional(previousUid);
   }
   const instanceUid = create$1g();
-  const instance = create$1a(load$2, moduleId, state.uid, resolvedUri, activeGroup.x, y, activeGroup.width, contentHeight);
+  const instance = create$1a(load$3, moduleId, state.uid, resolvedUri, activeGroup.x, y, activeGroup.width, contentHeight);
   instance.uid = instanceUid;
   // const oldActiveIndex = state.activeIndex
   const tabLabel = getLabel(resolvedUri);
@@ -20451,7 +20451,7 @@ const openUri = async (state, uri, focus = true, {
     instance.args = [context];
   }
   // @ts-ignore
-  const commands = await load$4(instance, focus);
+  const commands = await load$5(instance, focus);
   commands.push(['Viewlet.setBounds', instanceUid, activeGroup.x, tabHeight, activeGroup.width, contentHeight]);
   let tabsUid = state.tabsUid;
   if (tabsUid === -1) {
@@ -26500,7 +26500,7 @@ const ViewletKeyBindings_ipc = {
 
 const Deb = 'Deb';
 
-const commit = 'dba809d';
+const commit = '68ddb84';
 
 const getAutoUpdateType = () => {
   return invoke$I('AutoUpdater.getAutoUpdateType');
@@ -27545,7 +27545,7 @@ const show$4 = async (state, module, currentViewletId, restore) => {
   }
   const viewlet = {
     disposed: false,
-    getModule: load$2,
+    getModule: load$3,
     args: module === SideBar && currentViewletId ? [currentViewletId] : [],
     id: viewletModuleId,
     type: 0,
@@ -27563,7 +27563,7 @@ const show$4 = async (state, module, currentViewletId, restore) => {
   const restoreState = shouldRestore ? undefined : {
     restore: false
   };
-  const commands = await load$4(viewlet, false, shouldRestore, restoreState);
+  const commands = await load$5(viewlet, false, shouldRestore, restoreState);
   addPreviewBoundsCommand(commands, childUid, intermediateState, module);
 
   // TODO component might already be hidden again at this point
@@ -28123,7 +28123,7 @@ const replacePreview = async (state, uri, previewViewletId) => {
   setState$1(state.uid, newState);
   const viewlet = {
     disposed: false,
-    getModule: load$2,
+    getModule: load$3,
     args: [],
     id: previewViewletId,
     type: 0,
@@ -28137,7 +28137,7 @@ const replacePreview = async (state, uri, previewViewletId) => {
     parentUid: state.uid,
     uid: childUid
   };
-  const loadCommands = await load$4(viewlet, false, true, undefined);
+  const loadCommands = await load$5(viewlet, false, true, undefined);
   commands.push(...loadCommands);
   addPreviewBoundsCommand(commands, childUid, state, Preview);
   const latestState = getState$1(state.uid);
@@ -28272,7 +28272,7 @@ const replaceSecondaryPreview = async (state, uri) => {
   setState$1(state.uid, newState);
   const viewlet = {
     disposed: false,
-    getModule: load$2,
+    getModule: load$3,
     args: [],
     id: ExtensionView$1,
     type: 0,
@@ -28286,7 +28286,7 @@ const replaceSecondaryPreview = async (state, uri) => {
     parentUid: state.uid,
     uid: childUid
   };
-  const loadCommands = await load$4(viewlet, false, true, undefined);
+  const loadCommands = await load$5(viewlet, false, true, undefined);
   commands.push(...loadCommands);
   addPreviewBoundsCommand(commands, childUid, state, SecondaryPreview);
   return {
@@ -28474,8 +28474,8 @@ const setActionsDom$1 = (state, actionsDom, childUid, eventListeners) => {
   };
 };
 const createViewlet$1 = async (state, viewletModuleId, editorUid, tabId, bounds, uri, args = []) => {
-  const commands = await load$4({
-    getModule: load$2,
+  const commands = await load$5({
+    getModule: load$3,
     id: viewletModuleId,
     type: 0,
     // @ts-ignore
@@ -28505,8 +28505,8 @@ const renderMainAreaPending = async (state, uid) => {
   };
 };
 const createPanelViewlet = async (state, viewletModuleId, editorUid, tabId, actionsUid, bounds, uri, focus = false) => {
-  const commands = await load$4({
-    getModule: load$2,
+  const commands = await load$5({
+    getModule: load$3,
     id: viewletModuleId,
     type: 0,
     // @ts-ignore
@@ -28594,8 +28594,8 @@ const loadIfVisible = async (state, module) => {
       const restoreState = restore ? undefined : {
         restore: false
       };
-      commands = await load$4({
-        getModule: load$2,
+      commands = await load$5({
+        getModule: load$3,
         id: viewletModuleId,
         type: 0,
         // @ts-ignore
@@ -29008,8 +29008,8 @@ const showAsync = async (uid, points, module, viewletUid) => {
     } = module;
     const moduleId = isPreviewModule(module) ? getPreviewStorageId(points, module) : defaultModuleId;
     const uri = isPreviewModule(module) ? getPreviewUri(points, module) : '';
-    const commands = await load$4({
-      getModule: load$2,
+    const commands = await load$5({
+      getModule: load$3,
       id: moduleId,
       // @ts-ignore
       uid: viewletUid,
@@ -31964,8 +31964,8 @@ const handleSideBarViewletChange = async (state, moduleId, restore = true) => {
   }
   const childDimensions = getContentDimensions$1(state, titleAreaHeight);
   const childUid = create$1g();
-  const commands = await load$4({
-    getModule: load$2,
+  const commands = await load$5({
+    getModule: load$3,
     id: childModuleId,
     type: 0,
     // @ts-ignore
@@ -32321,8 +32321,8 @@ const handleSecondarySideBarViewletChange = async (state, moduleId) => {
   const childDimensions = getContentDimensions(state, titleAreaHeight);
   const uid = state.uid;
   const childUid = create$1g();
-  const commands = await load$4({
-    getModule: load$2,
+  const commands = await load$5({
+    getModule: load$3,
     id: moduleId,
     type: 0,
     // @ts-ignore
@@ -32478,6 +32478,98 @@ const get = query => {
   return get$1(query);
 };
 
+const storageKey = 'simple-browser-visited-sites';
+const maximumVisitedSites = 100;
+const maximumFaviconLength = 4096;
+const getOrigin = value => {
+  try {
+    const url = new URL(value);
+    if (url.protocol !== 'http:' && url.protocol !== 'https:') {
+      return undefined;
+    }
+    return url.origin;
+  } catch {
+    return undefined;
+  }
+};
+const isValidFavicon = favicon => {
+  if (typeof favicon !== 'string' || favicon.length === 0 || favicon.length > maximumFaviconLength) {
+    return false;
+  }
+  if (favicon.startsWith('data:image/')) {
+    return true;
+  }
+  return Boolean(getOrigin(favicon));
+};
+const normalizeSite = site => {
+  if (!site || typeof site !== 'object') {
+    return undefined;
+  }
+  const origin = getOrigin(site.origin);
+  if (!origin || !isValidFavicon(site.favicon)) {
+    return undefined;
+  }
+  return {
+    favicon: site.favicon,
+    origin
+  };
+};
+const normalize = value => {
+  if (!Array.isArray(value)) {
+    return [];
+  }
+  const sites = [];
+  const origins = new Set();
+  for (const item of value) {
+    const site = normalizeSite(item);
+    if (!site || origins.has(site.origin)) {
+      continue;
+    }
+    origins.add(site.origin);
+    sites.push(site);
+    if (sites.length === maximumVisitedSites) {
+      break;
+    }
+  }
+  return sites;
+};
+const load = async () => {
+  try {
+    return normalize(await getJson$5(storageKey));
+  } catch {
+    return [];
+  }
+};
+const save = async sites => {
+  try {
+    await setJson$3(storageKey, sites);
+  } catch {
+    // Browsing should continue when local storage is unavailable or full.
+  }
+};
+const add = (sites, url, favicon) => {
+  const origin = getOrigin(url);
+  if (!origin || !isValidFavicon(favicon)) {
+    return sites;
+  }
+  const newSite = {
+    favicon,
+    origin
+  };
+  return [newSite, ...sites.filter(site => site.origin !== origin)].slice(0, maximumVisitedSites);
+};
+const getSuggestions = (sites, query) => {
+  const normalizedQuery = query.trim().toLowerCase();
+  if (normalizedQuery.length < 2) {
+    return [];
+  }
+  return sites.filter(site => site.origin.toLowerCase().includes(normalizedQuery)).slice(0, 4).map(site => ({
+    favicon: site.favicon,
+    type: 'url',
+    value: site.origin
+  }));
+};
+
 const embedsWorkerUrl = `${assetDir}/packages/embeds-worker/dist/embedsWorkerMain.js`;
 
 const getConfiguredWorkerUrl = () => {
@@ -32791,17 +32883,48 @@ const create$7 = (id, uri, x, y, width, height) => {
     audioIndicatorEnabled: true,
     tabsEnabled: true,
     selectedTabIndex: 0,
-    zoomLevel: 0
+    zoomLevel: 0,
+    visitedSites: []
   };
 };
 const saveState$2 = state => {
   const {
-    iframeSrc
+    iframeSrc,
+    selectedTabIndex,
+    tabs
   } = state;
   return {
-    iframeSrc
+    iframeSrc,
+    selectedTabIndex,
+    tabs: tabs.map(tab => ({
+      favicon: tab.favicon,
+      iframeSrc: tab.iframeSrc,
+      inputValue: tab.inputValue,
+      title: tab.title
+    }))
   };
 };
+const getTabsFromSavedState = savedState => {
+  if (!Array.isArray(savedState?.tabs)) {
+    return [];
+  }
+  return savedState.tabs.filter(tab => tab && typeof tab === 'object').map(tab => {
+    const iframeSrc = typeof tab.iframeSrc === 'string' ? tab.iframeSrc : '';
+    return createTab$1({
+      browserViewId: 0,
+      favicon: typeof tab.favicon === 'string' ? tab.favicon : '',
+      iframeSrc,
+      inputValue: typeof tab.inputValue === 'string' ? tab.inputValue : iframeSrc,
+      title: typeof tab.title === 'string' ? tab.title : 'New Tab'
+    });
+  });
+};
+const getSavedSelectedTabIndex = (savedState, tabs) => {
+  if (tabs.length === 0 || !Number.isInteger(savedState?.selectedTabIndex)) {
+    return 0;
+  }
+  return Math.max(0, Math.min(savedState.selectedTabIndex, tabs.length - 1));
+};
 const getUrlFromSavedState = savedState => {
   if (savedState && savedState.iframeSrc) {
     return savedState.iframeSrc;
@@ -32824,7 +32947,7 @@ const backgroundLoadContent = async (state, savedState) => {
   const headerHeight = getHeaderHeight(tabsEnabled);
   // TODO since browser view is not visible at this point
   // it is not necessary to load keybindings for it
-  const keyBindings = await getKeyBindings$H();
+  const [keyBindings, visitedSites] = await Promise.all([getKeyBindings$H(), load()]);
   const fallThroughKeyBindings = getFallThroughKeyBindings(keyBindings);
   const browserViewId = await createWebContentsView(0);
   await setFallthroughKeyBindings(browserViewId, fallThroughKeyBindings);
@@ -32849,6 +32972,7 @@ const backgroundLoadContent = async (state, savedState) => {
     tabsEnabled,
     title,
     zoomLevel: 0,
+    visitedSites,
     uri: `simple-browser://${browserViewId}`,
     iframeSrc,
     inputValue: iframeSrc,
@@ -32873,9 +32997,12 @@ const loadContent$7 = async (state, savedState) => {
   } = state;
   const idPart = uri.slice('simple-browser://'.length);
   const id = getId(idPart);
-  const iframeSrc = getUrlFromSavedState(savedState);
+  const savedTabs = getTabsFromSavedState(savedState);
+  const savedSelectedTabIndex = getSavedSelectedTabIndex(savedState, savedTabs);
+  const savedSelectedTab = savedTabs[savedSelectedTabIndex];
+  const iframeSrc = savedSelectedTab ? savedSelectedTab.iframeSrc : getUrlFromSavedState(savedState);
   // TODO load keybindings in parallel with creating browserview
-  const keyBindings = await getKeyBindings$H();
+  const [keyBindings, visitedSites] = await Promise.all([getKeyBindings$H(), load()]);
   const audioIndicatorEnabled = get$h('simpleBrowser.audioIndicator.enabled') !== false;
   const suggestionsEnabled = get$h('simpleBrowser.suggestions');
   const tabsEnabled = get$h('simpleBrowser.tabs.enabled') !== false;
@@ -32886,78 +33013,57 @@ const loadContent$7 = async (state, savedState) => {
   const browserViewHeight = height - headerHeight;
   const shortcuts = getShortCuts();
   const fallThroughKeyBindings = getFallThroughKeyBindings(keyBindings);
-  if (id) {
-    const actualId = await createWebContentsView(id, uid);
-    await setFallthroughKeyBindings(actualId, fallThroughKeyBindings);
-    await resizeWebContentsView(actualId, browserViewX, browserViewY, browserViewWidth, browserViewHeight);
-    if (id !== actualId) {
-      await setIframeSrc(actualId, iframeSrc);
-    }
-    const stats = await getStats$1(actualId);
-    const title = stats.title || 'Simple Browser';
-    const tab = createTab$1({
-      browserViewId: actualId,
-      canGoBack: stats.canGoBack,
-      canGoForward: stats.canGoForward,
-      iframeSrc,
-      inputValue: iframeSrc,
-      muted: Boolean(stats.isAudioMuted),
-      title
-    });
-    return {
-      ...state,
-      audioIndicatorEnabled,
-      browserViewId: actualId,
-      iframeSrc,
-      inputValue: iframeSrc,
-      canGoBack: stats.canGoBack,
-      canGoForward: stats.canGoForward,
-      headerHeight,
-      selectedTabIndex: 0,
-      suggestionsEnabled,
-      shortcuts,
-      tabs: [tab],
-      tabsEnabled,
-      title,
-      muted: Boolean(stats.isAudioMuted)
-    };
-  }
-  const browserViewId = await createWebContentsView(/* restoreId */0, uid);
+  const browserViewId = await createWebContentsView(id, uid);
   await setFallthroughKeyBindings(browserViewId, fallThroughKeyBindings);
   await resizeWebContentsView(browserViewId, browserViewX, browserViewY, browserViewWidth, browserViewHeight);
   number(browserViewId);
-  await setIframeSrc(browserViewId, iframeSrc);
+  if (iframeSrc && (!id || id !== browserViewId)) {
+    await setIframeSrc(browserViewId, iframeSrc);
+  }
   const {
     title,
     canGoBack,
     canGoForward,
     isAudioMuted
   } = await getStats$1(browserViewId);
+  const restoredTabs = savedTabs.length > 0 ? savedTabs : [createTab$1({
+    browserViewId: 0,
+    iframeSrc,
+    inputValue: iframeSrc,
+    title: title || 'Simple Browser'
+  })];
+  const selectedTabIndex = tabsEnabled ? savedSelectedTabIndex : 0;
+  const tabsToRestore = tabsEnabled ? restoredTabs : [restoredTabs[savedSelectedTabIndex]];
+  const savedActiveTab = tabsToRestore[selectedTabIndex];
+  const activeTab = createTab$1({
+    ...savedActiveTab,
+    browserViewId,
+    canGoBack,
+    canGoForward,
+    iframeSrc,
+    inputValue: savedActiveTab.inputValue,
+    muted: Boolean(isAudioMuted),
+    title: title || savedActiveTab.title || 'Simple Browser'
+  });
+  const tabs = tabsToRestore.with(selectedTabIndex, activeTab);
   return {
     ...state,
     audioIndicatorEnabled,
-    iframeSrc,
-    inputValue: iframeSrc,
-    title,
+    iframeSrc: activeTab.iframeSrc,
+    inputValue: activeTab.inputValue,
+    title: activeTab.title,
     browserViewId,
     canGoBack,
     canGoForward,
     muted: Boolean(isAudioMuted),
-    uri: `simple-browser://${browserViewId}`,
+    uri: id ? uri : `simple-browser://${browserViewId}`,
     headerHeight,
-    selectedTabIndex: 0,
+    selectedTabIndex,
     suggestionsEnabled,
     shortcuts,
-    tabs: [createTab$1({
-      browserViewId,
-      canGoBack,
-      canGoForward,
-      iframeSrc,
-      inputValue: iframeSrc,
-      muted: Boolean(isAudioMuted),
-      title
-    })],
-    tabsEnabled
+    tabs,
+    tabsEnabled,
+    visitedSites
   };
 };
 const show$2 = async state => {
@@ -32967,7 +33073,7 @@ const show$2 = async state => {
   await show$3(browserViewId);
 };
 const hide = async state => {
-  await Promise.all(state.tabs.map(tab => hide$1(tab.browserViewId)));
+  await Promise.all(state.tabs.filter(tab => tab.browserViewId).map(tab => hide$1(tab.browserViewId)));
 };
 const createEmptyTab = async state => {
   const {
@@ -32985,6 +33091,17 @@ const createEmptyTab = async state => {
     browserViewId
   });
 };
+const materializeTab = async (state, tab) => {
+  const createdTab = await createEmptyTab(state);
+  if (tab.iframeSrc) {
+    void setIframeSrc(createdTab.browserViewId, tab.iframeSrc);
+  }
+  return {
+    ...tab,
+    browserViewId: createdTab.browserViewId,
+    isLoading: Boolean(tab.iframeSrc)
+  };
+};
 const switchWebContentsView = async (oldBrowserViewId, newBrowserViewId) => {
   await show$3(newBrowserViewId);
   if (oldBrowserViewId) {
@@ -33119,10 +33236,15 @@ const selectTab = async (state, index) => {
   if (state.hasSuggestionsOverlay) {
     newState = await closeSuggestions(state);
   }
-  const tab = newState.tabs[selectedTabIndex];
+  let tabs = newState.tabs;
+  let tab = tabs[selectedTabIndex];
+  if (!tab.browserViewId) {
+    tab = await materializeTab(newState, tab);
+    tabs = tabs.with(selectedTabIndex, tab);
+  }
   await switchWebContentsView(newState.browserViewId, tab.browserViewId);
   await focus$2(tab.browserViewId);
-  return activateTab(newState, newState.tabs, selectedTabIndex);
+  return activateTab(newState, tabs, selectedTabIndex);
 };
 const focusNextTab = state => {
   if (state.tabs.length === 0) {
@@ -33156,7 +33278,7 @@ const closeTab$1 = async (state, index) => {
       focusAddressVersion: newState.focusAddressVersion + 1
     };
   }
-  const tabs = currentState.tabs.toSpliced(tabIndex, 1);
+  let tabs = currentState.tabs.toSpliced(tabIndex, 1);
   const wasSelected = tabIndex === currentState.selectedTabIndex;
   let selectedTabIndex = currentState.selectedTabIndex;
   if (wasSelected) {
@@ -33164,7 +33286,9 @@ const closeTab$1 = async (state, index) => {
   } else if (tabIndex < selectedTabIndex) {
     selectedTabIndex--;
   }
-  await disposeWebContentsView(tab.browserViewId);
+  if (tab.browserViewId) {
+    await disposeWebContentsView(tab.browserViewId);
+  }
   if (!wasSelected) {
     return {
       ...currentState,
@@ -33172,7 +33296,11 @@ const closeTab$1 = async (state, index) => {
       tabs
     };
   }
-  const selectedTab = tabs[selectedTabIndex];
+  let selectedTab = tabs[selectedTabIndex];
+  if (!selectedTab.browserViewId) {
+    selectedTab = await materializeTab(currentState, selectedTab);
+    tabs = tabs.with(selectedTabIndex, selectedTab);
+  }
   await show$3(selectedTab.browserViewId);
   await focus$2(selectedTab.browserViewId);
   return activateTab(currentState, tabs, selectedTabIndex);
@@ -33198,8 +33326,8 @@ const closeTabsByIndex = async (state, indexes, preferredTabIndex) => {
   } = currentState;
   const preferredBrowserViewId = currentTabs[preferredTabIndex]?.browserViewId;
   const tabsToClose = currentTabs.filter((tab, index) => indexesToClose.has(index));
-  const remainingTabs = currentTabs.filter((tab, index) => !indexesToClose.has(index));
-  await Promise.all(tabsToClose.map(tab => disposeWebContentsView(tab.browserViewId)));
+  let remainingTabs = currentTabs.filter((tab, index) => !indexesToClose.has(index));
+  await Promise.all(tabsToClose.filter(tab => tab.browserViewId).map(tab => disposeWebContentsView(tab.browserViewId)));
   const retainedSelectedTabIndex = remainingTabs.findIndex(tab => tab.browserViewId === browserViewId);
   if (retainedSelectedTabIndex !== -1) {
     return {
@@ -33209,7 +33337,11 @@ const closeTabsByIndex = async (state, indexes, preferredTabIndex) => {
     };
   }
   const selectedTabIndex = Math.max(0, remainingTabs.findIndex(tab => tab.browserViewId === preferredBrowserViewId));
-  const selectedTab = remainingTabs[selectedTabIndex];
+  let selectedTab = remainingTabs[selectedTabIndex];
+  if (!selectedTab.browserViewId) {
+    selectedTab = await materializeTab(currentState, selectedTab);
+    remainingTabs = remainingTabs.with(selectedTabIndex, selectedTab);
+  }
   await show$3(selectedTab.browserViewId);
   await focus$2(selectedTab.browserViewId);
   return activateTab(currentState, remainingTabs, selectedTabIndex);
@@ -33311,13 +33443,13 @@ const handleInput$2 = async (state, value) => {
     }),
     selectedSuggestionIndex: -1
   };
-  if (!state.suggestionsEnabled || !shouldRequestSuggestions(value)) {
+  if (!state.suggestionsEnabled || value.trim().length < 2) {
     if (state.hasSuggestionsOverlay) {
       void execute$4('SimpleBrowser.closeSuggestions');
     }
     return newState;
   }
-  void requestSuggestions(state.uid, value);
+  void requestSuggestions(state.uid, value, shouldRequestSuggestions(value));
   return newState;
 };
 const suggestionsOverlayId = 'search-suggestions';
@@ -33326,25 +33458,40 @@ const shouldRequestSuggestions = value => {
   if (query.length < 2) {
     return false;
   }
-  return !/^(?:[a-z][a-z\d+.-]*:\/\/|localhost(?::\d+)?(?:\/|$)|\d{1,3}(?:\.\d{1,3}){3}(?::\d+)?(?:\/|$))/i.test(query);
+  return !/^(?:[a-z][a-z\d+.-]*:\/\/|localhost(?::\d+)?(?:\/|$)|\d{1,3}(?:\.\d{1,3}){3}(?::\d+)?(?:\/|$)|(?:[\w-]+\.)+[a-z]{2,}(?::\d+)?(?:\/|$))/i.test(query);
 };
-const requestSuggestions = async (uid, query) => {
+const requestSuggestions = async (uid, query, requestProviderSuggestions) => {
   let suggestions = [];
-  try {
-    suggestions = await get(query);
-  } catch {
-    // Provider failures should leave normal address-bar navigation available.
+  if (requestProviderSuggestions) {
+    try {
+      suggestions = await get(query);
+    } catch {
+      // Provider failures should leave normal address-bar navigation available.
+    }
   }
   await execute$4('SimpleBrowser.applySuggestions', uid, query, suggestions);
 };
+const createSearchSuggestion = value => {
+  return {
+    favicon: '',
+    type: 'search',
+    value
+  };
+};
+const getSuggestionValue = suggestion => {
+  return typeof suggestion === 'string' ? suggestion : suggestion?.value;
+};
 const applySuggestions = async (state, uid, query, suggestions) => {
   if (state.uid !== uid || state.inputValue !== query || !state.suggestionsEnabled) {
     return state;
   }
-  if (!Array.isArray(suggestions) || suggestions.length === 0) {
+  const visitedSiteSuggestions = getSuggestions(state.visitedSites, query);
+  const providerSuggestions = Array.isArray(suggestions) ? suggestions : [];
+  const allSuggestions = [...visitedSiteSuggestions, ...(providerSuggestions.length > 0 ? [createSearchSuggestion(query)] : []), ...providerSuggestions.map(createSearchSuggestion)];
+  const uniqueSuggestions = allSuggestions.filter((suggestion, index) => allSuggestions.findIndex(other => other.value === suggestion.value) === index).slice(0, 8);
+  if (uniqueSuggestions.length === 0) {
     return closeSuggestions(state);
   }
-  const uniqueSuggestions = [query, ...suggestions.filter(suggestion => suggestion !== query)].slice(0, 8);
   const overlayState = await showOverlay(state, suggestionsOverlayId);
   if (!overlayState.overlayIds.includes(suggestionsOverlayId)) {
     return state;
@@ -33404,7 +33551,7 @@ const navigate = (state, value) => {
   });
 };
 const acceptSuggestion = async (state, value) => {
-  const suggestion = typeof value === 'string' ? value : state.suggestions[state.selectedSuggestionIndex];
+  const suggestion = typeof value === 'string' ? value : getSuggestionValue(state.suggestions[state.selectedSuggestionIndex]);
   if (typeof suggestion !== 'string') {
     return state;
   }
@@ -33500,9 +33647,22 @@ const handleTitleUpdated = async (state, browserViewId, value) => {
 const handlePageFaviconUpdated = (state, browserViewId, favicons) => {
   const [actualBrowserViewId, actualFavicons] = parseWebContentsEvent(state, browserViewId, favicons);
   const favicon = Array.isArray(actualFavicons) ? actualFavicons[0] || '' : '';
-  return updateTab(state, actualBrowserViewId, {
+  const tab = state.tabs.find(tab => tab.browserViewId === actualBrowserViewId);
+  const newState = updateTab(state, actualBrowserViewId, {
     favicon
   });
+  if (!tab) {
+    return newState;
+  }
+  const visitedSites = add(state.visitedSites, tab.iframeSrc, favicon);
+  if (visitedSites === state.visitedSites) {
+    return newState;
+  }
+  void save(visitedSites);
+  return {
+    ...newState,
+    visitedSites
+  };
 };
 const handleAudioStateChanged = (state, browserViewId, audible) => {
   const [actualBrowserViewId, isAudioPlaying] = parseWebContentsEvent(state, browserViewId, audible);
@@ -33511,7 +33671,7 @@ const handleAudioStateChanged = (state, browserViewId, audible) => {
   });
 };
 const dispose$4 = async state => {
-  await Promise.all([...state.tabs.map(tab => disposeWebContentsView(tab.browserViewId)), dispose$5(state.snapshot)]);
+  await Promise.all([...state.tabs.filter(tab => tab.browserViewId).map(tab => disposeWebContentsView(tab.browserViewId)), dispose$5(state.snapshot)]);
 };
 
 // deprecated, use webcontentsview instead
@@ -34485,20 +34645,29 @@ const getSimpleBrowserVirtualDom = (canGoBack, canGoForward, isLoading, value, s
     });
     for (let index = 0; index < suggestions.length; index++) {
       const suggestion = suggestions[index];
+      const favicon = typeof suggestion === 'string' ? '' : suggestion.favicon;
+      const value = typeof suggestion === 'string' ? suggestion : suggestion.value;
       const selected = index === selectedSuggestionIndex;
       dom.push({
         type: Button$1,
         className: selected ? 'SimpleBrowserSuggestion SimpleBrowserSuggestionSelected' : 'SimpleBrowserSuggestion',
         role: Option$1,
         ariaSelected: selected,
-        'data-value': suggestion,
+        'data-value': value,
         onClick: HandleClickSuggestion,
         childCount: 2
-      }, {
+      }, favicon ? {
+        type: Img,
+        className: 'SimpleBrowserSuggestionFavicon',
+        crossOrigin: 'anonymous',
+        src: favicon,
+        draggable: false,
+        childCount: 0
+      } : {
         type: Div,
         className: 'MaskIcon MaskIconSearch SimpleBrowserSuggestionIcon',
         childCount: 0
-      }, text(suggestion));
+      }, text(value));
     }
   }
   return dom;
@@ -34616,7 +34785,7 @@ const resizeEffect = async state => {
     width,
     height
   } = state;
-  await Promise.all(tabs.map(tab => resizeWebContentsView(tab.browserViewId, x, y + headerHeight, width, height - headerHeight)));
+  await Promise.all(tabs.filter(tab => tab.browserViewId).map(tab => resizeWebContentsView(tab.browserViewId, x, y + headerHeight, width, height - headerHeight)));
 };
 
 const name$5 = 'SimpleBrowser';
@@ -36570,49 +36739,9 @@ const ViewletSimpleBrowserForward = {
   forward
 };
 
-const getConfirmationMessage = ({
-  cookieCount,
-  profileDirectory,
-  profileName
-}) => {
-  const cookieLabel = cookieCount === 1 ? 'cookie' : 'cookies';
-  return `Import ${cookieCount} ${cookieLabel} from Firefox profile "${profileName}" (${profileDirectory})? This gives Simple Browser the same website access as Firefox.`;
-};
-const getResultMessage = ({
-  failed,
-  imported,
-  skipped
-}) => {
-  return `Imported ${imported} Firefox cookies (${skipped} skipped, ${failed} failed).`;
-};
-const getErrorMessage = error => {
-  return error instanceof Error ? error.message : String(error);
-};
 const importFirefoxCookies = async state => {
-  try {
-    const {
-      browserViewId
-    } = state;
-    const info = await invoke$I('FirefoxCookieImport.getInfo');
-    const confirmed = await prompt$1(getConfirmationMessage(info), {
-      confirmMessage: 'Import',
-      title: 'Import Firefox Cookies'
-    });
-    if (!confirmed) {
-      return state;
-    }
-    const result = await invoke$I('FirefoxCookieImport.importCookies');
-    await reload$2(browserViewId);
-    const notificationType = result.failed > 0 ? 'warning' : 'info';
-    await create$1c(notificationType, getResultMessage(result));
-    return {
-      ...state,
-      isLoading: true
-    };
-  } catch (error) {
-    await create$1c('error', `Failed to import Firefox cookies: ${getErrorMessage(error)}`);
-    return state;
-  }
+  await execute$4('Main.openUri', 'cookie-import-view:///');
+  return state;
 };
 
 const ViewletSimpleBrowserImportFirefoxCookies = {