@lvce-editor/main-area-worker 8.4.0 → 8.6.0

package/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;
@@ -1433,10 +1658,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 +1680,89 @@ 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$1 = (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 handleAttach = async command => {
+  // TODO find a better way to append editors
+  const parentNodeSelector = '.editor-groups-container';
+  await invoke('Layout.attachViewlet', parentNodeSelector, command.instanceId);
+};
+
+const create = () => {
+  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
         };
@@ -1525,7 +1821,7 @@ const loadTabContentAsync = async (tabId, path, requestId, getLatestState) => {
     }
 
     // Assign editorUid if tab doesn't have one yet
-    const editorUid = latestTab.editorUid === -1 ? create$1() : latestTab.editorUid;
+    const editorUid = latestTab.editorUid === -1 ? create() : latestTab.editorUid;
     return updateTab(latestState, tabId, {
       editorUid,
       errorMessage: undefined,
@@ -1565,7 +1861,7 @@ const createViewletForTab = (state, tabId, viewletModuleId, bounds) => {
   if (tab.editorUid !== -1 || tab.loadingState === 'loading' || tab.loadingState === 'loaded') {
     return state;
   }
-  const editorUid = create$1();
+  const editorUid = create();
   const newState = updateTab(state, tabId, {
     editorUid
   });
@@ -1689,387 +1985,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;
   }
 
@@ -2291,44 +2294,554 @@ const closeEditorGroup = (state, groupId) => {
       activeGroupId: newActiveGroupId,
       groups: redistributedGroups
     }
-  };
-};
+  };
+};
+
+const getActiveGroup = (groups, activeGroupId) => {
+  return groups.find(g => g.id === activeGroupId);
+};
+
+const Left = 'left';
+const Right = 'right';
+
+const getActiveTab = state => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const activeGroup = groups.find(group => group.focused);
+  if (!activeGroup || !activeGroup.activeTabId) {
+    return undefined;
+  }
+  const activeTab = activeGroup.tabs.find(tab => tab.id === activeGroup.activeTabId);
+  if (!activeTab) {
+    return undefined;
+  }
+  return {
+    groupId: activeGroup.id,
+    tab: activeTab
+  };
+};
+
+const handleClickTogglePreview = async state => {
+  const activeTabInfo = getActiveTab(state);
+  if (!activeTabInfo || !activeTabInfo.tab.uri) {
+    return state;
+  }
+  await invoke('Layout.showPreview', activeTabInfo.tab.uri);
+  return state;
+};
+
+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;
+  const {
+    groups
+  } = layout;
+  const groupId = create();
+  const title = getLabel(uri);
+  const tabId = create();
+  const editorUid = create();
+  const newTab = {
+    editorType: 'text',
+    editorUid,
+    errorMessage: '',
+    icon: '',
+    id: tabId,
+    isDirty: false,
+    language: '',
+    loadingState: 'loading',
+    title,
+    uri
+  };
+  const newGroup = {
+    activeTabId: newTab.id,
+    focused: true,
+    id: groupId,
+    isEmpty: false,
+    size: 100,
+    tabs: [newTab]
+  };
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      activeGroupId: groupId,
+      groups: [...groups, newGroup]
+    }
+  };
+};
+
+const openTab = (state, groupId, tab) => {
+  const newTab = 'id' in tab && tab.id !== undefined ? tab : {
+    ...tab,
+    id: create()
+  };
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const updatedGroups = groups.map(group => {
+    if (group.id === groupId) {
+      const newTabs = [...group.tabs, newTab];
+      return {
+        ...group,
+        activeTabId: newTab.id,
+        isEmpty: newTabs.length === 0,
+        tabs: newTabs
+      };
+    }
+    return group;
+  });
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      groups: updatedGroups
+    }
+  };
+};
+
+const ensureActiveGroup = (state, uri) => {
+  // Find the active group (by activeGroupId or focused flag)
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const activeGroup = activeGroupId === undefined ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
+
+  // Generate a request ID for content loading
+  getNextRequestId();
+
+  // If no active group exists, create one
+  let newState;
+  if (activeGroup) {
+    // Create a new tab with the URI in the active group
+    const title = getLabel(uri);
+    const tabId = create();
+    const editorUid = create();
+    const newTab = {
+      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;
+};
+
+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 {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const updatedGroups = groups.map(group => ({
+    ...group,
+    focused: group.id === groupId
+  }));
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      activeGroupId: groupId,
+      groups: updatedGroups
+    }
+  };
+};
+
+const getActiveTabId = state => {
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const activeGroup = groups.find(g => g.id === activeGroupId);
+  return activeGroup?.activeTabId;
+};
+
+const getIconsCached = (dirents, fileIconCache) => {
+  return dirents.map(dirent => fileIconCache[dirent]);
+};
+
+const getBasename = uri => {
+  const lastSlashIndex = uri.lastIndexOf('/');
+  if (lastSlashIndex === -1) {
+    return uri;
+  }
+  return uri.slice(lastSlashIndex + 1);
+};
+const getMissingTabs = (tabs, fileIconCache) => {
+  const missingTabs = [];
+  for (const tab of tabs) {
+    if (tab.uri && !(tab.uri in fileIconCache)) {
+      missingTabs.push(tab);
+    }
+  }
+  return missingTabs;
+};
+const tabToIconRequest = tab => {
+  const uri = tab.uri || '';
+  return {
+    name: getBasename(uri),
+    path: uri,
+    type: 0 // file type
+  };
+};
+const getMissingIconRequestsForTabs = (tabs, fileIconCache) => {
+  const missingRequests = getMissingTabs(tabs, fileIconCache);
+  const iconRequests = missingRequests.map(tabToIconRequest);
+  return iconRequests;
+};
+
+const Directory = 3;
+const DirectoryExpanded = 4;
+
+const getSimpleIconRequestType = direntType => {
+  if (direntType === Directory || direntType === DirectoryExpanded) {
+    return 2;
+  }
+  return 1;
+};
+
+const toSimpleIconRequest = request => {
+  return {
+    name: request.name,
+    type: getSimpleIconRequestType(request.type)
+  };
+};
+
+const requestFileIcons = async requests => {
+  if (requests.length === 0) {
+    return [];
+  }
+  const simpleRequests = requests.map(toSimpleIconRequest);
+  const icons = await getIcons(simpleRequests);
+  return icons;
+};
+
+const updateIconCache = (iconCache, missingRequests, newIcons) => {
+  if (missingRequests.length === 0) {
+    return iconCache;
+  }
+  const newFileIconCache = {
+    ...iconCache
+  };
+  for (let i = 0; i < missingRequests.length; i++) {
+    const request = missingRequests[i];
+    const icon = newIcons[i];
+    newFileIconCache[request.path] = icon;
+  }
+  return newFileIconCache;
+};
+
+const getFileIconsForTabs = async (tabs, fileIconCache) => {
+  const missingRequests = getMissingIconRequestsForTabs(tabs, fileIconCache);
+  const newIcons = await requestFileIcons(missingRequests);
+  const newFileIconCache = updateIconCache(fileIconCache, missingRequests, newIcons);
+  const tabUris = tabs.map(tab => tab.uri || '');
+  const icons = getIconsCached(tabUris, newFileIconCache);
+  return {
+    icons,
+    newFileIconCache
+  };
+};
+
+const getOptionUriOptions = options => {
+  let uri = '';
+  if (typeof options === 'string') {
+    uri = options;
+  } else {
+    const {
+      uri: optionsUri
+    } = options;
+    uri = optionsUri;
+  }
+  return uri;
+};
+
+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
+  }
+  return viewletModuleId;
+};
+
+const switchTab = (state, groupId, tabId) => {
+  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
+        };
+      }
+    }
+    return group;
+  });
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      groups: updatedGroups
+    }
+  };
+};
+
+const openUri = async (state, options) => {
+  object(state);
+  const {
+    uid
+  } = state;
+  const uri = getOptionUriOptions(options);
+
+  // 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);
+  }
+
+  // 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'
+    });
+    tabId = existingTab.tab.id;
+  } else {
+    // Add tab to state BEFORE any async calls to prevent race conditions
+    stateWithTab = ensureActiveGroup(currentState, uri);
+    tabId = getActiveTabId(stateWithTab);
+  }
+
+  // Save state immediately after adding tab or retrying
+  set(uid, state, stateWithTab);
+  try {
+    const viewletModuleId = await getViewletModuleId(uri);
+
+    // 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'
+      });
+    }
+
+    // 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;
+
+    // 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);
 
-const getActiveGroup = (groups, activeGroupId) => {
-  return groups.find(g => g.id === activeGroupId);
-};
+    // 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);
 
-const Left = 'left';
-const Right = 'right';
+    // Attachment is handled automatically by virtual DOM reference nodes
+    const readyState = handleViewletReady(latestState, editorUid);
 
-const getActiveTab = state => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  const activeGroup = groups.find(group => group.focused);
-  if (!activeGroup || !activeGroup.activeTabId) {
-    return undefined;
-  }
-  const activeTab = activeGroup.tabs.find(tab => tab.id === activeGroup.activeTabId);
-  if (!activeTab) {
-    return undefined;
+    // 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;
   }
-  return {
-    groupId: activeGroup.id,
-    tab: activeTab
-  };
 };
 
-const handleClickTogglePreview = async state => {
-  const activeTabInfo = getActiveTab(state);
-  if (!activeTabInfo || !activeTabInfo.tab.uri) {
+const retryOpen = async state => {
+  const activeTabData = getActiveTab(state);
+  if (!activeTabData) {
     return state;
   }
-  await invoke('Layout.showPreview', activeTabInfo.tab.uri);
-  return state;
+  const {
+    tab
+  } = activeTabData;
+  if (!tab.uri) {
+    return state;
+  }
+  return openUri(state, tab.uri);
 };
 
 const splitEditorGroup$1 = (state, groupId, direction) => {
@@ -2342,7 +2855,7 @@ const splitEditorGroup$1 = (state, groupId, direction) => {
   if (!sourceGroup) {
     return state;
   }
-  const newGroupId = create$1();
+  const newGroupId = create();
   const isHorizontalSplit = direction === Left || direction === Right;
   const newLayoutDirection = isHorizontalSplit ? 'horizontal' : 'vertical';
   const updatedGroups = groups.map(group => {
@@ -2400,6 +2913,8 @@ const handleClickAction = async (state, action, rawGroupId) => {
         }
       }
       return state;
+    case 'retry-open':
+      return retryOpen(state);
     case 'split-right':
       return splitEditorGroup$1(state, activeGroup.id, Right);
     case 'toggle-preview':
@@ -2450,112 +2965,33 @@ const handleDoubleClick = async state => {
   return state;
 };
 
+const EditorGroupHeader = 'EditorGroupHeader';
+const EditorGroup = 'EditorGroup';
+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 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;
-  const {
-    groups
-  } = layout;
-  const groupId = create$1();
-  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
-  };
-  const newGroup = {
-    activeTabId: newTab.id,
-    focused: true,
-    id: groupId,
-    isEmpty: false,
-    size: 100,
-    tabs: [newTab]
-  };
-  return {
-    ...state,
-    layout: {
-      ...layout,
-      activeGroupId: groupId,
-      groups: [...groups, newGroup]
-    }
-  };
-};
-
-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,
-    id: create$1()
-  };
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  const updatedGroups = groups.map(group => {
-    if (group.id === groupId) {
-      const newTabs = [...group.tabs, newTab];
-      return {
-        ...group,
-        activeTabId: newTab.id,
-        isEmpty: newTabs.length === 0,
-        tabs: newTabs
-      };
-    }
-    return group;
-  });
-  return {
-    ...state,
-    layout: {
-      ...layout,
-      groups: updatedGroups
-    }
-  };
-};
+const MainTabModified = 'MainTabModified';
+const MainTabSelected = 'MainTabSelected';
 
 const newFile = async state => {
   object(state);
@@ -2608,8 +3044,8 @@ const newFile = async state => {
   getActiveTabId(newState);
 
   // Create a new empty tab
-  const tabId = create$1();
-  const editorUid = create$1();
+  const tabId = create();
+  const editorUid = create();
   const newTab = {
     editorType: 'text',
     editorUid,
@@ -2745,101 +3181,14 @@ const show2 = async (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 getIconsCached = (dirents, fileIconCache) => {
-  return dirents.map(dirent => fileIconCache[dirent]);
-};
-
-const getBasename = uri => {
-  const lastSlashIndex = uri.lastIndexOf('/');
-  if (lastSlashIndex === -1) {
-    return uri;
-  }
-  return uri.slice(lastSlashIndex + 1);
-};
-const getMissingTabs = (tabs, fileIconCache) => {
-  const missingTabs = [];
-  for (const tab of tabs) {
-    if (tab.uri && !(tab.uri in fileIconCache)) {
-      missingTabs.push(tab);
-    }
-  }
-  return missingTabs;
-};
-const tabToIconRequest = tab => {
-  const uri = tab.uri || '';
-  return {
-    name: getBasename(uri),
-    path: uri,
-    type: 0 // file type
-  };
-};
-const getMissingIconRequestsForTabs = (tabs, fileIconCache) => {
-  const missingRequests = getMissingTabs(tabs, fileIconCache);
-  const iconRequests = missingRequests.map(tabToIconRequest);
-  return iconRequests;
-};
-
-const Directory = 3;
-const DirectoryExpanded = 4;
-
-const getSimpleIconRequestType = direntType => {
-  if (direntType === Directory || direntType === DirectoryExpanded) {
-    return 2;
-  }
-  return 1;
-};
-
-const toSimpleIconRequest = request => {
-  return {
-    name: request.name,
-    type: getSimpleIconRequestType(request.type)
-  };
-};
-
-const requestFileIcons = async requests => {
-  if (requests.length === 0) {
-    return [];
-  }
-  const simpleRequests = requests.map(toSimpleIconRequest);
-  const icons = await getIcons(simpleRequests);
-  return icons;
-};
-
-const updateIconCache = (iconCache, missingRequests, newIcons) => {
-  if (missingRequests.length === 0) {
-    return iconCache;
-  }
-  const newFileIconCache = {
-    ...iconCache
-  };
-  for (let i = 0; i < missingRequests.length; i++) {
-    const request = missingRequests[i];
-    const icon = newIcons[i];
-    newFileIconCache[request.path] = icon;
-  }
-  return newFileIconCache;
-};
-
-const getFileIconsForTabs = async (tabs, fileIconCache) => {
-  const missingRequests = getMissingIconRequestsForTabs(tabs, fileIconCache);
-  const newIcons = await requestFileIcons(missingRequests);
-  const newFileIconCache = updateIconCache(fileIconCache, missingRequests, newIcons);
-  const tabUris = tabs.map(tab => tab.uri || '');
-  const icons = getIconsCached(tabUris, newFileIconCache);
-  return {
-    icons,
-    newFileIconCache
-  };
+  number(y);
+  const {
+    uid
+  } = state;
+  await show2(uid, Tab, x, y, {
+    menuId: Tab
+  });
+  return state;
 };
 
 const getAllTabs = layout => {
@@ -3017,7 +3366,7 @@ const createViewlets = async (layout, viewletModuleIds, bounds) => {
   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;
+      const editorUid = activeTab.editorUid === -1 ? create() : activeTab.editorUid;
       editorUids[activeTab.id] = editorUid;
       await createViewlet(viewletModuleIds[activeTab.id], editorUid, activeTab.id, bounds, activeTab.uri);
     }
@@ -3025,17 +3374,6 @@ const createViewlets = async (layout, viewletModuleIds, bounds) => {
   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
-  }
-  return viewletModuleId;
-};
-
 const getViewletModuleIds = async layout => {
   const viewletModuleIds = {};
   for (const group of layout.groups) {
@@ -3289,273 +3627,6 @@ const getMenuEntries = async (state, props) => {
   }
 };
 
-const ensureActiveGroup = (state, uri) => {
-  // Find the active group (by activeGroupId or focused flag)
-  const {
-    layout
-  } = state;
-  const {
-    activeGroupId,
-    groups
-  } = layout;
-  const activeGroup = activeGroupId === undefined ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
-
-  // Generate a request ID for content loading
-  getNextRequestId();
-
-  // If no active group exists, create one
-  let newState;
-  if (activeGroup) {
-    // Create a new tab with the URI in the active group
-    const title = getLabel(uri);
-    const tabId = create$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;
-};
-
-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 {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  const updatedGroups = groups.map(group => ({
-    ...group,
-    focused: group.id === groupId
-  }));
-  return {
-    ...state,
-    layout: {
-      ...layout,
-      activeGroupId: groupId,
-      groups: updatedGroups
-    }
-  };
-};
-
-const getOptionUriOptions = options => {
-  let uri = '';
-  if (typeof options === 'string') {
-    uri = options;
-  } else {
-    const {
-      uri: optionsUri
-    } = options;
-    uri = optionsUri;
-  }
-  return uri;
-};
-
-const switchTab = (state, groupId, tabId) => {
-  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
-        };
-      }
-    }
-    return group;
-  });
-  return {
-    ...state,
-    layout: {
-      ...layout,
-      groups: updatedGroups
-    }
-  };
-};
-
-const openUri = async (state, options) => {
-  object(state);
-  const {
-    uid
-  } = state;
-  const uri = getOptionUriOptions(options);
-
-  // 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);
-  }
-
-  // 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);
-  }
-
-  // Add tab to state BEFORE any async calls to prevent race conditions
-  const newState = ensureActiveGroup(currentState, uri);
-  const tabId = getActiveTabId(newState);
-
-  // Save state immediately after adding tab
-  set(uid, state, newState);
-  const viewletModuleId = await getViewletModuleId(uri);
-
-  // After async call, get the latest state to account for any concurrent changes
-  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)
-  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;
-  }
-  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;
-};
-
 const refresh = state => {
   return {
     ...state
@@ -3858,41 +3929,51 @@ 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 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 +4014,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 +4065,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 +4079,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 +4103,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,9 +4142,9 @@ 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];
 };
@@ -4079,26 +4153,42 @@ const renderEditorGroup = (group, groupIndex, splitButtonEnabled = false) => {
   const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
   return [{
     childCount: 2,
-    className: 'EditorGroup',
+    className: EditorGroup,
     type: Div
   }, ...renderEditorGroupHeader(group, groupIndex, splitButtonEnabled), {
     childCount: 1,
-    className: 'EditorContainer',
+    className: EditorContainer,
     type: Div
   }, ...renderEditor(activeTab)];
 };
 
+const renderSash = direction => {
+  return {
+    childCount: 0,
+    className: direction === 'vertical' ? 'SashVertical' : 'SashHorizontal',
+    type: Div
+  };
+};
+
 const getMainAreaVirtualDom = (layout, splitButtonEnabled = false) => {
+  const children = [];
+  for (let i = 0; i < layout.groups.length; i++) {
+    if (i > 0) {
+      // Insert sash between groups
+      children.push(renderSash(layout.direction));
+    }
+    children.push(...renderEditorGroup(layout.groups[i], i, splitButtonEnabled));
+  }
   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: EDITOR_GROUPS_CONTAINER,
+    role: None$1,
     type: Div
-  }, ...layout.groups.flatMap((group, groupIndex) => renderEditorGroup(group, groupIndex, splitButtonEnabled))];
+  }, ...children];
 };
 
 const renderItems = (oldState, newState) => {
@@ -4167,14 +4257,14 @@ 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']
   }];
 };
 
@@ -4239,7 +4329,7 @@ const splitDown = (state, groupId) => {
 
   // If there are no groups, create an initial empty group first
   if (groups.length === 0) {
-    const initialGroupId = create$1();
+    const initialGroupId = create();
     const initialGroup = {
       activeTabId: undefined,
       focused: true,
@@ -4276,7 +4366,7 @@ const splitRight = (state, groupId) => {
 
   // If there are no groups, create an initial empty group first
   if (groups.length === 0) {
-    const initialGroupId = create$1();
+    const initialGroupId = create();
     const initialGroup = {
       activeTabId: undefined,
       focused: true,
@@ -4308,7 +4398,7 @@ const commandMap = {
   'MainArea.closeTabsRight': wrapCommand(closeTabsRight),
   'MainArea.copyPath': wrapCommand(copyPath$1),
   'MainArea.copyRelativePath': wrapCommand(copyRelativePath$1),
-  'MainArea.create': create,
+  'MainArea.create': create$1,
   'MainArea.diff2': diff2,
   'MainArea.focusNext': wrapCommand(focusNextTab),
   'MainArea.focusNextTab': wrapCommand(focusNextTab),