@lvce-editor/static-server 0.71.3 → 0.71.5

package/static/{17fc835 → 08d6cdd}/packages/main-area-worker/dist/mainAreaWorkerMain.js

@@ -6,42 +6,68 @@ const create$7 = () => {
   const states = Object.create(null);
   const commandMapRef = {};
   return {
-    get(uid) {
-      return states[uid];
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
     },
-    set(uid, oldState, newState) {
-      states[uid] = {
-        oldState,
-        newState
-      };
+    diff(uid, modules, numbers) {
+      const {
+        newState,
+        oldState
+      } = states[uid];
+      const diffResult = [];
+      for (let i = 0; i < modules.length; i++) {
+        const fn = modules[i];
+        if (!fn(oldState, newState)) {
+          diffResult.push(numbers[i]);
+        }
+      }
+      return diffResult;
     },
     dispose(uid) {
       delete states[uid];
     },
+    get(uid) {
+      return states[uid];
+    },
+    getCommandIds() {
+      const keys = Object.keys(commandMapRef);
+      const ids = keys.map(toCommandId);
+      return ids;
+    },
     getKeys() {
       return Object.keys(states).map(key => {
         return Number.parseInt(key);
       });
     },
-    clear() {
-      for (const key of Object.keys(states)) {
-        delete states[key];
-      }
+    registerCommands(commandMap) {
+      Object.assign(commandMapRef, commandMap);
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        newState,
+        oldState
+      };
     },
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
         const {
-          oldState,
-          newState
+          newState,
+          oldState
         } = states[uid];
         const newerState = await fn(newState, ...args);
         if (oldState === newerState || newState === newerState) {
           return;
         }
-        const latest = states[uid];
+        const latestOld = states[uid];
+        const latestNew = {
+          ...latestOld.newState,
+          ...newerState
+        };
         states[uid] = {
-          oldState: latest.oldState,
-          newState: newerState
+          newState: latestNew,
+          oldState: latestOld.oldState
         };
       };
       return wrapped;
@@ -54,28 +80,6 @@ const create$7 = () => {
         return fn(newState, ...args);
       };
       return wrapped;
-    },
-    diff(uid, modules, numbers) {
-      const {
-        oldState,
-        newState
-      } = states[uid];
-      const diffResult = [];
-      for (let i = 0; i < modules.length; i++) {
-        const fn = modules[i];
-        if (!fn(oldState, newState)) {
-          diffResult.push(numbers[i]);
-        }
-      }
-      return diffResult;
-    },
-    getCommandIds() {
-      const keys = Object.keys(commandMapRef);
-      const ids = keys.map(toCommandId);
-      return ids;
-    },
-    registerCommands(commandMap) {
-      Object.assign(commandMapRef, commandMap);
     }
   };
 };
@@ -98,23 +102,29 @@ const {
   get: get$2,
   getCommandIds,
   registerCommands,
-  set: set$3,
+  set: set$4,
   wrapCommand,
   wrapGetter
 } = create$7();
 
-const create$6 = (uid, uri, x, y, width, height, platform, assetDir) => {
+const create$6 = (uid, uri, x, y, width, height, platform, assetDir, tabHeight = 35) => {
   const state = {
     assetDir,
+    fileIconCache: {},
+    height,
     layout: {
       activeGroupId: undefined,
       direction: 'horizontal',
       groups: []
     },
     platform,
-    uid
+    tabHeight,
+    uid,
+    width,
+    x,
+    y
   };
-  set$3(uid, state, state);
+  set$4(uid, state, state);
 };
 
 const isEqual = (oldState, newState) => {
@@ -146,14 +156,7 @@ const diff2 = uid => {
   return result;
 };
 
-const Button$1 = 1;
-const Div = 4;
-const Span = 8;
-const Text = 12;
-const Img = 17;
-const Pre = 51;
-
-const Button = 'event.button';
+const Button$1 = 'event.button';
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
 const TargetName = 'event.target.name';
@@ -163,9 +166,6 @@ const Tab = 13;
 const Separator = 1;
 const None = 0;
 
-const ExtensionHostWorker = 44;
-const RendererWorker = 1;
-
 const SetDom2 = 'Viewlet.setDom2';
 
 const getMenuIds = () => {
@@ -179,94 +179,9 @@ const handleClick = async (state, name) => {
   return state;
 };
 
-const closeTab = (state, groupId, tabId) => {
-  const {
-    layout
-  } = state;
-  const {
-    activeGroupId,
-    groups
-  } = layout;
-  const newGroups = groups.map(group => {
-    if (group.id === groupId) {
-      const newTabs = group.tabs.filter(tab => tab.id !== tabId);
-      let newActiveTabId = group.activeTabId;
-      if (group.activeTabId === tabId) {
-        const tabIndex = group.tabs.findIndex(tab => tab.id === tabId);
-        if (newTabs.length > 0) {
-          newActiveTabId = newTabs[Math.min(tabIndex, newTabs.length - 1)].id;
-        } else {
-          newActiveTabId = undefined;
-        }
-      }
-      return {
-        ...group,
-        activeTabId: newActiveTabId,
-        tabs: newTabs
-      };
-    }
-    return group;
-  });
-
-  // If the group has no tabs left and there are other groups, remove the group
-  const groupWithNoTabs = newGroups.find(group => group.id === groupId && group.tabs.length === 0);
-  if (groupWithNoTabs && newGroups.length > 1) {
-    const remainingGroups = newGroups.filter(group => group.id !== groupId);
-    const redistributedGroups = remainingGroups.map(group => ({
-      ...group,
-      size: Math.round(100 / remainingGroups.length)
-    }));
-    const newActiveGroupId = activeGroupId === groupId ? remainingGroups[0]?.id : activeGroupId;
-    return {
-      ...state,
-      layout: {
-        ...layout,
-        activeGroupId: newActiveGroupId,
-        groups: redistributedGroups
-      }
-    };
-  }
-  return {
-    ...state,
-    layout: {
-      ...layout,
-      groups: newGroups
-    }
-  };
-};
-
-const handleClickCloseTab = (state, rawGroupIndex, rawIndex) => {
-  if (!rawGroupIndex || !rawIndex) {
-    return state;
-  }
-  const groupIndex = Number.parseInt(rawGroupIndex);
-  const index = Number.parseInt(rawIndex);
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-
-  // Validate indexes
-  if (groupIndex < 0 || groupIndex >= groups.length) {
-    return state;
-  }
-  const group = groups[groupIndex];
-  if (index < 0 || index >= group.tabs.length) {
-    return state;
-  }
-  const tab = group.tabs[index];
-  const groupId = group.id;
-  const tabId = tab.id;
-  return closeTab(state, groupId, tabId);
-};
-
-// Counter for request IDs to handle race conditions
-let requestIdCounter = 0;
-const getNextRequestId = () => {
-  return ++requestIdCounter;
-};
+const ExtensionHostWorker = 44;
+const IconThemeWorker = 7009;
+const RendererWorker = 1;
 
 const normalizeLine = line => {
   if (line.startsWith('Error: ')) {
@@ -726,7 +641,7 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   return promise;
 };
 const Message$1 = 3;
-const create$5 = async ({
+const create$5$1 = async ({
   isMessagePortOpen,
   messagePort
 }) => {
@@ -777,7 +692,7 @@ const wrap$5 = messagePort => {
 };
 const IpcParentWithMessagePort$1 = {
   __proto__: null,
-  create: create$5,
+  create: create$5$1,
   signal: signal$1,
   wrap: wrap$5
 };
@@ -983,7 +898,7 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1$2 = (id, error) => {
+const create$1$1 = (id, error) => {
   return {
     jsonrpc: Two$1,
     id,
@@ -994,9 +909,9 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$2(id, errorProperty);
+  return create$1$1(id, errorProperty);
 };
-const create$3 = (message, result) => {
+const create$4 = (message, result) => {
   return {
     jsonrpc: Two$1,
     id: message.id,
@@ -1005,7 +920,7 @@ const create$3 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$3(message, resultProperty);
+  return create$4(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -1119,14 +1034,14 @@ const execute = (command, ...args) => {
 };
 
 const Two = '2.0';
-const create$s = (method, params) => {
+const create$t = (method, params) => {
   return {
     jsonrpc: Two,
     method,
     params
   };
 };
-const create$r = (id, method, params) => {
+const create$s = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -1136,14 +1051,14 @@ const create$r = (id, method, params) => {
   return message;
 };
 let id$1 = 0;
-const create$q = () => {
+const create$r = () => {
   return ++id$1;
 };
 
 /* eslint-disable n/no-unsupported-features/es-syntax */
 
 const registerPromise = map => {
-  const id = create$q();
+  const id = create$r();
   const {
     promise,
     resolve
@@ -1161,7 +1076,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$r(id, method, params);
+  const message = create$s(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -1197,7 +1112,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$s(method, params);
+      const message = create$t(method, params);
       ipc.send(message);
     }
   };
@@ -1233,7 +1148,54 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$4 = async ({
+
+/* eslint-disable @typescript-eslint/no-misused-promises */
+
+const createSharedLazyRpc = factory => {
+  let rpcPromise;
+  const getOrCreate = () => {
+    if (!rpcPromise) {
+      rpcPromise = factory();
+    }
+    return rpcPromise;
+  };
+  return {
+    async dispose() {
+      const rpc = await getOrCreate();
+      await rpc.dispose();
+    },
+    async invoke(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invoke(method, ...params);
+    },
+    async invokeAndTransfer(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    async send(method, ...params) {
+      const rpc = await getOrCreate();
+      rpc.send(method, ...params);
+    }
+  };
+};
+const create$j = async ({
+  commandMap,
+  isMessagePortOpen,
+  send
+}) => {
+  return createSharedLazyRpc(() => {
+    return create$3({
+      commandMap,
+      isMessagePortOpen,
+      send
+    });
+  });
+};
+const LazyTransferMessagePortRpcParent = {
+  __proto__: null,
+  create: create$j
+};
+const create$5 = async ({
   commandMap,
   isMessagePortOpen = true,
   messagePort
@@ -1250,7 +1212,7 @@ const create$4 = async ({
   messagePort.start();
   return rpc;
 };
-const create$2 = async ({
+const create$3 = async ({
   commandMap,
   isMessagePortOpen,
   send
@@ -1260,7 +1222,7 @@ const create$2 = async ({
     port2
   } = new MessageChannel();
   await send(port1);
-  return create$4({
+  return create$5({
     commandMap,
     isMessagePortOpen,
     messagePort: port2
@@ -1268,9 +1230,9 @@ const create$2 = async ({
 };
 const TransferMessagePortRpcParent = {
   __proto__: null,
-  create: create$2
+  create: create$3
 };
-const create$1$1 = async ({
+const create$2 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -1282,7 +1244,7 @@ const create$1$1 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$1$1
+  create: create$2
 };
 const createMockRpc = ({
   commandMap
@@ -1305,7 +1267,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$2 = (id, rpc) => {
+const set$3 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get = id => {
@@ -1338,7 +1300,7 @@ const create$1 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$2(rpcId, mockRpc);
+      set$3(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1347,15 +1309,24 @@ const create$1 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$2(rpcId, rpc);
+      set$3(rpcId, rpc);
     }
   };
 };
 
 const {
-  set: set$1
+  set: set$2
 } = create$1(ExtensionHostWorker);
 
+const {
+  invoke: invoke$1,
+  set: set$1
+} = create$1(IconThemeWorker);
+const getIcons = async iconRequests => {
+  // @ts-ignore
+  return invoke$1('IconTheme.getIcons', iconRequests);
+};
+
 const {
   invoke,
   invokeAndTransfer,
@@ -1369,11 +1340,33 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
   // @ts-ignore
   await invoke('ContextMenu.show2', uid, menuId, x, y, args);
 };
+const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
+  const command = 'IconTheme.handleMessagePort';
+  // @ts-ignore
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
+};
 const sendMessagePortToExtensionHostWorker$1 = async (port, rpcId = 0) => {
   const command = 'HandleMessagePort.handleMessagePort2';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
 };
 
+const handleAttach = async command => {
+  // TODO find a better way to append editors
+  const parentNodeSelector = '.editor-groups-container';
+  // @ts-ignore
+  await invoke('Layout.attachViewlet', parentNodeSelector, command.instanceId);
+};
+
+let counter = 0;
+const create = () => {
+  return ++counter;
+};
+const setMinId = minId => {
+  if (minId > counter) {
+    counter = minId;
+  }
+};
+
 const updateTab = (state, tabId, updates) => {
   const {
     layout
@@ -1408,6 +1401,7 @@ const updateTab = (state, tabId, updates) => {
     }
   };
 };
+
 const findTab = (state, tabId) => {
   const {
     layout
@@ -1440,8 +1434,12 @@ const loadTabContentAsync = async (tabId, path, requestId, getLatestState) => {
     if (!latestTab || latestTab.loadRequestId !== requestId) {
       return latestState;
     }
+
+    // Assign editorUid if tab doesn't have one yet
+    const editorUid = latestTab.editorUid === -1 ? create() : latestTab.editorUid;
     return updateTab(latestState, tabId, {
       content,
+      editorUid,
       errorMessage: undefined,
       loadingState: 'loaded'
     });
@@ -1461,48 +1459,311 @@ const loadTabContentAsync = async (tabId, path, requestId, getLatestState) => {
   }
 };
 
-const startContentLoading = async (oldState, state, tabId, path, requestId) => {
-  try {
-    const getLatestState = () => {
-      return get$2(state.uid).newState;
-    };
-    set$3(state.uid, oldState, state);
-    const newState = await loadTabContentAsync(tabId, path, requestId, getLatestState);
-    return newState;
-  } catch {
-    // Silently ignore errors - the tab may have been closed or the component unmounted
+/**
+ * SAFE: Create viewlet for a tab (no visible side effects)
+ * Can be called eagerly when tab is opened - the viewlet loads in the background.
+ */
+const createViewletForTab = (state, tabId, viewletModuleId, bounds) => {
+  const tab = findTab(state, tabId);
+  if (!tab) {
+    return state;
   }
-  return state;
-};
 
-const shouldLoadContent = tab => {
-  // Load if:
-  // - Has a path (file-based tab)
-  // - Not already loaded or currently loading
-  if (!tab.path) {
-    return false;
-  }
-  if (tab.loadingState === 'loading') {
-    return false;
-  }
-  if (tab.loadingState === 'loaded' && tab.content) {
-    return false;
+  // If tab already has an editorUid or is loading/loaded, don't recreate
+  if (tab.editorUid !== -1 || tab.loadingState === 'loading' || tab.loadingState === 'loaded') {
+    return state;
   }
-  return true;
+  const editorUid = create();
+  const newState = updateTab(state, tabId, {
+    editorUid
+  });
+  return newState;
 };
-const selectTab = async (state, groupIndex, index) => {
+
+/**
+ * Called when switching tabs.
+ * With reference nodes, attachment/detachment is handled automatically by virtual DOM rendering.
+ * No attach/detach commands needed - virtual DOM will render the correct reference at each position.
+ */
+const switchViewlet = (state, fromTabId, toTabId) => {
+  // No commands needed - virtual DOM reference nodes handle attachment automatically
+  // Virtual DOM will:
+  // 1. Remove the old reference node from the previous active tab
+  // 2. Add the new reference node for the now-active tab
+  // This achieves the same effect as detach/attach without explicit commands
+
+  return {
+    commands: [],
+    newState: state
+  };
+};
+
+const findTabByEditorUid = (state, editorUid) => {
   const {
-    layout,
-    uid
+    layout
   } = state;
   const {
     groups
   } = layout;
-
-  // Validate indexes
-  if (groupIndex < 0 || groupIndex >= groups.length) {
-    return state;
-  }
+  for (const group of groups) {
+    const tab = group.tabs.find(t => t.editorUid === editorUid);
+    if (tab) {
+      return tab;
+    }
+  }
+  return undefined;
+};
+
+/**
+ * Called when renderer reports viewlet finished creating.
+ * With reference nodes, attachment is handled automatically by virtual DOM rendering.
+ * No commands needed - state update is sufficient.
+ */
+const handleViewletReady = (state, editorUid) => {
+  if (editorUid === -1) {
+    throw new Error('Invalid editorUid -1');
+  }
+  // Find the tab by viewletRequestId
+  const tab = findTabByEditorUid(state, editorUid);
+  if (!tab) {
+    // Tab was closed, dispose viewlet
+    return state;
+  }
+
+  // Mark viewlet as ready and set instance id
+  // Reference nodes will handle rendering at the correct position automatically
+  const newState = updateTab(state, tab.id, {
+    editorUid,
+    loadingState: 'loaded'
+  });
+
+  // No attach commands needed - virtual DOM reference nodes handle positioning
+  return newState;
+};
+
+const handleCreate = async command => {
+  // Safe to call - no visible side effects
+  // @ts-ignore
+  const instanceId = Math.random(); // TODO try to find a better way to get consistent integer ids (thread safe)
+
+  await invoke('Layout.createViewlet', command.viewletModuleId, command.tabId, command.bounds, command.uri, instanceId);
+
+  // After viewlet is created, mark it as ready
+  // Attachment is handled automatically by virtual DOM reference nodes
+  const {
+    newState: state,
+    oldState
+  } = get$2(command.uid);
+  const readyState = handleViewletReady(state, command.editorUid);
+  set$4(command.uid, oldState, readyState);
+  return readyState;
+};
+
+const handleDetach = async command => {
+  // Hides viewlet but keeps it alive
+  // @ts-ignore
+  await invoke('Viewlet.detach', command.instanceId);
+};
+
+const handleDispose = async command => {
+  // Fully destroys viewlet
+  // @ts-ignore
+  await invoke('Viewlet.dispose', command.instanceId);
+};
+
+const handleSetBounds = async command => {
+  // @ts-ignore
+  await invoke('Viewlet.setBounds', command.instanceId, command.bounds);
+};
+
+const executeViewletCommands = async commands => {
+  for (const command of commands) {
+    switch (command.type) {
+      case 'attach':
+        await handleAttach(command);
+        break;
+      case 'create':
+        await handleCreate(command);
+        break;
+      case 'detach':
+        await handleDetach(command);
+        break;
+      case 'dispose':
+        await handleDispose(command);
+        break;
+      case 'setBounds':
+        await handleSetBounds(command);
+        break;
+    }
+  }
+};
+
+const closeTab = (state, groupId, tabId) => {
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const newGroups = groups.map(group => {
+    if (group.id === groupId) {
+      const newTabs = group.tabs.filter(tab => tab.id !== tabId);
+      let newActiveTabId = group.activeTabId;
+      if (group.activeTabId === tabId) {
+        const tabIndex = group.tabs.findIndex(tab => tab.id === tabId);
+        if (newTabs.length > 0) {
+          newActiveTabId = newTabs[Math.min(tabIndex, newTabs.length - 1)].id;
+        } else {
+          newActiveTabId = undefined;
+        }
+      }
+      return {
+        ...group,
+        activeTabId: newActiveTabId,
+        tabs: newTabs
+      };
+    }
+    return group;
+  });
+
+  // If the group has no tabs left and there are other groups, remove the group
+  const groupWithNoTabs = newGroups.find(group => group.id === groupId && group.tabs.length === 0);
+  if (groupWithNoTabs && newGroups.length > 1) {
+    const remainingGroups = newGroups.filter(group => group.id !== groupId);
+    const redistributedGroups = remainingGroups.map(group => ({
+      ...group,
+      size: Math.round(100 / remainingGroups.length)
+    }));
+    const newActiveGroupId = activeGroupId === groupId ? remainingGroups[0]?.id : activeGroupId;
+    return {
+      ...state,
+      layout: {
+        ...layout,
+        activeGroupId: newActiveGroupId,
+        groups: redistributedGroups
+      }
+    };
+  }
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      groups: newGroups
+    }
+  };
+};
+
+const handleClickCloseTab = (state, rawGroupIndex, rawIndex) => {
+  if (!rawGroupIndex || !rawIndex) {
+    return state;
+  }
+  const groupIndex = Number.parseInt(rawGroupIndex);
+  const index = Number.parseInt(rawIndex);
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+
+  // Validate indexes
+  if (groupIndex < 0 || groupIndex >= groups.length) {
+    return state;
+  }
+  const group = groups[groupIndex];
+  if (index < 0 || index >= group.tabs.length) {
+    return state;
+  }
+  const tab = group.tabs[index];
+  const groupId = group.id;
+  const tabId = tab.id;
+  return closeTab(state, groupId, tabId);
+};
+
+const createViewlet = async (viewletModuleId, editorUid, tabId, bounds, uri) => {
+  // @ts-ignore
+  await invoke('Layout.createViewlet', viewletModuleId, editorUid, tabId, bounds, uri);
+};
+
+const findTabById = (state, tabId) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  for (const group of groups) {
+    const tab = group.tabs.find(t => t.id === tabId);
+    if (tab) {
+      return {
+        groupId: group.id,
+        tab
+      };
+    }
+  }
+  return undefined;
+};
+
+// Counter for request IDs to handle race conditions
+let requestIdCounter = 0;
+const getNextRequestId = () => {
+  return ++requestIdCounter;
+};
+
+const startContentLoading = async (oldState, state, tabId, path, requestId) => {
+  try {
+    const getLatestState = () => {
+      return get$2(state.uid).newState;
+    };
+    set$4(state.uid, oldState, state);
+    const newState = await loadTabContentAsync(tabId, path, requestId, getLatestState);
+    return newState;
+  } catch {
+    // Silently ignore errors - the tab may have been closed or the component unmounted
+  }
+  return state;
+};
+
+const shouldLoadContent = tab => {
+  // Load if:
+  // - Has a path (file-based tab)
+  // - Not already loaded or currently loading
+  if (!tab.uri) {
+    return false;
+  }
+  if (tab.loadingState === 'loading') {
+    return false;
+  }
+  if (tab.loadingState === 'loaded' && tab.content) {
+    return false;
+  }
+  return true;
+};
+const getActiveTabId$1 = state => {
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const activeGroup = groups.find(g => g.id === activeGroupId);
+  return activeGroup?.activeTabId;
+};
+const selectTab = async (state, groupIndex, index) => {
+  const {
+    layout,
+    uid
+  } = state;
+  const {
+    groups
+  } = layout;
+
+  // Validate indexes
+  if (groupIndex < 0 || groupIndex >= groups.length) {
+    return state;
+  }
   const group = groups[groupIndex];
   if (index < 0 || index >= group.tabs.length) {
     return state;
@@ -1516,6 +1777,9 @@ const selectTab = async (state, groupIndex, index) => {
     return state;
   }
 
+  // Get previous active tab ID for viewlet switching
+  getActiveTabId$1(state);
+
   // Check if we need to load content for the newly selected tab
   const needsLoading = shouldLoadContent(tab);
   const requestId = needsLoading ? getNextRequestId() : 0;
@@ -1535,9 +1799,8 @@ const selectTab = async (state, groupIndex, index) => {
       if (t.id === tabId) {
         return {
           ...t,
-          errorMessage: undefined,
-          loadingState: 'loading',
-          loadRequestId: requestId
+          errorMessage: '',
+          loadingState: 'loading'
         };
       }
       return t;
@@ -1549,7 +1812,7 @@ const selectTab = async (state, groupIndex, index) => {
       tabs: updatedTabs
     };
   });
-  const newState = {
+  let newState = {
     ...state,
     layout: {
       ...layout,
@@ -1557,11 +1820,78 @@ const selectTab = async (state, groupIndex, index) => {
       groups: updatedGroups
     }
   };
-  set$3(uid, state, newState);
+
+  // Switch viewlet: detach old, attach new (if ready)
+  const {
+    commands: switchCommands,
+    newState: stateWithViewlet
+  } = switchViewlet(newState);
+  newState = stateWithViewlet;
+
+  // If new tab's viewlet isn't ready yet, trigger creation (idempotent)
+  const newTab = newState.layout.groups[groupIndex].tabs[index];
+  if (!newTab.loadingState || newTab.loadingState === 'loading') {
+    try {
+      // Query RendererWorker for viewlet module ID
+      // @ts-ignore
+      const viewletModuleId = await invoke('Layout.getModuleId', newTab.uri);
+      if (viewletModuleId) {
+        // Calculate bounds: use main area bounds minus 35px for tab height
+        const TAB_HEIGHT = 35;
+        const bounds = {
+          height: newState.height - TAB_HEIGHT,
+          width: newState.width,
+          x: newState.x,
+          y: newState.y + TAB_HEIGHT
+        };
+        const createdState = createViewletForTab(newState, tabId, viewletModuleId, bounds);
+        newState = createdState;
+
+        // Store updated state before creating viewlet
+        set$4(uid, state, newState);
+
+        // Execute viewlet commands if any
+        if (switchCommands.length > 0) {
+          await executeViewletCommands(switchCommands);
+        }
+
+        // Get the tab to extract editorUid for viewlet creation
+        const tabWithViewlet = findTabById(newState, tabId);
+        if (tabWithViewlet) {
+          const {
+            editorUid
+          } = tabWithViewlet.tab;
+          if (editorUid !== -1 && newTab.uri) {
+            // Create the actual viewlet instance
+            await createViewlet(viewletModuleId, editorUid, tabId, bounds, newTab.uri);
+
+            // Mark viewlet as ready
+            newState = handleViewletReady(newState, editorUid);
+            set$4(uid, state, newState);
+          }
+        }
+
+        // Start loading content in the background if needed
+        if (needsLoading && tab.uri) {
+          const latestState = await startContentLoading(state, newState, tabId, tab.uri, requestId);
+          return latestState;
+        }
+        return newState;
+      }
+    } catch {
+      // Viewlet creation is optional - silently ignore if RendererWorker isn't available
+    }
+  }
+  set$4(uid, state, newState);
+
+  // Execute viewlet commands if any
+  if (switchCommands.length > 0) {
+    await executeViewletCommands(switchCommands);
+  }
 
   // Start loading content in the background if needed
-  if (needsLoading && tab.path) {
-    const latestState = await startContentLoading(state, newState, tabId, tab.path, requestId);
+  if (needsLoading && tab.uri) {
+    const latestState = await startContentLoading(state, newState, tabId, tab.uri, requestId);
     return latestState;
   }
   return newState;
@@ -1611,7 +1941,7 @@ const createExtensionHostRpc = async () => {
 
 const initialize = async () => {
   const rpc = await createExtensionHostRpc();
-  set$1(rpc);
+  set$2(rpc);
 };
 
 const getMaxIdFromLayout = layout => {
@@ -1629,17 +1959,6 @@ const getMaxIdFromLayout = layout => {
   return maxId;
 };
 
-let idCounter = 0;
-const create = () => {
-  idCounter++;
-  return idCounter;
-};
-const setMinId = minId => {
-  if (minId > idCounter) {
-    idCounter = minId;
-  }
-};
-
 const isValidTab = tab => {
   return tab && typeof tab.id === 'number' && typeof tab.title === 'string' && typeof tab.content === 'string' && typeof tab.isDirty === 'boolean' && (tab.editorType === 'text' || tab.editorType === 'custom') && (tab.editorType !== 'custom' || typeof tab.customEditorId === 'string');
 };
@@ -1681,7 +2000,233 @@ const tryRestoreLayout = savedState => {
   if (!isValidMainAreaLayout(layout)) {
     return undefined;
   }
-  return layout;
+  return layout;
+};
+
+const getIconsCached = (dirents, fileIconCache) => {
+  return dirents.map(dirent => fileIconCache[dirent]);
+};
+
+const getBasename$1 = uri => {
+  const lastSlashIndex = uri.lastIndexOf('/');
+  if (lastSlashIndex === -1) {
+    return uri;
+  }
+  return uri.slice(lastSlashIndex + 1);
+};
+const getMissingTabs = (tabs, fileIconCache) => {
+  const missingTabs = [];
+  for (const tab of tabs) {
+    if (tab.uri && !(tab.uri in fileIconCache)) {
+      missingTabs.push(tab);
+    }
+  }
+  return missingTabs;
+};
+const tabToIconRequest = tab => {
+  const uri = tab.uri || '';
+  return {
+    name: getBasename$1(uri),
+    path: uri,
+    type: 0 // file type
+  };
+};
+const getMissingIconRequestsForTabs = (tabs, fileIconCache) => {
+  const missingRequests = getMissingTabs(tabs, fileIconCache);
+  const iconRequests = missingRequests.map(tabToIconRequest);
+  return iconRequests;
+};
+
+const Directory = 3;
+const DirectoryExpanded = 4;
+
+const getSimpleIconRequestType = direntType => {
+  if (direntType === Directory || direntType === DirectoryExpanded) {
+    return 2;
+  }
+  return 1;
+};
+
+const toSimpleIconRequest = request => {
+  return {
+    name: request.name,
+    type: getSimpleIconRequestType(request.type)
+  };
+};
+
+const requestFileIcons = async requests => {
+  if (requests.length === 0) {
+    return [];
+  }
+  const simpleRequests = requests.map(toSimpleIconRequest);
+  const icons = await getIcons(simpleRequests);
+  return icons;
+};
+
+const updateIconCache = (iconCache, missingRequests, newIcons) => {
+  if (missingRequests.length === 0) {
+    return iconCache;
+  }
+  const newFileIconCache = {
+    ...iconCache
+  };
+  for (let i = 0; i < missingRequests.length; i++) {
+    const request = missingRequests[i];
+    const icon = newIcons[i];
+    newFileIconCache[request.path] = icon;
+  }
+  return newFileIconCache;
+};
+
+const getFileIconsForTabs = async (tabs, fileIconCache) => {
+  const missingRequests = getMissingIconRequestsForTabs(tabs, fileIconCache);
+  const newIcons = await requestFileIcons(missingRequests);
+  const newFileIconCache = updateIconCache(fileIconCache, missingRequests, newIcons);
+  const tabUris = tabs.map(tab => tab.uri || '');
+  const icons = getIconsCached(tabUris, newFileIconCache);
+  return {
+    icons,
+    newFileIconCache
+  };
+};
+
+const getAllTabs = layout => {
+  const allTabs = [];
+  for (const group of layout.groups) {
+    allTabs.push(...group.tabs);
+  }
+  return allTabs;
+};
+
+const loadFileIcons = async state => {
+  try {
+    const allTabs = getAllTabs(state.layout);
+    const {
+      newFileIconCache
+    } = await getFileIconsForTabs(allTabs, state.fileIconCache);
+
+    // Update tabs with their icons
+    const updatedLayout = {
+      ...state.layout,
+      groups: state.layout.groups.map(group => ({
+        ...group,
+        tabs: group.tabs.map(tab => ({
+          ...tab,
+          icon: newFileIconCache[tab.uri || '']
+        }))
+      }))
+    };
+    return {
+      fileIconCache: newFileIconCache,
+      updatedLayout
+    };
+  } catch {
+    // If icon request fails, continue without icons
+    return {
+      fileIconCache: state.fileIconCache,
+      updatedLayout: state.layout
+    };
+  }
+};
+
+const getViewletModuleId = async uri => {
+  // Query RendererWorker for viewlet module ID (optional, may fail in tests)
+  let viewletModuleId;
+  try {
+    // @ts-ignore
+    viewletModuleId = await invoke('Layout.getModuleId', uri);
+  } catch {
+    // Viewlet creation is optional - silently ignore if RendererWorker isn't available
+  }
+  return viewletModuleId;
+};
+
+const TAB_HEIGHT = 35;
+
+// Get viewlet module IDs for active tabs in each group
+const getViewletModuleIds = async layout => {
+  const viewletModuleIds = {};
+  for (const group of layout.groups) {
+    const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
+    if (activeTab && activeTab.uri) {
+      const viewletModuleId = await getViewletModuleId(activeTab.uri);
+      if (viewletModuleId) {
+        viewletModuleIds[activeTab.id] = viewletModuleId;
+      }
+    }
+  }
+  return viewletModuleIds;
+};
+
+// Create viewlets for the active tabs
+const createViewlets = async (layout, viewletModuleIds, bounds) => {
+  const editorUids = {};
+  for (const group of layout.groups) {
+    const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
+    if (activeTab && viewletModuleIds[activeTab.id]) {
+      const editorUid = activeTab.editorUid === -1 ? create() : activeTab.editorUid;
+      editorUids[activeTab.id] = editorUid;
+      await createViewlet(viewletModuleIds[activeTab.id], editorUid, activeTab.id, bounds, activeTab.uri);
+    }
+  }
+  return editorUids;
+};
+
+// Update tabs with editor UIDs
+const updateTabs = (state, editorUids) => {
+  const updatedGroups = state.layout.groups.map(group => {
+    return {
+      ...group,
+      tabs: group.tabs.map(tab => {
+        if (editorUids[tab.id]) {
+          return {
+            ...tab,
+            editorUid: editorUids[tab.id]
+          };
+        }
+        return tab;
+      })
+    };
+  });
+  return {
+    ...state,
+    layout: {
+      ...state.layout,
+      groups: updatedGroups
+    }
+  };
+};
+const restoreAndCreateEditors = async (state, restoredLayout) => {
+  let newState = {
+    ...state,
+    layout: restoredLayout
+  };
+  const bounds = {
+    height: newState.height - TAB_HEIGHT,
+    width: newState.width,
+    x: newState.x,
+    y: newState.y + TAB_HEIGHT
+  };
+
+  // Get viewlet module IDs for all active tabs
+  const viewletModuleIds = await getViewletModuleIds(newState.layout);
+
+  // Create viewlets and get editor UIDs
+  const editorUids = await createViewlets(newState.layout, viewletModuleIds, bounds);
+
+  // Update tabs with editor UIDs
+  newState = updateTabs(newState, editorUids);
+
+  // Create viewlets in the lifecycle and mark them as ready
+  for (const group of newState.layout.groups) {
+    const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
+    if (activeTab && viewletModuleIds[activeTab.id]) {
+      const editorUid = editorUids[activeTab.id];
+      newState = createViewletForTab(newState, activeTab.id);
+      newState = handleViewletReady(newState, editorUid);
+    }
+  }
+  return newState;
 };
 
 const loadContent = async (state, savedState) => {
@@ -1689,10 +2234,23 @@ const loadContent = async (state, savedState) => {
   if (restoredLayout) {
     const maxId = getMaxIdFromLayout(restoredLayout);
     setMinId(maxId);
-    return {
-      ...state,
-      layout: restoredLayout
+
+    // Restore and create editors
+    const editorState = await restoreAndCreateEditors(state, restoredLayout);
+
+    // Load file icons with the updated editor state
+    const {
+      fileIconCache,
+      updatedLayout
+    } = await loadFileIcons(editorState);
+
+    // Merge the results
+    const finalState = {
+      ...editorState,
+      fileIconCache,
+      layout: updatedLayout
     };
+    return finalState;
   }
   return {
     ...state,
@@ -1716,33 +2274,30 @@ const i18nString = (key, placeholders = emptyObject) => {
   return key.replaceAll(RE_PLACEHOLDER, replacer);
 };
 
-/**
- * @enum {string}
- */
-const UiStrings = {
-  Close: 'Close',
-  CloseAll: 'Close All',
-  CloseOthers: 'Close Others',
-  CloseToTheRight: 'Close To The Right',
-  FindFileReferences: 'Find File References',
-  RevealInExplorer: 'Reveal in Explorer'};
+const Close = 'Close';
+const CloseAll = 'Close All';
+const CloseOthers = 'Close Others';
+const CloseToTheRight = 'Close To The Right';
+const FindFileReferences = 'Find File References';
+const RevealInExplorer = 'Reveal in Explorer';
+
 const close = () => {
-  return i18nString(UiStrings.Close);
+  return i18nString(Close);
 };
 const closeOthers = () => {
-  return i18nString(UiStrings.CloseOthers);
+  return i18nString(CloseOthers);
 };
 const closeAll = () => {
-  return i18nString(UiStrings.CloseAll);
+  return i18nString(CloseAll);
 };
 const revealInExplorer = () => {
-  return i18nString(UiStrings.RevealInExplorer);
+  return i18nString(RevealInExplorer);
 };
 const closeToTheRight = () => {
-  return i18nString(UiStrings.CloseToTheRight);
+  return i18nString(CloseToTheRight);
 };
 const findFileReferences = () => {
-  return i18nString(UiStrings.FindFileReferences);
+  return i18nString(FindFileReferences);
 };
 
 const menuEntrySeparator = {
@@ -1769,7 +2324,7 @@ const getMenuEntries$1 = state => {
   const tab = tabs[activeTabId || 0];
   object(tab);
   const {
-    path
+    uri: path
   } = tab;
   return [{
     command: 'Main.closeFocusedTab',
@@ -1815,42 +2370,60 @@ const getMenuEntries = async (state, props) => {
   }
 };
 
-const findTabByUri = (state, uri) => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  for (const group of groups) {
-    const tab = group.tabs.find(t => t.path === uri);
-    if (tab) {
-      return {
-        groupId: group.id,
-        tab
-      };
-    }
+const getBasename = uri => {
+  const lastSlashIndex = uri.lastIndexOf('/');
+  if (lastSlashIndex === -1) {
+    return uri;
   }
-  return undefined;
+  return uri.slice(lastSlashIndex + 1);
+};
+const getLabel = uri => {
+  if (uri.startsWith('settings://')) {
+    return 'Settings';
+  }
+  if (uri.startsWith('simple-browser://')) {
+    return 'Simple Browser';
+  }
+  return getBasename(uri);
 };
 
-const focusEditorGroup = (state, groupId) => {
+const createEmptyGroup = (state, uri, requestId) => {
   const {
     layout
   } = state;
   const {
     groups
   } = layout;
-  const updatedGroups = groups.map(group => ({
-    ...group,
-    focused: group.id === groupId
-  }));
+  const groupId = create();
+  const title = getLabel(uri);
+  const tabId = create();
+  const editorUid = create();
+  const newTab = {
+    content: '',
+    editorType: 'text',
+    editorUid,
+    errorMessage: '',
+    icon: '',
+    id: tabId,
+    isDirty: false,
+    language: '',
+    loadingState: 'loading',
+    title,
+    uri
+  };
+  const newGroup = {
+    activeTabId: newTab.id,
+    focused: true,
+    id: groupId,
+    size: 100,
+    tabs: [newTab]
+  };
   return {
     ...state,
     layout: {
       ...layout,
       activeGroupId: groupId,
-      groups: updatedGroups
+      groups: [...groups, newGroup]
     }
   };
 };
@@ -1885,21 +2458,110 @@ const openTab = (state, groupId, tab) => {
   };
 };
 
-const getBasename = uri => {
-  const lastSlashIndex = uri.lastIndexOf('/');
-  if (lastSlashIndex === -1) {
-    return uri;
+const ensureActiveGroup = (state, uri) => {
+  // Find the active group (by activeGroupId or focused flag)
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const activeGroup = activeGroupId === undefined ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
+
+  // Generate a request ID for content loading
+  getNextRequestId();
+
+  // If no active group exists, create one
+  let newState;
+  if (activeGroup) {
+    // Create a new tab with the URI in the active group
+    const title = getLabel(uri);
+    const tabId = create();
+    const editorUid = create();
+    const newTab = {
+      content: '',
+      editorType: 'text',
+      editorUid,
+      errorMessage: '',
+      icon: '',
+      id: tabId,
+      isDirty: false,
+      language: '',
+      loadingState: 'loading',
+      title,
+      uri: uri
+    };
+    newState = openTab(state, activeGroup.id, newTab);
+  } else {
+    newState = createEmptyGroup(state, uri);
   }
-  return uri.slice(lastSlashIndex + 1);
+  return newState;
 };
-const getLabel = uri => {
-  if (uri.startsWith('settings://')) {
-    return 'Settings';
+
+const findTabByUri = (state, uri) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  for (const group of groups) {
+    const tab = group.tabs.find(t => t.uri === uri);
+    if (tab) {
+      return {
+        groupId: group.id,
+        tab
+      };
+    }
   }
-  if (uri.startsWith('simple-browser://')) {
-    return 'Simple Browser';
+  return undefined;
+};
+
+const focusEditorGroup = (state, groupId) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const updatedGroups = groups.map(group => ({
+    ...group,
+    focused: group.id === groupId
+  }));
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      activeGroupId: groupId,
+      groups: updatedGroups
+    }
+  };
+};
+
+const getActiveTabId = state => {
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const activeGroup = groups.find(g => g.id === activeGroupId);
+  return activeGroup?.activeTabId;
+};
+
+const getOptionUriOptions = options => {
+  let uri = '';
+  if (typeof options === 'string') {
+    uri = options;
+  } else {
+    const {
+      uri: optionsUri
+    } = options;
+    uri = optionsUri;
   }
-  return getBasename(uri);
+  return uri;
 };
 
 const switchTab = (state, groupId, tabId) => {
@@ -1930,16 +2592,12 @@ const switchTab = (state, groupId, tabId) => {
   };
 };
 
-/* eslint-disable prefer-destructuring */
-
 const openUri = async (state, options) => {
   object(state);
-  let uri = '';
-  if (typeof options === 'string') {
-    uri = options;
-  } else {
-    uri = options.uri;
-  }
+  const {
+    uid
+  } = state;
+  const uri = getOptionUriOptions(options);
 
   // Check if a tab with this URI already exists
   const existingTab = findTabByUri(state, uri);
@@ -1949,69 +2607,88 @@ const openUri = async (state, options) => {
     return switchTab(focusedState, existingTab.groupId, existingTab.tab.id);
   }
 
-  // Find the active group (by activeGroupId or focused flag)
+  // Get previous active tab ID for viewlet switching
+  getActiveTabId(state);
+  const newState = ensureActiveGroup(state, uri);
+  const tabId = getActiveTabId(newState);
+  const viewletModuleId = await getViewletModuleId(uri);
+  if (!viewletModuleId) {
+    // TODO display some kind of errro that editor couldn't be opened
+    return newState;
+  }
+
+  // Calculate bounds: use main area bounds minus 35px for tab height
+  const TAB_HEIGHT = 35;
+  const bounds = {
+    height: newState.height - TAB_HEIGHT,
+    width: newState.width,
+    x: newState.x,
+    y: newState.y + TAB_HEIGHT
+  };
+  const stateWithViewlet = createViewletForTab(newState, tabId);
+  let intermediateState1 = stateWithViewlet;
+
+  // Switch viewlet (detach old, attach new if ready)
   const {
-    layout
-  } = state;
+    newState: switchedState
+  } = switchViewlet(intermediateState1);
+  intermediateState1 = switchedState;
+  set$4(uid, state, intermediateState1);
+
+  // @ts-ignore
+
+  // Get the tab to extract editorUid
+  const tabWithViewlet = findTabById(intermediateState1, tabId);
+  if (!tabWithViewlet) {
+    return intermediateState1;
+  }
   const {
-    activeGroupId,
-    groups
-  } = layout;
-  const activeGroup = activeGroupId === undefined ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
+    editorUid
+  } = tabWithViewlet.tab;
+  if (editorUid === -1) {
+    throw new Error(`invalid editorUid`);
+  }
+  await createViewlet(viewletModuleId, editorUid, tabId, bounds, uri);
 
-  // Generate a request ID for content loading
-  const requestId = getNextRequestId();
+  // After viewlet is created, get the latest state and mark it as ready
+  // This ensures we have any state updates that occurred during viewlet creation
+  const {
+    newState: latestState
+  } = get$2(uid);
 
-  // If no active group exists, create one
-  if (!activeGroup) {
-    const groupId = create();
-    const title = getLabel(uri);
-    const tabId = create();
-    const newTab = {
-      content: '',
-      editorType: 'text',
-      id: tabId,
-      isDirty: false,
-      loadingState: 'loading',
-      loadRequestId: requestId,
-      path: uri,
-      title
-    };
-    const newGroup = {
-      activeTabId: newTab.id,
-      focused: true,
-      id: groupId,
-      size: 100,
-      tabs: [newTab]
-    };
-    const newState = {
-      ...state,
-      layout: {
-        ...layout,
-        activeGroupId: groupId,
-        groups: [...groups, newGroup]
-      }
-    };
+  // Attachment is handled automatically by virtual DOM reference nodes
+  const readyState = handleViewletReady(latestState, editorUid);
 
-    // Start loading content
-    return startContentLoading(state, newState, tabId, uri, requestId);
+  // Request file icon for the newly opened tab
+  try {
+    const newTab = findTabById(readyState, tabId);
+    if (newTab && newTab.tab.uri) {
+      const {
+        newFileIconCache
+      } = await getFileIconsForTabs([newTab.tab], readyState.fileIconCache);
+      const icon = newFileIconCache[newTab.tab.uri] || '';
+
+      // Update the tab with the icon
+      const stateWithIcon = {
+        ...readyState,
+        fileIconCache: newFileIconCache,
+        layout: {
+          ...readyState.layout,
+          groups: readyState.layout.groups.map(group => ({
+            ...group,
+            tabs: group.tabs.map(tab => tab.id === tabId ? {
+              ...tab,
+              icon
+            } : tab)
+          }))
+        }
+      };
+      return stateWithIcon;
+    }
+  } catch {
+    // If icon request fails, continue without icon
   }
-
-  // Create a new tab with the URI in the active group
-  const title = getLabel(uri);
-  const tabId = create();
-  const newTab = {
-    content: '',
-    editorType: 'text',
-    id: tabId,
-    isDirty: false,
-    loadingState: 'loading',
-    loadRequestId: requestId,
-    path: uri,
-    title
-  };
-  const newState = openTab(state, activeGroup.id, newTab);
-  return startContentLoading(state, newState, tabId, uri, requestId);
+  return readyState;
 };
 
 const refresh = state => {
@@ -2020,6 +2697,13 @@ const refresh = state => {
   };
 };
 
+const Button = 1;
+const Div = 4;
+const Span = 8;
+const Text = 12;
+const Img = 17;
+const Pre = 51;
+
 const text = data => {
   return {
     childCount: 0,
@@ -2031,17 +2715,18 @@ const text = data => {
 const CSS_CLASSES = {
   EDITOR_GROUPS_CONTAINER: 'editor-groups-container'};
 
-const renderLoading = () => {
+const renderContent = content => {
   return [{
     childCount: 1,
-    className: 'TextEditor TextEditor--loading',
+    className: 'TextEditor',
     type: Div
   }, {
     childCount: 1,
-    className: 'EditorContent EditorContent--loading',
-    type: Div
-  }, text('Loading...')];
+    className: 'EditorContent',
+    type: Pre
+  }, text(content)];
 };
+
 const renderError = errorMessage => {
   return [{
     childCount: 1,
@@ -2053,40 +2738,52 @@ const renderError = errorMessage => {
     type: Div
   }, text(`Error: ${errorMessage}`)];
 };
-const renderContent = content => {
+
+const renderLoading = () => {
   return [{
     childCount: 1,
-    className: 'TextEditor',
+    className: 'TextEditor TextEditor--loading',
     type: Div
   }, {
     childCount: 1,
-    className: 'EditorContent',
-    type: Pre
-  }, text(content)];
+    className: 'EditorContent EditorContent--loading',
+    type: Div
+  }, text('Loading...')];
+};
+
+const renderViewletReference = tab => {
+  return [{
+    childCount: 0,
+    type: 100,
+    // Reference node type - frontend will append the component at this position
+    uid: tab.editorUid
+  }];
 };
+
 const renderEditor = tab => {
   if (!tab) {
+    // Keep backward compatible behavior: render empty content
     return renderContent('');
   }
-  if (tab.editorType === 'custom') {
-    return [{
-      childCount: 1,
-      className: 'CustomEditor',
-      type: Div
-    }, text(`Custom Editor: ${tab.customEditorId}`)];
-  }
 
-  // Handle loading state
+  // Viewlet is being created in background - show loading
   if (tab.loadingState === 'loading') {
     return renderLoading();
   }
 
-  // Handle error state
+  // Viewlet is ready - render a reference node
+  // Frontend will append the pre-created component at this position using the uid
+  // Check for viewletInstanceId to distinguish between viewlet and plain text tabs
+  if (tab.loadingState === 'loaded' && tab.editorUid !== -1) {
+    return renderViewletReference(tab);
+  }
+
+  // Viewlet error state
   if (tab.loadingState === 'error' && tab.errorMessage) {
     return renderError(tab.errorMessage);
   }
 
-  // Default: render content
+  // Default: render content (fallback for simple text without viewlet)
   return renderContent(tab.content || '');
 };
 
@@ -2104,12 +2801,12 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
     onClick: HandleClickTab,
     onContextMenu: HandleTabContextMenu,
     role: 'tab',
-    title: tab.path || tab.title,
+    title: tab.uri || tab.title,
     type: Div
   }, {
     childCount: 0,
     className: 'TabIcon',
-    src: 'icons/refresh.svg',
+    src: tab.icon,
     type: Img
   }, {
     childCount: 1,
@@ -2121,7 +2818,7 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
     'data-groupIndex': groupIndex,
     'data-index': tabIndex,
     onClick: HandleClickClose,
-    type: Button$1
+    type: Button
   }, text('×')];
 };
 
@@ -2193,7 +2890,7 @@ const render2 = (uid, diffResult) => {
     newState,
     oldState
   } = get$2(uid);
-  set$3(uid, newState, newState);
+  set$4(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -2210,7 +2907,7 @@ const renderEventListeners = () => {
     params: ['handleClickTab', 'event.target.dataset.groupIndex', 'event.target.dataset.index']
   }, {
     name: HandleTabContextMenu,
-    params: ['handleTabContextMenu', Button, ClientX, ClientY],
+    params: ['handleTabContextMenu', Button$1, ClientX, ClientY],
     preventDefault: true
   }];
 };
@@ -2249,11 +2946,31 @@ const commandMap = {
   'MainArea.render2': render2,
   'MainArea.renderEventListeners': renderEventListeners,
   'MainArea.resize': wrapCommand(resize),
-  'MainArea.saveState': saveState,
+  'MainArea.saveState': wrapGetter(saveState),
   'MainArea.selectTab': wrapCommand(selectTab),
   'MainArea.terminate': terminate
 };
 
+const send = port => {
+  return sendMessagePortToIconThemeWorker(port, 0);
+};
+const createIconThemeWorkerRpc = async () => {
+  try {
+    const rpc = await LazyTransferMessagePortRpcParent.create({
+      commandMap: {},
+      send
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create icon theme worker rpc`);
+  }
+};
+
+const initializeIconThemeWorker = async () => {
+  const rpc = await createIconThemeWorkerRpc();
+  set$1(rpc);
+};
+
 const initializeRendererWorker = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
@@ -2263,7 +2980,7 @@ const initializeRendererWorker = async () => {
 
 const listen = async () => {
   registerCommands(commandMap);
-  await initializeRendererWorker();
+  await Promise.all([initializeRendererWorker(), initializeIconThemeWorker()]);
 };
 
 const main$2 = async () => {