@lvce-editor/main-area-worker 9.24.0 → 9.28.0

package/dist/mainAreaWorkerMain.js

@@ -3,10 +3,67 @@ const toCommandId = key => {
   return key.slice(dotIndex + 1);
 };
 const create$f = () => {
+  const commandQueues = new Map();
+  const generations = Object.create(null);
   const states = Object.create(null);
   const commandMapRef = {};
+  const getGeneration = uid => generations[uid] || 0;
+  const isCurrentGeneration = (uid, generation) => {
+    return states[uid] !== undefined && getGeneration(uid) === generation;
+  };
+  const updateState = (uid, generation, fallbackState, updater) => {
+    if (!isCurrentGeneration(uid, generation)) {
+      return Promise.resolve(fallbackState);
+    }
+    const current = states[uid];
+    const updatedState = updater(current.newState);
+    if (updatedState !== current.newState) {
+      states[uid] = {
+        newState: updatedState,
+        oldState: current.oldState,
+        scheduledState: updatedState
+      };
+    }
+    return Promise.resolve(updatedState);
+  };
+  const createAsyncCommandContext = (uid, generation) => {
+    let latestState = states[uid].newState;
+    return {
+      getState: () => {
+        if (isCurrentGeneration(uid, generation)) {
+          latestState = states[uid].newState;
+        }
+        return latestState;
+      },
+      updateState: async updater => {
+        latestState = await updateState(uid, generation, latestState, updater);
+        return latestState;
+      }
+    };
+  };
+  const enqueueCommand = async (uid, command) => {
+    const previous = commandQueues.get(uid) || Promise.resolve();
+    const run = async () => {
+      try {
+        await previous;
+      } catch {
+        // The previous caller receives its error; later commands must still run.
+      }
+      await command();
+    };
+    const current = run();
+    commandQueues.set(uid, current);
+    try {
+      await current;
+    } finally {
+      if (commandQueues.get(uid) === current) {
+        commandQueues.delete(uid);
+      }
+    }
+  };
   return {
     clear() {
+      commandQueues.clear();
       for (const key of Object.keys(states)) {
         delete states[key];
       }
@@ -26,6 +83,7 @@ const create$f = () => {
       return diffResult;
     },
     dispose(uid) {
+      commandQueues.delete(uid);
       delete states[uid];
     },
     get(uid) {
@@ -43,14 +101,27 @@ const create$f = () => {
       Object.assign(commandMapRef, commandMap);
     },
     set(uid, oldState, newState, scheduledState) {
+      const current = states[uid];
+      if (!current || oldState === newState && newState !== current.newState) {
+        generations[uid] = getGeneration(uid) + 1;
+      }
       states[uid] = {
         newState,
         oldState,
         scheduledState: scheduledState ?? newState
       };
     },
+    wrapAsyncCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        const generation = getGeneration(uid);
+        const context = createAsyncCommandContext(uid, generation);
+        await fn(context, ...args);
+      };
+      return wrapped;
+    },
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
+        const generation = getGeneration(uid);
         const {
           newState,
           oldState
@@ -59,6 +130,9 @@ const create$f = () => {
         if (oldState === newerState || newState === newerState) {
           return;
         }
+        if (!isCurrentGeneration(uid, generation)) {
+          return;
+        }
         const latestOld = states[uid];
         const latestNew = {
           ...latestOld.newState,
@@ -83,6 +157,7 @@ const create$f = () => {
     },
     wrapLoadContent(fn) {
       const wrapped = async (uid, ...args) => {
+        const generation = getGeneration(uid);
         const {
           newState,
           oldState
@@ -97,6 +172,11 @@ const create$f = () => {
             error
           };
         }
+        if (!isCurrentGeneration(uid, generation)) {
+          return {
+            error
+          };
+        }
         const latestOld = states[uid];
         const latestNew = {
           ...latestOld.newState,
@@ -112,6 +192,51 @@ const create$f = () => {
         };
       };
       return wrapped;
+    },
+    wrapSerialAsyncCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        await enqueueCommand(uid, async () => {
+          if (!states[uid]) {
+            return;
+          }
+          const generation = getGeneration(uid);
+          const context = createAsyncCommandContext(uid, generation);
+          await fn(context, ...args);
+        });
+      };
+      return wrapped;
+    },
+    wrapSerialCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        await enqueueCommand(uid, async () => {
+          if (!states[uid]) {
+            return;
+          }
+          const generation = getGeneration(uid);
+          const {
+            newState,
+            oldState
+          } = states[uid];
+          const newerState = await fn(newState, ...args);
+          if (oldState === newerState || newState === newerState) {
+            return;
+          }
+          if (!isCurrentGeneration(uid, generation)) {
+            return;
+          }
+          const latestOld = states[uid];
+          const latestNew = {
+            ...latestOld.newState,
+            ...newerState
+          };
+          states[uid] = {
+            newState: latestNew,
+            oldState: latestOld.oldState,
+            scheduledState: latestNew
+          };
+        });
+      };
+      return wrapped;
     }
   };
 };
@@ -474,7 +599,14 @@ class IpcError extends VError {
       const cause = new Error(message);
       // @ts-ignore
       cause.code = code;
-      cause.stack = stack;
+      if (stack) {
+        Object.defineProperty(cause, 'stack', {
+          configurable: true,
+          enumerable: false,
+          value: stack,
+          writable: true
+        });
+      }
       super(cause, betterMessage);
     } else {
       super(betterMessage);
@@ -1773,123 +1905,463 @@ const closeTab = (state, groupId, tabId) => {
   return withGroups(stateWithClosedTab, newGroups);
 };
 
-const findTabInState = (state, groupId, tabId) => {
-  const {
-    layout
-  } = state;
-  const group = layout.groups.find(g => g.id === groupId);
-  return group?.tabs.find(t => t.id === tabId);
+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 saveEditor = async editorUid => {
-  return invoke('Editor.save', editorUid);
+const getTitle$1 = async editorUid => {
+  try {
+    const title = await invoke('Viewlet.getTitle', editorUid);
+    return typeof title === 'string' && title ? title : undefined;
+  } catch {
+    return undefined;
+  }
+};
+const createViewlet = async (viewletModuleId, editorUid, tabId, bounds, uri) => {
+  await invoke('Layout.createViewlet', viewletModuleId, editorUid, tabId, bounds, uri);
+  return getTitle$1(editorUid);
 };
 
-const closeTabAndSave = async (state, groupId, tabId) => {
-  const tab = findTabInState(state, groupId, tabId);
-  if (!tab) {
-    return state;
-  }
-  if (tab.editorUid !== -1 && tab.isDirty) {
-    const editorState = await saveEditor(tab.editorUid);
-    if (!editorState?.modified && tab.uri) {
-      await handleModifiedStatusChange$1(tab.uri, false);
-    }
-  }
-  return closeTab(state, groupId, tabId);
+const {
+  get,
+  getCommandIds,
+  getKeys: getKeys$1,
+  registerCommands,
+  set,
+  wrapAsyncCommand,
+  wrapGetter,
+  wrapSerialAsyncCommand,
+  wrapSerialCommand
+} = create$f();
+
+const create$2 = () => {
+  return Math.random();
 };
 
-const getFocusedGroup = state => {
+const updateTab = (state, tabId, updates) => {
   const {
     layout
   } = state;
   const {
     groups
   } = layout;
-  return groups.find(group => group.focused);
-};
-
-const closeActiveEditor = async state => {
-  const focusedGroup = getFocusedGroup(state);
-  if (!focusedGroup) {
-    return state;
-  }
-  const {
-    activeTabId
-  } = focusedGroup;
-  if (activeTabId === undefined) {
-    return state;
-  }
-  return closeTabAndSave(state, focusedGroup.id, activeTabId);
-};
-
-const closeAll$1 = state => {
-  const entries = state.layout.groups.flatMap((group, groupIndex) => {
-    return group.tabs.map((tab, tabIndex) => ({
-      group,
-      groupIndex,
-      tab,
-      tabIndex
-    }));
+  const updatedGroups = groups.map(group => {
+    const tabIndex = group.tabs.findIndex(t => t.id === tabId);
+    if (tabIndex === -1) {
+      return group;
+    }
+    const updatedTabs = group.tabs.map((tab, index) => {
+      if (index === tabIndex) {
+        return {
+          ...tab,
+          ...updates
+        };
+      }
+      return tab;
+    });
+    return {
+      ...group,
+      tabs: updatedTabs
+    };
   });
-  return withEmptyGroups(addClosedTabs(state, entries));
-};
-
-const redistributeSizesWithRemainder = groups => {
-  const baseSize = Math.floor(100 / groups.length);
-  const remainder = 100 % groups.length;
-  return groups.map((group, index) => ({
-    ...group,
-    size: baseSize + (index === groups.length - 1 ? remainder : 0)
-  }));
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      groups: updatedGroups
+    }
+  };
 };
 
-const closeEditorGroup$1 = (state, groupId) => {
-  if (Number.isNaN(groupId)) {
-    return state;
-  }
+const findTab = (state, tabId) => {
   const {
     layout
   } = state;
   const {
-    activeGroupId,
     groups
   } = layout;
-  const groupIndex = getGroupIndexById(state, groupId);
-  if (groupIndex === -1 || groups.length <= 1) {
-    return state;
+  for (const group of groups) {
+    const tab = group.tabs.find(t => t.id === tabId);
+    if (tab) {
+      return tab;
+    }
   }
-  const remainingGroups = groups.filter(group => group.id !== groupId);
-  const redistributedGroups = redistributeSizesWithRemainder(remainingGroups);
-  const newActiveGroupId = activeGroupId === groupId ? remainingGroups[0].id : activeGroupId;
-  return withGroupsAndActiveGroup(state, redistributedGroups, newActiveGroupId);
+  return undefined;
+};
+const loadFileContent = async path => {
+  const content = await readFile(path);
+  return content;
+};
+const getLoadFileErrorMessage = error => {
+  if (!(error instanceof Error)) {
+    return 'Failed to load file content';
+  }
+  if (error.message.includes('EISDIR') || error.message.includes('illegal operation on a directory') || error.message.includes('is a directory')) {
+    return 'Expected a file but received a folder';
+  }
+  return error.message;
 };
+const loadTabContentAsync = async (tabId, path, requestId, getLatestState) => {
+  try {
+    await loadFileContent(path);
 
-const isFocused = group => {
-  return group.focused;
+    // Check for race condition: get the latest state
+    const latestState = getLatestState();
+    const latestTab = findTab(latestState, tabId);
+
+    // If the tab no longer exists, discard this result
+    if (!latestTab) {
+      return latestState;
+    }
+
+    // If the tab is no longer in loading state, discard this result (newer request started)
+    if (latestTab.loadingState !== 'loading') {
+      return latestState;
+    }
+
+    // Assign editorUid if tab doesn't have one yet
+    const editorUid = latestTab.editorUid === -1 ? create$2() : latestTab.editorUid;
+    return updateTab(latestState, tabId, {
+      editorUid,
+      errorMessage: undefined,
+      loadingState: 'loaded'
+    });
+  } catch (error) {
+    // Check for race condition before updating with error
+    const latestState = getLatestState();
+    const latestTab = findTab(latestState, tabId);
+    if (!latestTab) {
+      return latestState;
+    }
+
+    // If the tab is no longer in loading state, discard this result (newer request started)
+    if (latestTab.loadingState !== 'loading') {
+      return latestState;
+    }
+    const errorMessage = getLoadFileErrorMessage(error);
+    return updateTab(latestState, tabId, {
+      errorMessage,
+      loadingState: 'error'
+    });
+  }
 };
-const closeFocusedTab = async state => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  const focusedGroup = groups.find(isFocused);
-  if (!focusedGroup) {
+
+/**
+ * SAFE: Create viewlet for a tab (no visible side effects)
+ * Can be called eagerly when tab is opened - the viewlet loads in the background.
+ */
+const createViewletForTab = (state, tabId, viewletModuleId, bounds) => {
+  const tab = findTab(state, tabId);
+  if (!tab) {
     return state;
   }
-  const {
-    activeTabId
-  } = focusedGroup;
-  if (activeTabId === undefined) {
+
+  // If tab already has an editorUid or is loading/loaded, don't recreate
+  if (tab.editorUid !== -1 || tab.loadingState === 'loading' || tab.loadingState === 'loaded') {
     return state;
   }
-  return closeTabAndSave(state, focusedGroup.id, activeTabId);
+  const editorUid = create$2();
+  const newState = updateTab(state, tabId, {
+    editorUid
+  });
+  return newState;
 };
 
-const closeOtherTabs = (state, groupId) => {
-  const {
+/**
+ * Called when switching tabs.
+ * With reference nodes, attachment/detachment is handled automatically by virtual DOM rendering.
+ * No attach/detach commands needed - virtual DOM will render the correct reference at each position.
+ */
+const switchViewlet = (state, fromTabId, toTabId) => {
+  // No commands needed - virtual DOM reference nodes handle attachment automatically
+  // Virtual DOM will:
+  // 1. Remove the old reference node from the previous active tab
+  // 2. Add the new reference node for the now-active tab
+  // This achieves the same effect as detach/attach without explicit commands
+
+  return {
+    commands: [],
+    newState: state
+  };
+};
+
+const findTabByEditorUid = (state, editorUid) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  for (const group of groups) {
+    const tab = group.tabs.find(t => t.editorUid === editorUid);
+    if (tab) {
+      return tab;
+    }
+  }
+  return undefined;
+};
+
+/**
+ * Called when renderer reports viewlet finished creating.
+ * With reference nodes, attachment is handled automatically by virtual DOM rendering.
+ * No commands needed - state update is sufficient.
+ */
+const handleViewletReady = (state, editorUid, title) => {
+  if (editorUid === -1) {
+    throw new Error('Invalid editorUid -1');
+  }
+  // Find the tab by viewletRequestId
+  const tab = findTabByEditorUid(state, editorUid);
+  if (!tab) {
+    // Tab was closed, dispose viewlet
+    return state;
+  }
+
+  // Mark viewlet as ready and set instance id
+  // Reference nodes will handle rendering at the correct position automatically
+  const newState = updateTab(state, tab.id, {
+    editorUid,
+    loadingState: 'loaded',
+    ...(title && {
+      title
+    })
+  });
+
+  // No attach commands needed - virtual DOM reference nodes handle positioning
+  return newState;
+};
+
+/**
+ * Dispose viewlet when tab is closed.
+ */
+const disposeViewletForTab = (state, tabId) => {
+  const tab = findTab(state, tabId);
+  if (!tab || tab.editorUid === -1) {
+    return {
+      commands: [],
+      newState: state
+    };
+  }
+  const commands = [{
+    instanceId: tab.editorUid,
+    type: 'dispose'
+  }];
+  return {
+    commands,
+    newState: state
+  };
+};
+
+const handleCreate = async command => {
+  // Safe to call - no visible side effects
+
+  const title = await createViewlet(command.viewletModuleId, command.editorUid, command.tabId, command.bounds, command.uri || '');
+
+  // After viewlet is created, mark it as ready
+  // Attachment is handled automatically by virtual DOM reference nodes
+  const {
+    newState: state,
+    oldState
+  } = get(command.uid);
+  const readyState = handleViewletReady(state, command.editorUid, title);
+  set(command.uid, oldState, readyState);
+  return readyState;
+};
+
+const handleDetach = async command => {
+  // Hides viewlet but keeps it alive
+
+  await invoke('Viewlet.detach', command.instanceId);
+};
+
+const handleDispose = async command => {
+  // Fully destroys viewlet
+
+  await invoke('Viewlet.dispose', command.instanceId);
+};
+
+const handleSetBounds = async command => {
+  await invoke('Viewlet.setBounds', command.instanceId, command.bounds);
+};
+
+const executeViewletCommand = async command => {
+  switch (command.type) {
+    case 'attach':
+      await handleAttach(command);
+      return;
+    case 'create':
+      await handleCreate(command);
+      return;
+    case 'detach':
+      await handleDetach(command);
+      return;
+    case 'dispose':
+      await handleDispose(command);
+      return;
+    case 'setBounds':
+      await handleSetBounds(command);
+      return;
+  }
+};
+const executeViewletCommands = async commands => {
+  for (const command of commands) {
+    await executeViewletCommand(command);
+  }
+};
+
+const findTabInState = (state, groupId, tabId) => {
+  const {
+    layout
+  } = state;
+  const group = layout.groups.find(g => g.id === groupId);
+  return group?.tabs.find(t => t.id === tabId);
+};
+
+const closeTabWithViewlet = async (state, groupId, tabId) => {
+  const tab = findTabInState(state, groupId, tabId);
+  const commands = [];
+  if (tab && tab.editorUid !== -1) {
+    const {
+      commands: disposeCommands
+    } = disposeViewletForTab(state, tabId);
+    commands.push(...disposeCommands);
+  }
+  const newState = closeTab(state, groupId, tabId);
+  const group = state.layout.groups.find(g => g.id === groupId);
+  const wasActiveTab = group?.activeTabId === tabId;
+  if (wasActiveTab) {
+    const newGroup = newState.layout.groups.find(g => g.id === groupId);
+    const newActiveTabId = newGroup?.activeTabId;
+    if (newActiveTabId !== undefined) {
+      const {
+        commands: switchCommands,
+        newState: switchedState
+      } = switchViewlet(newState);
+      commands.push(...switchCommands);
+      await executeViewletCommands(commands);
+      return switchedState;
+    }
+  }
+  if (commands.length > 0) {
+    await executeViewletCommands(commands);
+  }
+  return newState;
+};
+
+const saveEditor = async editorUid => {
+  return invoke('Editor.save', editorUid);
+};
+
+const closeTabAndSave = async (state, groupId, tabId) => {
+  const tab = findTabInState(state, groupId, tabId);
+  if (!tab) {
+    return state;
+  }
+  if (tab.editorUid !== -1 && tab.isDirty) {
+    const editorState = await saveEditor(tab.editorUid);
+    if (!editorState?.modified && tab.uri) {
+      await handleModifiedStatusChange$1(tab.uri, false);
+    }
+  }
+  if (tab.uri?.startsWith('simple-browser://')) {
+    return closeTabWithViewlet(state, groupId, tabId);
+  }
+  return closeTab(state, groupId, tabId);
+};
+
+const getFocusedGroup = state => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  return groups.find(group => group.focused);
+};
+
+const closeActiveEditor = async state => {
+  const focusedGroup = getFocusedGroup(state);
+  if (!focusedGroup) {
+    return state;
+  }
+  const {
+    activeTabId
+  } = focusedGroup;
+  if (activeTabId === undefined) {
+    return state;
+  }
+  return closeTabAndSave(state, focusedGroup.id, activeTabId);
+};
+
+const closeAll$1 = state => {
+  const entries = state.layout.groups.flatMap((group, groupIndex) => {
+    return group.tabs.map((tab, tabIndex) => ({
+      group,
+      groupIndex,
+      tab,
+      tabIndex
+    }));
+  });
+  return withEmptyGroups(addClosedTabs(state, entries));
+};
+
+const redistributeSizesWithRemainder = groups => {
+  const baseSize = Math.floor(100 / groups.length);
+  const remainder = 100 % groups.length;
+  return groups.map((group, index) => ({
+    ...group,
+    size: baseSize + (index === groups.length - 1 ? remainder : 0)
+  }));
+};
+
+const closeEditorGroup$1 = (state, groupId) => {
+  if (Number.isNaN(groupId)) {
+    return state;
+  }
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const groupIndex = getGroupIndexById(state, groupId);
+  if (groupIndex === -1 || groups.length <= 1) {
+    return state;
+  }
+  const remainingGroups = groups.filter(group => group.id !== groupId);
+  const redistributedGroups = redistributeSizesWithRemainder(remainingGroups);
+  const newActiveGroupId = activeGroupId === groupId ? remainingGroups[0].id : activeGroupId;
+  return withGroupsAndActiveGroup(state, redistributedGroups, newActiveGroupId);
+};
+
+const isFocused = group => {
+  return group.focused;
+};
+const closeFocusedTab = async state => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const focusedGroup = groups.find(isFocused);
+  if (!focusedGroup) {
+    return state;
+  }
+  const {
+    activeTabId
+  } = focusedGroup;
+  if (activeTabId === undefined) {
+    return state;
+  }
+  return closeTabAndSave(state, focusedGroup.id, activeTabId);
+};
+
+const closeOtherTabs = (state, groupId) => {
+  const {
     layout
   } = state;
   const {
@@ -2098,359 +2570,90 @@ const copyRelativePath$1 = async (state, path) => {
   // TODO use clipboard worker
   const relativePath = await invoke('Workspace.pathBaseName', path);
   await invoke('ClipBoard.writeText', relativePath);
-  return state;
-};
-
-const Horizontal = 1;
-const Vertical = 2;
-const isLayoutDirection = direction => {
-  return direction === Horizontal || direction === Vertical;
-};
-const normalizeLayoutDirection = direction => {
-  if (isLayoutDirection(direction)) {
-    return direction;
-  }
-  if (direction === 'horizontal') {
-    return Horizontal;
-  }
-  if (direction === 'vertical') {
-    return Vertical;
-  }
-  return undefined;
-};
-
-const {
-  get,
-  getCommandIds,
-  getKeys: getKeys$1,
-  registerCommands,
-  set,
-  wrapCommand,
-  wrapGetter
-} = create$f();
-
-const create$2 = (uid, uri, x, y, width, height, platform, assetDir, tabHeight = 35) => {
-  const state = {
-    assetDir,
-    closedTabs: [],
-    fileIconCache: {},
-    height,
-    homeDirUri: '',
-    iframes: [],
-    initial: true,
-    layout: {
-      activeGroupId: undefined,
-      direction: Horizontal,
-      groups: []
-    },
-    maxOpenEditorGroups: Infinity,
-    maxOpenEditors: Infinity,
-    minGroupHeightPx: 80,
-    minGroupWidthPx: 250,
-    platform,
-    splitButtonEnabled: false,
-    tabHeight,
-    uid,
-    width,
-    workspaceuri: uri,
-    x,
-    y
-  };
-  set(uid, state, state);
-};
-
-const isEqual$1 = (oldState, newState) => {
-  return false;
-};
-
-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 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
-        };
-      }
-      return tab;
-    });
-    return {
-      ...group,
-      tabs: updatedTabs
-    };
-  });
-  return {
-    ...state,
-    layout: {
-      ...layout,
-      groups: updatedGroups
-    }
-  };
-};
-
-const findTab = (state, tabId) => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  for (const group of groups) {
-    const tab = group.tabs.find(t => t.id === tabId);
-    if (tab) {
-      return tab;
-    }
-  }
-  return undefined;
-};
-const loadFileContent = async path => {
-  const content = await readFile(path);
-  return content;
-};
-const getLoadFileErrorMessage = error => {
-  if (!(error instanceof Error)) {
-    return 'Failed to load file content';
-  }
-  if (error.message.includes('EISDIR') || error.message.includes('illegal operation on a directory') || error.message.includes('is a directory')) {
-    return 'Expected a file but received a folder';
-  }
-  return error.message;
-};
-const loadTabContentAsync = async (tabId, path, requestId, getLatestState) => {
-  try {
-    await loadFileContent(path);
-
-    // Check for race condition: get the latest state
-    const latestState = getLatestState();
-    const latestTab = findTab(latestState, tabId);
-
-    // If the tab no longer exists, discard this result
-    if (!latestTab) {
-      return latestState;
-    }
-
-    // If the tab is no longer in loading state, discard this result (newer request started)
-    if (latestTab.loadingState !== 'loading') {
-      return latestState;
-    }
-
-    // Assign editorUid if tab doesn't have one yet
-    const editorUid = latestTab.editorUid === -1 ? create$1() : latestTab.editorUid;
-    return updateTab(latestState, tabId, {
-      editorUid,
-      errorMessage: undefined,
-      loadingState: 'loaded'
-    });
-  } catch (error) {
-    // Check for race condition before updating with error
-    const latestState = getLatestState();
-    const latestTab = findTab(latestState, tabId);
-    if (!latestTab) {
-      return latestState;
-    }
-
-    // If the tab is no longer in loading state, discard this result (newer request started)
-    if (latestTab.loadingState !== 'loading') {
-      return latestState;
-    }
-    const errorMessage = getLoadFileErrorMessage(error);
-    return updateTab(latestState, tabId, {
-      errorMessage,
-      loadingState: 'error'
-    });
-  }
-};
-
-/**
- * SAFE: Create viewlet for a tab (no visible side effects)
- * Can be called eagerly when tab is opened - the viewlet loads in the background.
- */
-const createViewletForTab = (state, tabId, viewletModuleId, bounds) => {
-  const tab = findTab(state, tabId);
-  if (!tab) {
-    return state;
-  }
-
-  // If tab already has an editorUid or is loading/loaded, don't recreate
-  if (tab.editorUid !== -1 || tab.loadingState === 'loading' || tab.loadingState === 'loaded') {
-    return state;
-  }
-  const editorUid = create$1();
-  const newState = updateTab(state, tabId, {
-    editorUid
-  });
-  return newState;
-};
-
-/**
- * Called when switching tabs.
- * With reference nodes, attachment/detachment is handled automatically by virtual DOM rendering.
- * No attach/detach commands needed - virtual DOM will render the correct reference at each position.
- */
-const switchViewlet = (state, fromTabId, toTabId) => {
-  // No commands needed - virtual DOM reference nodes handle attachment automatically
-  // Virtual DOM will:
-  // 1. Remove the old reference node from the previous active tab
-  // 2. Add the new reference node for the now-active tab
-  // This achieves the same effect as detach/attach without explicit commands
-
-  return {
-    commands: [],
-    newState: state
-  };
-};
-
-const findTabByEditorUid = (state, editorUid) => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  for (const group of groups) {
-    const tab = group.tabs.find(t => t.editorUid === editorUid);
-    if (tab) {
-      return tab;
-    }
-  }
-  return undefined;
+  return state;
 };
 
-/**
- * Called when renderer reports viewlet finished creating.
- * With reference nodes, attachment is handled automatically by virtual DOM rendering.
- * No commands needed - state update is sufficient.
- */
-const handleViewletReady = (state, editorUid) => {
-  if (editorUid === -1) {
-    throw new Error('Invalid editorUid -1');
+const Horizontal = 1;
+const Vertical = 2;
+const isLayoutDirection = direction => {
+  return direction === Horizontal || direction === Vertical;
+};
+const normalizeLayoutDirection = direction => {
+  if (isLayoutDirection(direction)) {
+    return direction;
   }
-  // Find the tab by viewletRequestId
-  const tab = findTabByEditorUid(state, editorUid);
-  if (!tab) {
-    // Tab was closed, dispose viewlet
-    return state;
+  if (direction === 'horizontal') {
+    return Horizontal;
   }
-
-  // Mark viewlet as ready and set instance id
-  // Reference nodes will handle rendering at the correct position automatically
-  const newState = updateTab(state, tab.id, {
-    editorUid,
-    loadingState: 'loaded'
-  });
-
-  // No attach commands needed - virtual DOM reference nodes handle positioning
-  return newState;
+  if (direction === 'vertical') {
+    return Vertical;
+  }
+  return undefined;
 };
 
-const handleCreate = async command => {
-  // Safe to call - no visible side effects
-
-  const instanceId = Math.random(); // TODO try to find a better way to get consistent integer ids (thread safe)
-
-  await invoke('Layout.createViewlet', command.viewletModuleId, command.tabId, command.bounds, command.uri, instanceId);
-
-  // After viewlet is created, mark it as ready
-  // Attachment is handled automatically by virtual DOM reference nodes
-  const {
-    newState: state,
-    oldState
-  } = get(command.uid);
-  const readyState = handleViewletReady(state, command.editorUid);
-  set(command.uid, oldState, readyState);
-  return readyState;
+const create$1 = (uid, uri, x, y, width, height, platform, assetDir, tabHeight = 35) => {
+  const state = {
+    assetDir,
+    closedTabs: [],
+    fileIconCache: {},
+    height,
+    homeDirUri: '',
+    iframes: [],
+    initial: true,
+    layout: {
+      activeGroupId: undefined,
+      direction: Horizontal,
+      groups: []
+    },
+    maxOpenEditorGroups: Infinity,
+    maxOpenEditors: Infinity,
+    minGroupHeightPx: 80,
+    minGroupWidthPx: 250,
+    platform,
+    splitButtonEnabled: false,
+    tabHeight,
+    uid,
+    width,
+    workspaceuri: uri,
+    x,
+    y
+  };
+  set(uid, state, state);
 };
 
-const handleDetach = async command => {
-  // Hides viewlet but keeps it alive
-
-  await invoke('Viewlet.detach', command.instanceId);
+const isEqual$1 = (oldState, newState) => {
+  return false;
 };
 
-const handleDispose = async command => {
-  // Fully destroys viewlet
-
-  await invoke('Viewlet.dispose', command.instanceId);
+const isEqual = (oldState, newState) => {
+  return oldState.layout === newState.layout;
 };
 
-const handleSetBounds = async command => {
-  await invoke('Viewlet.setBounds', command.instanceId, command.bounds);
-};
+const RenderItems = 4;
+const RenderCss = 10;
+const RenderIncremental = 11;
 
-const executeViewletCommand = async command => {
-  switch (command.type) {
-    case 'attach':
-      await handleAttach(command);
-      return;
-    case 'create':
-      await handleCreate(command);
-      return;
-    case 'detach':
-      await handleDetach(command);
-      return;
-    case 'dispose':
-      await handleDispose(command);
-      return;
-    case 'setBounds':
-      await handleSetBounds(command);
-      return;
+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 executeViewletCommands = async commands => {
-  for (const command of commands) {
-    await executeViewletCommand(command);
-  }
+
+const diff2 = uid => {
+  const {
+    newState,
+    oldState
+  } = get(uid);
+  const result = diff(oldState, newState);
+  return result;
 };
 
 const requestIdState = {
@@ -2685,10 +2888,6 @@ const getUpdatedGroups = (groups, groupIndex, needsLoading, tabId) => {
   });
 };
 
-const createViewlet = async (viewletModuleId, editorUid, tabId, bounds, uri) => {
-  await invoke('Layout.createViewlet', viewletModuleId, editorUid, tabId, bounds, uri);
-};
-
 const findTabById = (state, tabId) => {
   const {
     layout
@@ -2803,8 +3002,8 @@ const maybeCreateViewletForSelectedTab = async (state, newState, groupIndex, ind
       editorUid
     } = tabWithViewlet.tab;
     if (editorUid !== -1 && selectedTab.uri) {
-      await createViewlet(viewletModuleId, editorUid, tabId, bounds, selectedTab.uri);
-      stateWithViewlet = handleViewletReady(stateWithViewlet, editorUid);
+      const title = await createViewlet(viewletModuleId, editorUid, tabId, bounds, selectedTab.uri);
+      stateWithViewlet = handleViewletReady(stateWithViewlet, editorUid, title);
       set(uid, state, stateWithViewlet);
     }
   }
@@ -3348,9 +3547,9 @@ const createEmptyGroup$1 = (state, uri, requestId, preview = false, title = getL
   const {
     groups
   } = layout;
-  const groupId = create$1();
-  const tabId = create$1();
-  const editorUid = create$1();
+  const groupId = create$2();
+  const tabId = create$2();
+  const editorUid = create$2();
   const newTab = {
     editorInput,
     editorType,
@@ -3391,7 +3590,7 @@ const openTab = (state, groupId, tab) => {
   };
   const newTab = 'id' in normalizedTab && normalizedTab.id !== undefined ? normalizedTab : {
     ...normalizedTab,
-    id: create$1()
+    id: create$2()
   };
   const {
     layout
@@ -3478,8 +3677,8 @@ const ensureActiveGroup = (state, uri, preview = false, title = getLabel(uri), e
     }
 
     // Create a new tab with the URI in the active group
-    const tabId = create$1();
-    const editorUid = create$1();
+    const tabId = create$2();
+    const editorUid = create$2();
     const newTab = {
       editorInput,
       editorType,
@@ -3669,7 +3868,7 @@ const getFileIconsForTabs = async (tabs, fileIconCache) => {
   };
 };
 
-const updateTabIcon = async (uid, state, readyState, tabId) => {
+const updateTabIcon = async (context, readyState, tabId) => {
   const newTab = findTabById(readyState, tabId);
   if (!newTab || !newTab.tab.uri) {
     return undefined;
@@ -3678,9 +3877,7 @@ const updateTabIcon = async (uid, state, readyState, tabId) => {
     const {
       newFileIconCache
     } = await getFileIconsForTabs([newTab.tab], readyState.fileIconCache);
-    const {
-      newState: stateBeforeIconUpdate
-    } = get(uid);
+    const stateBeforeIconUpdate = context.getState();
     const icon = newFileIconCache[newTab.tab.uri] || '';
     const stateWithIcon = {
       ...stateBeforeIconUpdate,
@@ -3696,19 +3893,16 @@ const updateTabIcon = async (uid, state, readyState, tabId) => {
         }))
       }
     };
-    set(uid, state, stateWithIcon);
-    return stateWithIcon;
+    return context.updateState(() => stateWithIcon);
   } catch {
     return undefined;
   }
 };
 
-const openInput = async (state, options) => {
+const openInputWithContext = async (context, options) => {
+  const state = context.getState();
   object(state);
   object(options);
-  const {
-    uid
-  } = state;
   const {
     editorInput
   } = options;
@@ -3716,40 +3910,40 @@ const openInput = async (state, options) => {
   const uri = getEditorInputUri(editorInput);
   const title = getEditorInputTitle(editorInput);
   const editorType = getEditorInputEditorType(editorInput);
-  const currentState = getCurrentState(state);
+  const currentState = state;
   const existingTab = findTabByUri(currentState, uri);
   const shouldRetryExistingTab = !!existingTab && existingTab.tab.loadingState === 'error';
   if (existingTab && !shouldRetryExistingTab) {
     const focusedState = focusEditorGroup(currentState, existingTab.groupId);
-    return switchTab(focusedState, existingTab.groupId, existingTab.tab.id);
+    const switchedState = switchTab(focusedState, existingTab.groupId, existingTab.tab.id);
+    await context.updateState(() => switchedState);
+    return;
   }
   const previousTabId = getActiveTabId(currentState);
   const {
     stateWithTab,
     tabId
   } = getStateWithTab(currentState, editorInput, existingTab, shouldRetryExistingTab, uri, preview, title, editorType);
-  set(uid, state, stateWithTab);
+  await context.updateState(() => stateWithTab);
   if (await isDirectoryEditorInput(editorInput)) {
-    const {
-      newState: latestState
-    } = get(uid);
+    const latestState = context.getState();
     const errorState = updateTab(latestState, tabId, {
       errorMessage: 'Expected a file but received a folder',
       loadingState: 'error'
     });
-    set(uid, state, errorState);
-    return errorState;
+    await context.updateState(() => errorState);
+    return;
   }
   try {
     const viewletModuleId = await getViewletModuleIdForEditorInput(editorInput);
-    const {
-      newState: stateAfterModuleId
-    } = get(uid);
+    const stateAfterModuleId = context.getState();
     if (!viewletModuleId) {
-      return updateTab(stateAfterModuleId, tabId, {
+      const unsupportedState = updateTab(stateAfterModuleId, tabId, {
         errorMessage: 'Could not determine editor type for this URI',
         loadingState: 'error'
       });
+      await context.updateState(() => unsupportedState);
+      return;
     }
     const bounds = {
       height: stateAfterModuleId.height - stateAfterModuleId.tabHeight,
@@ -3763,10 +3957,10 @@ const openInput = async (state, options) => {
       newState: switchedState
     } = switchViewlet(intermediateState, previousTabId, tabId);
     intermediateState = switchedState;
-    set(uid, state, intermediateState);
+    await context.updateState(() => intermediateState);
     const tabWithViewlet = findTabById(intermediateState, tabId);
     if (!tabWithViewlet) {
-      return intermediateState;
+      return;
     }
     const {
       editorUid
@@ -3774,33 +3968,42 @@ const openInput = async (state, options) => {
     if (editorUid === -1) {
       throw new Error('invalid editorUid');
     }
-    await createViewlet(viewletModuleId, editorUid, tabId, bounds, uri);
-    const {
-      newState: latestState
-    } = get(uid);
-    const readyState = handleViewletReady(latestState, editorUid);
-    set(uid, state, readyState);
-    const stateWithIcon = await updateTabIcon(uid, state, readyState, tabId);
+    const renderedTitle = await createViewlet(viewletModuleId, editorUid, tabId, bounds, uri);
+    const latestState = context.getState();
+    const readyState = handleViewletReady(latestState, editorUid, renderedTitle);
+    await context.updateState(() => readyState);
+    const stateWithIcon = await updateTabIcon(context, readyState, tabId);
     if (stateWithIcon) {
-      return stateWithIcon;
+      return;
     }
-    const {
-      newState: finalState
-    } = get(uid);
-    return finalState;
   } catch (error) {
-    const {
-      newState: latestState
-    } = get(uid);
+    const latestState = context.getState();
     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;
+    await context.updateState(() => errorState);
   }
 };
+const openInput = async (state, options) => {
+  const {
+    uid
+  } = state;
+  let currentState = getCurrentState(state);
+  const context = {
+    getState: () => get(uid)?.newState ?? currentState,
+    updateState: updater => {
+      const storedState = get(uid);
+      const latestState = storedState?.newState ?? currentState;
+      currentState = updater(latestState);
+      set(uid, storedState?.oldState ?? state, currentState);
+      return Promise.resolve(currentState);
+    }
+  };
+  await openInputWithContext(context, options);
+  return context.getState();
+};
 
 const getOptionUriOptions = options => {
   if (typeof options === 'string') {
@@ -3809,14 +4012,20 @@ const getOptionUriOptions = options => {
   return options.uri;
 };
 
-const openUri = async (state, options) => {
+const getOpenInputOptions = options => {
   const uri = getOptionUriOptions(options);
   const preview = typeof options === 'string' ? false : options.preview ?? false;
-  return openInput(state, {
+  return {
     editorInput: getNormalizedOpenEditorInput(uri),
     focus: typeof options === 'string' ? false : options.focus,
     preview
-  });
+  };
+};
+const openUri = async (state, options) => {
+  return openInput(state, getOpenInputOptions(options));
+};
+const openUriWithContext = async (context, options) => {
+  await openInputWithContext(context, getOpenInputOptions(options));
 };
 
 const retryOpen = async state => {
@@ -4002,7 +4211,7 @@ const splitEditorGroup$1 = (state, groupId, direction) => {
   if (!sourceGroup) {
     return state;
   }
-  const newGroupId = create$1();
+  const newGroupId = create$2();
   const splitLayoutDirection = getSplitLayoutDirection(direction);
   const baseNewGroup = {
     activeTabId: undefined,
@@ -4219,8 +4428,8 @@ const newFile = async state => {
   getActiveTabId(newState);
 
   // Create a new empty tab
-  const tabId = create$1();
-  const editorUid = create$1();
+  const tabId = create$2();
+  const editorUid = create$2();
   const newTab = {
     editorType: 'text',
     editorUid,
@@ -4265,13 +4474,13 @@ const newFile = async state => {
   if (actualEditorUid === -1) {
     throw new Error(`invalid editorUid`);
   }
-  await createViewlet(viewletModuleId, actualEditorUid, tabId, bounds, newTab.uri || '');
+  const title = await createViewlet(viewletModuleId, 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);
+  const readyState = handleViewletReady(latestState, actualEditorUid, title);
   return readyState;
 };
 
@@ -4366,6 +4575,9 @@ const handleModifiedStatusChange = (state, uri, newStatus) => {
     }
   };
 };
+const handleModifiedStatusChangeWithContext = async (context, uri, newStatus) => {
+  await context.updateState(state => handleModifiedStatusChange(state, uri, newStatus));
+};
 
 const handleResize = async (state, dimensions) => {
   const {
@@ -4598,47 +4810,6 @@ const handleUriChange = async (state, oldUri, newUri) => {
   };
 };
 
-const handleWorkspaceChange = state => {
-  const {
-    layout
-  } = state;
-  return {
-    ...state,
-    layout: {
-      ...layout,
-      activeGroupId: undefined,
-      groups: []
-    }
-  };
-};
-
-const hasActiveTextEditor = state => {
-  const activeTab = getActiveTab(state);
-  return activeTab?.tab.editorInput?.type === 'editor';
-};
-
-const id = 7201;
-const sendMessagePortToExtensionHostWorker = async port => {
-  await sendMessagePortToExtensionHostWorker$1(port, id);
-};
-
-const createExtensionHostRpc = async () => {
-  try {
-    const rpc = await create$8({
-      commandMap: {},
-      send: sendMessagePortToExtensionHostWorker
-    });
-    return rpc;
-  } catch (error) {
-    throw new VError(error, `Failed to create extension host rpc`);
-  }
-};
-
-const initialize = async () => {
-  const rpc = await createExtensionHostRpc();
-  set$3(rpc);
-};
-
 const toFileUri = path => {
   if (!path) {
     return '';
@@ -4748,15 +4919,22 @@ const tryRestoreLayout = savedState => {
 
 const createViewlets = async (layout, viewletModuleIds, bounds) => {
   const editorUids = {};
+  const titles = {};
   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$2() : activeTab.editorUid;
       editorUids[activeTab.id] = editorUid;
-      await createViewlet(viewletModuleIds[activeTab.id], editorUid, activeTab.id, bounds, activeTab.uri);
+      const title = await createViewlet(viewletModuleIds[activeTab.id], editorUid, activeTab.id, bounds, activeTab.uri);
+      if (title) {
+        titles[activeTab.id] = title;
+      }
     }
   }
-  return editorUids;
+  return {
+    editorUids,
+    titles
+  };
 };
 
 const getViewletModuleIds = async layout => {
@@ -4833,7 +5011,10 @@ const restoreAndCreateEditors = async (state, restoredLayout) => {
   const viewletModuleIds = await getViewletModuleIds(newState.layout);
 
   // Create viewlets and get editor UIDs
-  const editorUids = await createViewlets(newState.layout, viewletModuleIds, bounds);
+  const {
+    editorUids,
+    titles
+  } = await createViewlets(newState.layout, viewletModuleIds, bounds);
 
   // Update tabs with editor UIDs
   newState = updateTabs(newState, editorUids);
@@ -4844,7 +5025,7 @@ const restoreAndCreateEditors = async (state, restoredLayout) => {
     if (activeTab && viewletModuleIds[activeTab.id]) {
       const editorUid = editorUids[activeTab.id];
       newState = createViewletForTab(newState, activeTab.id);
-      newState = handleViewletReady(newState, editorUid);
+      newState = handleViewletReady(newState, editorUid, titles[activeTab.id]);
     }
   }
   return newState;
@@ -4887,6 +5068,37 @@ const loadContent = async (state, savedState) => {
   };
 };
 
+const handleWorkspaceChange = async (state, _workspacePath, savedState) => {
+  return loadContent(state, savedState);
+};
+
+const hasActiveTextEditor = state => {
+  const activeTab = getActiveTab(state);
+  return activeTab?.tab.editorInput?.type === 'editor';
+};
+
+const id = 7201;
+const sendMessagePortToExtensionHostWorker = async port => {
+  await sendMessagePortToExtensionHostWorker$1(port, id);
+};
+
+const createExtensionHostRpc = async () => {
+  try {
+    const rpc = await create$8({
+      commandMap: {},
+      send: sendMessagePortToExtensionHostWorker
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create extension host rpc`);
+  }
+};
+
+const initialize = async () => {
+  const rpc = await createExtensionHostRpc();
+  set$3(rpc);
+};
+
 const hasTargetGroup = groupId => {
   return groupId !== undefined && groupId >= 0;
 };
@@ -4899,15 +5111,15 @@ const getMenuEntryArgs = groupId => {
 };
 
 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);
+  let result = key;
+  for (const [placeholder, replacement] of Object.entries(placeholders)) {
+    result = result.split(`{${placeholder}}`).join(String(replacement));
+  }
+  return result;
 };
 
 const Close = 'Close';
@@ -5260,26 +5472,26 @@ const newWindow = async state => {
   return state;
 };
 
-const openUris = async (state, uris) => {
+const openUrisWithContext = async (context, uris) => {
   if (uris.length === 0) {
-    return state;
+    return;
   }
+  await openUriWithContext(context, uris[0]);
   if (uris.length === 1) {
-    return openUri(state, uris[0]);
+    return;
   }
-  let currentState = await openUri(state, uris[0]);
+  let currentState = context.getState();
   const firstTab = findTabByUri(currentState, uris[0]);
   for (const uri of uris.slice(1)) {
     const existingTab = findTabByUri(currentState, uri);
-    if (existingTab) {
-      continue;
+    if (!existingTab) {
+      currentState = ensureActiveGroup(currentState, uri);
     }
-    currentState = ensureActiveGroup(currentState, uri);
   }
-  if (!firstTab) {
-    return currentState;
+  if (firstTab) {
+    currentState = switchTab(currentState, firstTab.groupId, firstTab.tab.id);
   }
-  return switchTab(currentState, firstTab.groupId, firstTab.tab.id);
+  await context.updateState(() => currentState);
 };
 
 const refresh = state => {
@@ -6350,7 +6562,7 @@ const createEmptyGroup = () => {
   return {
     activeTabId: undefined,
     focused: false,
-    id: create$1(),
+    id: create$2(),
     isEmpty: true,
     size: 100,
     tabs: []
@@ -6525,7 +6737,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$2();
     const initialGroup = {
       activeTabId: undefined,
       focused: true,
@@ -6560,7 +6772,7 @@ const splitLeft = (state, groupId) => {
     groups
   } = layout;
   if (groups.length === 0) {
-    const initialGroupId = create$1();
+    const initialGroupId = create$2();
     const initialGroup = {
       activeTabId: undefined,
       focused: true,
@@ -6594,7 +6806,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$2();
     const initialGroup = {
       activeTabId: undefined,
       focused: true,
@@ -6625,7 +6837,7 @@ const splitUp = (state, groupId) => {
     groups
   } = layout;
   if (groups.length === 0) {
-    const initialGroupId = create$1();
+    const initialGroupId = create$2();
     const initialGroup = {
       activeTabId: undefined,
       focused: true,
@@ -6652,99 +6864,99 @@ const splitUp = (state, groupId) => {
 };
 
 const commandMap = {
-  'Main.closeActiveEditor': wrapCommand(closeActiveEditor),
-  'Main.closeAll': wrapCommand(closeAll$1),
-  'Main.closeAllEditors': wrapCommand(closeAll$1),
-  'Main.closeFocusedTab': wrapCommand(closeFocusedTab),
-  'Main.closeOthers': wrapCommand(closeOtherTabs),
-  'Main.closeSaved': wrapCommand(closeSaved$1),
-  'Main.closeTabsByUris': wrapCommand(closeTabsByUris),
-  'Main.closeTabsRight': wrapCommand(closeTabsRight),
-  'Main.copyPath': wrapCommand(copyPath$1),
-  'Main.copyRelativePath': wrapCommand(copyRelativePath$1),
-  'Main.focusNext': wrapCommand(focusNextTab),
-  'Main.focusNextTab': wrapCommand(focusNextTab),
-  'Main.focusPrevious': wrapCommand(focusPreviousTab),
-  'Main.focusPreviousTab': wrapCommand(focusPreviousTab),
-  'Main.handleModifiedStatusChange': wrapCommand(handleModifiedStatusChange),
-  'Main.handleTabContextMenu': wrapCommand(handleTabContextMenu),
+  'Main.closeActiveEditor': wrapSerialCommand(closeActiveEditor),
+  'Main.closeAll': wrapSerialCommand(closeAll$1),
+  'Main.closeAllEditors': wrapSerialCommand(closeAll$1),
+  'Main.closeFocusedTab': wrapSerialCommand(closeFocusedTab),
+  'Main.closeOthers': wrapSerialCommand(closeOtherTabs),
+  'Main.closeSaved': wrapSerialCommand(closeSaved$1),
+  'Main.closeTabsByUris': wrapSerialCommand(closeTabsByUris),
+  'Main.closeTabsRight': wrapSerialCommand(closeTabsRight),
+  'Main.copyPath': wrapSerialCommand(copyPath$1),
+  'Main.copyRelativePath': wrapSerialCommand(copyRelativePath$1),
+  'Main.focusNext': wrapSerialCommand(focusNextTab),
+  'Main.focusNextTab': wrapSerialCommand(focusNextTab),
+  'Main.focusPrevious': wrapSerialCommand(focusPreviousTab),
+  'Main.focusPreviousTab': wrapSerialCommand(focusPreviousTab),
+  'Main.handleModifiedStatusChange': wrapAsyncCommand(handleModifiedStatusChangeWithContext),
+  'Main.handleTabContextMenu': wrapSerialCommand(handleTabContextMenu),
   'Main.hasActiveTextEditor': wrapGetter(hasActiveTextEditor),
-  'Main.openInput': wrapCommand(openInput),
-  'Main.openUri': wrapCommand(openUri),
-  'Main.openUris': wrapCommand(openUris),
-  'Main.restoreClosedTab': wrapCommand(restoreClosedTab),
-  'Main.save': wrapCommand(save),
+  'Main.openInput': wrapSerialAsyncCommand(openInputWithContext),
+  'Main.openUri': wrapSerialAsyncCommand(openUriWithContext),
+  'Main.openUris': wrapSerialAsyncCommand(openUrisWithContext),
+  'Main.restoreClosedTab': wrapSerialCommand(restoreClosedTab),
+  'Main.save': wrapSerialCommand(save),
   'Main.saveState': wrapGetter(saveState),
-  'Main.splitRight': wrapCommand(splitRight),
-  'MainArea.closeActiveEditor': wrapCommand(closeActiveEditor),
-  'MainArea.closeAll': wrapCommand(closeAll$1),
-  'MainArea.closeAllEditors': wrapCommand(closeAll$1),
-  'MainArea.closeEditorGroup': wrapCommand(closeEditorGroup$1),
-  'MainArea.closeFocusedTab': wrapCommand(closeFocusedTab),
-  'MainArea.closeOthers': wrapCommand(closeOtherTabs),
-  'MainArea.closeSaved': wrapCommand(closeSaved$1),
-  'MainArea.closeTabsByUris': wrapCommand(closeTabsByUris),
-  'MainArea.closeTabsRight': wrapCommand(closeTabsRight),
-  'MainArea.copyIntoNewWindow': wrapCommand(copyIntoNewWindow$1),
-  'MainArea.copyPath': wrapCommand(copyPath$1),
-  'MainArea.copyRelativePath': wrapCommand(copyRelativePath$1),
-  'MainArea.create': create$2,
+  'Main.splitRight': wrapSerialCommand(splitRight),
+  'MainArea.closeActiveEditor': wrapSerialCommand(closeActiveEditor),
+  'MainArea.closeAll': wrapSerialCommand(closeAll$1),
+  'MainArea.closeAllEditors': wrapSerialCommand(closeAll$1),
+  'MainArea.closeEditorGroup': wrapSerialCommand(closeEditorGroup$1),
+  'MainArea.closeFocusedTab': wrapSerialCommand(closeFocusedTab),
+  'MainArea.closeOthers': wrapSerialCommand(closeOtherTabs),
+  'MainArea.closeSaved': wrapSerialCommand(closeSaved$1),
+  'MainArea.closeTabsByUris': wrapSerialCommand(closeTabsByUris),
+  'MainArea.closeTabsRight': wrapSerialCommand(closeTabsRight),
+  'MainArea.copyIntoNewWindow': wrapSerialCommand(copyIntoNewWindow$1),
+  'MainArea.copyPath': wrapSerialCommand(copyPath$1),
+  'MainArea.copyRelativePath': wrapSerialCommand(copyRelativePath$1),
+  'MainArea.create': create$1,
   'MainArea.diff2': diff2,
-  'MainArea.flipEditorLayout': wrapCommand(flipLayout),
-  'MainArea.focusNext': wrapCommand(focusNextTab),
-  'MainArea.focusNextTab': wrapCommand(focusNextTab),
-  'MainArea.focusPrevious': wrapCommand(focusPreviousTab),
-  'MainArea.focusPreviousTab': wrapCommand(focusPreviousTab),
+  'MainArea.flipEditorLayout': wrapSerialCommand(flipLayout),
+  'MainArea.focusNext': wrapSerialCommand(focusNextTab),
+  'MainArea.focusNextTab': wrapSerialCommand(focusNextTab),
+  'MainArea.focusPrevious': wrapSerialCommand(focusPreviousTab),
+  'MainArea.focusPreviousTab': wrapSerialCommand(focusPreviousTab),
   'MainArea.getCommandIds': getCommandIds,
   'MainArea.getMenuEntries': wrapGetter(getMenuEntries),
   'MainArea.getMenuIds': getMenuIds,
-  'MainArea.handleClick': wrapCommand(handleClick),
-  'MainArea.handleClickAction': wrapCommand(handleClickAction),
-  'MainArea.handleClickCloseTab': wrapCommand(handleClickCloseTab),
-  'MainArea.handleClickTab': wrapCommand(handleClickTab),
-  'MainArea.handleClickTogglePreview': wrapCommand(handleClickTogglePreview),
-  'MainArea.handleContextMenu': wrapCommand(handleContextMenu),
-  'MainArea.handleDoubleClick': wrapCommand(handleDoubleClick),
-  'MainArea.handleHeaderDoubleClick': wrapCommand(handleHeaderDoubleClick),
-  'MainArea.handleIconThemeChange': wrapCommand(handleIconThemeChange),
-  'MainArea.handleModifiedStatusChange': wrapCommand(handleModifiedStatusChange),
+  'MainArea.handleClick': wrapSerialCommand(handleClick),
+  'MainArea.handleClickAction': wrapSerialCommand(handleClickAction),
+  'MainArea.handleClickCloseTab': wrapSerialCommand(handleClickCloseTab),
+  'MainArea.handleClickTab': wrapSerialCommand(handleClickTab),
+  'MainArea.handleClickTogglePreview': wrapSerialCommand(handleClickTogglePreview),
+  'MainArea.handleContextMenu': wrapSerialCommand(handleContextMenu),
+  'MainArea.handleDoubleClick': wrapSerialCommand(handleDoubleClick),
+  'MainArea.handleHeaderDoubleClick': wrapSerialCommand(handleHeaderDoubleClick),
+  'MainArea.handleIconThemeChange': wrapSerialCommand(handleIconThemeChange),
+  'MainArea.handleModifiedStatusChange': wrapAsyncCommand(handleModifiedStatusChangeWithContext),
   '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),
+  'MainArea.handleSashPointerDown': wrapSerialCommand(handleSashPointerDown),
+  'MainArea.handleSashPointerMove': wrapSerialCommand(handleSashPointerMove),
+  'MainArea.handleSashPointerUp': wrapSerialCommand(handleSashPointerUp),
+  'MainArea.handleTabContextMenu': wrapSerialCommand(handleTabContextMenu),
+  'MainArea.handleUriChange': wrapSerialCommand(handleUriChange),
+  'MainArea.handleWorkspaceChange': wrapSerialCommand(handleWorkspaceChange),
   'MainArea.hasActiveTextEditor': wrapGetter(hasActiveTextEditor),
   'MainArea.initialize': initialize,
-  'MainArea.loadContent': wrapCommand(loadContent),
-  'MainArea.moveIntoNewWindow': wrapCommand(moveIntoNewWindow),
-  'MainArea.newFile': wrapCommand(newFile),
-  'MainArea.newWindow': wrapCommand(newWindow),
-  'MainArea.openInput': wrapCommand(openInput),
-  'MainArea.openUri': wrapCommand(openUri),
-  'MainArea.openUris': wrapCommand(openUris),
-  'MainArea.refresh': wrapCommand(refresh),
+  'MainArea.loadContent': wrapSerialCommand(loadContent),
+  'MainArea.moveIntoNewWindow': wrapSerialCommand(moveIntoNewWindow),
+  'MainArea.newFile': wrapSerialCommand(newFile),
+  'MainArea.newWindow': wrapSerialCommand(newWindow),
+  'MainArea.openInput': wrapSerialAsyncCommand(openInputWithContext),
+  'MainArea.openUri': wrapSerialAsyncCommand(openUriWithContext),
+  'MainArea.openUris': wrapSerialAsyncCommand(openUrisWithContext),
+  'MainArea.refresh': wrapSerialCommand(refresh),
   'MainArea.render2': render2,
   'MainArea.renderEventListeners': renderEventListeners,
   'MainArea.resize': wrapGetter(handleResize),
-  'MainArea.restoreClosedTab': wrapCommand(restoreClosedTab),
-  'MainArea.save': wrapCommand(save),
+  'MainArea.restoreClosedTab': wrapSerialCommand(restoreClosedTab),
+  'MainArea.save': wrapSerialCommand(save),
   'MainArea.saveState': wrapGetter(saveState),
-  'MainArea.selectTab': wrapCommand(selectTab),
-  'MainArea.setEditorLayoutGrid': wrapCommand(setEditorLayoutGrid),
-  'MainArea.setEditorLayoutSingle': wrapCommand(setEditorLayoutSingle),
-  'MainArea.setEditorLayoutThreeColumns': wrapCommand(setEditorLayoutThreeColumns),
-  'MainArea.setEditorLayoutThreeRows': wrapCommand(setEditorLayoutThreeRows),
-  'MainArea.setEditorLayoutTwoColumns': wrapCommand(setEditorLayoutTwoColumns),
-  'MainArea.setEditorLayoutTwoColumnsBottom': wrapCommand(setEditorLayoutTwoColumnsBottom),
-  'MainArea.setEditorLayoutTwoRows': wrapCommand(setEditorLayoutTwoRows),
-  'MainArea.setEditorLayoutTwoRowsRight': wrapCommand(setEditorLayoutTwoRowsRight),
-  'MainArea.splitDown': wrapCommand(splitDown),
-  'MainArea.splitLeft': wrapCommand(splitLeft),
-  'MainArea.splitRight': wrapCommand(splitRight),
-  'MainArea.splitUp': wrapCommand(splitUp),
+  'MainArea.selectTab': wrapSerialCommand(selectTab),
+  'MainArea.setEditorLayoutGrid': wrapSerialCommand(setEditorLayoutGrid),
+  'MainArea.setEditorLayoutSingle': wrapSerialCommand(setEditorLayoutSingle),
+  'MainArea.setEditorLayoutThreeColumns': wrapSerialCommand(setEditorLayoutThreeColumns),
+  'MainArea.setEditorLayoutThreeRows': wrapSerialCommand(setEditorLayoutThreeRows),
+  'MainArea.setEditorLayoutTwoColumns': wrapSerialCommand(setEditorLayoutTwoColumns),
+  'MainArea.setEditorLayoutTwoColumnsBottom': wrapSerialCommand(setEditorLayoutTwoColumnsBottom),
+  'MainArea.setEditorLayoutTwoRows': wrapSerialCommand(setEditorLayoutTwoRows),
+  'MainArea.setEditorLayoutTwoRowsRight': wrapSerialCommand(setEditorLayoutTwoRowsRight),
+  'MainArea.splitDown': wrapSerialCommand(splitDown),
+  'MainArea.splitLeft': wrapSerialCommand(splitLeft),
+  'MainArea.splitRight': wrapSerialCommand(splitRight),
+  'MainArea.splitUp': wrapSerialCommand(splitUp),
   'MainArea.terminate': terminate
 };