@lvce-editor/static-server 0.74.0 → 0.74.2

package/static/{6e21d18 → 1b54f05}/packages/main-area-worker/dist/mainAreaWorkerMain.js

@@ -87,7 +87,231 @@ const terminate = () => {
   globalThis.close();
 };
 
-const Button$1 = 1;
+const closeTab = (state, groupId, tabId) => {
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+
+  // Find the group to close the tab from
+  const groupIndex = groups.findIndex(g => g.id === groupId);
+  if (groupIndex === -1) {
+    return state;
+  }
+  const group = groups[groupIndex];
+  // Check if the tab exists in the group
+  const tabWasRemoved = group.tabs.some(tab => tab.id === tabId);
+  if (!tabWasRemoved) {
+    return state;
+  }
+  const newGroups = groups.map(grp => {
+    if (grp.id === groupId) {
+      const newTabs = grp.tabs.filter(tab => tab.id !== tabId);
+      let newActiveTabId = grp.activeTabId;
+      if (grp.activeTabId === tabId) {
+        const tabIndex = grp.tabs.findIndex(tab => tab.id === tabId);
+        if (newTabs.length > 0) {
+          newActiveTabId = newTabs[Math.min(tabIndex, newTabs.length - 1)].id;
+        } else {
+          newActiveTabId = undefined;
+        }
+      }
+      return {
+        ...grp,
+        activeTabId: newActiveTabId,
+        isEmpty: newTabs.length === 0,
+        tabs: newTabs
+      };
+    }
+    return grp;
+  });
+
+  // If the group has no tabs left after closing, remove the group
+  const groupIsNowEmpty = newGroups[groupIndex].tabs.length === 0;
+  if (groupIsNowEmpty) {
+    const remainingGroups = newGroups.filter(group => group.id !== groupId);
+
+    // If there are remaining groups, redistribute sizes
+    if (remainingGroups.length > 0) {
+      const redistributedGroups = remainingGroups.map(grp => ({
+        ...grp,
+        size: Math.round(100 / remainingGroups.length)
+      }));
+      const newActiveGroupId = activeGroupId === groupId ? remainingGroups[0]?.id : activeGroupId;
+      return {
+        ...state,
+        layout: {
+          ...layout,
+          activeGroupId: newActiveGroupId,
+          groups: redistributedGroups
+        }
+      };
+    }
+
+    // If no remaining groups, return empty layout
+    return {
+      ...state,
+      layout: {
+        ...layout,
+        activeGroupId: undefined,
+        groups: []
+      }
+    };
+  }
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      groups: newGroups
+    }
+  };
+};
+
+const closeActiveEditor = state => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const focusedGroup = groups.find(group => group.focused);
+  if (!focusedGroup) {
+    return state;
+  }
+  const {
+    activeTabId
+  } = focusedGroup;
+  if (activeTabId === undefined) {
+    return state;
+  }
+  return closeTab(state, focusedGroup.id, activeTabId);
+};
+
+const closeAll$1 = state => {
+  return {
+    ...state,
+    layout: {
+      ...state.layout,
+      activeGroupId: undefined,
+      groups: []
+    }
+  };
+};
+
+const closeFocusedTab = state => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const focusedGroup = groups.find(group => group.focused);
+  if (!focusedGroup) {
+    return state;
+  }
+  const {
+    activeTabId
+  } = focusedGroup;
+  if (activeTabId === undefined) {
+    return state;
+  }
+  return closeTab(state, focusedGroup.id, activeTabId);
+};
+
+const closeOtherTabs = (state, groupId) => {
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const targetGroupId = groupId ?? activeGroupId;
+  if (targetGroupId === undefined) {
+    return state;
+  }
+  const group = groups.find(g => g.id === targetGroupId);
+  if (!group) {
+    return state;
+  }
+  const {
+    activeTabId
+  } = group;
+  if (activeTabId === undefined) {
+    return state;
+  }
+  const newGroups = groups.map(g => {
+    if (g.id === targetGroupId) {
+      const newTabs = g.tabs.filter(tab => tab.id === activeTabId);
+      return {
+        ...g,
+        activeTabId,
+        isEmpty: newTabs.length === 0,
+        tabs: newTabs
+      };
+    }
+    return g;
+  });
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      groups: newGroups
+    }
+  };
+};
+
+const closeTabsRight = (state, groupId) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const group = groups.find(g => g.id === groupId);
+  if (!group) {
+    return state;
+  }
+  const {
+    activeTabId,
+    tabs
+  } = group;
+  if (activeTabId === undefined) {
+    return state;
+  }
+  const activeTabIndex = tabs.findIndex(tab => tab.id === activeTabId);
+  if (activeTabIndex === -1) {
+    return state;
+  }
+  const newTabs = tabs.slice(0, activeTabIndex + 1);
+  if (newTabs.length === tabs.length) {
+    return state;
+  }
+  const newGroups = groups.map(g => {
+    if (g.id === groupId) {
+      return {
+        ...g,
+        isEmpty: newTabs.length === 0,
+        tabs: newTabs
+      };
+    }
+    return g;
+  });
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      groups: newGroups
+    }
+  };
+};
+
+const None$1 = 'none';
+
+const Button$2 = 1;
 const Div = 4;
 const Span = 8;
 const Text = 12;
@@ -95,9 +319,10 @@ const Img = 17;
 const Pre = 51;
 const Reference = 100;
 
-const Button = 'event.button';
+const Button$1 = 'event.button';
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
+const EventTargetClassName = 'event.target.className';
 const TargetName = 'event.target.name';
 
 const Tab = 13;
@@ -110,6 +335,7 @@ const ExtensionHostWorker = 44;
 const IconThemeWorker = 7009;
 const RendererWorker = 1;
 
+const SetCss = 'Viewlet.setCss';
 const SetDom2 = 'Viewlet.setDom2';
 const SetPatches = 'Viewlet.setPatches';
 
@@ -1261,7 +1487,7 @@ const create$j = async ({
   send
 }) => {
   return createSharedLazyRpc(() => {
-    return create$3({
+    return create$3$1({
       commandMap,
       isMessagePortOpen,
       send
@@ -1289,7 +1515,7 @@ const create$5 = async ({
   messagePort.start();
   return rpc;
 };
-const create$3 = async ({
+const create$3$1 = async ({
   commandMap,
   isMessagePortOpen,
   send
@@ -1307,7 +1533,7 @@ const create$3 = async ({
 };
 const TransferMessagePortRpcParent = {
   __proto__: null,
-  create: create$3
+  create: create$3$1
 };
 const create$2$1 = async ({
   commandMap
@@ -1355,7 +1581,7 @@ const remove = id => {
 };
 
 /* eslint-disable  @typescript-eslint/explicit-function-return-type */
-const create$2 = rpcId => {
+const create$3 = rpcId => {
   return {
     async dispose() {
       const rpc = get$1(rpcId);
@@ -1393,16 +1619,16 @@ const create$2 = rpcId => {
 
 const {
   set: set$4
-} = create$2(ClipBoardWorker);
+} = create$3(ClipBoardWorker);
 
 const {
   set: set$3
-} = create$2(ExtensionHostWorker);
+} = create$3(ExtensionHostWorker);
 
 const {
   invoke: invoke$1,
   set: set$2
-} = create$2(IconThemeWorker);
+} = create$3(IconThemeWorker);
 const getIcons = async iconRequests => {
   // @ts-ignore
   return invoke$1('IconTheme.getIcons', iconRequests);
@@ -1412,7 +1638,7 @@ const {
   invoke,
   invokeAndTransfer,
   set: set$1
-} = create$2(RendererWorker);
+} = create$3(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
@@ -1433,10 +1659,17 @@ 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';
-  await invoke('Layout.attachViewlet', parentNodeSelector, command.instanceId);
+const copyPath$1 = async (state, path) => {
+  string(path);
+  await invoke('ClipBoard.writeText', path);
+  return state;
+};
+
+const copyRelativePath$1 = async (state, path) => {
+  string(path);
+  const relativePath = await invoke('Workspace.pathBaseName', path);
+  await invoke('ClipBoard.writeText', relativePath);
+  return state;
 };
 
 const {
@@ -1448,25 +1681,94 @@ const {
   wrapGetter
 } = create$6();
 
-const create$1 = () => {
-  return Math.random();
-};
-
-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 {
+const create$2 = (uid, uri, x, y, width, height, platform, assetDir, tabHeight = 35) => {
+  const state = {
+    assetDir,
+    fileIconCache: {},
+    height,
+    iframes: [],
+    initial: true,
+    layout: {
+      activeGroupId: undefined,
+      direction: 'horizontal',
+      groups: []
+    },
+    platform,
+    splitButtonEnabled: false,
+    tabHeight,
+    uid,
+    width,
+    workspaceuri: uri,
+    x,
+    y
+  };
+  set(uid, state, state);
+};
+
+const isEqual$1 = (oldState, newState) => {
+  return oldState.width === newState.width && oldState.height === newState.height;
+};
+
+const isEqual = (oldState, newState) => {
+  return oldState.layout === newState.layout;
+};
+
+const RenderItems = 4;
+const RenderCss = 10;
+const RenderIncremental = 11;
+
+const modules = [isEqual, isEqual$1];
+const numbers = [RenderIncremental, RenderCss];
+
+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(uid);
+  const result = diff(oldState, newState);
+  return result;
+};
+
+const createViewlet = async (viewletModuleId, editorUid, tabId, bounds, uri) => {
+  await invoke('Layout.createViewlet', viewletModuleId, editorUid, tabId, bounds, uri);
+};
+
+const handleAttach = async command => {
+  // TODO find a better way to append editors
+  const parentNodeSelector = '.editor-groups-container, .EditorGroup';
+  await invoke('Layout.attachViewlet', parentNodeSelector, command.instanceId);
+};
+
+const create$1 = () => {
+  return Math.random();
+};
+
+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
         };
@@ -1689,387 +1991,94 @@ const executeViewletCommands = async commands => {
   }
 };
 
-const closeTab = (state, groupId, tabId) => {
+const findTabById = (state, tabId) => {
   const {
     layout
   } = state;
   const {
-    activeGroupId,
     groups
   } = layout;
-
-  // Find the group to close the tab from
-  const groupIndex = groups.findIndex(g => g.id === groupId);
-  if (groupIndex === -1) {
-    return state;
-  }
-  const group = groups[groupIndex];
-  // Check if the tab exists in the group
-  const tabWasRemoved = group.tabs.some(tab => tab.id === tabId);
-  if (!tabWasRemoved) {
-    return state;
-  }
-  const newGroups = groups.map(grp => {
-    if (grp.id === groupId) {
-      const newTabs = grp.tabs.filter(tab => tab.id !== tabId);
-      let newActiveTabId = grp.activeTabId;
-      if (grp.activeTabId === tabId) {
-        const tabIndex = grp.tabs.findIndex(tab => tab.id === tabId);
-        if (newTabs.length > 0) {
-          newActiveTabId = newTabs[Math.min(tabIndex, newTabs.length - 1)].id;
-        } else {
-          newActiveTabId = undefined;
-        }
-      }
+  for (const group of groups) {
+    const tab = group.tabs.find(t => t.id === tabId);
+    if (tab) {
       return {
-        ...grp,
-        activeTabId: newActiveTabId,
-        isEmpty: newTabs.length === 0,
-        tabs: newTabs
+        groupId: group.id,
+        tab
       };
     }
-    return grp;
-  });
-
-  // If the group has no tabs left after closing, remove the group
-  const groupIsNowEmpty = newGroups[groupIndex].tabs.length === 0;
-  if (groupIsNowEmpty) {
-    const remainingGroups = newGroups.filter(group => group.id !== groupId);
+  }
+  return undefined;
+};
 
-    // If there are remaining groups, redistribute sizes
-    if (remainingGroups.length > 0) {
-      const redistributedGroups = remainingGroups.map(grp => ({
-        ...grp,
-        size: Math.round(100 / remainingGroups.length)
-      }));
-      const newActiveGroupId = activeGroupId === groupId ? remainingGroups[0]?.id : activeGroupId;
-      return {
-        ...state,
-        layout: {
-          ...layout,
-          activeGroupId: newActiveGroupId,
-          groups: redistributedGroups
-        }
-      };
-    }
+// Counter for request IDs to handle race conditions
+let requestIdCounter = 0;
+const getNextRequestId = () => {
+  return ++requestIdCounter;
+};
 
-    // If no remaining groups, return empty layout
-    return {
-      ...state,
-      layout: {
-        ...layout,
-        activeGroupId: undefined,
-        groups: []
-      }
+const startContentLoading = async (oldState, state, tabId, path, requestId) => {
+  try {
+    const getLatestState = () => {
+      return get(state.uid).newState;
     };
+    set(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,
-    layout: {
-      ...layout,
-      groups: newGroups
-    }
-  };
+  return state;
 };
 
-const closeActiveEditor = state => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  const focusedGroup = groups.find(group => group.focused);
-  if (!focusedGroup) {
-    return state;
+const shouldLoadContent = tab => {
+  // Load if:
+  // - Has a path (file-based tab)
+  // - Not already loaded or currently loading
+  if (!tab.uri) {
+    return false;
   }
-  const {
-    activeTabId
-  } = focusedGroup;
-  if (activeTabId === undefined) {
-    return state;
+  if (tab.loadingState === 'loading') {
+    return false;
   }
-  return closeTab(state, focusedGroup.id, activeTabId);
-};
-
-const closeAll$1 = state => {
-  return {
-    ...state,
-    layout: {
-      ...state.layout,
-      activeGroupId: undefined,
-      groups: []
-    }
-  };
+  if (tab.loadingState === 'loaded') {
+    return false;
+  }
+  return true;
 };
-
-const closeFocusedTab = state => {
+const getActiveTabId$1 = state => {
   const {
     layout
   } = state;
   const {
+    activeGroupId,
     groups
   } = layout;
-  const focusedGroup = groups.find(group => group.focused);
-  if (!focusedGroup) {
-    return state;
-  }
-  const {
-    activeTabId
-  } = focusedGroup;
-  if (activeTabId === undefined) {
-    return state;
-  }
-  return closeTab(state, focusedGroup.id, activeTabId);
+  const activeGroup = groups.find(g => g.id === activeGroupId);
+  return activeGroup?.activeTabId;
 };
-
-const closeOtherTabs = (state, groupId) => {
+const selectTab = async (state, groupIndex, index) => {
   const {
-    layout
+    layout,
+    uid
   } = state;
   const {
-    activeGroupId,
     groups
   } = layout;
-  const targetGroupId = groupId ?? activeGroupId;
-  if (targetGroupId === undefined) {
+
+  // Validate indexes
+  if (groupIndex < 0 || groupIndex >= groups.length) {
     return state;
   }
-  const group = groups.find(g => g.id === targetGroupId);
-  if (!group) {
+  const group = groups[groupIndex];
+  if (index < 0 || index >= group.tabs.length) {
     return state;
   }
-  const {
-    activeTabId
-  } = group;
-  if (activeTabId === undefined) {
-    return state;
-  }
-  const newGroups = groups.map(g => {
-    if (g.id === targetGroupId) {
-      const newTabs = g.tabs.filter(tab => tab.id === activeTabId);
-      return {
-        ...g,
-        activeTabId,
-        isEmpty: newTabs.length === 0,
-        tabs: newTabs
-      };
-    }
-    return g;
-  });
-  return {
-    ...state,
-    layout: {
-      ...layout,
-      groups: newGroups
-    }
-  };
-};
-
-const closeTabsRight = (state, groupId) => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  const group = groups.find(g => g.id === groupId);
-  if (!group) {
-    return state;
-  }
-  const {
-    activeTabId,
-    tabs
-  } = group;
-  if (activeTabId === undefined) {
-    return state;
-  }
-  const activeTabIndex = tabs.findIndex(tab => tab.id === activeTabId);
-  if (activeTabIndex === -1) {
-    return state;
-  }
-  const newTabs = tabs.slice(0, activeTabIndex + 1);
-  if (newTabs.length === tabs.length) {
-    return state;
-  }
-  const newGroups = groups.map(g => {
-    if (g.id === groupId) {
-      return {
-        ...g,
-        isEmpty: newTabs.length === 0,
-        tabs: newTabs
-      };
-    }
-    return g;
-  });
-  return {
-    ...state,
-    layout: {
-      ...layout,
-      groups: newGroups
-    }
-  };
-};
-
-const copyPath$1 = async (state, path) => {
-  string(path);
-  await invoke('ClipBoard.writeText', path);
-  return state;
-};
-
-const copyRelativePath$1 = async (state, path) => {
-  string(path);
-  const relativePath = await invoke('Workspace.pathBaseName', path);
-  await invoke('ClipBoard.writeText', relativePath);
-  return state;
-};
-
-const create = (uid, uri, x, y, width, height, platform, assetDir, tabHeight = 35) => {
-  const state = {
-    assetDir,
-    fileIconCache: {},
-    height,
-    iframes: [],
-    initial: true,
-    layout: {
-      activeGroupId: undefined,
-      direction: 'horizontal',
-      groups: []
-    },
-    platform,
-    splitButtonEnabled: false,
-    tabHeight,
-    uid,
-    width,
-    workspaceuri: uri,
-    x,
-    y
-  };
-  set(uid, state, state);
-};
-
-const isEqual = (oldState, newState) => {
-  return oldState.layout === newState.layout;
-};
-
-const RenderItems = 4;
-const RenderIncremental = 11;
-
-const modules = [isEqual];
-const numbers = [RenderIncremental];
-
-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(uid);
-  const result = diff(oldState, newState);
-  return result;
-};
-
-const createViewlet = async (viewletModuleId, editorUid, tabId, bounds, uri) => {
-  await invoke('Layout.createViewlet', viewletModuleId, editorUid, tabId, bounds, uri);
-};
-
-const findTabById = (state, tabId) => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  for (const group of groups) {
-    const tab = group.tabs.find(t => t.id === tabId);
-    if (tab) {
-      return {
-        groupId: group.id,
-        tab
-      };
-    }
-  }
-  return undefined;
-};
-
-// Counter for request IDs to handle race conditions
-let requestIdCounter = 0;
-const getNextRequestId = () => {
-  return ++requestIdCounter;
-};
-
-const startContentLoading = async (oldState, state, tabId, path, requestId) => {
-  try {
-    const getLatestState = () => {
-      return get(state.uid).newState;
-    };
-    set(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') {
-    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) {
+  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;
   }
 
@@ -2264,7 +2273,7 @@ const handleClick = async (state, name) => {
   return state;
 };
 
-const closeEditorGroup = (state, groupId) => {
+const closeEditorGroup$1 = (state, groupId) => {
   const {
     layout
   } = state;
@@ -2331,148 +2340,27 @@ const handleClickTogglePreview = async state => {
   return state;
 };
 
-const splitEditorGroup$1 = (state, groupId, direction) => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  const sourceGroup = groups.find(group => group.id === groupId);
-  if (!sourceGroup) {
-    return state;
-  }
-  const newGroupId = create$1();
-  const isHorizontalSplit = direction === Left || direction === Right;
-  const newLayoutDirection = isHorizontalSplit ? 'horizontal' : 'vertical';
-  const updatedGroups = groups.map(group => {
-    if (group.id === groupId) {
-      return {
-        ...group,
-        focused: false,
-        size: 50
-      };
-    }
-    return group;
-  });
-  const newGroup = {
-    activeTabId: undefined,
-    focused: true,
-    id: newGroupId,
-    isEmpty: true,
-    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)];
-  }
-  return {
-    ...state,
-    layout: {
-      activeGroupId: newGroupId,
-      direction: newLayoutDirection,
-      groups: reorderedGroups
-    }
-  };
-};
-
-const handleClickAction = async (state, action, rawGroupId) => {
-  if (!action) {
-    return state;
-  }
-  if (state.layout.activeGroupId === undefined) {
-    return state;
-  }
-  const activeGroup = getActiveGroup(state.layout.groups, state.layout.activeGroupId);
-  if (!activeGroup) {
-    return state;
-  }
-  switch (action) {
-    case 'close-group':
-      if (rawGroupId) {
-        const groupId = Number.parseInt(rawGroupId, 10);
-        if (!Number.isNaN(groupId)) {
-          return closeEditorGroup(state, groupId);
-        }
-      }
-      return state;
-    case 'split-right':
-      return splitEditorGroup$1(state, activeGroup.id, Right);
-    case 'toggle-preview':
-      return handleClickTogglePreview(state);
-    default:
-      return state;
-  }
-};
-
-const handleClickCloseTab = (state, rawGroupIndex, rawIndex) => {
-  if (!rawGroupIndex || !rawIndex) {
-    return state;
-  }
-  const groupIndex = Number.parseInt(rawGroupIndex);
-  const index = Number.parseInt(rawIndex);
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-
-  // Validate indexes
-  if (groupIndex < 0 || groupIndex >= groups.length) {
-    return state;
-  }
-  const group = groups[groupIndex];
-  if (index < 0 || index >= group.tabs.length) {
-    return state;
-  }
-  const tab = group.tabs[index];
-  const groupId = group.id;
-  const tabId = tab.id;
-  return closeTab(state, groupId, tabId);
-};
-
-const 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 handleDoubleClick = async state => {
-  // TODO: implement handleDoubleClick
-  return state;
-};
-
-const MainTabs = 'MainTabs';
-
-const getBasename$1 = uri => {
-  const lastSlashIndex = uri.lastIndexOf('/');
-  if (lastSlashIndex === -1) {
-    return uri;
-  }
-  return uri.slice(lastSlashIndex + 1);
-};
-const getLabel = uri => {
-  if (uri.startsWith('settings://')) {
-    return 'Settings';
-  }
-  if (uri.startsWith('simple-browser://')) {
-    return 'Simple Browser';
-  }
-  if (uri.startsWith('language-models://')) {
-    return 'Language Models';
-  }
-  return getBasename$1(uri);
-};
-
-const createEmptyGroup = (state, uri, requestId) => {
+const getBasename$1 = uri => {
+  const lastSlashIndex = uri.lastIndexOf('/');
+  if (lastSlashIndex === -1) {
+    return uri;
+  }
+  return uri.slice(lastSlashIndex + 1);
+};
+const getLabel = uri => {
+  if (uri.startsWith('settings://')) {
+    return 'Settings';
+  }
+  if (uri.startsWith('simple-browser://')) {
+    return 'Simple Browser';
+  }
+  if (uri.startsWith('language-models://')) {
+    return 'Language Models';
+  }
+  return getBasename$1(uri);
+};
+
+const createEmptyGroup = (state, uri, requestId) => {
   const {
     layout
   } = state;
@@ -2513,18 +2401,6 @@ const createEmptyGroup = (state, uri, requestId) => {
   };
 };
 
-const getActiveTabId = state => {
-  const {
-    layout
-  } = state;
-  const {
-    activeGroupId,
-    groups
-  } = layout;
-  const activeGroup = groups.find(g => g.id === activeGroupId);
-  return activeGroup?.activeTabId;
-};
-
 const openTab = (state, groupId, tab) => {
   const newTab = 'id' in tab && tab.id !== undefined ? tab : {
     ...tab,
@@ -2557,202 +2433,96 @@ const openTab = (state, groupId, tab) => {
   };
 };
 
-const newFile = async state => {
-  object(state);
+const ensureActiveGroup = (state, uri) => {
+  // Find the active group (by activeGroupId or focused flag)
   const {
-    layout,
-    uid
+    layout
   } = state;
   const {
     activeGroupId,
     groups
   } = layout;
-
-  // Find the active group
   const activeGroup = activeGroupId === undefined ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
 
-  // Prepare initial state
-  let newState = state;
-  let targetGroupId;
-  if (activeGroup) {
-    targetGroupId = activeGroup.id;
-  } else {
-    // No active group, create an empty one
-    newState = createEmptyGroup(state, '');
-    const updatedActiveGroupId = newState.layout.activeGroupId;
-    if (!updatedActiveGroupId) {
-      return state;
-    }
-    targetGroupId = updatedActiveGroupId;
+  // Generate a request ID for content loading
+  getNextRequestId();
 
-    // Remove the tab that createEmptyGroup created, we'll add our own
-    newState = {
-      ...newState,
-      layout: {
-        ...newState.layout,
-        groups: newState.layout.groups.map(group => {
-          if (group.id === targetGroupId) {
-            return {
-              ...group,
-              activeTabId: undefined,
-              tabs: []
-            };
-          }
-          return group;
-        })
-      }
+  // 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$1();
+    const editorUid = create$1();
+    const newTab = {
+      editorType: 'text',
+      editorUid,
+      errorMessage: '',
+      icon: '',
+      id: tabId,
+      isDirty: false,
+      language: '',
+      loadingState: 'loading',
+      title,
+      uri: uri
     };
+    newState = openTab(state, activeGroup.id, newTab);
+  } else {
+    newState = createEmptyGroup(state, uri);
   }
+  return newState;
+};
 
-  // Get previous active tab ID for viewlet switching
-  getActiveTabId(newState);
-
-  // Create a new empty tab
-  const tabId = create$1();
-  const editorUid = create$1();
-  const newTab = {
-    editorType: 'text',
-    editorUid,
-    errorMessage: '',
-    icon: '',
-    id: tabId,
-    isDirty: false,
-    language: 'plaintext',
-    loadingState: 'loading',
-    title: 'Untitled',
-    uri: 'untitled:///1'
-  };
-  const stateWithNewTab = openTab(newState, targetGroupId, newTab);
-
-  // Calculate bounds: use main area bounds minus tab height
-  const bounds = {
-    height: stateWithNewTab.height - stateWithNewTab.tabHeight,
-    width: stateWithNewTab.width,
-    x: stateWithNewTab.x,
-    y: stateWithNewTab.y + stateWithNewTab.tabHeight
-  };
-  const stateWithViewlet = createViewletForTab(stateWithNewTab, tabId);
-  let intermediateState = stateWithViewlet;
-
-  // Switch viewlet (detach old, attach new if ready)
+const findTabByUri = (state, uri) => {
   const {
-    newState: switchedState
-  } = switchViewlet(intermediateState);
-  intermediateState = switchedState;
-  set(uid, state, intermediateState);
-
-  // Get the tab to extract editorUid
-  const tabWithViewlet = findTabById(intermediateState, tabId);
-  if (!tabWithViewlet) {
-    return intermediateState;
-  }
+    layout
+  } = state;
   const {
-    editorUid: actualEditorUid
-  } = tabWithViewlet.tab;
-  if (actualEditorUid === -1) {
-    throw new Error(`invalid editorUid`);
-  }
-  await createViewlet('Editor', actualEditorUid, tabId, bounds, newTab.uri || '');
-
-  // After viewlet is created, get the latest state and mark it as ready
-  const {
-    newState: latestState
-  } = get(uid);
-  const readyState = handleViewletReady(latestState, actualEditorUid);
-  return readyState;
-};
-
-const handleHeaderDoubleClick = async (state, className, groupIndexRaw) => {
-  if (className !== MainTabs) {
-    return state;
+    groups
+  } = layout;
+  for (const group of groups) {
+    const tab = group.tabs.find(t => t.uri === uri);
+    if (tab) {
+      return {
+        groupId: group.id,
+        tab
+      };
+    }
   }
-  return newFile(state);
+  return undefined;
 };
 
-const handleModifiedStatusChange = (state, uri, newStatus) => {
+const focusEditorGroup = (state, groupId) => {
   const {
     layout
   } = state;
   const {
     groups
   } = layout;
-  const updatedGroups = groups.map(group => {
-    return {
-      ...group,
-      tabs: group.tabs.map(tab => {
-        if (tab.uri === uri) {
-          return {
-            ...tab,
-            isDirty: newStatus
-          };
-        }
-        return tab;
-      })
-    };
-  });
+  const updatedGroups = groups.map(group => ({
+    ...group,
+    focused: group.id === groupId
+  }));
   return {
     ...state,
     layout: {
       ...layout,
+      activeGroupId: groupId,
       groups: updatedGroups
     }
   };
 };
 
-const handleResize = async (state, dimensions) => {
-  const {
-    height,
-    width,
-    x,
-    y
-  } = dimensions;
-
-  // Resize all editor children to their new bounds
+const getActiveTabId = state => {
   const {
-    layout,
-    tabHeight,
-    uid
+    layout
   } = state;
   const {
+    activeGroupId,
     groups
   } = layout;
-  const contentHeight = height - tabHeight;
-  const allResizeCommands = [];
-  for (const group of groups) {
-    for (const tab of group.tabs) {
-      if (tab.editorUid !== -1) {
-        try {
-          const resizeCommands = await invoke('Viewlet.resize', tab.editorUid, {
-            height: contentHeight,
-            width,
-            x,
-            y: y + tabHeight
-          });
-          allResizeCommands.push(...resizeCommands);
-        } catch {
-          // ignore
-        }
-      }
-    }
-  }
-  allResizeCommands.push(['Viewlet.setBounds', uid, x, y, width, height]);
-  return allResizeCommands;
-};
-
-const show2 = async (uid, menuId, x, y, args) => {
-  await showContextMenu2(uid, menuId, x, y, args);
-};
-
-const handleTabContextMenu = async (state, button, x, y) => {
-  number(x);
-  number(y);
-  const {
-    uid
-  } = state;
-  await show2(uid, Tab, x, y, {
-    menuId: Tab
-  });
-  return state;
+  const activeGroup = groups.find(g => g.id === activeGroupId);
+  return activeGroup?.activeTabId;
 };
 
 const getIconsCached = (dirents, fileIconCache) => {
@@ -2842,223 +2612,523 @@ const getFileIconsForTabs = async (tabs, fileIconCache) => {
   };
 };
 
-const getAllTabs = layout => {
-  const allTabs = [];
-  for (const group of layout.groups) {
-    allTabs.push(...group.tabs);
+const getOptionUriOptions = options => {
+  let uri = '';
+  if (typeof options === 'string') {
+    uri = options;
+  } else {
+    const {
+      uri: optionsUri
+    } = options;
+    uri = optionsUri;
   }
-  return allTabs;
+  return uri;
 };
 
-const loadFileIcons = async state => {
+const getViewletModuleId = async uri => {
+  // Query RendererWorker for viewlet module ID (optional, may fail in tests)
+  let viewletModuleId;
   try {
-    const allTabs = getAllTabs(state.layout);
-    const {
-      newFileIconCache
-    } = await getFileIconsForTabs(allTabs, state.fileIconCache);
-
-    // Update tabs with their icons
-    const updatedLayout = {
-      ...state.layout,
-      groups: state.layout.groups.map(group => ({
-        ...group,
-        tabs: group.tabs.map(tab => ({
-          ...tab,
-          icon: newFileIconCache[tab.uri || '']
-        }))
-      }))
-    };
-    return {
-      fileIconCache: newFileIconCache,
-      updatedLayout
-    };
+    viewletModuleId = await invoke('Layout.getModuleId', uri);
   } catch {
-    // If icon request fails, continue without icons
-    return {
-      fileIconCache: state.fileIconCache,
-      updatedLayout: state.layout
-    };
+    // Viewlet creation is optional - silently ignore if RendererWorker isn't available
   }
+  return viewletModuleId;
 };
 
-const handleUriChange = async (state, oldUri, newUri) => {
+const switchTab = (state, groupId, tabId) => {
   const {
     layout
   } = state;
   const {
     groups
   } = layout;
-  const newTitle = getLabel(newUri);
   const updatedGroups = groups.map(group => {
-    return {
-      ...group,
-      tabs: group.tabs.map(tab => {
-        if (tab.uri === oldUri) {
-          return {
-            ...tab,
-            title: newTitle,
-            uri: newUri
-          };
-        }
-        return tab;
-      })
-    };
+    if (group.id === groupId) {
+      const tabExists = group.tabs.some(tab => tab.id === tabId);
+      if (tabExists) {
+        return {
+          ...group,
+          activeTabId: tabId
+        };
+      }
+    }
+    return group;
   });
-  const stateWithUpdatedUri = {
+  return {
     ...state,
     layout: {
       ...layout,
       groups: updatedGroups
     }
   };
-
-  // Load icons for the new URI
-  const result = await loadFileIcons(stateWithUpdatedUri);
-  return {
-    ...stateWithUpdatedUri,
-    fileIconCache: result.fileIconCache,
-    layout: result.updatedLayout
-  };
 };
 
-const handleWorkspaceChange = state => {
-  return {
-    ...state,
-    layout: {
-      ...state.layout,
-      activeGroupId: undefined,
-      groups: []
-    }
-  };
-};
+const openUri = async (state, options) => {
+  object(state);
+  const {
+    uid
+  } = state;
+  const uri = getOptionUriOptions(options);
 
-const id = 7201;
-const sendMessagePortToExtensionHostWorker = async port => {
-  await sendMessagePortToExtensionHostWorker$1(port, id);
-};
+  // Check if a tab with this URI already exists in the passed-in state
+  const existingTab = findTabByUri(state, uri);
+  const shouldRetryExistingTab = existingTab && existingTab.tab.loadingState === 'error';
+  if (existingTab && !shouldRetryExistingTab) {
+    // Tab exists, switch to it and focus its group
+    const focusedState = focusEditorGroup(state, existingTab.groupId);
+    return switchTab(focusedState, existingTab.groupId, existingTab.tab.id);
+  }
 
-const createExtensionHostRpc = async () => {
-  try {
-    const rpc = await TransferMessagePortRpcParent.create({
-      commandMap: {},
-      send: sendMessagePortToExtensionHostWorker
+  // Get previous active tab ID for viewlet switching
+  const previousTabId = getActiveTabId(state);
+
+  // Check if there's existing state in the global store
+  const stateFromStore = get(uid);
+  let currentState;
+  if (stateFromStore) {
+    const storedState = stateFromStore.newState;
+    // Use the stored state if it has more tabs than the passed-in state
+    // (indicating concurrent calls have already added tabs)
+    // Otherwise use the passed-in state (test setup with initial data)
+    const storedTabCount = storedState.layout.groups.reduce((sum, g) => sum + g.tabs.length, 0);
+    const passedTabCount = state.layout.groups.reduce((sum, g) => sum + g.tabs.length, 0);
+    if (storedTabCount > passedTabCount) {
+      // Stored state has more tabs - concurrent calls have added tabs
+      currentState = storedState;
+    } else {
+      // Passed-in state has same or more tabs, use it (likely fresh test setup)
+      currentState = state;
+      set(uid, state, state);
+    }
+  } else {
+    // No state in store yet, register the passed-in state
+    currentState = state;
+    set(uid, state, state);
+  }
+  let tabId;
+  let stateWithTab;
+  if (shouldRetryExistingTab && existingTab) {
+    const focusedState = focusEditorGroup(currentState, existingTab.groupId);
+    stateWithTab = updateTab(focusedState, existingTab.tab.id, {
+      errorMessage: '',
+      loadingState: 'loading'
     });
-    return rpc;
-  } catch (error) {
-    throw new VError(error, `Failed to create extension host rpc`);
+    tabId = existingTab.tab.id;
+  } else {
+    // Add tab to state BEFORE any async calls to prevent race conditions
+    stateWithTab = ensureActiveGroup(currentState, uri);
+    tabId = getActiveTabId(stateWithTab);
   }
-};
 
-const initialize = async () => {
-  const rpc = await createExtensionHostRpc();
-  set$3(rpc);
-};
+  // Save state immediately after adding tab or retrying
+  set(uid, state, stateWithTab);
+  try {
+    const viewletModuleId = await getViewletModuleId(uri);
 
-const isValidTab = tab => {
-  return tab && typeof tab.id === 'number' && typeof tab.title === 'string' && typeof tab.isDirty === 'boolean' && typeof tab.editorUid === 'number' && typeof tab.icon === 'string' && (tab.editorType === 'text' || tab.editorType === 'custom');
-};
+    // After async call, get the latest state to account for any concurrent changes
+    const {
+      newState: stateAfterModuleId
+    } = get(uid);
+    if (!viewletModuleId) {
+      return updateTab(stateAfterModuleId, tabId, {
+        errorMessage: 'Could not determine editor type for this URI',
+        loadingState: 'error'
+      });
+    }
 
-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 && typeof group.isEmpty === 'boolean';
-};
+    // Calculate bounds: use main area bounds minus tab height
+    const bounds = {
+      height: stateAfterModuleId.height - stateAfterModuleId.tabHeight,
+      width: stateAfterModuleId.width,
+      x: stateAfterModuleId.x,
+      y: stateAfterModuleId.y + stateAfterModuleId.tabHeight
+    };
+    const stateWithViewlet = createViewletForTab(stateAfterModuleId, tabId, viewletModuleId, bounds);
+    let intermediateState1 = stateWithViewlet;
 
-const isValidMainAreaLayout = layout => {
-  if (!layout || typeof layout !== 'object') {
-    return false;
+    // Switch viewlet (detach old, attach new if ready)
+    const {
+      newState: switchedState
+    } = switchViewlet(intermediateState1, previousTabId, tabId);
+    intermediateState1 = switchedState;
+    set(uid, state, intermediateState1);
+
+    // 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);
+
+    // 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(uid);
+
+    // Attachment is handled automatically by virtual DOM reference nodes
+    const readyState = handleViewletReady(latestState, editorUid);
+
+    // Save state before async icon request
+    set(uid, state, readyState);
+
+    // Request file icon for the newly opened tab
+    try {
+      const newTab = findTabById(readyState, tabId);
+      if (newTab && newTab.tab.uri) {
+        const {
+          newFileIconCache
+        } = await getFileIconsForTabs([newTab.tab], readyState.fileIconCache);
+
+        // After async call, get the latest state again
+        const {
+          newState: stateBeforeIconUpdate
+        } = get(uid);
+        const icon = newFileIconCache[newTab.tab.uri] || '';
+
+        // Update the tab with the icon in the latest state
+        const stateWithIcon = {
+          ...stateBeforeIconUpdate,
+          fileIconCache: newFileIconCache,
+          layout: {
+            ...stateBeforeIconUpdate.layout,
+            groups: stateBeforeIconUpdate.layout.groups.map(group => ({
+              ...group,
+              tabs: group.tabs.map(tab => tab.id === tabId ? {
+                ...tab,
+                icon
+              } : tab)
+            }))
+          }
+        };
+
+        // Save the state with icon update so concurrent calls can see it
+        set(uid, state, stateWithIcon);
+        return stateWithIcon;
+      }
+    } catch {
+      // If icon request fails, continue without icon
+    }
+
+    // Get final latest state
+    const {
+      newState: finalState
+    } = get(uid);
+    return finalState;
+  } catch (error) {
+    const {
+      newState: latestState
+    } = get(uid);
+    const errorMessage = error instanceof Error ? error.message : 'Failed to open URI';
+    const errorState = updateTab(latestState, tabId, {
+      errorMessage,
+      loadingState: 'error'
+    });
+    set(uid, state, errorState);
+    return errorState;
   }
-  const layoutObj = layout;
-  if (layoutObj.activeGroupId !== undefined && typeof layoutObj.activeGroupId !== 'number') {
-    return false;
+};
+
+const retryOpen = async state => {
+  const activeTabData = getActiveTab(state);
+  if (!activeTabData) {
+    return state;
   }
-  if (layoutObj.direction !== 'horizontal' && layoutObj.direction !== 'vertical') {
-    return false;
+  const {
+    tab
+  } = activeTabData;
+  if (!tab.uri) {
+    return state;
   }
-  if (!Array.isArray(layoutObj.groups)) {
-    return false;
+  return openUri(state, tab.uri);
+};
+
+const splitEditorGroup$1 = (state, groupId, direction) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const sourceGroup = groups.find(group => group.id === groupId);
+  if (!sourceGroup) {
+    return state;
   }
-  if (!layoutObj.groups.every(isValidEditorGroup)) {
-    return false;
+  const newGroupId = create$1();
+  const isHorizontalSplit = direction === Left || direction === Right;
+  const newLayoutDirection = isHorizontalSplit ? 'horizontal' : 'vertical';
+  const updatedGroups = groups.map(group => {
+    if (group.id === groupId) {
+      return {
+        ...group,
+        focused: false,
+        size: 50
+      };
+    }
+    return group;
+  });
+  const newGroup = {
+    activeTabId: undefined,
+    focused: true,
+    id: newGroupId,
+    isEmpty: true,
+    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)];
   }
-  return true;
+  return {
+    ...state,
+    layout: {
+      activeGroupId: newGroupId,
+      direction: newLayoutDirection,
+      groups: reorderedGroups
+    }
+  };
 };
 
-const tryRestoreLayout = savedState => {
-  if (savedState === undefined || savedState === null) {
-    return undefined;
+const handleClickAction = async (state, action, rawGroupId) => {
+  if (!action) {
+    return state;
   }
-  if (typeof savedState !== 'object') {
-    return undefined;
+  if (state.layout.activeGroupId === undefined) {
+    return state;
   }
+  const activeGroup = getActiveGroup(state.layout.groups, state.layout.activeGroupId);
+  if (!activeGroup) {
+    return state;
+  }
+  switch (action) {
+    case 'close-group':
+      if (rawGroupId) {
+        const groupId = Number.parseInt(rawGroupId, 10);
+        if (!Number.isNaN(groupId)) {
+          return closeEditorGroup$1(state, groupId);
+        }
+      }
+      return state;
+    case 'retry-open':
+      return retryOpen(state);
+    case 'split-right':
+      return splitEditorGroup$1(state, activeGroup.id, Right);
+    case 'toggle-preview':
+      return handleClickTogglePreview(state);
+    default:
+      return state;
+  }
+};
+
+const handleClickCloseTab = (state, rawGroupIndex, rawIndex) => {
+  if (!rawGroupIndex || !rawIndex) {
+    return state;
+  }
+  const groupIndex = Number.parseInt(rawGroupIndex);
+  const index = Number.parseInt(rawIndex);
   const {
     layout
-  } = savedState;
-  if (!isValidMainAreaLayout(layout)) {
-    return undefined;
+  } = 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);
+};
 
-  // Normalize all tabs to have editorUid: -1 so SelectTab will create viewlets
-  // Mark all restored tabs as not dirty
-  const normalizedLayout = {
-    ...layout,
-    groups: layout.groups.map(group => ({
-      ...group,
-      tabs: group.tabs.map(tab => ({
-        ...tab,
-        editorUid: -1,
-        isDirty: false
-      }))
-    }))
-  };
-  return normalizedLayout;
+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 createViewlets = async (layout, viewletModuleIds, bounds) => {
-  const editorUids = {};
-  for (const group of layout.groups) {
-    const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
-    if (activeTab && viewletModuleIds[activeTab.id]) {
-      const editorUid = activeTab.editorUid === -1 ? create$1() : activeTab.editorUid;
-      editorUids[activeTab.id] = editorUid;
-      await createViewlet(viewletModuleIds[activeTab.id], editorUid, activeTab.id, bounds, activeTab.uri);
+const handleDoubleClick = async state => {
+  // TODO: implement handleDoubleClick
+  return state;
+};
+
+const EditorGroupHeader = 'EditorGroupHeader';
+const EmptyGroupCloseButton = 'EmptyGroupCloseButton';
+const EditorGroup = 'EditorGroup';
+const EditorGroupsHorizontal = 'EditorGroupsHorizontal';
+const EditorGroupsVertical = 'EditorGroupsVertical';
+const EditorContainer = 'EditorContainer';
+const EditorGroupActions = 'EditorGroupActions';
+const EditorGroupActionButton = 'EditorGroupActionButton';
+const SplitEditorGroupButton = 'SplitEditorGroupButton';
+const MaskIconPreview = 'MaskIcon MaskIconPreview';
+const MaskIconCircleFilled = 'MaskIcon MaskIconCircleFilled';
+const MaskIconClose = 'MaskIcon MaskIconClose';
+const TextEditor = 'TextEditor';
+const TextEditorLoading = 'TextEditor TextEditor--loading';
+const EditorContentLoading = 'EditorContent EditorContent--loading';
+const TextEditorError = 'TextEditor TextEditor--error';
+const EditorContentError = 'EditorContent EditorContent--error';
+const Main = 'Main';
+const EDITOR_GROUPS_CONTAINER = 'editor-groups-container';
+const TabIcon = 'TabIcon';
+const TabTitle = 'TabTitle';
+const Button = 'Button';
+const ButtonSecondary = 'ButtonSecondary';
+const EditorContent = 'EditorContent';
+const EditorTabCloseButton = 'EditorTabCloseButton';
+const IconButton = 'IconButton';
+const MainTab = 'MainTab';
+const MainTabs = 'MainTabs';
+const MainTabModified = 'MainTabModified';
+const MainTabSelected = 'MainTabSelected';
+
+const newFile = async state => {
+  object(state);
+  const {
+    layout,
+    uid
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+
+  // Find the active group
+  const activeGroup = activeGroupId === undefined ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
+
+  // Prepare initial state
+  let newState = state;
+  let targetGroupId;
+  if (activeGroup) {
+    targetGroupId = activeGroup.id;
+  } else {
+    // No active group, create an empty one
+    newState = createEmptyGroup(state, '');
+    const updatedActiveGroupId = newState.layout.activeGroupId;
+    if (!updatedActiveGroupId) {
+      return state;
     }
+    targetGroupId = updatedActiveGroupId;
+
+    // Remove the tab that createEmptyGroup created, we'll add our own
+    newState = {
+      ...newState,
+      layout: {
+        ...newState.layout,
+        groups: newState.layout.groups.map(group => {
+          if (group.id === targetGroupId) {
+            return {
+              ...group,
+              activeTabId: undefined,
+              tabs: []
+            };
+          }
+          return group;
+        })
+      }
+    };
   }
-  return editorUids;
-};
 
-const getViewletModuleId = async uri => {
-  // Query RendererWorker for viewlet module ID (optional, may fail in tests)
-  let viewletModuleId;
-  try {
-    viewletModuleId = await invoke('Layout.getModuleId', uri);
-  } catch {
-    // Viewlet creation is optional - silently ignore if RendererWorker isn't available
+  // Get previous active tab ID for viewlet switching
+  getActiveTabId(newState);
+
+  // Create a new empty tab
+  const tabId = create$1();
+  const editorUid = create$1();
+  const newTab = {
+    editorType: 'text',
+    editorUid,
+    errorMessage: '',
+    icon: '',
+    id: tabId,
+    isDirty: false,
+    language: 'plaintext',
+    loadingState: 'loading',
+    title: 'Untitled',
+    uri: 'untitled:///1'
+  };
+  const stateWithNewTab = openTab(newState, targetGroupId, newTab);
+
+  // Calculate bounds: use main area bounds minus tab height
+  const bounds = {
+    height: stateWithNewTab.height - stateWithNewTab.tabHeight,
+    width: stateWithNewTab.width,
+    x: stateWithNewTab.x,
+    y: stateWithNewTab.y + stateWithNewTab.tabHeight
+  };
+  const stateWithViewlet = createViewletForTab(stateWithNewTab, tabId);
+  let intermediateState = stateWithViewlet;
+
+  // Switch viewlet (detach old, attach new if ready)
+  const {
+    newState: switchedState
+  } = switchViewlet(intermediateState);
+  intermediateState = switchedState;
+  set(uid, state, intermediateState);
+
+  // Get the tab to extract editorUid
+  const tabWithViewlet = findTabById(intermediateState, tabId);
+  if (!tabWithViewlet) {
+    return intermediateState;
   }
-  return viewletModuleId;
+  const {
+    editorUid: actualEditorUid
+  } = tabWithViewlet.tab;
+  if (actualEditorUid === -1) {
+    throw new Error(`invalid editorUid`);
+  }
+  await createViewlet('Editor', actualEditorUid, tabId, bounds, newTab.uri || '');
+
+  // After viewlet is created, get the latest state and mark it as ready
+  const {
+    newState: latestState
+  } = get(uid);
+  const readyState = handleViewletReady(latestState, actualEditorUid);
+  return readyState;
 };
 
-const getViewletModuleIds = async layout => {
-  const viewletModuleIds = {};
-  for (const group of layout.groups) {
-    const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
-    if (activeTab && activeTab.uri) {
-      const viewletModuleId = await getViewletModuleId(activeTab.uri);
-      if (viewletModuleId) {
-        viewletModuleIds[activeTab.id] = viewletModuleId;
-      }
-    }
+const handleHeaderDoubleClick = async (state, className, groupIndexRaw) => {
+  if (className !== MainTabs) {
+    return state;
   }
-  return viewletModuleIds;
+  return newFile(state);
 };
 
-const updateTabs = (state, editorUids) => {
-  const updatedGroups = state.layout.groups.map(group => {
+const handleModifiedStatusChange = (state, uri, newStatus) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const updatedGroups = groups.map(group => {
     return {
       ...group,
       tabs: group.tabs.map(tab => {
-        if (editorUids[tab.id]) {
+        if (tab.uri === uri) {
           return {
             ...tab,
-            editorUid: editorUids[tab.id]
+            isDirty: newStatus
           };
         }
         return tab;
@@ -3068,492 +3138,619 @@ const updateTabs = (state, editorUids) => {
   return {
     ...state,
     layout: {
-      ...state.layout,
+      ...layout,
       groups: updatedGroups
     }
   };
 };
 
-const restoreAndCreateEditors = async (state, restoredLayout) => {
-  let newState = {
-    ...state,
-    layout: restoredLayout
-  };
-  const bounds = {
-    height: newState.height - state.tabHeight,
-    width: newState.width,
-    x: newState.x,
-    y: newState.y + state.tabHeight
-  };
-
-  // Get viewlet module IDs for all active tabs
-  const viewletModuleIds = await getViewletModuleIds(newState.layout);
-
-  // Create viewlets and get editor UIDs
-  const editorUids = await createViewlets(newState.layout, viewletModuleIds, bounds);
-
-  // Update tabs with editor UIDs
-  newState = updateTabs(newState, editorUids);
+const handleResize = async (state, dimensions) => {
+  const {
+    height,
+    width,
+    x,
+    y
+  } = dimensions;
 
-  // Create viewlets in the lifecycle and mark them as ready
-  for (const group of newState.layout.groups) {
-    const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
-    if (activeTab && viewletModuleIds[activeTab.id]) {
-      const editorUid = editorUids[activeTab.id];
-      newState = createViewletForTab(newState, activeTab.id);
-      newState = handleViewletReady(newState, editorUid);
+  // Resize all editor children to their new bounds
+  const {
+    layout,
+    tabHeight,
+    uid
+  } = state;
+  const {
+    groups
+  } = layout;
+  const contentHeight = height - tabHeight;
+  const allResizeCommands = [];
+  for (const group of groups) {
+    for (const tab of group.tabs) {
+      if (tab.editorUid !== -1) {
+        try {
+          const resizeCommands = await invoke('Viewlet.resize', tab.editorUid, {
+            height: contentHeight,
+            width,
+            x,
+            y: y + tabHeight
+          });
+          allResizeCommands.push(...resizeCommands);
+        } catch {
+          // ignore
+        }
+      }
     }
   }
-  return newState;
+  allResizeCommands.push(['Viewlet.setBounds', uid, x, y, width, height]);
+  return allResizeCommands;
 };
 
-const loadContent = async (state, savedState) => {
-  const restoredLayout = tryRestoreLayout(savedState);
-  if (restoredLayout) {
-    // Restore and create editors
-    const editorState = await restoreAndCreateEditors(state, restoredLayout);
-
-    // Load file icons with the updated editor state
-    const {
-      fileIconCache,
-      updatedLayout
-    } = await loadFileIcons(editorState);
-
-    // Merge the results
-    const finalState = {
-      ...editorState,
-      fileIconCache,
-      initial: false,
-      layout: updatedLayout
-    };
-    return finalState;
+const create = (beforeGroupId, afterGroupId) => {
+  return `${beforeGroupId}:${afterGroupId}`;
+};
+const parse = sashId => {
+  if (!sashId) {
+    return undefined;
+  }
+  const [beforeRaw, afterRaw] = sashId.split(':');
+  if (!beforeRaw || !afterRaw) {
+    return undefined;
+  }
+  const beforeGroupId = Number.parseInt(beforeRaw, 10);
+  const afterGroupId = Number.parseInt(afterRaw, 10);
+  if (!Number.isFinite(beforeGroupId) || !Number.isFinite(afterGroupId)) {
+    return undefined;
+  }
+  return {
+    afterGroupId,
+    beforeGroupId
+  };
+};
+
+const handleSashPointerDown = async (state, sashId, clientXRaw, clientYRaw) => {
+  const parsed = parse(sashId);
+  if (!parsed) {
+    return state;
+  }
+  const beforeGroup = state.layout.groups.find(group => group.id === parsed.beforeGroupId);
+  const afterGroup = state.layout.groups.find(group => group.id === parsed.afterGroupId);
+  if (!beforeGroup || !afterGroup) {
+    return state;
+  }
+  const clientX = Number.parseFloat(clientXRaw);
+  const clientY = Number.parseFloat(clientYRaw);
+  if (!Number.isFinite(clientX) || !Number.isFinite(clientY)) {
+    return state;
   }
   return {
     ...state,
-    initial: false,
-    layout: {
-      activeGroupId: undefined,
-      direction: 'horizontal',
-      groups: []
+    sashDrag: {
+      afterGroupId: parsed.afterGroupId,
+      afterSize: afterGroup.size,
+      beforeGroupId: parsed.beforeGroupId,
+      beforeSize: beforeGroup.size,
+      sashId,
+      startClientX: clientX,
+      startClientY: clientY
     }
   };
 };
 
-const findGroupById = (state, groupId) => {
+const MIN_GROUP_SIZE = 10;
+const clamp = (value, min, max) => {
+  return Math.min(max, Math.max(min, value));
+};
+const round = value => {
+  return Math.round(value * 100) / 100;
+};
+const handleSashPointerMove = async (state, clientXRaw, clientYRaw) => {
   const {
-    layout
+    sashDrag
   } = state;
-  const {
-    groups
-  } = layout;
-  return groups.find(group => group.id === groupId);
-};
-
-const emptyObject = {};
-const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
-const i18nString = (key, placeholders = emptyObject) => {
-  if (placeholders === emptyObject) {
-    return key;
+  if (!sashDrag) {
+    return state;
   }
-  const replacer = (match, rest) => {
-    return placeholders[rest];
+  const clientX = Number.parseFloat(clientXRaw);
+  const clientY = Number.parseFloat(clientYRaw);
+  if (!Number.isFinite(clientX) || !Number.isFinite(clientY)) {
+    return state;
+  }
+  const axisSize = state.layout.direction === 'horizontal' ? state.width : state.height;
+  if (!axisSize) {
+    return state;
+  }
+  const deltaPx = state.layout.direction === 'horizontal' ? clientX - sashDrag.startClientX : clientY - sashDrag.startClientY;
+  const deltaPercent = deltaPx / axisSize * 100;
+  const totalResizableSize = sashDrag.beforeSize + sashDrag.afterSize;
+  const beforeSize = clamp(sashDrag.beforeSize + deltaPercent, MIN_GROUP_SIZE, totalResizableSize - MIN_GROUP_SIZE);
+  const afterSize = totalResizableSize - beforeSize;
+  const groups = state.layout.groups.map(group => {
+    if (group.id === sashDrag.beforeGroupId) {
+      return {
+        ...group,
+        size: round(beforeSize)
+      };
+    }
+    if (group.id === sashDrag.afterGroupId) {
+      return {
+        ...group,
+        size: round(afterSize)
+      };
+    }
+    return group;
+  });
+  return {
+    ...state,
+    layout: {
+      ...state.layout,
+      groups
+    }
   };
-  return key.replaceAll(RE_PLACEHOLDER, replacer);
 };
 
-const Close = 'Close';
-const CloseAll = 'Close All';
-const CloseOthers = 'Close Others';
-const CloseToTheRight = 'Close To The Right';
-const CopyPath = 'Copy Path';
-const CopyRelativePath = 'Copy Relative Path';
-const FindFileReferences = 'Find File References';
-const RevealInExplorer = 'Reveal in Explorer';
-const SplitEditorGroup = 'Split Editor Group';
-const TogglePreview = 'Toggle Preview';
-
-const splitEditorGroup = () => {
-  return i18nString(SplitEditorGroup);
-};
-const close = () => {
-  return i18nString(Close);
-};
-const closeOthers = () => {
-  return i18nString(CloseOthers);
-};
-const closeAll = () => {
-  return i18nString(CloseAll);
-};
-const revealInExplorer = () => {
-  return i18nString(RevealInExplorer);
-};
-const closeToTheRight = () => {
-  return i18nString(CloseToTheRight);
-};
-const findFileReferences = () => {
-  return i18nString(FindFileReferences);
-};
-const copyPath = () => {
-  return i18nString(CopyPath);
-};
-const copyRelativePath = () => {
-  return i18nString(CopyRelativePath);
-};
-const togglePreview = () => {
-  return i18nString(TogglePreview);
+const handleSashPointerUp = async state => {
+  if (!state.sashDrag) {
+    return state;
+  }
+  return {
+    ...state,
+    sashDrag: undefined
+  };
 };
 
-const menuEntrySeparator = {
-  command: '',
-  flags: Separator,
-  id: 'separator',
-  label: ''
+const show2 = async (uid, menuId, x, y, args) => {
+  await showContextMenu2(uid, menuId, x, y, args);
 };
 
-// TODO should pass tab uri as argument or tab index
-const getMenuEntries$1 = state => {
+const handleTabContextMenu = async (state, button, x, y) => {
+  number(x);
+  number(y);
   const {
-    layout
+    uid
   } = state;
-  const {
-    activeGroupId
-  } = layout;
-  const group = findGroupById(state, activeGroupId || 0);
-  if (!group) {
-    return [];
-  }
-  const {
-    activeTabId,
-    tabs
-  } = group;
-  const tab = tabs.find(t => t.id === activeTabId);
-  if (!tab) {
-    return [];
-  }
-  const {
-    uri: path
-  } = tab;
-  return [{
-    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.closeAll',
-    flags: None,
-    id: 'tabCloseAll',
-    label: closeAll()
-  }, menuEntrySeparator, {
-    args: [path],
-    command: 'Explorer.revealItem',
-    flags: None,
-    id: 'revealInExplorer',
-    label: revealInExplorer()
-  }, {
-    args: [path],
-    command: 'Main.copyPath',
-    flags: None,
-    id: 'copyPath',
-    label: copyPath()
-  }, {
-    args: [path],
-    command: 'Main.copyRelativePath',
-    flags: None,
-    id: 'copyRelativePath',
-    label: copyRelativePath()
-  }, menuEntrySeparator, {
-    args: [/* id */'References', /* focus */true, path],
-    command: 'SideBar.show',
-    flags: None,
-    id: 'findFileReferences',
-    label: findFileReferences()
-  }];
+  await show2(uid, Tab, x, y, {
+    menuId: Tab
+  });
+  return state;
 };
 
-const getMenuEntries = async (state, props) => {
-  switch (props.menuId) {
-    case Tab:
-      return getMenuEntries$1(state);
-    default:
-      return [];
+const getAllTabs = layout => {
+  const allTabs = [];
+  for (const group of layout.groups) {
+    allTabs.push(...group.tabs);
   }
+  return allTabs;
 };
 
-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();
+const loadFileIcons = async state => {
+  try {
+    const allTabs = getAllTabs(state.layout);
+    const {
+      newFileIconCache
+    } = await getFileIconsForTabs(allTabs, state.fileIconCache);
 
-  // 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$1();
-    const editorUid = create$1();
-    const newTab = {
-      editorType: 'text',
-      editorUid,
-      errorMessage: '',
-      icon: '',
-      id: tabId,
-      isDirty: false,
-      language: '',
-      loadingState: 'loading',
-      title,
-      uri: uri
+    // Update tabs with their icons
+    const updatedLayout = {
+      ...state.layout,
+      groups: state.layout.groups.map(group => ({
+        ...group,
+        tabs: group.tabs.map(tab => ({
+          ...tab,
+          icon: newFileIconCache[tab.uri || '']
+        }))
+      }))
+    };
+    return {
+      fileIconCache: newFileIconCache,
+      updatedLayout
+    };
+  } catch {
+    // If icon request fails, continue without icons
+    return {
+      fileIconCache: state.fileIconCache,
+      updatedLayout: state.layout
     };
-    newState = openTab(state, activeGroup.id, newTab);
-  } else {
-    newState = createEmptyGroup(state, uri);
-  }
-  return newState;
-};
-
-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 undefined;
 };
 
-const focusEditorGroup = (state, groupId) => {
+const handleUriChange = async (state, oldUri, newUri) => {
   const {
     layout
   } = state;
   const {
     groups
   } = layout;
-  const updatedGroups = groups.map(group => ({
-    ...group,
-    focused: group.id === groupId
-  }));
-  return {
+  const newTitle = getLabel(newUri);
+  const updatedGroups = groups.map(group => {
+    return {
+      ...group,
+      tabs: group.tabs.map(tab => {
+        if (tab.uri === oldUri) {
+          return {
+            ...tab,
+            title: newTitle,
+            uri: newUri
+          };
+        }
+        return tab;
+      })
+    };
+  });
+  const stateWithUpdatedUri = {
     ...state,
     layout: {
       ...layout,
-      activeGroupId: groupId,
       groups: updatedGroups
     }
   };
+
+  // Load icons for the new URI
+  const result = await loadFileIcons(stateWithUpdatedUri);
+  return {
+    ...stateWithUpdatedUri,
+    fileIconCache: result.fileIconCache,
+    layout: result.updatedLayout
+  };
 };
 
-const getOptionUriOptions = options => {
-  let uri = '';
-  if (typeof options === 'string') {
-    uri = options;
-  } else {
-    const {
-      uri: optionsUri
-    } = options;
-    uri = optionsUri;
+const handleWorkspaceChange = state => {
+  return {
+    ...state,
+    layout: {
+      ...state.layout,
+      activeGroupId: undefined,
+      groups: []
+    }
+  };
+};
+
+const id = 7201;
+const sendMessagePortToExtensionHostWorker = async port => {
+  await sendMessagePortToExtensionHostWorker$1(port, id);
+};
+
+const createExtensionHostRpc = async () => {
+  try {
+    const rpc = await TransferMessagePortRpcParent.create({
+      commandMap: {},
+      send: sendMessagePortToExtensionHostWorker
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create extension host rpc`);
   }
-  return uri;
 };
 
-const switchTab = (state, groupId, tabId) => {
+const initialize = async () => {
+  const rpc = await createExtensionHostRpc();
+  set$3(rpc);
+};
+
+const isValidTab = tab => {
+  return tab && typeof tab.id === 'number' && typeof tab.title === 'string' && typeof tab.isDirty === 'boolean' && typeof tab.editorUid === 'number' && typeof tab.icon === 'string' && (tab.editorType === 'text' || tab.editorType === 'custom');
+};
+
+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 && typeof group.isEmpty === 'boolean';
+};
+
+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 tryRestoreLayout = savedState => {
+  if (savedState === undefined || savedState === null) {
+    return undefined;
+  }
+  if (typeof savedState !== 'object') {
+    return undefined;
+  }
   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) {
-        return {
-          ...group,
-          activeTabId: tabId
-        };
+  } = savedState;
+  if (!isValidMainAreaLayout(layout)) {
+    return undefined;
+  }
+
+  // Normalize all tabs to have editorUid: -1 so SelectTab will create viewlets
+  // Mark all restored tabs as not dirty
+  const normalizedLayout = {
+    ...layout,
+    groups: layout.groups.map(group => ({
+      ...group,
+      tabs: group.tabs.map(tab => ({
+        ...tab,
+        editorUid: -1,
+        isDirty: false
+      }))
+    }))
+  };
+  return normalizedLayout;
+};
+
+const createViewlets = async (layout, viewletModuleIds, bounds) => {
+  const editorUids = {};
+  for (const group of layout.groups) {
+    const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
+    if (activeTab && viewletModuleIds[activeTab.id]) {
+      const editorUid = activeTab.editorUid === -1 ? create$1() : activeTab.editorUid;
+      editorUids[activeTab.id] = editorUid;
+      await createViewlet(viewletModuleIds[activeTab.id], editorUid, activeTab.id, bounds, activeTab.uri);
+    }
+  }
+  return editorUids;
+};
+
+const getViewletModuleIds = async layout => {
+  const viewletModuleIds = {};
+  for (const group of layout.groups) {
+    const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
+    if (activeTab && activeTab.uri) {
+      const viewletModuleId = await getViewletModuleId(activeTab.uri);
+      if (viewletModuleId) {
+        viewletModuleIds[activeTab.id] = viewletModuleId;
       }
     }
-    return group;
+  }
+  return viewletModuleIds;
+};
+
+const updateTabs = (state, editorUids) => {
+  const updatedGroups = state.layout.groups.map(group => {
+    return {
+      ...group,
+      tabs: group.tabs.map(tab => {
+        if (editorUids[tab.id]) {
+          return {
+            ...tab,
+            editorUid: editorUids[tab.id]
+          };
+        }
+        return tab;
+      })
+    };
   });
   return {
     ...state,
     layout: {
-      ...layout,
+      ...state.layout,
       groups: updatedGroups
     }
   };
 };
 
-const openUri = async (state, options) => {
-  object(state);
+const restoreAndCreateEditors = async (state, restoredLayout) => {
+  let newState = {
+    ...state,
+    layout: restoredLayout
+  };
+  const bounds = {
+    height: newState.height - state.tabHeight,
+    width: newState.width,
+    x: newState.x,
+    y: newState.y + state.tabHeight
+  };
+
+  // Get viewlet module IDs for all active tabs
+  const viewletModuleIds = await getViewletModuleIds(newState.layout);
+
+  // Create viewlets and get editor UIDs
+  const editorUids = await createViewlets(newState.layout, viewletModuleIds, bounds);
+
+  // Update tabs with editor UIDs
+  newState = updateTabs(newState, editorUids);
+
+  // Create viewlets in the lifecycle and mark them as ready
+  for (const group of newState.layout.groups) {
+    const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
+    if (activeTab && viewletModuleIds[activeTab.id]) {
+      const editorUid = editorUids[activeTab.id];
+      newState = createViewletForTab(newState, activeTab.id);
+      newState = handleViewletReady(newState, editorUid);
+    }
+  }
+  return newState;
+};
+
+const loadContent = async (state, savedState) => {
+  const restoredLayout = tryRestoreLayout(savedState);
+  if (restoredLayout) {
+    // Restore and create editors
+    const editorState = await restoreAndCreateEditors(state, restoredLayout);
+
+    // Load file icons with the updated editor state
+    const {
+      fileIconCache,
+      updatedLayout
+    } = await loadFileIcons(editorState);
+
+    // Merge the results
+    const finalState = {
+      ...editorState,
+      fileIconCache,
+      initial: false,
+      layout: updatedLayout
+    };
+    return finalState;
+  }
+  return {
+    ...state,
+    initial: false,
+    layout: {
+      activeGroupId: undefined,
+      direction: 'horizontal',
+      groups: []
+    }
+  };
+};
+
+const findGroupById = (state, groupId) => {
   const {
-    uid
+    layout
   } = state;
-  const uri = getOptionUriOptions(options);
+  const {
+    groups
+  } = layout;
+  return groups.find(group => group.id === groupId);
+};
 
-  // Check if a tab with this URI already exists in the passed-in state
-  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);
+const emptyObject = {};
+const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
+const i18nString = (key, placeholders = emptyObject) => {
+  if (placeholders === emptyObject) {
+    return key;
   }
+  const replacer = (match, rest) => {
+    return placeholders[rest];
+  };
+  return key.replaceAll(RE_PLACEHOLDER, replacer);
+};
 
-  // Get previous active tab ID for viewlet switching
-  getActiveTabId(state);
-
-  // Check if there's existing state in the global store
-  const stateFromStore = get(uid);
-  let currentState;
-  if (stateFromStore) {
-    const storedState = stateFromStore.newState;
-    // Use the stored state if it has more tabs than the passed-in state
-    // (indicating concurrent calls have already added tabs)
-    // Otherwise use the passed-in state (test setup with initial data)
-    const storedTabCount = storedState.layout.groups.reduce((sum, g) => sum + g.tabs.length, 0);
-    const passedTabCount = state.layout.groups.reduce((sum, g) => sum + g.tabs.length, 0);
-    if (storedTabCount > passedTabCount) {
-      // Stored state has more tabs - concurrent calls have added tabs
-      currentState = storedState;
-    } else {
-      // Passed-in state has same or more tabs, use it (likely fresh test setup)
-      currentState = state;
-      set(uid, state, state);
-    }
-  } else {
-    // No state in store yet, register the passed-in state
-    currentState = state;
-    set(uid, state, state);
-  }
+const Close = 'Close';
+const CloseEditorGroup = 'Close Editor Group';
+const CloseAll = 'Close All';
+const CloseOthers = 'Close Others';
+const CloseToTheRight = 'Close To The Right';
+const CopyPath = 'Copy Path';
+const CopyRelativePath = 'Copy Relative Path';
+const FindFileReferences = 'Find File References';
+const RevealInExplorer = 'Reveal in Explorer';
+const SplitEditorGroup = 'Split Editor Group';
+const TogglePreview = 'Toggle Preview';
 
-  // Add tab to state BEFORE any async calls to prevent race conditions
-  const newState = ensureActiveGroup(currentState, uri);
-  const tabId = getActiveTabId(newState);
+const splitEditorGroup = () => {
+  return i18nString(SplitEditorGroup);
+};
+const close = () => {
+  return i18nString(Close);
+};
+const closeEditorGroup = () => {
+  return i18nString(CloseEditorGroup);
+};
+const closeOthers = () => {
+  return i18nString(CloseOthers);
+};
+const closeAll = () => {
+  return i18nString(CloseAll);
+};
+const revealInExplorer = () => {
+  return i18nString(RevealInExplorer);
+};
+const closeToTheRight = () => {
+  return i18nString(CloseToTheRight);
+};
+const findFileReferences = () => {
+  return i18nString(FindFileReferences);
+};
+const copyPath = () => {
+  return i18nString(CopyPath);
+};
+const copyRelativePath = () => {
+  return i18nString(CopyRelativePath);
+};
+const togglePreview = () => {
+  return i18nString(TogglePreview);
+};
 
-  // Save state immediately after adding tab
-  set(uid, state, newState);
-  const viewletModuleId = await getViewletModuleId(uri);
+const menuEntrySeparator = {
+  command: '',
+  flags: Separator,
+  id: 'separator',
+  label: ''
+};
 
-  // After async call, get the latest state to account for any concurrent changes
+// TODO should pass tab uri as argument or tab index
+const getMenuEntries$1 = state => {
   const {
-    newState: stateAfterModuleId
-  } = get(uid);
-  if (!viewletModuleId) {
-    // TODO display some kind of errro that editor couldn't be opened
-    return stateAfterModuleId;
-  }
-
-  // Calculate bounds: use main area bounds minus tab height
-  const bounds = {
-    height: stateAfterModuleId.height - stateAfterModuleId.tabHeight,
-    width: stateAfterModuleId.width,
-    x: stateAfterModuleId.x,
-    y: stateAfterModuleId.y + stateAfterModuleId.tabHeight
-  };
-  const stateWithViewlet = createViewletForTab(stateAfterModuleId, tabId);
-  let intermediateState1 = stateWithViewlet;
-
-  // Switch viewlet (detach old, attach new if ready)
+    layout
+  } = state;
   const {
-    newState: switchedState
-  } = switchViewlet(intermediateState1);
-  intermediateState1 = switchedState;
-  set(uid, state, intermediateState1);
-
-  // Get the tab to extract editorUid
-  const tabWithViewlet = findTabById(intermediateState1, tabId);
-  if (!tabWithViewlet) {
-    return intermediateState1;
+    activeGroupId
+  } = layout;
+  const group = findGroupById(state, activeGroupId || 0);
+  if (!group) {
+    return [];
   }
   const {
-    editorUid
-  } = tabWithViewlet.tab;
-  if (editorUid === -1) {
-    throw new Error(`invalid editorUid`);
+    activeTabId,
+    tabs
+  } = group;
+  const tab = tabs.find(t => t.id === activeTabId);
+  if (!tab) {
+    return [];
   }
-  await createViewlet(viewletModuleId, editorUid, tabId, bounds, uri);
-
-  // 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(uid);
-
-  // Attachment is handled automatically by virtual DOM reference nodes
-  const readyState = handleViewletReady(latestState, editorUid);
-
-  // Save state before async icon request
-  set(uid, state, readyState);
-
-  // Request file icon for the newly opened tab
-  try {
-    const newTab = findTabById(readyState, tabId);
-    if (newTab && newTab.tab.uri) {
-      const {
-        newFileIconCache
-      } = await getFileIconsForTabs([newTab.tab], readyState.fileIconCache);
-
-      // After async call, get the latest state again
-      const {
-        newState: stateBeforeIconUpdate
-      } = get(uid);
-      const icon = newFileIconCache[newTab.tab.uri] || '';
-
-      // Update the tab with the icon in the latest state
-      const stateWithIcon = {
-        ...stateBeforeIconUpdate,
-        fileIconCache: newFileIconCache,
-        layout: {
-          ...stateBeforeIconUpdate.layout,
-          groups: stateBeforeIconUpdate.layout.groups.map(group => ({
-            ...group,
-            tabs: group.tabs.map(tab => tab.id === tabId ? {
-              ...tab,
-              icon
-            } : tab)
-          }))
-        }
-      };
+    uri: path
+  } = tab;
+  return [{
+    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.closeAll',
+    flags: None,
+    id: 'tabCloseAll',
+    label: closeAll()
+  }, menuEntrySeparator, {
+    args: [path],
+    command: 'Explorer.revealItem',
+    flags: None,
+    id: 'revealInExplorer',
+    label: revealInExplorer()
+  }, {
+    args: [path],
+    command: 'Main.copyPath',
+    flags: None,
+    id: 'copyPath',
+    label: copyPath()
+  }, {
+    args: [path],
+    command: 'Main.copyRelativePath',
+    flags: None,
+    id: 'copyRelativePath',
+    label: copyRelativePath()
+  }, menuEntrySeparator, {
+    args: [/* id */'References', /* focus */true, path],
+    command: 'SideBar.show',
+    flags: None,
+    id: 'findFileReferences',
+    label: findFileReferences()
+  }];
+};
 
-      // Save the state with icon update so concurrent calls can see it
-      set(uid, state, stateWithIcon);
-      return stateWithIcon;
-    }
-  } catch {
-    // If icon request fails, continue without icon
+const getMenuEntries = async (state, props) => {
+  switch (props.menuId) {
+    case Tab:
+      return getMenuEntries$1(state);
+    default:
+      return [];
   }
-
-  // Get final latest state
-  const {
-    newState: finalState
-  } = get(uid);
-  return finalState;
 };
 
 const refresh = state => {
@@ -3562,6 +3759,39 @@ const refresh = state => {
   };
 };
 
+const getCss = () => {
+  const rules = [`.MainArea {
+}`, `.editor-groups-container {
+  position: relative;
+}`, `.Sash {
+  position: absolute;
+  z-index: 1;
+}`, `.SashVertical {
+  top: 0;
+  bottom: 0;
+  width: 0;
+  cursor: col-resize;
+}`, `.SashVertical:hover {
+  width: 4px;
+  margin-left: -2px;
+}`, `.SashHorizontal {
+  left: 0;
+  right: 0;
+  height: 0;
+  cursor: row-resize;
+}`, `.SashHorizontal:hover {
+  height: 4px;
+  margin-top: -2px;
+}`];
+  const css = rules.join('\n');
+  return css;
+};
+
+const renderCss = (oldState, newState) => {
+  const css = getCss();
+  return [SetCss, newState.uid, css];
+};
+
 const text = data => {
   return {
     childCount: 0,
@@ -3858,41 +4088,54 @@ const diffTree = (oldNodes, newNodes) => {
   return removeTrailingNavigationPatches(patches);
 };
 
-const CSS_CLASSES = {
-  EDITOR_GROUPS_CONTAINER: 'editor-groups-container'};
-
 const renderContent = content => {
   return [{
     childCount: 1,
-    className: 'TextEditor',
+    className: TextEditor,
     type: Div
   }, {
     childCount: 1,
-    className: 'EditorContent',
+    className: EditorContent,
     type: Pre
   }, text(content)];
 };
 
+const HandleClickAction = 10;
+const HandleClick = 11;
+const HandleClickClose = 12;
+const HandleClickTab = 13;
+const HandleTabContextMenu = 14;
+const HandleHeaderDoubleClick = 15;
+const HandleSashPointerDown = 16;
+const HandleSashPointerMove = 17;
+const HandleSashPointerUp = 18;
+
 const renderError = errorMessage => {
   return [{
-    childCount: 1,
-    className: 'TextEditor TextEditor--error',
+    childCount: 2,
+    className: TextEditorError,
     type: Div
   }, {
-    childCount: 1,
-    className: 'EditorContent EditorContent--error',
+    childCount: 2,
+    className: EditorContentError,
     type: Div
-  }, text(`Error: ${errorMessage}`)];
+  }, text(`Error: ${errorMessage}`), {
+    childCount: 1,
+    className: `${Button} ${ButtonSecondary}`,
+    'data-action': 'retry-open',
+    onClick: HandleClickAction,
+    type: Button$2
+  }, text('Retry')];
 };
 
 const renderLoading = () => {
   return [{
     childCount: 1,
-    className: 'TextEditor TextEditor--loading',
+    className: TextEditorLoading,
     type: Div
   }, {
     childCount: 1,
-    className: 'EditorContent EditorContent--loading',
+    className: EditorContentLoading,
     type: Div
   }, text('Loading...')];
 };
@@ -3933,50 +4176,43 @@ const renderEditor = tab => {
   return renderContent('');
 };
 
-const HandleClickAction = 10;
-const HandleClick = 11;
-const HandleClickClose = 12;
-const HandleClickTab = 13;
-const HandleTabContextMenu = 14;
-const HandleHeaderDoubleClick = 15;
-
 const renderTabActions = (isDirty, tabIndex, groupIndex) => {
   if (isDirty) {
     return [{
       childCount: 1,
-      className: 'EditorTabCloseButton',
+      className: EditorTabCloseButton,
       'data-groupIndex': groupIndex,
       'data-index': tabIndex,
       type: Div
     }, {
       childCount: 0,
-      className: 'MaskIcon MaskIconCircleFilled',
+      className: MaskIconCircleFilled,
       type: Div
     }];
   }
   return [{
     'aria-label': 'Close',
     childCount: 1,
-    className: 'EditorTabCloseButton',
+    className: EditorTabCloseButton,
     'data-groupIndex': groupIndex,
     'data-index': tabIndex,
     onClick: HandleClickClose,
-    type: Button$1
+    type: Button$2
   }, {
     childCount: 0,
-    className: 'MaskIcon MaskIconClose',
+    className: MaskIconClose,
     type: Div
   }];
 };
 
 const renderTab = (tab, isActive, tabIndex, groupIndex) => {
   const closeButtonNodes = renderTabActions(tab.isDirty, tabIndex, groupIndex);
-  let className = 'MainTab';
+  let className = MainTab;
   if (isActive) {
-    className += ' MainTabSelected';
+    className += ' ' + MainTabSelected;
   }
   if (tab.isDirty) {
-    className += ' MainTabModified';
+    className += ' ' + MainTabModified;
   }
   return [{
     'aria-selected': isActive,
@@ -3991,13 +4227,13 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
     type: Div
   }, {
     childCount: 0,
-    className: 'TabIcon',
-    role: 'none',
+    className: TabIcon,
+    role: None$1,
     src: tab.icon,
     type: Img
   }, {
     childCount: 1,
-    className: 'TabTitle',
+    className: TabTitle,
     type: Span
   }, text(tab.title), ...closeButtonNodes];
 };
@@ -4005,7 +4241,7 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
 const getTabsVirtualDom = (group, groupIndex, tabsChildCount) => {
   return [{
     childCount: tabsChildCount,
-    className: 'MainTabs',
+    className: MainTabs,
     role: 'tablist',
     type: Div
   }, ...group.tabs.flatMap((tab, tabIndex) => renderTab(tab, tab.id === group.activeTabId, tabIndex, groupIndex))];
@@ -4029,34 +4265,34 @@ const renderEditorGroupActions = (group, groupIndex, splitButtonEnabled) => {
     buttons.push({
       ariaLabel: 'Preview',
       childCount: 1,
-      className: 'IconButton',
+      className: IconButton,
       'data-action': 'toggle-preview',
       'data-groupId': String(group.id),
       name: 'toggle-preview',
       onClick: HandleClickAction,
       title: togglePreview(),
-      type: Button$1
+      type: Button$2
     }, {
       childCount: 0,
-      className: 'MaskIcon MaskIconPreview',
+      className: MaskIconPreview,
       type: Div
     });
   }
   if (splitButtonEnabled) {
     buttons.push({
       childCount: 1,
-      className: 'EditorGroupActionButton SplitEditorGroupButton',
+      className: EditorGroupActionButton + ' ' + SplitEditorGroupButton,
       'data-action': 'split-right',
       'data-groupId': String(group.id),
       onClick: HandleClickAction,
       title: splitEditorGroup(),
-      type: Button$1
+      type: Button$2
     }, text('split'));
   }
   return [{
     childCount: buttons.length / 2,
     // Each button has 2 nodes (button + text)
-    className: 'EditorGroupActions',
+    className: EditorGroupActions,
     role: 'toolbar',
     type: Div
   }, ...buttons];
@@ -4068,37 +4304,103 @@ const renderEditorGroupHeader = (group, groupIndex, splitButtonEnabled) => {
   const hasActions = actions.length > 0;
   return [{
     childCount: hasActions ? 2 : 1,
-    className: 'EditorGroupHeader',
+    className: EditorGroupHeader,
     onDblClick: HandleHeaderDoubleClick,
-    role: 'none',
+    role: None$1,
     type: Div
   }, ...getTabsVirtualDom(group, groupIndex, tabsChildCount), ...actions];
 };
 
-const renderEditorGroup = (group, groupIndex, splitButtonEnabled = false) => {
+const renderEmptyGroupCloseButton = (group, groupIndex) => {
+  return [{
+    childCount: 1,
+    className: EmptyGroupCloseButton,
+    'data-groupId': String(group.id),
+    name: 'close-group',
+    onClick: HandleClickAction,
+    title: closeEditorGroup(),
+    type: Button$2
+  }, text('✕')];
+};
+
+const renderEmptyEditorGroup = (group, groupIndex, style) => {
+  return [{
+    childCount: 1,
+    className: EditorGroup,
+    style,
+    type: Div
+  }, ...renderEmptyGroupCloseButton(group)];
+};
+
+const renderEditorGroup = (group, groupIndex, splitButtonEnabled = false, sizeProperty = 'width') => {
   const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
+  const style = `${sizeProperty}:${group.size}%;`;
+  const hasTabs = group.tabs.length > 0;
+  const hasEmptyGroupCloseButton = !hasTabs;
+  if (hasEmptyGroupCloseButton) {
+    return renderEmptyEditorGroup(group, groupIndex, style);
+  }
   return [{
     childCount: 2,
-    className: 'EditorGroup',
+    className: EditorGroup,
+    style,
     type: Div
   }, ...renderEditorGroupHeader(group, groupIndex, splitButtonEnabled), {
     childCount: 1,
-    className: 'EditorContainer',
+    className: EditorContainer,
     type: Div
   }, ...renderEditor(activeTab)];
 };
 
+const renderSash = (direction, sashId, style) => {
+  return {
+    childCount: 0,
+    className: direction === 'horizontal' ? 'Sash SashVertical' : 'Sash SashHorizontal',
+    'data-sashId': sashId,
+    onPointerDown: HandleSashPointerDown,
+    onPointerMove: HandleSashPointerMove,
+    onPointerUp: HandleSashPointerUp,
+    style,
+    type: Div
+  };
+};
+
 const getMainAreaVirtualDom = (layout, splitButtonEnabled = false) => {
+  const sizeProperty = layout.direction === 'vertical' ? 'height' : 'width';
+  if (layout.groups.length === 1) {
+    return [{
+      childCount: 1,
+      className: Main,
+      type: Div
+    }, ...renderEditorGroup(layout.groups[0], 0, splitButtonEnabled, sizeProperty)];
+  }
+  const children = [];
+  const isSplit = layout.groups.length > 1;
+  const directionClassName = isSplit ? layout.direction === 'horizontal' ? EditorGroupsVertical : EditorGroupsHorizontal : '';
+  const editorGroupsContainerClassName = directionClassName ? `${EDITOR_GROUPS_CONTAINER} ${directionClassName}` : EDITOR_GROUPS_CONTAINER;
+  let sashOffset = 0;
+  for (let i = 0; i < layout.groups.length; i++) {
+    sashOffset += layout.groups[i].size;
+    if (i > 0) {
+      // Insert sash between groups
+      const beforeGroupId = layout.groups[i - 1].id;
+      const afterGroupId = layout.groups[i].id;
+      const sashId = create(beforeGroupId, afterGroupId);
+      const style = layout.direction === 'horizontal' ? `left:${sashOffset - layout.groups[i].size}%;` : `top:${sashOffset - layout.groups[i].size}%;`;
+      children.push(renderSash(layout.direction, sashId, style));
+    }
+    children.push(...renderEditorGroup(layout.groups[i], i, splitButtonEnabled, sizeProperty));
+  }
   return [{
     childCount: 1,
-    className: 'Main',
+    className: Main,
     type: Div
   }, {
-    childCount: layout.groups.length,
-    className: CSS_CLASSES.EDITOR_GROUPS_CONTAINER,
-    role: 'none',
+    childCount: children.length,
+    className: editorGroupsContainerClassName,
+    role: None$1,
     type: Div
-  }, ...layout.groups.flatMap((group, groupIndex) => renderEditorGroup(group, groupIndex, splitButtonEnabled))];
+  }, ...children];
 };
 
 const renderItems = (oldState, newState) => {
@@ -4124,6 +4426,8 @@ const renderIncremental = (oldState, newState) => {
 
 const getRenderer = diffType => {
   switch (diffType) {
+    case RenderCss:
+      return renderCss;
     case RenderIncremental:
       return renderIncremental;
     case RenderItems:
@@ -4167,14 +4471,23 @@ const renderEventListeners = () => {
     params: ['handleClickTab', 'event.target.dataset.groupIndex', 'event.target.dataset.index']
   }, {
     name: HandleTabContextMenu,
-    params: ['handleTabContextMenu', Button, ClientX, ClientY],
+    params: ['handleTabContextMenu', Button$1, ClientX, ClientY],
     preventDefault: true
   }, {
     name: HandleClickAction,
     params: ['handleClickAction', TargetName, 'event.target.dataset.groupId']
   }, {
     name: HandleHeaderDoubleClick,
-    params: ['handleHeaderDoubleClick', 'event.target.className', 'event.target.dataset.groupId']
+    params: ['handleHeaderDoubleClick', EventTargetClassName, 'event.target.dataset.groupId']
+  }, {
+    name: HandleSashPointerDown,
+    params: ['handleSashPointerDown', 'event.target.dataset.sashId', ClientX, ClientY]
+  }, {
+    name: HandleSashPointerMove,
+    params: ['handleSashPointerMove', ClientX, ClientY]
+  }, {
+    name: HandleSashPointerUp,
+    params: ['handleSashPointerUp', ClientX, ClientY]
   }];
 };
 
@@ -4308,7 +4621,7 @@ const commandMap = {
   'MainArea.closeTabsRight': wrapCommand(closeTabsRight),
   'MainArea.copyPath': wrapCommand(copyPath$1),
   'MainArea.copyRelativePath': wrapCommand(copyRelativePath$1),
-  'MainArea.create': create,
+  'MainArea.create': create$2,
   'MainArea.diff2': diff2,
   'MainArea.focusNext': wrapCommand(focusNextTab),
   'MainArea.focusNextTab': wrapCommand(focusNextTab),
@@ -4327,6 +4640,9 @@ const commandMap = {
   'MainArea.handleModifiedStatusChange': wrapCommand(handleModifiedStatusChange),
   'MainArea.handleResize': wrapGetter(handleResize),
   // TODO would need to have a function that returns newstate as well as commands
+  'MainArea.handleSashPointerDown': wrapCommand(handleSashPointerDown),
+  'MainArea.handleSashPointerMove': wrapCommand(handleSashPointerMove),
+  'MainArea.handleSashPointerUp': wrapCommand(handleSashPointerUp),
   'MainArea.handleTabContextMenu': wrapCommand(handleTabContextMenu),
   'MainArea.handleUriChange': wrapCommand(handleUriChange),
   'MainArea.handleWorkspaceChange': wrapCommand(handleWorkspaceChange),