@lvce-editor/source-control-worker 3.14.0 → 3.15.0

package/dist/sourceControlWorkerMain.js

@@ -145,7 +145,6 @@ const walkValue = (value, transferrables, isTransferrable) => {
     for (const property of Object.values(value)) {
       walkValue(property, transferrables, isTransferrable);
     }
-    return;
   }
 };
 const getTransferrables = value => {
@@ -299,7 +298,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);
@@ -1122,12 +1128,226 @@ const create$1 = rpcId => {
   };
 };
 
+const None$1 = 'none';
+const ToolBar = 'toolbar';
+const Tree$1 = 'tree';
+const TreeItem$1 = 'treeitem';
+
+const Badge = 'Badge';
+const MaskIcon = 'MaskIcon';
+const SourceControlBadge = 'SourceControlBadge';
+
+const Directory = 3;
+const DirectoryExpanded = 4;
+const File = 7;
+
+const Audio = 0;
+const Button$2 = 1;
+const Col = 2;
+const ColGroup = 3;
+const Div = 4;
+const H1 = 5;
+const Input = 6;
+const Kbd = 7;
+const Span = 8;
+const Table = 9;
+const TBody = 10;
+const Td = 11;
+const Text = 12;
+const Th = 13;
+const THead = 14;
+const Tr = 15;
+const I = 16;
+const Img = 17;
+const Root = 0;
+const Ins = 20;
+const Del = 21;
+const H2 = 22;
+const H3 = 23;
+const H4 = 24;
+const H5 = 25;
+const H6 = 26;
+const Article = 27;
+const Aside = 28;
+const Footer = 29;
+const Header = 30;
+const Nav = 40;
+const Section = 41;
+const Search = 42;
+const Dd = 43;
+const Dl = 44;
+const Figcaption = 45;
+const Figure = 46;
+const Hr = 47;
+const Li = 48;
+const Ol = 49;
+const P = 50;
+const Pre = 51;
+const A = 53;
+const Abbr = 54;
+const Br = 55;
+const Cite = 56;
+const Data = 57;
+const Time = 58;
+const Tfoot = 59;
+const Ul = 60;
+const Video = 61;
+const TextArea = 62;
+const Select = 63;
+const Option = 64;
+const Code = 65;
+const Label$1 = 66;
+const Dt = 67;
+const Iframe = 68;
+const Main = 69;
+const Strong = 70;
+const Em = 71;
+const Style = 72;
+const Html = 73;
+const Head = 74;
+const Title = 75;
+const Meta = 76;
+const Canvas = 77;
+const Form = 78;
+const BlockQuote = 79;
+const Quote = 80;
+const Circle = 81;
+const Defs = 82;
+const Ellipse = 83;
+const G = 84;
+const Line = 85;
+const Path = 86;
+const Polygon = 87;
+const Polyline = 88;
+const Rect = 89;
+const Svg = 90;
+const Use = 91;
+const Reference = 100;
+
+const VirtualDomElements = {
+  __proto__: null,
+  A,
+  Abbr,
+  Article,
+  Aside,
+  Audio,
+  BlockQuote,
+  Br,
+  Button: Button$2,
+  Canvas,
+  Circle,
+  Cite,
+  Code,
+  Col,
+  ColGroup,
+  Data,
+  Dd,
+  Defs,
+  Del,
+  Div,
+  Dl,
+  Dt,
+  Ellipse,
+  Em,
+  Figcaption,
+  Figure,
+  Footer,
+  Form,
+  G,
+  H1,
+  H2,
+  H3,
+  H4,
+  H5,
+  H6,
+  Head,
+  Header,
+  Hr,
+  Html,
+  I,
+  Iframe,
+  Img,
+  Input,
+  Ins,
+  Kbd,
+  Label: Label$1,
+  Li,
+  Line,
+  Main,
+  Meta,
+  Nav,
+  Ol,
+  Option,
+  P,
+  Path,
+  Polygon,
+  Polyline,
+  Pre,
+  Quote,
+  Rect,
+  Reference,
+  Root,
+  Search,
+  Section,
+  Select,
+  Span,
+  Strong,
+  Style,
+  Svg,
+  TBody,
+  THead,
+  Table,
+  Td,
+  Text,
+  TextArea,
+  Tfoot,
+  Th,
+  Time,
+  Title,
+  Tr,
+  Ul,
+  Use,
+  Video
+};
+
+const Button$1 = 'event.button';
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
+const DeltaMode = 'event.deltaMode';
+const DeltaY = 'event.deltaY';
+const TargetName = 'event.target.name';
+const TargetValue = 'event.target.value';
+
+const Enter = 3;
+
+const User = 1;
+const Script = 2;
+
+const CtrlCmd = 1 << 11 >>> 0;
+
+const SourceControl$1 = 22;
+
+const None = 0;
+
+const Web = 1;
+const Electron = 2;
+const Remote = 3;
+
 const ExtensionHostWorker = 44;
 const ExtensionManagementWorker = 9006;
 const IconThemeWorker = 7009;
 const RendererProcess = 1670;
 const RendererWorker = 1;
-const SourceControlWorker = 66;
+
+const SetCss = 'Viewlet.setCss';
+const SetDom2 = 'Viewlet.setDom2';
+const SetFocusContext = 'Viewlet.setFocusContext';
+const SetValueByName = 'Viewlet.setValueByName';
+
+const List$1 = 1;
+const Tree = 2;
+
+const FocusSourceControlInput = 24;
 
 const {
   invoke: invoke$4,
@@ -1144,10 +1364,14 @@ const {
   set: set$4
 } = create$1(RendererProcess);
 
+const {
+  set: set$3
+} = create$1(IconThemeWorker);
+
 const {
   invoke: invoke$1,
   invokeAndTransfer,
-  set: set$3
+  set: set$2
 } = create$1(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
@@ -1159,10 +1383,6 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
 const readFile$1 = async uri => {
   return invoke$1('FileSystem.readFile', uri);
 };
-const sendMessagePortToExtensionHostWorker$1 = async (port, rpcId = 0) => {
-  const command = 'HandleMessagePort.handleMessagePort2';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
-};
 const activateByEvent$1 = (event, assetDir, platform) => {
   return invoke$1('ExtensionHostManagement.activateByEvent', event, assetDir, platform);
 };
@@ -1178,41 +1398,112 @@ const getPreference = async key => {
   return await invoke$1('Preferences.get', key);
 };
 const openUri$1 = async (uri, focus, options) => {
-  await invoke$1('Main.openUri', uri, focus, options);
+  await invoke$1('Main.openUri', {
+    ...options,
+    focus,
+    uri
+  });
 };
 
-const {
-  set: set$2
-} = create$1(IconThemeWorker);
-
 const toCommandId = key => {
   const dotIndex = key.indexOf('.');
   return key.slice(dotIndex + 1);
 };
 const create = () => {
+  const commandQueues = new Map();
+  const generations = Object.create(null);
   const states = Object.create(null);
-  const commandMapRef = {};
+  const commandMapRef = Object.create(null);
+  const commandsById = Object.create(null);
+  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];
       }
     },
+    createDirectEventCommandMap(requestRender) {
+      return {
+        async 'Viewlet.executeViewletCommand'(uid, command, ...args) {
+          const fn = commandsById[command];
+          if (!fn) {
+            throw new Error(`Viewlet command not found: ${command}`);
+          }
+          await fn(uid, ...args);
+          await requestRender(uid);
+        }
+      };
+    },
     diff(uid, modules, numbers) {
       const {
-        newState,
-        oldState
+        oldState,
+        scheduledState
       } = states[uid];
       const diffResult = [];
       for (let i = 0; i < modules.length; i++) {
         const fn = modules[i];
-        if (!fn(oldState, newState)) {
+        if (!fn(oldState, scheduledState)) {
           diffResult.push(numbers[i]);
         }
       }
       return diffResult;
     },
     dispose(uid) {
+      commandQueues.delete(uid);
       delete states[uid];
     },
     get(uid) {
@@ -1224,21 +1515,36 @@ const create = () => {
       return ids;
     },
     getKeys() {
-      return Object.keys(states).map(key => {
-        return Number.parseFloat(key);
-      });
+      return Object.keys(states).map(Number);
     },
     registerCommands(commandMap) {
       Object.assign(commandMapRef, commandMap);
+      for (const [key, fn] of Object.entries(commandMap)) {
+        commandsById[toCommandId(key)] = fn;
+      }
     },
-    set(uid, oldState, newState) {
+    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
+        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
@@ -1247,6 +1553,9 @@ const create = () => {
         if (oldState === newerState || newState === newerState) {
           return;
         }
+        if (!isCurrentGeneration(uid, generation)) {
+          return;
+        }
         const latestOld = states[uid];
         const latestNew = {
           ...latestOld.newState,
@@ -1254,7 +1563,8 @@ const create = () => {
         };
         states[uid] = {
           newState: latestNew,
-          oldState: latestOld.oldState
+          oldState: latestOld.oldState,
+          scheduledState: latestNew
         };
       };
       return wrapped;
@@ -1270,6 +1580,7 @@ const create = () => {
     },
     wrapLoadContent(fn) {
       const wrapped = async (uid, ...args) => {
+        const generation = getGeneration(uid);
         const {
           newState,
           oldState
@@ -1284,6 +1595,11 @@ const create = () => {
             error
           };
         }
+        if (!isCurrentGeneration(uid, generation)) {
+          return {
+            error
+          };
+        }
         const latestOld = states[uid];
         const latestNew = {
           ...latestOld.newState,
@@ -1291,13 +1607,59 @@ const create = () => {
         };
         states[uid] = {
           newState: latestNew,
-          oldState: latestOld.oldState
+          oldState: latestOld.oldState,
+          scheduledState: latestNew
         };
         return {
           error
         };
       };
       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;
     }
   };
 };
@@ -1305,60 +1667,6 @@ const terminate = () => {
   globalThis.close();
 };
 
-const None$1 = 'none';
-const ToolBar = 'toolbar';
-const Tree$1 = 'tree';
-const TreeItem$1 = 'treeitem';
-
-const Badge = 'Badge';
-const MaskIcon = 'MaskIcon';
-const SourceControlBadge = 'SourceControlBadge';
-
-const Directory = 3;
-const DirectoryExpanded = 4;
-const File = 7;
-
-const Button$2 = 1;
-const Div = 4;
-const Span = 8;
-const Text = 12;
-const Img = 17;
-const TextArea = 62;
-const Reference = 100;
-
-const Button$1 = 'event.button';
-const ClientX = 'event.clientX';
-const ClientY = 'event.clientY';
-const DeltaMode = 'event.deltaMode';
-const DeltaY = 'event.deltaY';
-const TargetName = 'event.target.name';
-const TargetValue = 'event.target.value';
-
-const Enter = 3;
-
-const User = 1;
-const Script = 2;
-
-const CtrlCmd = 1 << 11 >>> 0;
-
-const SourceControl$1 = 22;
-
-const None = 0;
-
-const Web = 1;
-const Electron = 2;
-const Remote = 3;
-
-const SetCss = 'Viewlet.setCss';
-const SetDom2 = 'Viewlet.setDom2';
-const SetFocusContext = 'Viewlet.setFocusContext';
-const SetValueByName = 'Viewlet.setValueByName';
-
-const List$1 = 1;
-const Tree = 2;
-
-const FocusSourceControlInput = 24;
-
 const getActualDecorationIcon = (iconDefinitions, icon) => {
   if (typeof icon === 'number') {
     const value = iconDefinitions[icon];
@@ -1531,7 +1839,7 @@ const executeProvider = async ({
   return result;
 };
 
-const CommandExecute = 'ExtensionHostCommand.executeCommand';
+const CommandExecute = 'Extensions.executeCommand';
 const SourceControlAcceptInput = 'ExtensionHostSourceControl.acceptInput';
 const SourceControlGenerateCommitMessage = 'ExtensionHostSourceControl.generateCommitMessage';
 const SourceControlGetBadgeCount = 'ExtensionHostSourceControl.getBadgeCount';
@@ -1744,8 +2052,9 @@ const getIconDefinitions = async (providerIds, assetDir, platform) => {
       return [];
     }
     const icons = extension['source-control-icons'].filter(icon => typeof icon === 'string');
+    const baseUri = extension.uri.endsWith('/') ? extension.uri : `${extension.uri}/`;
     return icons.map(icon => {
-      const uri = `${extension.uri}/${icon}`;
+      const uri = new URL(icon, baseUri).href;
       if (platform === Electron || platform === Remote) {
         const protocol = getProtocol(uri);
         const path = getPath(protocol, uri);
@@ -1820,15 +2129,15 @@ const getNumberOfVisibleItems = (listHeight, itemHeight) => {
 };
 
 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 OpenChanges = 'Open Changes';
@@ -2342,6 +2651,8 @@ const text = data => {
   };
 };
 
+new Set(Object.values(VirtualDomElements));
+
 const SetText = 1;
 const Replace = 2;
 const SetAttribute = 3;
@@ -2413,21 +2724,18 @@ const getChildrenWithCount = (nodes, startIndex, childCount) => {
 };
 
 const compareNodes = (oldNode, newNode) => {
-  const patches = [];
   // Check if node type changed - return null to signal incompatible nodes
   // (caller should handle this with a Replace operation)
   if (oldNode.type !== newNode.type) {
     return null;
   }
+  const patches = [];
   // Handle reference nodes - special handling for uid changes
-  if (oldNode.type === Reference) {
-    if (oldNode.uid !== newNode.uid) {
-      patches.push({
-        type: SetReferenceNodeUid,
-        uid: newNode.uid
-      });
-    }
-    return patches;
+  if (oldNode.type === Reference && oldNode.uid !== newNode.uid) {
+    patches.push({
+      type: SetReferenceNodeUid,
+      uid: newNode.uid
+    });
   }
   // Handle text nodes
   if (oldNode.type === Text && newNode.type === Text) {
@@ -2440,8 +2748,8 @@ const compareNodes = (oldNode, newNode) => {
     return patches;
   }
   // Compare attributes
-  const oldKeys = getKeys(oldNode);
-  const newKeys = getKeys(newNode);
+  const oldKeys = getKeys(oldNode).filter(key => oldNode.type !== Reference || key !== 'uid');
+  const newKeys = getKeys(newNode).filter(key => newNode.type !== Reference || key !== 'uid');
   // Check for attribute changes
   for (const key of newKeys) {
     if (oldNode[key] !== newNode[key]) {
@@ -2454,7 +2762,7 @@ const compareNodes = (oldNode, newNode) => {
   }
   // Check for removed attributes
   for (const key of oldKeys) {
-    if (!(key in newNode)) {
+    if (!Object.hasOwn(newNode, key)) {
       patches.push({
         type: RemoveAttribute,
         key
@@ -2465,18 +2773,90 @@ const compareNodes = (oldNode, newNode) => {
 };
 
 const treeToArray = node => {
-  const result = [node.node];
-  for (const child of node.children) {
-    result.push(...treeToArray(child));
+  const result = [];
+  const stack = [node];
+  while (stack.length > 0) {
+    const current = stack.pop();
+    result.push(current.node);
+    for (let i = current.children.length - 1; i >= 0; i--) {
+      stack.push(current.children[i]);
+    }
   }
   return result;
 };
 
+const navigateToChild = (patches, currentChildIndex, index) => {
+  if (currentChildIndex === -1) {
+    patches.push({
+      type: NavigateChild,
+      index
+    });
+    return index;
+  }
+  if (currentChildIndex !== index) {
+    patches.push({
+      type: NavigateSibling,
+      index
+    });
+  }
+  return index;
+};
+const navigateToParent = (patches, currentChildIndex) => {
+  if (currentChildIndex >= 0) {
+    patches.push({
+      type: NavigateParent
+    });
+  }
+  return -1;
+};
+const addTree = (newNode, patches) => {
+  patches.push({
+    type: Add,
+    nodes: treeToArray(newNode)
+  });
+};
+const replaceTree = (newNode, patches) => {
+  patches.push({
+    type: Replace,
+    nodes: treeToArray(newNode)
+  });
+};
+const diffExistingChild = (oldNode, newNode, patches, currentChildIndex, index) => {
+  const nodePatches = compareNodes(oldNode.node, newNode.node);
+  if (nodePatches === null) {
+    const nextChildIndex = navigateToChild(patches, currentChildIndex, index);
+    replaceTree(newNode, patches);
+    return nextChildIndex;
+  }
+  const hasChildrenToCompare = oldNode.children.length > 0 || newNode.children.length > 0;
+  if (nodePatches.length === 0 && !hasChildrenToCompare) {
+    return currentChildIndex;
+  }
+  const nextChildIndex = navigateToChild(patches, currentChildIndex, index);
+  if (nodePatches.length > 0) {
+    patches.push(...nodePatches);
+  }
+  if (hasChildrenToCompare) {
+    diffChildren(oldNode.children, newNode.children, patches);
+  }
+  return nextChildIndex;
+};
+const diffRootNode = (oldNode, newNode, patches) => {
+  const nodePatches = compareNodes(oldNode.node, newNode.node);
+  if (nodePatches === null) {
+    replaceTree(newNode, patches);
+    return;
+  }
+  if (nodePatches.length > 0) {
+    patches.push(...nodePatches);
+  }
+  if (oldNode.children.length > 0 || newNode.children.length > 0) {
+    diffChildren(oldNode.children, newNode.children, patches);
+  }
+};
 const diffChildren = (oldChildren, newChildren, patches) => {
   const maxLength = Math.max(oldChildren.length, newChildren.length);
-  // Track where we are: -1 means at parent, >= 0 means at child index
   let currentChildIndex = -1;
-  // Collect indices of children to remove (we'll add these patches at the end in reverse order)
   const indicesToRemove = [];
   for (let i = 0; i < maxLength; i++) {
     const oldNode = oldChildren[i];
@@ -2485,88 +2865,17 @@ const diffChildren = (oldChildren, newChildren, patches) => {
       continue;
     }
     if (!oldNode) {
-      // Add new node - we should be at the parent
-      if (currentChildIndex >= 0) {
-        // Navigate back to parent
-        patches.push({
-          type: NavigateParent
-        });
-        currentChildIndex = -1;
-      }
-      // Flatten the entire subtree so renderInternal can handle it
-      const flatNodes = treeToArray(newNode);
-      patches.push({
-        type: Add,
-        nodes: flatNodes
-      });
-    } else if (newNode) {
-      // Compare nodes to see if we need any patches
-      const nodePatches = compareNodes(oldNode.node, newNode.node);
-      // If nodePatches is null, the node types are incompatible - need to replace
-      if (nodePatches === null) {
-        // Navigate to this child
-        if (currentChildIndex === -1) {
-          patches.push({
-            type: NavigateChild,
-            index: i
-          });
-          currentChildIndex = i;
-        } else if (currentChildIndex !== i) {
-          patches.push({
-            type: NavigateSibling,
-            index: i
-          });
-          currentChildIndex = i;
-        }
-        // Replace the entire subtree
-        const flatNodes = treeToArray(newNode);
-        patches.push({
-          type: Replace,
-          nodes: flatNodes
-        });
-        // After replace, we're at the new element (same position)
-        continue;
-      }
-      // Check if we need to recurse into children
-      const hasChildrenToCompare = oldNode.children.length > 0 || newNode.children.length > 0;
-      // Only navigate to this element if we need to do something
-      if (nodePatches.length > 0 || hasChildrenToCompare) {
-        // Navigate to this child if not already there
-        if (currentChildIndex === -1) {
-          patches.push({
-            type: NavigateChild,
-            index: i
-          });
-          currentChildIndex = i;
-        } else if (currentChildIndex !== i) {
-          patches.push({
-            type: NavigateSibling,
-            index: i
-          });
-          currentChildIndex = i;
-        }
-        // Apply node patches (these apply to the current element, not children)
-        if (nodePatches.length > 0) {
-          patches.push(...nodePatches);
-        }
-        // Compare children recursively
-        if (hasChildrenToCompare) {
-          diffChildren(oldNode.children, newNode.children, patches);
-        }
-      }
-    } else {
-      // Remove old node - collect the index for later removal
+      currentChildIndex = navigateToParent(patches, currentChildIndex);
+      addTree(newNode, patches);
+      continue;
+    }
+    if (!newNode) {
       indicesToRemove.push(i);
+      continue;
     }
+    currentChildIndex = diffExistingChild(oldNode, newNode, patches, currentChildIndex, i);
   }
-  // Navigate back to parent if we ended at a child
-  if (currentChildIndex >= 0) {
-    patches.push({
-      type: NavigateParent
-    });
-  }
-  // Add remove patches in reverse order (highest index first)
-  // This ensures indices remain valid as we remove
+  navigateToParent(patches, currentChildIndex);
   for (let j = indicesToRemove.length - 1; j >= 0; j--) {
     patches.push({
       type: RemoveChild,
@@ -2575,47 +2884,22 @@ const diffChildren = (oldChildren, newChildren, patches) => {
   }
 };
 const diffTrees = (oldTree, newTree, patches, path) => {
-  // At the root level (path.length === 0), we're already AT the element
-  // So we compare the root node directly, then compare its children
   if (path.length === 0 && oldTree.length === 1 && newTree.length === 1) {
-    const oldNode = oldTree[0];
-    const newNode = newTree[0];
-    // Compare root nodes
-    const nodePatches = compareNodes(oldNode.node, newNode.node);
-    // If nodePatches is null, the root node types are incompatible - need to replace
-    if (nodePatches === null) {
-      const flatNodes = treeToArray(newNode);
-      patches.push({
-        type: Replace,
-        nodes: flatNodes
-      });
-      return;
-    }
-    if (nodePatches.length > 0) {
-      patches.push(...nodePatches);
-    }
-    // Compare children
-    if (oldNode.children.length > 0 || newNode.children.length > 0) {
-      diffChildren(oldNode.children, newNode.children, patches);
-    }
-  } else {
-    // Non-root level or multiple root elements - use the regular comparison
-    diffChildren(oldTree, newTree, patches);
+    diffRootNode(oldTree[0], newTree[0], patches);
+    return;
   }
+  diffChildren(oldTree, newTree, patches);
 };
 
 const removeTrailingNavigationPatches = patches => {
-  // Find the last non-navigation patch
-  let lastNonNavigationIndex = -1;
-  for (let i = patches.length - 1; i >= 0; i--) {
-    const patch = patches[i];
+  while (patches.length > 0) {
+    const patch = patches.at(-1);
     if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling) {
-      lastNonNavigationIndex = i;
       break;
     }
+    patches.pop();
   }
-  // Return patches up to and including the last non-navigation patch
-  return lastNonNavigationIndex === -1 ? [] : patches.slice(0, lastNonNavigationIndex + 1);
+  return patches;
 };
 
 const diffTree = (oldNodes, newNodes) => {
@@ -3251,22 +3535,6 @@ const handleWorkspaceRefresh = async state => {
   });
 };
 
-const sendMessagePortToExtensionHostWorker = async port => {
-  await sendMessagePortToExtensionHostWorker$1(port, SourceControlWorker);
-};
-
-const createExtensionHostRpc = async () => {
-  try {
-    const rpc = await create$3({
-      commandMap: {},
-      send: sendMessagePortToExtensionHostWorker
-    });
-    return rpc;
-  } catch (error) {
-    throw new VError(error, `Failed to create extension host rpc`);
-  }
-};
-
 const sendMessagePortToTextMeasurementWorker = async port => {
   await sendMessagePortToTextMeasurementWorker$1(port);
 };
@@ -3299,15 +3567,15 @@ const initializeExtensionManagementWorker = async () => {
   try {
     const rpc = await createExtensionManagementWorkerRpc();
     set$5(rpc);
+    set$6(rpc);
   } catch {
     // ignore
   }
 };
 
 const initialize = async () => {
-  const [extensionHostRpc, textRpc] = await Promise.all([createExtensionHostRpc(), createTextMeasurementWorkerRpc(), initializeExtensionManagementWorker()]);
-  set$6(extensionHostRpc);
-  set$2(textRpc);
+  const [textRpc] = await Promise.all([createTextMeasurementWorkerRpc(), initializeExtensionManagementWorker()]);
+  set$3(textRpc);
 };
 
 const getIndentRule = indent => {
@@ -3344,11 +3612,18 @@ const renderCss = (oldState, newState) => {
   const listHeight = Math.max(height - headerHeight, 0);
   const scrollBarY = scrollBarHeight > 0 ? getScrollBarY(deltaY, finalDeltaY, listHeight, scrollBarHeight) : 0;
   const itemOffset = -(deltaY % itemHeight);
-  const indentCss = indentRules ? `\n${indentRules}\n` : '';
+  const indentCss = indentRules ? `${indentRules}\n` : '';
   const css = `:root {
   --SourceControlInputHeight: ${inputBoxHeight}px;
 }
 
+.SourceControl .SplitButtonContent > .MaskIcon {
+  width: 16px;
+  height: 16px;
+  margin-right: 4px;
+  flex-shrink: 0;
+}
+
 .SourceControl .ScrollBarThumb {
   height: ${scrollBarHeight}px;
   translate: 0 ${Math.round(scrollBarY)}px;
@@ -3357,7 +3632,11 @@ const renderCss = (oldState, newState) => {
 .SourceControlItems > .TreeItem:first-child {
   margin-top: ${itemOffset}px;
 }
-${indentCss}`;
+
+${indentCss}.IndentRight-12 {
+  padding-right: 12px;
+}
+`;
   return [SetCss, id, css];
 };
 
@@ -3381,6 +3660,7 @@ const InputBox = 'InputBox';
 const Label = 'Label';
 const LabelDetail = 'LabelDetail';
 const List = 'List';
+const ListItems = 'ListItems';
 const Message = 'Message';
 const Progress = 'Progress';
 const ProgressContainer = 'ProgressContainer';
@@ -3399,6 +3679,7 @@ const SplitButtonDisabled = 'SplitButtonDisabled';
 const StrikeThrough = 'StrikeThrough';
 const TreeItem = 'TreeItem';
 const Viewlet = 'Viewlet';
+const ViewSourceControlInput = 'ViewSourceControlInput';
 
 const HandleClickAt = 1;
 const HandleContextMenu = 2;
@@ -3469,8 +3750,13 @@ const messageNode$1 = {
   className: Message,
   type: Div
 };
+const inputWrapperNode = {
+  childCount: 1,
+  className: ViewSourceControlInput,
+  type: Div
+};
 const getSourceControlInputDom = (inputPlaceholder, inputMessage) => {
-  const dom = [{
+  const dom = [inputWrapperNode, {
     ariaLabel: sourceControlInput(),
     autocapitalize: 'off',
     autocorrect: 'off',
@@ -3564,13 +3850,9 @@ const getLabelClassName = decorationStrikeThrough => {
 };
 
 const getTreeItemClassName = indent => {
-  let className = TreeItem;
-  className = mergeClassNames(className, `Indent-${indent}`);
-  return className;
+  return mergeClassNames(TreeItem, `Indent-${indent}`, 'IndentRight-12');
 };
 
-const PaddingRight = '12px';
-
 const createItemDirectory = item => {
   const {
     badgeCount,
@@ -3593,7 +3875,6 @@ const createItemDirectory = item => {
     ariaSetSize: setSize,
     childCount: 3 + (hasButtons ? 1 : 0),
     className: treeItemClassName,
-    paddingRight: PaddingRight,
     role: TreeItem$1,
     type: Div
   }, {
@@ -3658,7 +3939,6 @@ const createItemOther = item => {
     ariaSetSize: setSize,
     childCount: 3 + (hasButtons ? 1 : 0),
     className: treeItemClassName,
-    paddingRight: '12px',
     role: TreeItem$1,
     title: file,
     type: Div
@@ -3702,7 +3982,7 @@ const getSourceControlListVirtualDom = (items, scrollBarHeight, scrollBarActive)
     type: Div
   }, {
     childCount: items.length,
-    className: SourceControlItems,
+    className: mergeClassNames(ListItems, SourceControlItems),
     onClick: HandleClickAt,
     onPointerOut: HandleMouseOutAt,
     onPointerOver: HandleMouseOverAt,
@@ -3969,14 +4249,19 @@ const renderEventListeners = () => {
   }];
 };
 
-const revealInExplorer = async (state, uri) => {
+const timerGlobal = globalThis;
+const revealInExplorerActual = async uri => {
   await invoke$1('SideBar.show', 'Explorer');
   const states = await invoke$1('Viewlet.getAllStates');
   const viewlets = Object.values(states);
   const sideBar = viewlets.find(viewlet => viewlet.currentViewletId === 'Explorer');
   const explorerUid = Math.max(...viewlets.filter(viewlet => viewlet.parentUid === sideBar.uid).map(viewlet => viewlet.uid));
   await invoke$1('Viewlet.executeViewletCommand', explorerUid, 'reveal', uri);
-  await invoke$1('Viewlet.executeViewletCommand', explorerUid, 'refresh');
+};
+const revealInExplorer = (state, uri) => {
+  timerGlobal.setTimeout(() => {
+    void revealInExplorerActual(uri);
+  }, 0);
   return state;
 };
 
@@ -4081,7 +4366,7 @@ const listen = async () => {
   const rpc = await create$2({
     commandMap: commandMap
   });
-  set$3(rpc);
+  set$2(rpc);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/source-control-worker",
-  "version": "3.14.0",
+  "version": "3.15.0",
   "description": "Source Control Worker",
   "keywords": [
     "Lvce Editor"