@lvce-editor/static-server 0.71.2 → 0.71.4

package/static/{5fe0be8 → db5fd5f}/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);
     }
   };
 };
@@ -106,13 +110,17 @@ const {
 const create$6 = (uid, uri, x, y, width, height, platform, assetDir) => {
   const state = {
     assetDir,
+    height,
     layout: {
       activeGroupId: undefined,
       direction: 'horizontal',
       groups: []
     },
     platform,
-    uid
+    uid,
+    width,
+    x,
+    y
   };
   set$3(uid, state, state);
 };
@@ -179,95 +187,6 @@ 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 normalizeLine = line => {
   if (line.startsWith('Error: ')) {
     return line.slice('Error: '.length);
@@ -726,7 +645,7 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   return promise;
 };
 const Message$1 = 3;
-const create$5 = async ({
+const create$5$1 = async ({
   isMessagePortOpen,
   messagePort
 }) => {
@@ -777,7 +696,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 +902,7 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1$2 = (id, error) => {
+const create$1$1 = (id, error) => {
   return {
     jsonrpc: Two$1,
     id,
@@ -994,9 +913,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 +924,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 +1038,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 +1055,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 +1080,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 +1116,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 +1152,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$4 = async ({
+const create$5 = async ({
   commandMap,
   isMessagePortOpen = true,
   messagePort
@@ -1250,7 +1169,7 @@ const create$4 = async ({
   messagePort.start();
   return rpc;
 };
-const create$2 = async ({
+const create$3 = async ({
   commandMap,
   isMessagePortOpen,
   send
@@ -1260,7 +1179,7 @@ const create$2 = async ({
     port2
   } = new MessageChannel();
   await send(port1);
-  return create$4({
+  return create$5({
     commandMap,
     isMessagePortOpen,
     messagePort: port2
@@ -1268,9 +1187,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 +1201,7 @@ const create$1$1 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$1$1
+  create: create$2
 };
 const createMockRpc = ({
   commandMap
@@ -1374,6 +1293,23 @@ const sendMessagePortToExtensionHostWorker$1 = async (port, rpcId = 0) => {
   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 +1344,7 @@ const updateTab = (state, tabId, updates) => {
     }
   };
 };
+
 const findTab = (state, tabId) => {
   const {
     layout
@@ -1440,8 +1377,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,86 +1402,327 @@ 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;
+  for (const group of groups) {
+    const tab = group.tabs.find(t => t.editorUid === editorUid);
+    if (tab) {
+      return tab;
+    }
+  }
+  return undefined;
+};
 
-  // Validate indexes
-  if (groupIndex < 0 || groupIndex >= groups.length) {
-    return state;
+/**
+ * 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');
   }
-  const group = groups[groupIndex];
-  if (index < 0 || index >= group.tabs.length) {
+  // Find the tab by viewletRequestId
+  const tab = findTabByEditorUid(state, editorUid);
+  if (!tab) {
+    // Tab was closed, dispose viewlet
     return state;
   }
-  const tab = group.tabs[index];
-  const groupId = group.id;
-  const tabId = tab.id;
 
-  // Return same state if this group and tab are already active
-  if (layout.activeGroupId === groupId && group.activeTabId === tabId) {
-    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'
+  });
 
-  // Check if we need to load content for the newly selected tab
-  const needsLoading = shouldLoadContent(tab);
-  const requestId = needsLoading ? getNextRequestId() : 0;
+  // No attach commands needed - virtual DOM reference nodes handle positioning
+  return newState;
+};
 
-  // Update the groups array with the new active tab and active group
-  // Also set loading state if needed
-  const updatedGroups = groups.map((g, i) => {
-    if (i !== groupIndex) {
-      return {
-        ...g,
-        focused: false
-      };
-    }
+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)
 
-    // This is the group being selected
-    const updatedTabs = needsLoading ? g.tabs.map(t => {
-      if (t.id === tabId) {
-        return {
-          ...t,
-          errorMessage: undefined,
-          loadingState: 'loading',
-          loadRequestId: requestId
-        };
-      }
-      return t;
+  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$3(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);
+};
+
+// 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$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
+  }
+  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;
+  }
+  const tab = group.tabs[index];
+  const groupId = group.id;
+  const tabId = tab.id;
+
+  // Return same state if this group and tab are already active
+  if (layout.activeGroupId === groupId && group.activeTabId === tabId) {
+    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;
+
+  // Update the groups array with the new active tab and active group
+  // Also set loading state if needed
+  const updatedGroups = groups.map((g, i) => {
+    if (i !== groupIndex) {
+      return {
+        ...g,
+        focused: false
+      };
+    }
+
+    // This is the group being selected
+    const updatedTabs = needsLoading ? g.tabs.map(t => {
+      if (t.id === tabId) {
+        return {
+          ...t,
+          errorMessage: '',
+          loadingState: 'loading'
+        };
+      }
+      return t;
     }) : g.tabs;
     return {
       ...g,
@@ -1549,7 +1731,7 @@ const selectTab = async (state, groupIndex, index) => {
       tabs: updatedTabs
     };
   });
-  const newState = {
+  let newState = {
     ...state,
     layout: {
       ...layout,
@@ -1557,11 +1739,47 @@ const selectTab = async (state, groupIndex, index) => {
       groups: updatedGroups
     }
   };
+
+  // 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;
+      }
+    } catch {
+      // Viewlet creation is optional - silently ignore if RendererWorker isn't available
+    }
+  }
   set$3(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;
@@ -1614,6 +1832,11 @@ const initialize = async () => {
   set$1(rpc);
 };
 
+const createViewlet = async (viewletModuleId, editorUid, tabId, bounds, uri) => {
+  // @ts-ignore
+  await invoke('Layout.createViewlet', viewletModuleId, editorUid, tabId, bounds, uri);
+};
+
 const getMaxIdFromLayout = layout => {
   let maxId = 0;
   for (const group of layout.groups) {
@@ -1629,15 +1852,16 @@ const getMaxIdFromLayout = layout => {
   return maxId;
 };
 
-let idCounter = 0;
-const create = () => {
-  idCounter++;
-  return idCounter;
-};
-const setMinId = minId => {
-  if (minId > idCounter) {
-    idCounter = minId;
+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 isValidTab = tab => {
@@ -1689,10 +1913,66 @@ const loadContent = async (state, savedState) => {
   if (restoredLayout) {
     const maxId = getMaxIdFromLayout(restoredLayout);
     setMinId(maxId);
-    return {
+    let newState = {
       ...state,
       layout: restoredLayout
     };
+
+    // Create viewlets only for active tabs in each group
+    const TAB_HEIGHT = 35;
+    const bounds = {
+      height: newState.height - TAB_HEIGHT,
+      width: newState.width,
+      x: newState.x,
+      y: newState.y + TAB_HEIGHT
+    };
+    for (const group of restoredLayout.groups) {
+      // Find the active tab in this group
+      const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
+      if (activeTab && activeTab.uri) {
+        const viewletModuleId = await getViewletModuleId(activeTab.uri);
+        if (viewletModuleId) {
+          // Ensure the tab has an editorUid
+          const editorUid = activeTab.editorUid === -1 ? create() : activeTab.editorUid;
+
+          // Create viewlet for the tab
+          newState = createViewletForTab(newState, activeTab.id);
+
+          // Update the tab with the editorUid in the state
+          const updatedGroups = newState.layout.groups.map(g => {
+            if (g.id !== group.id) {
+              return g;
+            }
+            return {
+              ...g,
+              tabs: g.tabs.map(t => {
+                if (t.id !== activeTab.id) {
+                  return t;
+                }
+                return {
+                  ...t,
+                  editorUid
+                };
+              })
+            };
+          });
+          newState = {
+            ...newState,
+            layout: {
+              ...newState.layout,
+              groups: updatedGroups
+            }
+          };
+
+          // Create the actual viewlet instance
+          await createViewlet(viewletModuleId, editorUid, activeTab.id, bounds, activeTab.uri);
+
+          // Mark the viewlet as ready
+          newState = handleViewletReady(newState, editorUid);
+        }
+      }
+    }
+    return newState;
   }
   return {
     ...state,
@@ -1716,33 +1996,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 +2046,7 @@ const getMenuEntries$1 = state => {
   const tab = tabs[activeTabId || 0];
   object(tab);
   const {
-    path
+    uri: path
   } = tab;
   return [{
     command: 'Main.closeFocusedTab',
@@ -1815,42 +2092,59 @@ 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: '',
+    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 +2179,128 @@ 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: '',
+      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 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
+      };
+    }
   }
-  if (uri.startsWith('simple-browser://')) {
-    return 'Simple Browser';
+  return undefined;
+};
+
+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
+      };
+    }
   }
-  return getBasename(uri);
+  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 uri;
 };
 
 const switchTab = (state, groupId, tabId) => {
@@ -1930,16 +2331,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 +2346,58 @@ const openUri = async (state, options) => {
     return switchTab(focusedState, existingTab.groupId, existingTab.tab.id);
   }
 
-  // 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);
+  // 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;
+  }
 
-  // Generate a request ID for content loading
-  const requestId = getNextRequestId();
+  // 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;
 
-  // 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]
-      }
-    };
+  // Switch viewlet (detach old, attach new if ready)
+  const {
+    newState: switchedState
+  } = switchViewlet(intermediateState1);
+  intermediateState1 = switchedState;
+  set$3(uid, state, intermediateState1);
 
-    // Start loading content
-    return startContentLoading(state, newState, tabId, uri, requestId);
+  // @ts-ignore
+
+  // Get the tab to extract editorUid
+  const tabWithViewlet = findTabById(intermediateState1, tabId);
+  if (!tabWithViewlet) {
+    return intermediateState1;
+  }
+  const {
+    editorUid
+  } = tabWithViewlet.tab;
+  if (editorUid === -1) {
+    throw new Error(`invalid editorUid`);
   }
+  await createViewlet(viewletModuleId, editorUid, tabId, bounds, uri);
 
-  // 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);
+  // 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);
+
+  // Attachment is handled automatically by virtual DOM reference nodes
+  const readyState = handleViewletReady(latestState, editorUid);
+  return readyState;
 };
 
 const refresh = state => {
@@ -2064,29 +2450,38 @@ const renderContent = content => {
     type: Pre
   }, text(content)];
 };
+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,7 +2499,7 @@ 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,
@@ -2249,7 +2644,7 @@ 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
 };