@lvce-editor/static-server 0.70.19 → 0.70.21

package/static/{711ab07 → a0480e0}/packages/main-area-worker/dist/mainAreaWorkerMain.js

@@ -1,3 +1,273 @@
+const toCommandId = key => {
+  const dotIndex = key.indexOf('.');
+  return key.slice(dotIndex + 1);
+};
+const create$7 = () => {
+  const states = Object.create(null);
+  const commandMapRef = {};
+  return {
+    get(uid) {
+      return states[uid];
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        oldState,
+        newState
+      };
+    },
+    dispose(uid) {
+      delete states[uid];
+    },
+    getKeys() {
+      return Object.keys(states).map(key => {
+        return Number.parseInt(key);
+      });
+    },
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
+    },
+    wrapCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          oldState,
+          newState
+        } = states[uid];
+        const newerState = await fn(newState, ...args);
+        if (oldState === newerState || newState === newerState) {
+          return;
+        }
+        const latest = states[uid];
+        states[uid] = {
+          oldState: latest.oldState,
+          newState: newerState
+        };
+      };
+      return wrapped;
+    },
+    wrapGetter(fn) {
+      const wrapped = (uid, ...args) => {
+        const {
+          newState
+        } = states[uid];
+        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);
+    }
+  };
+};
+const terminate = () => {
+  globalThis.close();
+};
+
+const closeAll$1 = state => {
+  return {
+    ...state,
+    layout: {
+      ...state.layout,
+      activeGroupId: undefined,
+      groups: []
+    }
+  };
+};
+
+const {
+  get: get$2,
+  getCommandIds,
+  registerCommands,
+  set: set$3,
+  wrapCommand,
+  wrapGetter
+} = create$7();
+
+const create$6 = (uid, uri, x, y, width, height, platform, assetDir) => {
+  const state = {
+    assetDir,
+    layout: {
+      activeGroupId: undefined,
+      direction: 'horizontal',
+      groups: []
+    },
+    platform,
+    uid
+  };
+  set$3(uid, state, state);
+};
+
+const isEqual = (oldState, newState) => {
+  return oldState.layout === newState.layout;
+};
+
+const RenderItems = 4;
+
+const modules = [isEqual];
+const numbers = [RenderItems];
+
+const diff = (oldState, newState) => {
+  const diffResult = [];
+  for (let i = 0; i < modules.length; i++) {
+    const fn = modules[i];
+    if (!fn(oldState, newState)) {
+      diffResult.push(numbers[i]);
+    }
+  }
+  return diffResult;
+};
+
+const diff2 = uid => {
+  const {
+    newState,
+    oldState
+  } = get$2(uid);
+  const result = diff(oldState, newState);
+  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 ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
+const TargetName = 'event.target.name';
+
+const Tab = 13;
+
+const Separator = 1;
+const None = 0;
+
+const ExtensionHostWorker = 44;
+const RendererWorker = 1;
+
+const SetDom2 = 'Viewlet.setDom2';
+
+const getMenuIds = () => {
+  return [Tab];
+};
+
+const handleClick = async (state, name) => {
+  if (!name) {
+    return state;
+  }
+  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);
@@ -90,6 +360,12 @@ const getType = value => {
       return Unknown;
   }
 };
+const object = value => {
+  const type = getType(value);
+  if (type !== Object$1) {
+    throw new AssertionError('expected value to be of type object');
+  }
+};
 const number = value => {
   const type = getType(value);
   if (type !== Number$1) {
@@ -508,7 +784,7 @@ const IpcParentWithMessagePort$1 = {
 
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const get$3 = id => {
+const get$1 = id => {
   return callbacks[id];
 };
 const remove$1 = id => {
@@ -657,7 +933,7 @@ const warn = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$3(id);
+  const fn = get$1(id);
   if (!fn) {
     console.log(response);
     warn(`callback ${id} may already be disposed`);
@@ -974,7 +1250,7 @@ const create$4 = async ({
   messagePort.start();
   return rpc;
 };
-const create$2$1 = async ({
+const create$2 = async ({
   commandMap,
   isMessagePortOpen,
   send
@@ -992,7 +1268,7 @@ const create$2$1 = async ({
 };
 const TransferMessagePortRpcParent = {
   __proto__: null,
-  create: create$2$1
+  create: create$2
 };
 const create$1$1 = async ({
   commandMap
@@ -1028,26 +1304,11 @@ const createMockRpc = ({
   return mockRpc;
 };
 
-const Button$1 = 'button';
-
-const Button = 1;
-const Div = 4;
-const Span = 8;
-const Text = 12;
-const Pre = 51;
-
-const TargetName = 'event.target.name';
-
-const ExtensionHostWorker = 44;
-const RendererWorker = 1;
-
-const SetDom2 = 'Viewlet.setDom2';
-
 const rpcs = Object.create(null);
-const set$3 = (id, rpc) => {
+const set$2 = (id, rpc) => {
   rpcs[id] = rpc;
 };
-const get$2 = id => {
+const get = id => {
   return rpcs[id];
 };
 const remove = id => {
@@ -1055,21 +1316,21 @@ const remove = id => {
 };
 
 /* eslint-disable  @typescript-eslint/explicit-function-return-type */
-const create$2 = rpcId => {
+const create$1 = rpcId => {
   return {
     async dispose() {
-      const rpc = get$2(rpcId);
+      const rpc = get(rpcId);
       await rpc.dispose();
     },
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get$2(rpcId);
+      const rpc = get(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get$2(rpcId);
+      const rpc = get(rpcId);
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
@@ -1077,7 +1338,7 @@ const create$2 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$3(rpcId, mockRpc);
+      set$2(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1086,218 +1347,248 @@ const create$2 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$3(rpcId, rpc);
+      set$2(rpcId, rpc);
     }
   };
 };
 
 const {
-  invoke: invoke$1,
-  set: set$2
-} = create$2(ExtensionHostWorker);
+  set: set$1
+} = create$1(ExtensionHostWorker);
 
 const {
   invoke,
   invokeAndTransfer,
-  set: set$1
-} = create$2(RendererWorker);
+  set
+} = create$1(RendererWorker);
+const showContextMenu2 = async (uid, menuId, x, y, args) => {
+  number(uid);
+  number(menuId);
+  number(x);
+  number(y);
+  // @ts-ignore
+  await invoke('ContextMenu.show2', uid, menuId, x, y, args);
+};
 const sendMessagePortToExtensionHostWorker$1 = async (port, rpcId = 0) => {
   const command = 'HandleMessagePort.handleMessagePort2';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
 };
-const activateByEvent$1 = (event, assetDir, platform) => {
-  return invoke('ExtensionHostManagement.activateByEvent', event, assetDir, platform);
+
+const updateTab = (state, tabId, updates) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const updatedGroups = groups.map(group => {
+    const tabIndex = group.tabs.findIndex(t => t.id === tabId);
+    if (tabIndex === -1) {
+      return group;
+    }
+    const updatedTabs = group.tabs.map((tab, index) => {
+      if (index === tabIndex) {
+        return {
+          ...tab,
+          ...updates
+        };
+      }
+      return tab;
+    });
+    return {
+      ...group,
+      tabs: updatedTabs
+    };
+  });
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      groups: updatedGroups
+    }
+  };
 };
-const getPreference = async key => {
-  return await invoke('Preferences.get', key);
+const findTab = (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 tab;
+    }
+  }
+  return undefined;
 };
-
-const toCommandId = key => {
-  const dotIndex = key.indexOf('.');
-  return key.slice(dotIndex + 1);
-};
-const create$1 = () => {
-  const states = Object.create(null);
-  const commandMapRef = {};
-  return {
-    get(uid) {
-      return states[uid];
-    },
-    set(uid, oldState, newState) {
-      states[uid] = {
-        oldState,
-        newState
-      };
-    },
-    dispose(uid) {
-      delete states[uid];
-    },
-    getKeys() {
-      return Object.keys(states).map(key => {
-        return Number.parseInt(key);
-      });
-    },
-    clear() {
-      for (const key of Object.keys(states)) {
-        delete states[key];
-      }
-    },
-    wrapCommand(fn) {
-      const wrapped = async (uid, ...args) => {
-        const {
-          oldState,
-          newState
-        } = states[uid];
-        const newerState = await fn(newState, ...args);
-        if (oldState === newerState || newState === newerState) {
-          return;
-        }
-        const latest = states[uid];
-        states[uid] = {
-          oldState: latest.oldState,
-          newState: newerState
-        };
-      };
-      return wrapped;
-    },
-    wrapGetter(fn) {
-      const wrapped = (uid, ...args) => {
-        const {
-          newState
-        } = states[uid];
-        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);
-    }
-  };
-};
-const terminate = () => {
-  globalThis.close();
+const loadFileContent = async path => {
+  // @ts-ignore
+  const content = await invoke('FileSystem.readFile', path);
+  return content;
 };
+const loadTabContentAsync = async (tabId, path, requestId, getLatestState) => {
+  try {
+    const content = await loadFileContent(path);
 
-const {
-  get: get$1,
-  getCommandIds: getCommandIds$1,
-  registerCommands: registerCommands$1,
-  set,
-  wrapCommand: wrapCommand$1} = create$1();
+    // Check for race condition: get the latest state and verify the request ID
+    const latestState = getLatestState();
+    const latestTab = findTab(latestState, tabId);
 
-const create = (uid, uri, x, y, width, height, platform, assetDir) => {
-  const state = {
-    assetDir,
-    platform,
-    statusBarItemsLeft: [],
-    statusBarItemsRight: [],
-    uid
-  };
-  set(uid, state, state);
+    // If the tab no longer exists or a newer request was started, discard this result
+    if (!latestTab || latestTab.loadRequestId !== requestId) {
+      return latestState;
+    }
+    return updateTab(latestState, tabId, {
+      content,
+      errorMessage: undefined,
+      loadingState: 'loaded'
+    });
+  } catch (error) {
+    // Check for race condition before updating with error
+    const latestState = getLatestState();
+    const latestTab = findTab(latestState, tabId);
+    if (!latestTab || latestTab.loadRequestId !== requestId) {
+      return latestState;
+    }
+    const errorMessage = error instanceof Error ? error.message : 'Failed to load file content';
+    return updateTab(latestState, tabId, {
+      content: '',
+      errorMessage,
+      loadingState: 'error'
+    });
+  }
 };
 
-const isEqual = (oldState, newState) => {
-  return oldState.statusBarItemsLeft === newState.statusBarItemsLeft && oldState.statusBarItemsRight === newState.statusBarItemsRight;
+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 RenderItems = 4;
+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;
+  }
+  return true;
+};
+const selectTab = async (state, groupIndex, index) => {
+  const {
+    layout,
+    uid
+  } = state;
+  const {
+    groups
+  } = layout;
 
-const modules = [isEqual];
-const numbers = [RenderItems];
+  // 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;
 
-const diff = (oldState, newState) => {
-  const diffResult = [];
-  for (let i = 0; i < modules.length; i++) {
-    const fn = modules[i];
-    if (!fn(oldState, newState)) {
-      diffResult.push(numbers[i]);
-    }
+  // Return same state if this group and tab are already active
+  if (layout.activeGroupId === groupId && group.activeTabId === tabId) {
+    return state;
   }
-  return diffResult;
-};
 
-const diff2 = uid => {
-  const {
-    newState,
-    oldState
-  } = get$1(uid);
-  const result = diff(oldState, newState);
-  return result;
-};
+  // Check if we need to load content for the newly selected tab
+  const needsLoading = shouldLoadContent(tab);
+  const requestId = needsLoading ? getNextRequestId() : 0;
 
-const getMatchingItem = (itemsLeft, itemsRight, name) => {
-  for (const item of itemsLeft) {
-    if (item.name === name) {
-      return item;
+  // 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
+      };
     }
-  }
-  for (const item of itemsRight) {
-    if (item.name === name) {
-      return item;
+
+    // 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;
+    }) : g.tabs;
+    return {
+      ...g,
+      activeTabId: tabId,
+      focused: true,
+      tabs: updatedTabs
+    };
+  });
+  const newState = {
+    ...state,
+    layout: {
+      ...layout,
+      activeGroupId: groupId,
+      groups: updatedGroups
     }
-  }
-  return undefined;
-};
+  };
+  set$3(uid, state, newState);
 
-const handleClickExtensionStatusBarItem = async name => {
-  // @ts-ignore
-  await invoke$1(`ExtensionHostStatusBar.executeCommand`, name);
+  // Start loading content in the background if needed
+  if (needsLoading && tab.path) {
+    const latestState = await startContentLoading(state, newState, tabId, tab.path, requestId);
+    return latestState;
+  }
+  return newState;
 };
 
-const handleClickNotification = async () => {
-  // TODO toggle notifications
+const handleClickTab = async (state, groupIndexRaw, indexRaw) => {
+  if (!groupIndexRaw || !indexRaw) {
+    return state;
+  }
+  const groupIndex = Number.parseInt(groupIndexRaw);
+  const index = Number.parseInt(indexRaw);
+  return selectTab(state, groupIndex, index);
 };
 
-const handleClickProblems = async () => {
-  // @ts-ignore
-  await invoke('Layout.showPanel');
-  // @ts-ignore
-  await invoke('Panel.toggleView', 'Problems');
+const show2 = async (uid, menuId, x, y, args) => {
+  await showContextMenu2(uid, menuId, x, y, args);
 };
 
-const Notifications = 'Notifications';
-const Problems = 'Problems';
-
-const handleClick = async (state, name) => {
-  if (!name) {
-    return state;
-  }
+const handleTabContextMenu = async (state, x, y) => {
+  number(x);
+  number(y);
   const {
-    statusBarItemsLeft,
-    statusBarItemsRight
+    uid
   } = state;
-  const item = getMatchingItem(statusBarItemsLeft, statusBarItemsRight, name);
-  if (!item) {
-    return state;
-  }
-  if (item.name === Notifications) {
-    await handleClickNotification();
-  } else if (item.name === Problems) {
-    await handleClickProblems();
-  } else {
-    await handleClickExtensionStatusBarItem(name);
-  }
-  // TODO
-  // sendExtensionWorker([/* statusBarItemHandleClick */ 7657, /* name */ name])
+  await show2(uid, Tab, x, y, {
+    menuId: Tab
+  });
   return state;
 };
 
@@ -1320,415 +1611,267 @@ const createExtensionHostRpc = async () => {
 
 const initialize = async () => {
   const rpc = await createExtensionHostRpc();
-  set$2(rpc);
+  set$1(rpc);
 };
 
-const getIndex = (items, item) => {
-  for (let i = 0; i < items.length; i++) {
-    if (items[i].name === item.name) {
-      return i;
+const getMaxIdFromLayout = layout => {
+  let maxId = 0;
+  for (const group of layout.groups) {
+    if (group.id > maxId) {
+      maxId = group.id;
+    }
+    for (const tab of group.tabs) {
+      if (tab.id > maxId) {
+        maxId = tab.id;
+      }
     }
   }
-  return -1;
-};
-
-const updateArray = (items, newItem) => {
-  const index = getIndex(items, newItem);
-  const before = items.slice(0, index);
-  const after = items.slice(index + 1);
-  return [...before, newItem, ...after];
+  return maxId;
 };
 
-const itemLeftUpdate = (state, newItem) => {
-  return {
-    ...state,
-    statusBarItemsLeft: updateArray([...state.statusBarItemsLeft], newItem)
-  };
+let idCounter = 0;
+const create = () => {
+  idCounter++;
+  return idCounter;
 };
-
-const itemRightCreate = (state, newItem) => {
-  const {
-    statusBarItemsRight
-  } = state;
-  const newStatusBarItemsRight = [...statusBarItemsRight, newItem];
-  return {
-    ...state,
-    statusBarItemsRight: newStatusBarItemsRight
-  };
+const setMinId = minId => {
+  if (minId > idCounter) {
+    idCounter = minId;
+  }
 };
 
-const itemRightUpdate = (state, newItem) => {
-  const {
-    statusBarItemsRight
-  } = state;
-  const newStatusBarItemsRight = updateArray([...statusBarItemsRight], newItem);
-  return {
-    ...state,
-    statusBarItemsRight: newStatusBarItemsRight
-  };
+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');
 };
 
-const ProblemsErrorIcon = 'ProblemsErrorIcon';
-const ProblemsWarningIcon = 'ProblemsWarningIcon';
-const StatusBarItem = 'StatusBarItem';
-const StatusBarItemsLeft = 'StatusBarItemsLeft';
-const StatusBarItemsRight = 'StatusBarItemsRight';
-
-const OnStatusBarItem = 'onStatusBarItem';
-
-const GetStatusBarItems = 'ExtensionHost.getStatusBarItems2';
-
-const activateByEvent = (event, assetDir, platform) => {
-  // @ts-ignore
-  return activateByEvent$1(event, assetDir, platform);
-};
-
-const executeProviders = async ({
-  assetDir,
-  combineResults,
-  event,
-  method,
-  noProviderFoundMessage = 'No provider found',
-  noProviderFoundResult,
-  params,
-  platform
-}) => {
-  await activateByEvent(event, assetDir, platform);
-  // @ts-ignore
-  const result = await invoke$1(method, ...params);
-  return result;
+const isValidEditorGroup = group => {
+  return group && typeof group.id === 'number' && Array.isArray(group.tabs) && group.tabs.every(isValidTab) && (group.activeTabId === undefined || typeof group.activeTabId === 'number') && typeof group.focused === 'boolean' && typeof group.size === 'number' && group.size > 0;
 };
 
-const combineResults = results => {
-  return results.flat();
-};
-const getStatusBarItems$1 = (assetDir, platform) => {
-  return executeProviders({
-    assetDir,
-    combineResults,
-    event: OnStatusBarItem,
-    method: GetStatusBarItems,
-    noProviderFoundMessage: 'No status bar item provider found',
-    noProviderFoundResult: [],
-    params: [],
-    platform
-  });
+const isValidMainAreaLayout = layout => {
+  if (!layout || typeof layout !== 'object') {
+    return false;
+  }
+  const layoutObj = layout;
+  if (layoutObj.activeGroupId !== undefined && typeof layoutObj.activeGroupId !== 'number') {
+    return false;
+  }
+  if (layoutObj.direction !== 'horizontal' && layoutObj.direction !== 'vertical') {
+    return false;
+  }
+  if (!Array.isArray(layoutObj.groups)) {
+    return false;
+  }
+  if (!layoutObj.groups.every(isValidEditorGroup)) {
+    return false;
+  }
+  return true;
 };
 
-const toStatusBarItem = uiStatusBarItem => {
-  const elements = [];
-  if (uiStatusBarItem.icon) {
-    elements.push({
-      type: 'icon',
-      value: uiStatusBarItem.icon
-    });
+const tryRestoreLayout = savedState => {
+  if (savedState === undefined || savedState === null) {
+    return undefined;
   }
-  if (uiStatusBarItem.text) {
-    elements.push({
-      type: 'text',
-      value: uiStatusBarItem.text
-    });
+  if (typeof savedState !== 'object') {
+    return undefined;
   }
-  if (elements.length === 0) {
-    elements.push({
-      type: 'text',
-      value: ''
-    });
+  const {
+    layout
+  } = savedState;
+  if (!isValidMainAreaLayout(layout)) {
+    return undefined;
   }
-  return {
-    command: uiStatusBarItem.command || undefined,
-    elements,
-    name: uiStatusBarItem.name,
-    tooltip: uiStatusBarItem.tooltip
-  };
+  return layout;
 };
 
-const toUiStatusBarItem = extensionHostStatusBarItem => {
+const loadContent = async (state, savedState) => {
+  const restoredLayout = tryRestoreLayout(savedState);
+  if (restoredLayout) {
+    const maxId = getMaxIdFromLayout(restoredLayout);
+    setMinId(maxId);
+    return {
+      ...state,
+      layout: restoredLayout
+    };
+  }
   return {
-    command: extensionHostStatusBarItem.command || '',
-    icon: extensionHostStatusBarItem.icon || '',
-    name: extensionHostStatusBarItem.id || extensionHostStatusBarItem.name || '',
-    text: extensionHostStatusBarItem.text || '',
-    tooltip: extensionHostStatusBarItem.tooltip || ''
+    ...state,
+    layout: {
+      activeGroupId: undefined,
+      direction: 'horizontal',
+      groups: []
+    }
   };
 };
 
-const toUiStatusBarItems = statusBarItems => {
-  if (!statusBarItems) {
-    return [];
+const emptyObject = {};
+const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
+const i18nString = (key, placeholders = emptyObject) => {
+  if (placeholders === emptyObject) {
+    return key;
   }
-  return statusBarItems.map(toUiStatusBarItem);
+  const replacer = (match, rest) => {
+    return placeholders[rest];
+  };
+  return key.replaceAll(RE_PLACEHOLDER, replacer);
 };
 
-const getStatusBarItems = async (showItems, assetDir, platform) => {
-  if (!showItems) {
-    return [];
-  }
-  await activateByEvent('onSourceControl', assetDir, platform);
-  const extensionStatusBarItems = await getStatusBarItems$1(assetDir, platform);
-  const uiStatusBarItems = toUiStatusBarItems(extensionStatusBarItems);
-  const extraItems = [{
-    command: undefined,
-    elements: [{
-      type: 'text',
-      value: 'Notifications'
-    }],
-    name: Notifications,
-    tooltip: ''
-  }, {
-    command: undefined,
-    elements: [{
-      type: 'icon',
-      value: ProblemsErrorIcon
-    }, {
-      type: 'text',
-      value: '0'
-    }, {
-      type: 'icon',
-      value: ProblemsWarningIcon
-    }, {
-      type: 'text',
-      value: '0'
-    }],
-    name: Problems,
-    tooltip: ''
-  }];
-  return [...uiStatusBarItems.map(toStatusBarItem), ...extraItems];
+/**
+ * @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 = () => {
+  return i18nString(UiStrings.Close);
 };
-
-const get = async key => {
-  return getPreference(key);
+const closeOthers = () => {
+  return i18nString(UiStrings.CloseOthers);
 };
-
-const itemsVisible = async () => {
-  const statusBarItemsPreference = (await get('statusBar.itemsVisible')) ?? true;
-  return statusBarItemsPreference;
+const closeAll = () => {
+  return i18nString(UiStrings.CloseAll);
 };
-
-const loadContent = async state => {
-  const {
-    assetDir,
-    platform
-  } = state;
-  const statusBarItemsPreference = await itemsVisible();
-  const statusBarItems = await getStatusBarItems(statusBarItemsPreference, assetDir, platform);
-  return {
-    ...state,
-    statusBarItemsLeft: [...statusBarItems],
-    statusBarItemsRight: []
-  };
+const revealInExplorer = () => {
+  return i18nString(UiStrings.RevealInExplorer);
 };
-
-const text = data => {
-  return {
-    childCount: 0,
-    text: data,
-    type: Text
-  };
+const closeToTheRight = () => {
+  return i18nString(UiStrings.CloseToTheRight);
+};
+const findFileReferences = () => {
+  return i18nString(UiStrings.FindFileReferences);
 };
 
-const HandleClick = 11;
-
-const getElementVirtualDom = element => {
-  if (element.type === 'text') {
-    return [text(element.value)];
-  }
-  if (element.type === 'icon') {
-    return [{
-      childCount: 0,
-      className: element.value,
-      type: Div
-    }];
-  }
-  return [];
+const menuEntrySeparator = {
+  command: '',
+  flags: Separator,
+  id: 'separator',
+  label: ''
 };
-const getStatusBarItemVirtualDom = statusBarItem => {
+
+// TODO should pass tab uri as argument or tab index
+const getMenuEntries$1 = state => {
+  const {
+    layout
+  } = state;
   const {
-    elements,
-    name,
-    tooltip
-  } = statusBarItem;
-  const elementNodes = elements.flatMap(getElementVirtualDom);
+    activeGroupId,
+    groups
+  } = layout;
+  const group = groups[activeGroupId || 0];
+  const {
+    activeTabId,
+    tabs
+  } = group;
+  const tab = tabs[activeTabId || 0];
+  object(tab);
+  const {
+    path
+  } = tab;
   return [{
-    childCount: elementNodes.length,
-    className: StatusBarItem,
-    name,
-    role: Button$1,
-    tabIndex: -1,
-    title: tooltip,
-    type: Button
-  }, ...elementNodes];
+    command: 'Main.closeFocusedTab',
+    flags: None,
+    id: 'tabClose',
+    label: close()
+  }, {
+    command: 'Main.closeOthers',
+    flags: None,
+    id: 'tabCloseOthers',
+    label: closeOthers()
+  }, {
+    command: 'Main.closeTabsRight',
+    flags: None,
+    id: 'tabCloseToTheRight',
+    label: closeToTheRight()
+  }, {
+    command: 'Main.closeAllEditors',
+    flags: None,
+    id: 'tabCloseAll',
+    label: closeAll()
+  }, menuEntrySeparator, {
+    args: [path],
+    command: 'Explorer.revealItem',
+    flags: None,
+    id: 'revealInExplorer',
+    label: revealInExplorer()
+  }, menuEntrySeparator, {
+    args: [/* id */'References', /* focus */true, path],
+    command: 'SideBar.show',
+    flags: None,
+    id: 'findFileReferences',
+    label: findFileReferences()
+  }];
 };
 
-const getStatusBarItemsVirtualDom = (items, className) => {
-  if (items.length === 0) {
-    return [];
+const getMenuEntries = async (state, props) => {
+  switch (props.menuId) {
+    case Tab:
+      return getMenuEntries$1(state);
+    default:
+      return [];
   }
-  return [{
-    childCount: items.length,
-    className,
-    type: Div
-  }, ...items.flatMap(getStatusBarItemVirtualDom)];
-};
-
-const getChildCount = (leftCount, rightCount) => {
-  let count = 0;
-  if (leftCount > 0) {
-    count++;
-  }
-  if (rightCount > 0) {
-    count++;
-  }
-  return count;
-};
-const getStatusBarVirtualDom = (statusBarItemsLeft, statusBarItemsRight) => {
-  const dom = [{
-    childCount: getChildCount(statusBarItemsLeft.length, statusBarItemsRight.length),
-    className: 'StatusBar',
-    onClick: HandleClick,
-    type: Div
-  }, ...getStatusBarItemsVirtualDom(statusBarItemsLeft, StatusBarItemsLeft), ...getStatusBarItemsVirtualDom(statusBarItemsRight, StatusBarItemsRight)];
-  return dom;
 };
 
-const renderItems = (oldState, newState) => {
+const findTabByUri = (state, uri) => {
   const {
-    statusBarItemsLeft,
-    statusBarItemsRight,
-    uid
-  } = newState;
-  const dom = getStatusBarVirtualDom(statusBarItemsLeft, statusBarItemsRight);
-  return [SetDom2, uid, dom];
-};
-
-const getRenderer = diffType => {
-  switch (diffType) {
-    case RenderItems:
-      return renderItems;
-    default:
-      throw new Error('unknown renderer');
-  }
-};
-
-const applyRender = (oldState, newState, diffResult) => {
-  const commands = [];
-  for (const item of diffResult) {
-    const fn = getRenderer(item);
-    const result = fn(oldState, newState);
-    if (result.length > 0) {
-      commands.push(result);
+    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
+      };
     }
   }
-  return commands;
-};
-
-const render2 = (uid, diffResult) => {
-  const {
-    newState,
-    oldState
-  } = get$1(uid);
-  set(uid, newState, newState);
-  const commands = applyRender(oldState, newState, diffResult);
-  return commands;
-};
-
-const renderEventListeners = () => {
-  return [{
-    name: HandleClick,
-    params: ['handleClick', TargetName]
-  }];
-};
-
-const resize = (state, dimensions) => {
-  return {
-    ...state,
-    ...dimensions
-  };
+  return undefined;
 };
 
-const saveState = uid => {
-  number(uid);
-  const value = get$1(uid);
+const focusEditorGroup = (state, groupId) => {
   const {
-    newState
-  } = value;
+    layout
+  } = state;
   const {
-    statusBarItemsLeft,
-    statusBarItemsRight
-  } = newState;
-  return {
-    itemsLeft: statusBarItemsLeft,
-    itemsRight: statusBarItemsRight
-  };
-};
-
-const commandMap = {
-  'StatusBar.create': create,
-  'StatusBar.diff2': diff2,
-  'StatusBar.getCommandIds': getCommandIds$1,
-  'StatusBar.handleClick': wrapCommand$1(handleClick),
-  'StatusBar.initialize': initialize,
-  'StatusBar.itemLeftUpdate': wrapCommand$1(itemLeftUpdate),
-  'StatusBar.itemRightCreate': wrapCommand$1(itemRightCreate),
-  'StatusBar.itemRightUpdate': wrapCommand$1(itemRightUpdate),
-  'StatusBar.loadContent': wrapCommand$1(loadContent),
-  'StatusBar.render2': render2,
-  'StatusBar.renderEventListeners': renderEventListeners,
-  'StatusBar.resize': wrapCommand$1(resize),
-  'StatusBar.saveState': saveState,
-  'StatusBar.terminate': terminate
-};
-
-const listen = async () => {
-  registerCommands$1(commandMap);
-  const rpc = await WebWorkerRpcClient.create({
-    commandMap: commandMap
-  });
-  set$1(rpc);
-};
-
-const main$2 = async () => {
-  await listen();
-};
-
-const closeEditorGroup = (state, groupId) => {
-  const groupIndex = state.layout.groups.findIndex(group => group.id === groupId);
-  if (groupIndex === -1 || state.layout.groups.length <= 1) {
-    return state;
-  }
-  const remainingGroups = state.layout.groups.filter(group => group.id !== groupId);
-  const redistributedGroups = remainingGroups.map((group, index) => ({
+    groups
+  } = layout;
+  const updatedGroups = groups.map(group => ({
     ...group,
-    size: Math.round(100 / remainingGroups.length)
+    focused: group.id === groupId
   }));
-  const newActiveGroupId = state.layout.activeGroupId === groupId ? remainingGroups[0].id : state.layout.activeGroupId;
   return {
     ...state,
     layout: {
-      ...state.layout,
-      activeGroupId: newActiveGroupId,
-      groups: redistributedGroups
+      ...layout,
+      activeGroupId: groupId,
+      groups: updatedGroups
     }
   };
 };
 
-const closeTab = (state, groupId, tabId) => {
-  const groups = state.layout.groups.map(group => {
+const openTab = (state, groupId, tab) => {
+  const newTab = 'id' in tab && tab.id !== undefined ? tab : {
+    ...tab,
+    id: create()
+  };
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const updatedGroups = 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
+        activeTabId: newTab.id,
+        tabs: [...group.tabs, newTab]
       };
     }
     return group;
@@ -1736,254 +1879,37 @@ const closeTab = (state, groupId, tabId) => {
   return {
     ...state,
     layout: {
-      ...state.layout,
-      groups
-    }
-  };
-};
-
-const focusEditorGroup = (state, groupId) => {
-  const groups = state.layout.groups.map(group => ({
-    ...group,
-    focused: group.id === groupId
-  }));
-  return {
-    ...state,
-    layout: {
-      ...state.layout,
-      activeGroupId: groupId,
-      groups
+      ...layout,
+      groups: updatedGroups
     }
   };
 };
 
-const CSS_CLASSES = {
-  CUSTOM_EDITOR: 'custom-editor',
-  EDITOR_CONTAINER: 'editor-container',
-  EDITOR_CONTENT: 'editor-content',
-  EDITOR_GROUP: 'editor-group',
-  EDITOR_GROUP_FOCUSED: 'focused',
-  EDITOR_GROUPS_CONTAINER: 'editor-groups-container',
-  EMPTY_EDITOR: 'empty-editor',
-  MAIN_AREA: 'main-area',
-  TAB: 'tab',
-  TAB_ACTIVE: 'active',
-  TAB_BAR: 'tab-bar',
-  TAB_CLOSE: 'tab-close',
-  TAB_TITLE: 'tab-title',
-  TEXT_EDITOR: 'text-editor'
-};
-const CSS_ATTRIBUTES = {
-  DATA_ACTION: 'data-action',
-  DATA_CUSTOM_EDITOR_ID: 'data-custom-editor-id',
-  DATA_DIRECTION: 'data-direction',
-  DATA_GROUP_ID: 'data-group-id',
-  DATA_LANGUAGE: 'data-language',
-  DATA_TAB_ID: 'data-tab-id'
-};
-const CSS_STYLES = {
-  CUSTOM_EDITOR_STYLE: 'flex: 1; overflow: auto;',
-  EDITOR_GROUP_BASE: 'display: flex; flex-direction: column; border-right: 1px solid var(--border-color);',
-  EDITOR_GROUP_FOCUSED_STYLE: 'box-shadow: 0 0 0 1px var(--focus-border-color);',
-  EMPTY_EDITOR_STYLE: 'flex: 1; display: flex; align-items: center; justify-content: center; color: var(--dimmed-color);',
-  FLEX_COLUMN: 'display: flex; flex-direction: column; height: 100%;',
-  FLEX_ROW: 'display: flex; flex-direction: row; height: 100%;',
-  TAB_ACTIVE_STYLE: 'background: var(--tab-active-background); color: var(--tab-active-color);',
-  TAB_BAR_BASE: 'display: flex; align-items: center; background: var(--tab-bar-background); border-bottom: 1px solid var(--border-color);',
-  TAB_BASE: 'padding: 4px 8px; cursor: pointer; border-right: 1px solid var(--border-color); display: flex; align-items: center; gap: 4px;',
-  TAB_CLOSE_STYLE: 'background: none; border: none; cursor: pointer; padding: 2px; border-radius: 2px; opacity: 0.7;',
-  TEXT_EDITOR_STYLE: 'flex: 1; overflow: auto; font-family: var(--editor-font-family); font-size: var(--editor-font-size);'
-};
-const THEMES = {
-  DARK: {
-    '--border-color': '#3e3e42',
-    '--dimmed-color': '#858585',
-    '--editor-font-family': 'Consolas, Monaco, "Courier New", monospace',
-    '--editor-font-size': '14px',
-    '--focus-border-color': '#0078d4',
-    '--tab-active-background': '#1e1e1e',
-    '--tab-active-color': '#ffffff',
-    '--tab-bar-background': '#252526',
-    '--tab-close-hover-background': '#3e3e42'
-  },
-  LIGHT: {
-    '--border-color': '#e1e1e1',
-    '--dimmed-color': '#999999',
-    '--editor-font-family': 'Consolas, Monaco, "Courier New", monospace',
-    '--editor-font-size': '14px',
-    '--focus-border-color': '#0078d4',
-    '--tab-active-background': '#ffffff',
-    '--tab-active-color': '#333333',
-    '--tab-bar-background': '#f3f3f3',
-    '--tab-close-hover-background': '#e1e1e1'
-  }
-};
-const getThemeStyles = (theme = 'DARK') => {
-  const themeVars = THEMES[theme];
-  return Object.entries(themeVars).map(([key, value]) => `${key}: ${value};`).join(' ');
-};
-
-const renderTab = (tab, isActive) => {
-  return {
-    attributes: {
-      [CSS_ATTRIBUTES.DATA_TAB_ID]: tab.id,
-      style: `${CSS_STYLES.TAB_BASE} ${isActive ? CSS_STYLES.TAB_ACTIVE_STYLE : ''}`
-    },
-    childCount: 2,
-    children: [{
-      childCount: 1,
-      children: [tab.isDirty ? `*${tab.title}` : tab.title],
-      className: CSS_CLASSES.TAB_TITLE,
-      type: Span
-    }, {
-      attributes: {
-        [CSS_ATTRIBUTES.DATA_ACTION]: 'close-tab',
-        [CSS_ATTRIBUTES.DATA_TAB_ID]: tab.id,
-        style: CSS_STYLES.TAB_CLOSE_STYLE
-      },
-      childCount: 1,
-      children: ['×'],
-      className: CSS_CLASSES.TAB_CLOSE,
-      type: Button
-    }],
-    className: `${CSS_CLASSES.TAB} ${isActive ? CSS_CLASSES.TAB_ACTIVE : ''}`,
-    type: Div
-  };
-};
-const renderTabBar = group => {
-  return {
-    attributes: {
-      [CSS_ATTRIBUTES.DATA_GROUP_ID]: group.id,
-      style: CSS_STYLES.TAB_BAR_BASE
-    },
-    childCount: group.tabs.length,
-    children: group.tabs.map(tab => renderTab(tab, tab.id === group.activeTabId)),
-    className: CSS_CLASSES.TAB_BAR,
-    type: Div
-  };
-};
-const renderEditor = tab => {
-  if (tab.editorType === 'custom') {
-    return {
-      attributes: {
-        [CSS_ATTRIBUTES.DATA_CUSTOM_EDITOR_ID]: tab.customEditorId,
-        [CSS_ATTRIBUTES.DATA_TAB_ID]: tab.id,
-        style: CSS_STYLES.CUSTOM_EDITOR_STYLE
-      },
-      childCount: 1,
-      children: [`Custom Editor: ${tab.customEditorId}`],
-      className: CSS_CLASSES.CUSTOM_EDITOR,
-      type: Div
-    };
+const getBasename = uri => {
+  const lastSlashIndex = uri.lastIndexOf('/');
+  if (lastSlashIndex === -1) {
+    return uri;
   }
-  return {
-    attributes: {
-      [CSS_ATTRIBUTES.DATA_LANGUAGE]: tab.language || 'plaintext',
-      [CSS_ATTRIBUTES.DATA_TAB_ID]: tab.id,
-      style: CSS_STYLES.TEXT_EDITOR_STYLE
-    },
-    childCount: 1,
-    children: [{
-      childCount: 1,
-      children: [tab.content || ''],
-      className: CSS_CLASSES.EDITOR_CONTENT,
-      type: Pre
-    }],
-    className: CSS_CLASSES.TEXT_EDITOR,
-    type: Div
-  };
-};
-const renderEditorGroup = group => {
-  const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
-  return {
-    attributes: {
-      [CSS_ATTRIBUTES.DATA_GROUP_ID]: group.id,
-      style: `${CSS_STYLES.EDITOR_GROUP_BASE} flex: ${group.size}; ${group.focused ? CSS_STYLES.EDITOR_GROUP_FOCUSED_STYLE : ''}`
-    },
-    childCount: 2,
-    children: [renderTabBar(group), {
-      childCount: activeTab ? 1 : 1,
-      children: activeTab ? [renderEditor(activeTab)] : [{
-        attributes: {
-          style: CSS_STYLES.EMPTY_EDITOR_STYLE
-        },
-        childCount: 1,
-        children: ['No open tabs'],
-        className: CSS_CLASSES.EMPTY_EDITOR,
-        type: Div
-      }],
-      className: CSS_CLASSES.EDITOR_CONTAINER,
-      type: Div
-    }],
-    className: `${CSS_CLASSES.EDITOR_GROUP} ${group.focused ? CSS_CLASSES.EDITOR_GROUP_FOCUSED : ''}`,
-    type: Div
-  };
+  return uri.slice(lastSlashIndex + 1);
 };
-const getMainAreaVirtualDom = state => {
-  return [{
-    attributes: {
-      [CSS_ATTRIBUTES.DATA_DIRECTION]: state.layout.direction,
-      style: getThemeStyles('DARK')
-    },
-    childCount: 1,
-    children: [{
-      attributes: {
-        style: state.layout.direction === 'horizontal' ? CSS_STYLES.FLEX_ROW : CSS_STYLES.FLEX_COLUMN
-      },
-      childCount: state.layout.groups.length,
-      children: state.layout.groups.map(renderEditorGroup),
-      className: CSS_CLASSES.EDITOR_GROUPS_CONTAINER,
-      type: Div
-    }],
-    className: CSS_CLASSES.MAIN_AREA,
-    type: Div
-  }];
-};
-
-const splitEditorGroup = (state, groupId, direction) => {
-  const sourceGroup = state.layout.groups.find(group => group.id === groupId);
-  if (!sourceGroup) {
-    return state;
+const getLabel = uri => {
+  if (uri.startsWith('settings://')) {
+    return 'Settings';
   }
-  const newGroupId = `group-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`;
-  const isHorizontalSplit = direction === 'left' || direction === 'right';
-  const newLayoutDirection = isHorizontalSplit ? 'horizontal' : 'vertical';
-  const updatedGroups = state.layout.groups.map(group => {
-    if (group.id === groupId) {
-      return {
-        ...group,
-        focused: false,
-        size: 50
-      };
-    }
-    return group;
-  });
-  const newGroup = {
-    activeTabId: undefined,
-    focused: true,
-    id: newGroupId,
-    size: 50,
-    tabs: []
-  };
-  let reorderedGroups;
-  if (direction === 'right' || direction === 'down') {
-    reorderedGroups = [...updatedGroups, newGroup];
-  } else {
-    const sourceIndex = updatedGroups.findIndex(group => group.id === groupId);
-    reorderedGroups = [...updatedGroups.slice(0, sourceIndex), newGroup, ...updatedGroups.slice(sourceIndex)];
+  if (uri.startsWith('simple-browser://')) {
+    return 'Simple Browser';
   }
-  return {
-    ...state,
-    layout: {
-      activeGroupId: newGroupId,
-      direction: newLayoutDirection,
-      groups: reorderedGroups
-    }
-  };
+  return getBasename(uri);
 };
 
 const switchTab = (state, groupId, tabId) => {
-  const groups = state.layout.groups.map(group => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const updatedGroups = groups.map(group => {
     if (group.id === groupId) {
       const tabExists = group.tabs.some(tab => tab.id === tabId);
       if (tabExists) {
@@ -1998,260 +1924,358 @@ const switchTab = (state, groupId, tabId) => {
   return {
     ...state,
     layout: {
-      ...state.layout,
-      groups
+      ...layout,
+      groups: updatedGroups
     }
   };
 };
 
-const handleMainAreaClick = (state, event) => {
-  const {
-    target
-  } = event;
-  if (!target.dataset) {
-    return state;
-  }
-  const {
-    dataset
-  } = target;
-
-  // Handle tab click
-  if (dataset.tabId) {
-    const {
-      groupId
-    } = dataset;
-    if (groupId) {
-      return switchTab(state, groupId, dataset.tabId);
-    }
-  }
-
-  // Handle tab close button
-  if (dataset.action === 'close-tab' && dataset.tabId) {
-    const {
-      groupId
-    } = dataset;
-    if (groupId) {
-      return closeTab(state, groupId, dataset.tabId);
-    }
-  }
+/* eslint-disable prefer-destructuring */
 
-  // Handle editor group focus
-  if (dataset.groupId && !dataset.tabId) {
-    return focusEditorGroup(state, dataset.groupId);
+const openUri = async (state, options) => {
+  object(state);
+  let uri = '';
+  if (typeof options === 'string') {
+    uri = options;
+  } else {
+    uri = options.uri;
   }
 
-  // Handle split actions
-  if (dataset.action?.startsWith('split-')) {
-    const {
-      groupId
-    } = dataset;
-    if (groupId) {
-      const direction = dataset.action.replace('split-', '');
-      return splitEditorGroup(state, groupId, direction);
-    }
+  // Check if a tab with this URI already exists
+  const existingTab = findTabByUri(state, uri);
+  if (existingTab) {
+    // Tab exists, switch to it and focus its group
+    const focusedState = focusEditorGroup(state, existingTab.groupId);
+    return switchTab(focusedState, existingTab.groupId, existingTab.tab.id);
   }
-  return state;
-};
 
-const handleMainAreaKeyboard = (state, event) => {
+  // Find the active group (by activeGroupId or focused flag)
   const {
-    ctrlKey = false,
-    key,
-    metaKey = false,
-    shiftKey = false
-  } = event;
-  const isCtrl = ctrlKey || metaKey;
-  const activeGroup = state.layout.groups.find(group => group.focused);
-  if (!activeGroup) {
-    return state;
-  }
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const activeGroup = activeGroupId === undefined ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
 
-  // Tab navigation
-  if (key === 'Tab' && isCtrl) {
-    const groupIndex = state.layout.groups.findIndex(group => group.id === activeGroup.id);
-    const nextGroupIndex = shiftKey ? (groupIndex - 1 + state.layout.groups.length) % state.layout.groups.length : (groupIndex + 1) % state.layout.groups.length;
-    const nextGroup = state.layout.groups[nextGroupIndex];
-    return focusEditorGroup(state, nextGroup.id);
-  }
+  // Generate a request ID for content loading
+  const requestId = getNextRequestId();
 
-  // Switch between tabs within group
-  if (key === 'ArrowLeft' && isCtrl && !shiftKey) {
-    const activeTabIndex = activeGroup.tabs.findIndex(tab => tab.id === activeGroup.activeTabId);
-    if (activeTabIndex > 0) {
-      const prevTab = activeGroup.tabs[activeTabIndex - 1];
-      return switchTab(state, activeGroup.id, prevTab.id);
-    }
-  }
-  if (key === 'ArrowRight' && isCtrl && !shiftKey) {
-    const activeTabIndex = activeGroup.tabs.findIndex(tab => tab.id === activeGroup.activeTabId);
-    if (activeTabIndex < activeGroup.tabs.length - 1) {
-      const nextTab = activeGroup.tabs[activeTabIndex + 1];
-      return switchTab(state, activeGroup.id, nextTab.id);
-    }
-  }
+  // 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]
+      }
+    };
 
-  // Close current tab
-  if (key === 'w' && isCtrl && activeGroup.activeTabId) {
-    return closeTab(state, activeGroup.id, activeGroup.activeTabId);
+    // Start loading content
+    return startContentLoading(state, newState, tabId, uri, requestId);
   }
 
-  // Split editor
-  if (key === '\\' && isCtrl) {
-    const direction = shiftKey ? 'down' : 'right';
-    return splitEditorGroup(state, activeGroup.id, direction);
-  }
-  return state;
+  // 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);
 };
 
-const moveTabToGroup = (state, sourceGroupId, targetGroupId, tabId, targetIndex) => {
-  const sourceGroup = state.layout.groups.find(group => group.id === sourceGroupId);
-  const targetGroup = state.layout.groups.find(group => group.id === targetGroupId);
-  if (!sourceGroup || !targetGroup || sourceGroupId === targetGroupId) {
-    return state;
-  }
-  const tabToMove = sourceGroup.tabs.find(tab => tab.id === tabId);
-  if (!tabToMove) {
-    return state;
-  }
-  const updatedGroups = state.layout.groups.map(group => {
-    if (group.id === sourceGroupId) {
-      const newTabs = group.tabs.filter(tab => tab.id !== tabId);
-      let newActiveTabId = group.activeTabId;
-      if (group.activeTabId === tabId) {
-        if (newTabs.length > 0) {
-          const removedIndex = group.tabs.findIndex(tab => tab.id === tabId);
-          newActiveTabId = newTabs[Math.min(removedIndex, newTabs.length - 1)].id;
-        } else {
-          newActiveTabId = undefined;
-        }
-      }
-      return {
-        ...group,
-        activeTabId: newActiveTabId,
-        tabs: newTabs
-      };
-    }
-    if (group.id === targetGroupId) {
-      const insertIndex = targetIndex === undefined ? group.tabs.length : targetIndex;
-      const newTabs = [...group.tabs];
-      newTabs.splice(insertIndex, 0, tabToMove);
-      return {
-        ...group,
-        activeTabId: tabId,
-        tabs: newTabs
-      };
-    }
-    return group;
-  });
+const refresh = state => {
   return {
-    ...state,
-    layout: {
-      ...state.layout,
-      activeGroupId: targetGroupId,
-      groups: updatedGroups
-    }
+    ...state
   };
 };
 
-const startTabDrag = (state, tabId, groupId) => {
+const text = data => {
   return {
-    dragState: {
-      draggedTabId: tabId,
-      sourceGroupId: groupId
-    },
-    state
+    childCount: 0,
+    text: data,
+    type: Text
   };
 };
-const updateTabDrag = (state, dragState, targetGroupId, targetIndex) => {
-  return {
-    ...dragState,
-    targetGroupId,
-    targetIndex
-  };
+
+const CSS_CLASSES = {
+  EDITOR_GROUPS_CONTAINER: 'editor-groups-container'};
+
+const renderLoading = () => {
+  return [{
+    childCount: 1,
+    className: 'TextEditor TextEditor--loading',
+    type: Div
+  }, {
+    childCount: 1,
+    className: 'EditorContent EditorContent--loading',
+    type: Div
+  }, text('Loading...')];
 };
-const endTabDrag = (state, dragState) => {
-  if (dragState.targetGroupId && dragState.targetGroupId !== dragState.sourceGroupId) {
-    return moveTabToGroup(state, dragState.sourceGroupId, dragState.targetGroupId, dragState.draggedTabId, dragState.targetIndex);
+const renderError = errorMessage => {
+  return [{
+    childCount: 1,
+    className: 'TextEditor TextEditor--error',
+    type: Div
+  }, {
+    childCount: 1,
+    className: 'EditorContent EditorContent--error',
+    type: Div
+  }, text(`Error: ${errorMessage}`)];
+};
+const renderContent = content => {
+  return [{
+    childCount: 1,
+    className: 'TextEditor',
+    type: Div
+  }, {
+    childCount: 1,
+    className: 'EditorContent',
+    type: Pre
+  }, text(content)];
+};
+const renderEditor = tab => {
+  if (!tab) {
+    return renderContent('');
   }
-  return state;
+  if (tab.editorType === 'custom') {
+    return [{
+      childCount: 1,
+      className: 'CustomEditor',
+      type: Div
+    }, text(`Custom Editor: ${tab.customEditorId}`)];
+  }
+
+  // Handle loading state
+  if (tab.loadingState === 'loading') {
+    return renderLoading();
+  }
+
+  // Handle error state
+  if (tab.loadingState === 'error' && tab.errorMessage) {
+    return renderError(tab.errorMessage);
+  }
+
+  // Default: render content
+  return renderContent(tab.content || '');
 };
 
-const {
-  getCommandIds,
-  registerCommands,
-  wrapCommand} = create$1();
+const HandleClick = 11;
+const HandleClickClose = 12;
+const HandleClickTab = 13;
+const HandleTabContextMenu = 14;
 
-const openTab = (state, groupId, tab) => {
-  const newTab = {
-    ...tab,
-    id: `tab-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`
-  };
-  const groups = state.layout.groups.map(group => {
-    if (group.id === groupId) {
-      return {
-        ...group,
-        activeTabId: newTab.id,
-        tabs: [...group.tabs, newTab]
-      };
+const renderTab = (tab, isActive, tabIndex, groupIndex) => {
+  return [{
+    childCount: 3,
+    className: isActive ? 'MainTab MainTabSelected' : 'MainTab',
+    'data-groupIndex': groupIndex,
+    'data-index': tabIndex,
+    onClick: HandleClickTab,
+    onContextMenu: HandleTabContextMenu,
+    role: 'tab',
+    title: tab.path || tab.title,
+    type: Div
+  }, {
+    childCount: 0,
+    className: 'TabIcon',
+    src: 'icons/refresh.svg',
+    type: Img
+  }, {
+    childCount: 1,
+    className: 'TabTitle',
+    type: Span
+  }, text(tab.isDirty ? `*${tab.title}` : tab.title), {
+    childCount: 1,
+    className: 'EditorTabCloseButton',
+    'data-groupIndex': groupIndex,
+    'data-index': tabIndex,
+    onClick: HandleClickClose,
+    type: Button$1
+  }, text('×')];
+};
+
+const renderTabBar = (group, groupIndex) => {
+  return [{
+    childCount: group.tabs.length,
+    className: 'MainTabs',
+    type: Div
+  }, ...group.tabs.flatMap((tab, tabIndex) => renderTab(tab, tab.id === group.activeTabId, tabIndex, groupIndex))];
+};
+
+const renderEditorGroup = (group, groupIndex) => {
+  const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
+  return [{
+    childCount: 2,
+    className: 'EditorGroup',
+    type: Div
+  }, ...renderTabBar(group, groupIndex), {
+    childCount: activeTab ? 1 : 1,
+    className: 'EditorContainer',
+    type: Div
+  }, ...renderEditor(activeTab)];
+};
+
+const getMainAreaVirtualDom = layout => {
+  return [{
+    childCount: 1,
+    className: 'Main',
+    type: Div
+  }, {
+    childCount: layout.groups.length,
+    className: CSS_CLASSES.EDITOR_GROUPS_CONTAINER,
+    type: Div
+  }, ...layout.groups.flatMap((group, groupIndex) => renderEditorGroup(group, groupIndex))];
+};
+
+const renderItems = (oldState, newState) => {
+  const {
+    layout,
+    uid
+  } = newState;
+  const dom = getMainAreaVirtualDom(layout);
+  return [SetDom2, uid, dom];
+};
+
+const getRenderer = diffType => {
+  switch (diffType) {
+    case RenderItems:
+      return renderItems;
+    default:
+      throw new Error('unknown renderer');
+  }
+};
+
+const applyRender = (oldState, newState, diffResult) => {
+  const commands = [];
+  for (const item of diffResult) {
+    const fn = getRenderer(item);
+    const result = fn(oldState, newState);
+    if (result.length > 0) {
+      commands.push(result);
     }
-    return group;
-  });
+  }
+  return commands;
+};
+
+const render2 = (uid, diffResult) => {
+  const {
+    newState,
+    oldState
+  } = get$2(uid);
+  set$3(uid, newState, newState);
+  const commands = applyRender(oldState, newState, diffResult);
+  return commands;
+};
+
+const renderEventListeners = () => {
+  return [{
+    name: HandleClick,
+    params: ['handleClick', TargetName]
+  }, {
+    name: HandleClickClose,
+    params: ['handleClickCloseTab', 'event.target.dataset.groupIndex', 'event.target.dataset.index']
+  }, {
+    name: HandleClickTab,
+    params: ['handleClickTab', 'event.target.dataset.groupIndex', 'event.target.dataset.index']
+  }, {
+    name: HandleTabContextMenu,
+    params: ['handleTabContextMenu', Button, ClientX, ClientY],
+    preventDefault: true
+  }];
+};
+
+const resize = (state, dimensions) => {
   return {
     ...state,
-    layout: {
-      ...state.layout,
-      groups
-    }
+    ...dimensions
   };
 };
 
-const restoreMainAreaState = (savedState, currentState) => {
-  try {
-    const parsed = JSON.parse(savedState);
-    return {
-      ...currentState,
-      layout: parsed.layout
-    };
-  } catch (error) {
-    console.error('Failed to restore main area state:', error);
-    return currentState;
-  }
+const saveState = state => {
+  const {
+    layout
+  } = state;
+  return {
+    layout
+  };
 };
 
-const saveMainAreaState = state => {
-  return JSON.stringify({
-    layout: state.layout,
-    version: '1.0.0'
+const commandMap = {
+  'MainArea.closeAll': wrapCommand(closeAll$1),
+  'MainArea.create': create$6,
+  'MainArea.diff2': diff2,
+  'MainArea.getCommandIds': getCommandIds,
+  'MainArea.getMenuEntries': wrapGetter(getMenuEntries),
+  'MainArea.getMenuIds': getMenuIds,
+  'MainArea.handleClick': wrapCommand(handleClick),
+  'MainArea.handleClickCloseTab': wrapCommand(handleClickCloseTab),
+  'MainArea.handleClickTab': wrapCommand(handleClickTab),
+  'MainArea.handleTabContextMenu': wrapCommand(handleTabContextMenu),
+  'MainArea.initialize': initialize,
+  'MainArea.loadContent': wrapCommand(loadContent),
+  'MainArea.openUri': wrapCommand(openUri),
+  'MainArea.refresh': wrapCommand(refresh),
+  'MainArea.render2': render2,
+  'MainArea.renderEventListeners': renderEventListeners,
+  'MainArea.resize': wrapCommand(resize),
+  'MainArea.saveState': saveState,
+  'MainArea.selectTab': wrapCommand(selectTab),
+  'MainArea.terminate': terminate
+};
+
+const initializeRendererWorker = async () => {
+  const rpc = await WebWorkerRpcClient.create({
+    commandMap: commandMap
   });
+  set(rpc);
 };
 
-const mainAreaCommandMap = {
-  'MainArea.closeEditorGroup': wrapCommand((state, groupId) => closeEditorGroup(state, groupId)),
-  'MainArea.closeTab': wrapCommand((state, groupId, tabId) => closeTab(state, groupId, tabId)),
-  'MainArea.create': () => {},
-  'MainArea.endTabDrag': wrapCommand((state, dragState) => endTabDrag(state, dragState)),
-  'MainArea.focusEditorGroup': wrapCommand((state, groupId) => focusEditorGroup(state, groupId)),
-  'MainArea.getCommandIds': getCommandIds,
-  'MainArea.getVirtualDom': state => getMainAreaVirtualDom(state),
-  'MainArea.handleClick': wrapCommand((state, event) => handleMainAreaClick(state, event)),
-  'MainArea.handleKeyboard': wrapCommand((state, event) => handleMainAreaKeyboard(state, event)),
-  'MainArea.moveTabToGroup': wrapCommand((state, sourceGroupId, targetGroupId, tabId, targetIndex) => moveTabToGroup(state, sourceGroupId, targetGroupId, tabId, targetIndex)),
-  'MainArea.openTab': wrapCommand((state, groupId, tab) => openTab(state, groupId, tab)),
-  'MainArea.restoreState': wrapCommand((state, savedState) => restoreMainAreaState(savedState, state)),
-  'MainArea.saveState': state => saveMainAreaState(state),
-  'MainArea.splitEditorGroup': wrapCommand((state, groupId, direction) => splitEditorGroup(state, groupId, direction)),
-  'MainArea.startTabDrag': (state, tabId, groupId) => startTabDrag(state, tabId, groupId),
-  'MainArea.switchTab': wrapCommand((state, groupId, tabId) => switchTab(state, groupId, tabId)),
-  'MainArea.terminate': terminate,
-  'MainArea.updateTabDrag': (state, dragState, targetGroupId, targetIndex) => updateTabDrag(state, dragState, targetGroupId, targetIndex)
+const listen = async () => {
+  registerCommands(commandMap);
+  await initializeRendererWorker();
+};
+
+const main$2 = async () => {
+  await listen();
 };
 
 const main$1 = async () => {
-  registerCommands(mainAreaCommandMap);
+  registerCommands(commandMap);
   const rpc = await WebWorkerRpcClient.create({
-    commandMap: mainAreaCommandMap
+    commandMap: commandMap
   });
-  set$1(rpc);
+  set(rpc);
 };
 
 const main = async () => {