@lvce-editor/source-control-worker 2.24.0 → 3.1.0

package/dist/sourceControlWorkerMain.js

@@ -63,7 +63,7 @@ class AssertionError extends Error {
 const Object$1 = 1;
 const Number$1 = 2;
 const Array$1 = 3;
-const String = 4;
+const String$1 = 4;
 const Boolean$1 = 5;
 const Function = 6;
 const Null = 7;
@@ -75,7 +75,7 @@ const getType = value => {
     case 'function':
       return Function;
     case 'string':
-      return String;
+      return String$1;
     case 'object':
       if (value === null) {
         return Null;
@@ -98,7 +98,7 @@ const number = value => {
 };
 const string = value => {
   const type = getType(value);
-  if (type !== String) {
+  if (type !== String$1) {
     throw new AssertionError('expected value to be of type string');
   }
 };
@@ -512,56 +512,35 @@ const IpcParentWithMessagePort$1 = {
   wrap: wrap$5
 };
 
-const Two = '2.0';
-const create$4 = (method, params) => {
-  return {
-    jsonrpc: Two,
-    method,
-    params
-  };
+class CommandNotFoundError extends Error {
+  constructor(command) {
+    super(`Command not found ${command}`);
+    this.name = 'CommandNotFoundError';
+  }
+}
+const commands = Object.create(null);
+const register = commandMap => {
+  Object.assign(commands, commandMap);
 };
-const callbacks = Object.create(null);
-const set$5 = (id, fn) => {
-  callbacks[id] = fn;
+const getCommand = key => {
+  return commands[key];
 };
+const execute = (command, ...args) => {
+  const fn = getCommand(command);
+  if (!fn) {
+    throw new CommandNotFoundError(command);
+  }
+  return fn(...args);
+};
+
+const Two$1 = '2.0';
+const callbacks = Object.create(null);
 const get$3 = id => {
   return callbacks[id];
 };
-const remove = id => {
+const remove$1 = id => {
   delete callbacks[id];
 };
-let id = 0;
-const create$3$1 = () => {
-  return ++id;
-};
-const registerPromise = () => {
-  const id = create$3$1();
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  set$5(id, resolve);
-  return {
-    id,
-    promise
-  };
-};
-const create$2$1 = (method, params) => {
-  const {
-    id,
-    promise
-  } = registerPromise();
-  const message = {
-    jsonrpc: Two,
-    method,
-    params,
-    id
-  };
-  return {
-    message,
-    promise
-  };
-};
 class JsonRpcError extends Error {
   constructor(message) {
     super(message);
@@ -578,12 +557,12 @@ const getErrorConstructor = (message, type) => {
     switch (type) {
       case DomException:
         return DOMException;
-      case TypeError$1:
-        return TypeError;
-      case SyntaxError$1:
-        return SyntaxError;
       case ReferenceError$1:
         return ReferenceError;
+      case SyntaxError$1:
+        return SyntaxError;
+      case TypeError$1:
+        return TypeError;
       default:
         return Error;
     }
@@ -712,7 +691,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove(id);
+  remove$1(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -739,27 +718,27 @@ const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
       code: MethodNotFound,
-      message: error.message,
-      data: error.stack
+      data: error.stack,
+      message: error.message
     };
   }
   return {
     code: Custom,
-    message: prettyError.message,
     data: {
-      stack: getStack(prettyError),
-      codeFrame: prettyError.codeFrame,
-      type: getErrorType(prettyError),
       code: prettyError.code,
-      name: prettyError.name
-    }
+      codeFrame: prettyError.codeFrame,
+      name: prettyError.name,
+      stack: getStack(prettyError),
+      type: getErrorType(prettyError)
+    },
+    message: prettyError.message
   };
 };
 const create$1$1 = (id, error) => {
   return {
-    jsonrpc: Two,
+    error,
     id,
-    error
+    jsonrpc: Two$1
   };
 };
 const getErrorResponse = (id, error, preparePrettyError, logError) => {
@@ -768,27 +747,27 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$6 = (message, result) => {
+const create$8 = (message, result) => {
   return {
-    jsonrpc: Two,
     id: message.id,
+    jsonrpc: Two$1,
     result: result ?? null
   };
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$6(message, resultProperty);
+  return create$8(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two,
-    id,
     error: {
       code: Custom,
+      data: error,
       // @ts-ignore
-      message: error.message,
-      data: error
-    }
+      message: error.message
+    },
+    id,
+    jsonrpc: Two$1
   };
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
@@ -818,35 +797,35 @@ const normalizeParams = args => {
   if (args.length === 1) {
     const options = args[0];
     return {
+      execute: options.execute,
       ipc: options.ipc,
+      logError: options.logError || defaultLogError,
       message: options.message,
-      execute: options.execute,
-      resolve: options.resolve || defaultResolve,
       preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
-      logError: options.logError || defaultLogError,
-      requiresSocket: options.requiresSocket || defaultRequiresSocket
+      requiresSocket: options.requiresSocket || defaultRequiresSocket,
+      resolve: options.resolve || defaultResolve
     };
   }
   return {
+    execute: args[2],
     ipc: args[0],
+    logError: args[5],
     message: args[1],
-    execute: args[2],
-    resolve: args[3],
     preparePrettyError: args[4],
-    logError: args[5],
-    requiresSocket: args[6]
+    requiresSocket: args[6],
+    resolve: args[3]
   };
 };
 const handleJsonRpcMessage = async (...args) => {
   const options = normalizeParams(args);
   const {
-    message,
-    ipc,
     execute,
-    resolve,
-    preparePrettyError,
+    ipc,
     logError,
-    requiresSocket
+    message,
+    preparePrettyError,
+    requiresSocket,
+    resolve
   } = options;
   if ('id' in message) {
     if ('method' in message) {
@@ -868,11 +847,51 @@ const handleJsonRpcMessage = async (...args) => {
   }
   throw new JsonRpcError('unexpected message');
 };
-const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
+
+const Two = '2.0';
+
+const create$7 = (method, params) => {
+  return {
+    jsonrpc: Two,
+    method,
+    params
+  };
+};
+
+const create$6 = (id, method, params) => {
+  const message = {
+    id,
+    jsonrpc: Two,
+    method,
+    params
+  };
+  return message;
+};
+
+let id = 0;
+const create$5 = () => {
+  return ++id;
+};
+
+const registerPromise = map => {
+  const id = create$5();
   const {
-    message,
+    promise,
+    resolve
+  } = Promise.withResolvers();
+  map[id] = resolve;
+  return {
+    id,
     promise
-  } = create$2$1(method, params);
+  };
+};
+
+const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
+  const {
+    id,
+    promise
+  } = registerPromise(callbacks);
+  const message = create$6(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -881,60 +900,40 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   const responseMessage = await promise;
   return unwrapJsonRpcResult(responseMessage);
 };
-const send = (transport, method, ...params) => {
-  const message = create$4(method, params);
-  transport.send(message);
-};
-const invoke$2 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, false);
-};
-const invokeAndTransfer$1 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, true);
-};
-
-class CommandNotFoundError extends Error {
-  constructor(command) {
-    super(`Command not found ${command}`);
-    this.name = 'CommandNotFoundError';
-  }
-}
-const commands = Object.create(null);
-const register = commandMap => {
-  Object.assign(commands, commandMap);
-};
-const getCommand = key => {
-  return commands[key];
-};
-const execute = (command, ...args) => {
-  const fn = getCommand(command);
-  if (!fn) {
-    throw new CommandNotFoundError(command);
-  }
-  return fn(...args);
-};
-
 const createRpc = ipc => {
+  const callbacks = Object.create(null);
+  ipc._resolve = (id, response) => {
+    const fn = callbacks[id];
+    if (!fn) {
+      console.warn(`callback ${id} may already be disposed`);
+      return;
+    }
+    fn(response);
+    delete callbacks[id];
+  };
   const rpc = {
+    async dispose() {
+      await ipc?.dispose();
+    },
+    invoke(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, false);
+    },
+    invokeAndTransfer(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, true);
+    },
     // @ts-ignore
     ipc,
     /**
      * @deprecated
      */
     send(method, ...params) {
-      send(ipc, method, ...params);
-    },
-    invoke(method, ...params) {
-      return invoke$2(ipc, method, ...params);
-    },
-    invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer$1(ipc, method, ...params);
-    },
-    async dispose() {
-      await ipc?.dispose();
+      const message = create$7(method, params);
+      ipc.send(message);
     }
   };
   return rpc;
 };
+
 const requiresSocket = () => {
   return false;
 };
@@ -947,8 +946,9 @@ const logError = () => {
 const handleMessage = event => {
   const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
   const actualExecute = event?.target?.execute || execute;
-  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError, actualRequiresSocket);
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError, actualRequiresSocket);
 };
+
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
     ipc.addEventListener('message', handleMessage);
@@ -957,6 +957,7 @@ const handleIpc = ipc => {
     ipc.on('message', handleMessage);
   }
 };
+
 const listen$1 = async (module, options) => {
   const rawIpc = await module.listen(options);
   if (module.signal) {
@@ -965,15 +966,17 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$5 = async ({
+
+const create$4 = async ({
   commandMap,
+  isMessagePortOpen = true,
   messagePort
 }) => {
   // TODO create a commandMap per rpc instance
   register(commandMap);
   const rawIpc = await IpcParentWithMessagePort$1.create({
-    messagePort,
-    isMessagePortOpen: true
+    isMessagePortOpen,
+    messagePort
   });
   const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
   handleIpc(ipc);
@@ -981,12 +984,10 @@ const create$5 = async ({
   messagePort.start();
   return rpc;
 };
-const PlainMessagePortRpc = {
-  __proto__: null,
-  create: create$5
-};
+
 const create$3 = async ({
   commandMap,
+  isMessagePortOpen,
   send
 }) => {
   const {
@@ -994,15 +995,13 @@ const create$3 = async ({
     port2
   } = new MessageChannel();
   await send(port1);
-  return create$5({
+  return create$4({
     commandMap,
+    isMessagePortOpen,
     messagePort: port2
   });
 };
-const TransferMessagePortRpcParent = {
-  __proto__: null,
-  create: create$3
-};
+
 const create$2 = async ({
   commandMap
 }) => {
@@ -1013,16 +1012,96 @@ const create$2 = async ({
   const rpc = createRpc(ipc);
   return rpc;
 };
-const WebWorkerRpcClient = {
-  __proto__: null,
-  create: create$2
+
+const createMockRpc = ({
+  commandMap
+}) => {
+  const invocations = [];
+  const invoke = (method, ...params) => {
+    invocations.push([method, ...params]);
+    const command = commandMap[method];
+    if (!command) {
+      throw new Error(`command ${method} not found`);
+    }
+    return command(...params);
+  };
+  const mockRpc = {
+    invocations,
+    invoke,
+    invokeAndTransfer: invoke
+  };
+  return mockRpc;
+};
+
+const rpcs = Object.create(null);
+const set$5 = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+const get$2 = id => {
+  return rpcs[id];
+};
+const remove = id => {
+  delete rpcs[id];
+};
+
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
+const create$1 = rpcId => {
+  return {
+    async dispose() {
+      const rpc = get$2(rpcId);
+      await rpc.dispose();
+    },
+    // @ts-ignore
+    invoke(method, ...params) {
+      const rpc = get$2(rpcId);
+      // @ts-ignore
+      return rpc.invoke(method, ...params);
+    },
+    // @ts-ignore
+    invokeAndTransfer(method, ...params) {
+      const rpc = get$2(rpcId);
+      // @ts-ignore
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    registerMockRpc(commandMap) {
+      const mockRpc = createMockRpc({
+        commandMap
+      });
+      set$5(rpcId, mockRpc);
+      // @ts-ignore
+      mockRpc[Symbol.dispose] = () => {
+        remove(rpcId);
+      };
+      // @ts-ignore
+      return mockRpc;
+    },
+    set(rpc) {
+      set$5(rpcId, rpc);
+    }
+  };
 };
 
+const None$1 = 'none';
+const ToolBar = 'toolbar';
+const Tree$1 = 'tree';
+const TreeItem$1 = 'treeitem';
+
+const Badge = 'Badge';
+const SourceControlBadge = 'SourceControlBadge';
+
 const Directory = 3;
 const DirectoryExpanded = 4;
 const File = 7;
 
-const Button$2 = 'event.button';
+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';
@@ -1030,14 +1109,19 @@ 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$1 = 0;
+const None = 0;
 
 const ExtensionHostWorker = 44;
+const ExtensionManagementWorker = 9006;
 const IconThemeWorker = 7009;
 const RendererWorker = 1;
 const SourceControlWorker = 66;
@@ -1048,47 +1132,19 @@ const SetFocusContext = 'Viewlet.setFocusContext';
 const SetValueByName = 'Viewlet.setValueByName';
 
 const List = 1;
-const Tree$1 = 2;
+const Tree = 2;
 
 const FocusSourceControlInput = 24;
 
-const rpcs = Object.create(null);
-const set$4 = (id, rpc) => {
-  rpcs[id] = rpc;
-};
-const get$2 = id => {
-  return rpcs[id];
-};
-
-const create$1 = rpcId => {
-  return {
-    async dispose() {
-      const rpc = get$2(rpcId);
-      await rpc.dispose();
-    },
-    // @ts-ignore
-    invoke(method, ...params) {
-      const rpc = get$2(rpcId);
-      // @ts-ignore
-      return rpc.invoke(method, ...params);
-    },
-    // @ts-ignore
-    invokeAndTransfer(method, ...params) {
-      const rpc = get$2(rpcId);
-      // @ts-ignore
-      return rpc.invokeAndTransfer(method, ...params);
-    },
-    set(rpc) {
-      set$4(rpcId, rpc);
-    }
-  };
-};
-
 const {
   invoke: invoke$1,
-  set: set$3
+  set: set$4
 } = create$1(ExtensionHostWorker);
 
+const {
+  set: set$3
+} = create$1(ExtensionManagementWorker);
+
 const {
   invoke,
   invokeAndTransfer,
@@ -1099,7 +1155,6 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(menuId);
   number(x);
   number(y);
-  // @ts-ignore
   await invoke('ContextMenu.show2', uid, menuId, x, y, args);
 };
 const readFile$1 = async uri => {
@@ -1114,9 +1169,12 @@ const activateByEvent$1 = (event, assetDir, platform) => {
 };
 const sendMessagePortToTextMeasurementWorker$1 = async port => {
   const command = 'TextMeasurement.handleMessagePort';
-  // @ts-ignore
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToTextMeasurementWorker', port, command, 0);
 };
+const sendMessagePortToExtensionManagementWorker = async (port, rpcId) => {
+  const command = 'Extensions.handleMessagePort';
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionManagementWorker', port, command, rpcId);
+};
 const getPreference = async key => {
   return await invoke('Preferences.get', key);
 };
@@ -1136,42 +1194,68 @@ const create = () => {
   const states = Object.create(null);
   const commandMapRef = {};
   return {
-    get(uid) {
-      return states[uid];
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
     },
-    set(uid, oldState, newState) {
-      states[uid] = {
-        oldState,
-        newState
-      };
+    diff(uid, modules, numbers) {
+      const {
+        newState,
+        oldState
+      } = states[uid];
+      const diffResult = [];
+      for (let i = 0; i < modules.length; i++) {
+        const fn = modules[i];
+        if (!fn(oldState, newState)) {
+          diffResult.push(numbers[i]);
+        }
+      }
+      return diffResult;
     },
     dispose(uid) {
       delete states[uid];
     },
+    get(uid) {
+      return states[uid];
+    },
+    getCommandIds() {
+      const keys = Object.keys(commandMapRef);
+      const ids = keys.map(toCommandId);
+      return ids;
+    },
     getKeys() {
       return Object.keys(states).map(key => {
-        return Number.parseInt(key);
+        return Number.parseFloat(key);
       });
     },
-    clear() {
-      for (const key of Object.keys(states)) {
-        delete states[key];
-      }
+    registerCommands(commandMap) {
+      Object.assign(commandMapRef, commandMap);
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        newState,
+        oldState
+      };
     },
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
         const {
-          oldState,
-          newState
+          newState,
+          oldState
         } = states[uid];
         const newerState = await fn(newState, ...args);
         if (oldState === newerState || newState === newerState) {
           return;
         }
-        const latest = states[uid];
+        const latestOld = states[uid];
+        const latestNew = {
+          ...latestOld.newState,
+          ...newerState
+        };
         states[uid] = {
-          oldState: latest.oldState,
-          newState: newerState
+          newState: latestNew,
+          oldState: latestOld.oldState
         };
       };
       return wrapped;
@@ -1185,27 +1269,36 @@ const create = () => {
       };
       return wrapped;
     },
-    diff(uid, modules, numbers) {
-      const {
-        oldState,
-        newState
-      } = states[uid];
-      const diffResult = [];
-      for (let i = 0; i < modules.length; i++) {
-        const fn = modules[i];
-        if (!fn(oldState, newState)) {
-          diffResult.push(numbers[i]);
+    wrapLoadContent(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          newState,
+          oldState
+        } = states[uid];
+        const result = await fn(newState, ...args);
+        const {
+          error,
+          state
+        } = result;
+        if (oldState === state || newState === state) {
+          return {
+            error
+          };
         }
-      }
-      return diffResult;
-    },
-    getCommandIds() {
-      const keys = Object.keys(commandMapRef);
-      const ids = keys.map(toCommandId);
-      return ids;
-    },
-    registerCommands(commandMap) {
-      Object.assign(commandMapRef, commandMap);
+        const latestOld = states[uid];
+        const latestNew = {
+          ...latestOld.newState,
+          ...state
+        };
+        states[uid] = {
+          newState: latestNew,
+          oldState: latestOld.oldState
+        };
+        return {
+          error
+        };
+      };
+      return wrapped;
     }
   };
 };
@@ -1248,7 +1341,7 @@ const getDisplayItemsGroup = (group, expandedGroups, iconDefinitions) => {
   const {
     length
   } = items;
-  const isExpanded = expandedGroups[id] || false;
+  const isExpanded = expandedGroups[id] ?? false;
   const type = isExpanded ? DirectoryExpanded : Directory;
   const icon = isExpanded ? 'ChevronDown' : 'ChevronRight';
   if (length > 0) {
@@ -1387,9 +1480,13 @@ const executeProvider = async ({
 
 const CommandExecute = 'ExtensionHostCommand.executeCommand';
 const SourceControlAcceptInput = 'ExtensionHostSourceControl.acceptInput';
+const SourceControlGenerateCommitMessage = 'ExtensionHostSourceControl.generateCommitMessage';
+const SourceControlGetBadgeCount = 'ExtensionHostSourceControl.getBadgeCount';
+const SourceControlGetChangedFiles = 'ExtensionHost.sourceControlGetChangedFiles';
 const SourceControlGetFileDecorations = 'ExtensionHostSourceControl.getFileDecorations';
 const SourceControlGetEnabledProviderIds = 'ExtensionHostSourceControl.getEnabledProviderIds';
 const SourceControlGetFileBefore = 'ExtensionHostSourceControl.getFileBefore';
+const SourceControlGetFeatures = 'ExtensionHostSourceControl.getFeatures';
 const SourceControlGetGroups = 'ExtensionHostSourceControl.getGroups';
 
 const acceptInput$2 = async (providerId, text, assetDir, platform) => {
@@ -1402,6 +1499,43 @@ const acceptInput$2 = async (providerId, text, assetDir, platform) => {
     // noProviderFoundMessage: 'No source control provider found',
   });
 };
+const generateCommitMessage$2 = async (providerId, assetDir, platform) => {
+  return executeProvider({
+    assetDir,
+    event: 'none',
+    method: SourceControlGenerateCommitMessage,
+    params: [providerId],
+    platform
+  });
+};
+const getFeatures = async (providerId, assetDir, platform) => {
+  return executeProvider({
+    assetDir,
+    event: 'none',
+    method: SourceControlGetFeatures,
+    params: [providerId],
+    platform
+  });
+};
+const getChangedFiles = (providerId, assetDir, platform) => {
+  return executeProvider({
+    assetDir,
+    event: 'none',
+    method: SourceControlGetChangedFiles,
+    params: [providerId],
+    platform
+    // noProviderFoundMessage: 'No source control provider found',
+  });
+};
+const getBadgeCount$2 = (providerId, assetDir, platform) => {
+  return executeProvider({
+    assetDir,
+    event: 'none',
+    method: SourceControlGetBadgeCount,
+    params: [providerId],
+    platform
+  });
+};
 const getFileDecorations$1 = (providerId, uris, assetDir, platform) => {
   string(assetDir);
   number(platform);
@@ -1449,11 +1583,68 @@ const getIconDefinitions$1 = async providerId => {
   return result;
 };
 
+const Disk = 'file';
+
+const RE_PROTOCOL = /^([a-z-]+):\/\//;
+const getProtocol = uri => {
+  if (!uri) {
+    return Disk;
+  }
+  const protocolMatch = uri.match(RE_PROTOCOL);
+  if (protocolMatch) {
+    return protocolMatch[1];
+  }
+  return Disk;
+};
+
 const acceptInput$1 = (providerId, text, assetDir, platform) => {
   string(providerId);
   string(text);
   return acceptInput$2(providerId, text, assetDir, platform);
 };
+const generateCommitMessage$1 = (providerId, assetDir, platform) => {
+  string(providerId);
+  return generateCommitMessage$2(providerId, assetDir, platform);
+};
+const getShowGenerateCommitMessageButton = async (providerId, assetDir, platform) => {
+  string(providerId);
+  try {
+    const features = await getFeatures(providerId, assetDir, platform);
+    if (!features || typeof features !== 'object') {
+      return true;
+    }
+    if ('showGenerateCommitMessageButton' in features && typeof features.showGenerateCommitMessageButton === 'boolean') {
+      return features.showGenerateCommitMessageButton;
+    }
+    return true;
+  } catch {
+    return true;
+  }
+};
+const getProviderBadgeCount = async (providerId, assetDir, platform) => {
+  try {
+    return await getBadgeCount$2(providerId, assetDir, platform);
+  } catch {
+    try {
+      const changedFiles = await getChangedFiles(providerId, assetDir, platform);
+      return changedFiles.length;
+    } catch {
+      return 0;
+    }
+  }
+};
+const getBadgeCount$1 = async (providerIds, assetDir, platform) => {
+  let badgeCount = 0;
+  for (const providerId of providerIds) {
+    badgeCount += await getProviderBadgeCount(providerId, assetDir, platform);
+  }
+  return badgeCount;
+};
+const getWorkspaceBadgeCount = async (root, assetDir, platform) => {
+  const scheme = getProtocol(root);
+  const providerIds = await getEnabledProviderIds(scheme, root, assetDir, platform);
+  return getBadgeCount$1(providerIds, assetDir, platform);
+};
 const getFileDecorations = (providerId, uris, assetDir, platform) => {
   return getFileDecorations$1(providerId, uris, assetDir, platform);
 };
@@ -1491,6 +1682,12 @@ const getGroups = async (enabledProviderIds, root, assetDir, platform) => {
   };
 };
 
+const inputPaddingBlock = 11;
+const buttonBlockHeight = 34;
+const getHeaderHeight = (inputBoxHeight, sourceControlButtons) => {
+  return inputBoxHeight + inputPaddingBlock + sourceControlButtons.length * buttonBlockHeight;
+};
+
 const getTextHeight = async (input, width, fontFamily, fontSize, fontWeight, letterSpacing, lineHeight, inputPadding) => {
   try {
     if (!input) {
@@ -1521,31 +1718,17 @@ const getListHeight = (itemsLength, itemHeight, maxHeight) => {
   number(itemHeight);
   number(maxHeight);
   if (itemsLength === 0) {
-    return itemHeight;
-  }
-  const totalHeight = itemsLength * itemHeight;
-  return Math.min(totalHeight, maxHeight);
-};
-
-// TODO optimize this function to return the minimum number
-// of visible items needed, e.g. when not scrolled 5 items with
-// 20px fill 100px but when scrolled 6 items are needed
-const getNumberOfVisibleItems = (listHeight, itemHeight) => {
-  return Math.ceil(listHeight / itemHeight) + 1;
-};
-
-const Disk = 'file';
-
-const RE_PROTOCOL = /^([a-z-]+):\/\//;
-const getProtocol = uri => {
-  if (!uri) {
-    return Disk;
-  }
-  const protocolMatch = uri.match(RE_PROTOCOL);
-  if (protocolMatch) {
-    return protocolMatch[1];
+    return itemHeight;
   }
-  return Disk;
+  const totalHeight = itemsLength * itemHeight;
+  return Math.min(totalHeight, maxHeight);
+};
+
+// TODO optimize this function to return the minimum number
+// of visible items needed, e.g. when not scrolled 5 items with
+// 20px fill 100px but when scrolled 6 items are needed
+const getNumberOfVisibleItems = (listHeight, itemHeight) => {
+  return Math.ceil(listHeight / itemHeight) + 1;
 };
 
 const emptySourceControlButtons = [];
@@ -1596,15 +1779,29 @@ const requestSourceActions = async () => {
   const extensions = await getExtensions();
   const newCache = Object.create(null);
   for (const extension of extensions) {
-    if (extension && extension['source-control-actions']) {
-      for (const [key, value] of Object.entries(extension['source-control-actions'])) {
-        newCache[key] = value;
-      }
+    if (!extension || !extension['source-control-actions']) {
+      continue;
+    }
+    const sourceControlActions = Object.entries(extension['source-control-actions']);
+    for (const [key, value] of sourceControlActions) {
+      newCache[key] = value;
     }
   }
   return newCache;
 };
 
+const requestSourceControlButtons = async () => {
+  const extensions = await getExtensions();
+  const buttons = [];
+  for (const extension of extensions) {
+    if (!extension || !Array.isArray(extension['source-control-buttons'])) {
+      continue;
+    }
+    buttons.push(...extension['source-control-buttons']);
+  }
+  return buttons;
+};
+
 /* eslint-disable unicorn/no-array-reduce */
 const restoreExpandedGroups = groups => {
   return groups.map(group => group.id).reduce((total, current) => {
@@ -1657,6 +1854,7 @@ const RevealInExplorerView = 'Reveal in Explorer View';
 const OpenContainingFolder = 'Open Containing Folder';
 const ViewAsTree$1 = 'View As Tree';
 const CommitAndPush$1 = 'Commit and Push';
+const GenerateCommitMessage$1 = 'Generate Commit Message';
 const Refresh$2 = 'Refresh';
 const MessageEnterToCommitOnMaster = `Message (Enter) to commit on 'master'`;
 const SourceControlInput$1 = 'Source Control Input';
@@ -1691,6 +1889,9 @@ const viewAsTree$1 = () => {
 const commitAndPush = () => {
   return i18nString(CommitAndPush$1);
 };
+const generateCommitMessage = () => {
+  return i18nString(GenerateCommitMessage$1);
+};
 const refresh$1 = () => {
   return i18nString(Refresh$2);
 };
@@ -1726,6 +1927,7 @@ const loadContent = async (state, savedState) => {
     platform
   } = state;
   const enabledProviderIds = await getEnabledProviderIds(scheme, root, assetDir, platform);
+  const showGenerateCommitMessageButton = enabledProviderIds.length === 0 ? false : await getShowGenerateCommitMessageButton(enabledProviderIds[0], assetDir, platform);
   const iconDefinitions = await getIconDefinitions(enabledProviderIds);
   const {
     allGroups,
@@ -1734,10 +1936,11 @@ const loadContent = async (state, savedState) => {
   const expandedGroups = restoreExpandedGroups(allGroups);
   const displayItems = getDisplayItems(allGroups, expandedGroups, iconDefinitions);
   const actionsCache = await requestSourceActions();
+  const sourceControlButtons = await requestSourceControlButtons();
 
   // TODO make preferences async and more functional
   const splitButtonEnabled = await get$1('sourceControl.splitButtonEnabled');
-  const badgeCount = allGroups.reduce((sum, group) => sum + group.items.length, 0);
+  const badgeCount = await getBadgeCount$1(enabledProviderIds, assetDir, platform);
   const total = displayItems.length;
   const contentHeight = total * itemHeight;
   const listHeight = getListHeight(total, itemHeight, height);
@@ -1750,6 +1953,7 @@ const loadContent = async (state, savedState) => {
   const finalDeltaY = getFinalDeltaY(listHeight, itemHeight, total);
   const inputPlaceholder = messageEnterToCommitOnMaster();
   const inputBoxHeight = await getInputHeight(inputValue, width, inputFontFamily, inputFontSize, inputFontWeight, inputLetterSpacing, inputLineHeight, inputPadding);
+  const headerHeight = getHeaderHeight(inputBoxHeight, sourceControlButtons);
   return {
     ...state,
     actionsCache,
@@ -1760,7 +1964,9 @@ const loadContent = async (state, savedState) => {
     fileIconCache: newFileIconCache,
     finalDeltaY,
     gitRoot,
+    headerHeight,
     iconDefinitions,
+    initial: false,
     inputBoxHeight,
     inputPlaceholder,
     inputValue,
@@ -1768,6 +1974,8 @@ const loadContent = async (state, savedState) => {
     maxLineY,
     root,
     scrollBarHeight,
+    showGenerateCommitMessageButton,
+    sourceControlButtons,
     splitButtonEnabled,
     visibleItems
   };
@@ -1794,15 +2002,76 @@ const acceptInput = async state => {
     info('[ViewletSourceControl] no source control provider found');
     return state;
   }
-  const providerId = enabledProviderIds[0];
-  await acceptInput$1(providerId, inputValue, assetDir, platform);
+  for (const providerId of enabledProviderIds) {
+    await acceptInput$1(providerId, inputValue, assetDir, platform);
+  }
   const newState = await loadContent(state, {});
   return {
     ...newState,
+    inputMessage: '',
     inputValue: ''
   };
 };
 
+const createDefaultState = () => ({
+  actionsCache: Object.create(null),
+  allGroups: [],
+  assetDir: '',
+  badgeCount: 0,
+  decorationIcons: [],
+  deltaY: 0,
+  enabledProviderIds: [],
+  expandedGroups: Object.create(null),
+  fileIconCache: {},
+  finalDeltaY: 0,
+  focus: 0,
+  gitRoot: '',
+  handleOffset: 0,
+  headerHeight: 40,
+  height: 100,
+  history: [],
+  iconDefinitions: [],
+  id: 1,
+  index: [],
+  initial: false,
+  inputBoxHeight: 30,
+  inputBoxMaxHeight: 214,
+  inputFontFamily: '',
+  inputFontSize: 15,
+  inputFontWeight: 400,
+  inputLetterSpacing: 0.5,
+  inputLineHeight: 14.95,
+  inputMessage: '',
+  inputPadding: 2,
+  inputPlaceholder: '',
+  inputSource: 0,
+  inputValue: '',
+  isVisible: true,
+  itemHeight: 20,
+  items: [],
+  maxInputLines: 5,
+  maxLineY: 0,
+  merge: [],
+  minimumSliderSize: 30,
+  minLineY: 0,
+  platform: 0,
+  providerId: '',
+  root: '/',
+  scrollBarActive: false,
+  scrollBarHeight: 0,
+  showGenerateCommitMessageButton: false,
+  sourceControlButtons: [],
+  splitButtonEnabled: false,
+  untracked: [],
+  viewMode: 1,
+  visibleItems: [],
+  width: 100,
+  workingTree: [],
+  workspacePath: '',
+  x: 0,
+  y: 0
+});
+
 const {
   get,
   getCommandIds,
@@ -1812,58 +2081,16 @@ const {
   wrapGetter
 } = create();
 
-const create2 = (id, uri, x, y, width, height, workspacePath, platform, assetDir) => {
+const create2 = (id, _uri, x, y, width, height, workspacePath, platform, assetDir) => {
+  const defaultState = createDefaultState();
   const state = {
-    actionsCache: Object.create(null),
-    allGroups: [],
+    ...defaultState,
     assetDir,
-    badgeCount: 0,
-    decorationIcons: [],
-    deltaY: 0,
-    enabledProviderIds: [],
-    expandedGroups: Object.create(null),
-    fileIconCache: Object.create(null),
-    finalDeltaY: 0,
-    focus: 0,
-    gitRoot: '',
-    handleOffset: 0,
-    headerHeight: 40,
-    // TODO
     height,
-    history: [],
-    iconDefinitions: [],
     id,
-    index: [],
-    inputBoxHeight: 30,
-    inputBoxMaxHeight: 214,
-    inputFontFamily: 'system-ui, Ubuntu, "Droid Sans", sans-serif',
-    inputFontSize: 13,
-    inputFontWeight: 400,
-    inputLetterSpacing: 0,
-    inputLineHeight: 20,
-    inputPadding: 2,
-    inputPlaceholder: '',
-    inputSource: 0,
-    inputValue: '',
-    isVisible: true,
-    itemHeight: 20,
-    items: [],
-    maxInputLines: 5,
-    maxLineY: 0,
-    merge: [],
-    minimumSliderSize: 20,
-    minLineY: 0,
+    initial: true,
     platform,
-    providerId: '',
-    root: '',
-    scrollBarActive: false,
-    scrollBarHeight: 0,
-    splitButtonEnabled: false,
-    untracked: [],
-    viewMode: 1,
-    visibleItems: [],
     width,
-    workingTree: [],
     workspacePath,
     x,
     y
@@ -1880,20 +2107,21 @@ const isEqual$2 = (oldState, newState) => {
 };
 
 const isEqual$1 = (oldState, newState) => {
-  return oldState.allGroups === newState.allGroups && oldState.deltaY === newState.deltaY && oldState.items === newState.items && oldState.maxLineY === newState.maxLineY && oldState.minLineY === newState.minLineY && oldState.visibleItems === newState.visibleItems;
+  return oldState.allGroups === newState.allGroups && oldState.deltaY === newState.deltaY && oldState.items === newState.items && oldState.maxLineY === newState.maxLineY && oldState.minLineY === newState.minLineY && oldState.sourceControlButtons === newState.sourceControlButtons && oldState.visibleItems === newState.visibleItems;
 };
 
 const RenderItems = 4;
 const RenderFocusContext = 7;
 const RenderValue = 8;
 const RenderCss = 10;
+const RenderIncremental = 11;
 
 const isEqual = (oldState, newState) => {
   return newState.inputSource === User || oldState.inputValue === newState.inputValue;
 };
 
 const modules = [isEqual$1, isEqual, isEqual$3, isEqual$2];
-const numbers = [RenderItems, RenderValue, RenderCss, RenderFocusContext];
+const numbers = [RenderIncremental, RenderValue, RenderCss, RenderFocusContext];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -1928,37 +2156,305 @@ const getInfo = uid => {
   return newState.allGroups;
 };
 
-const None = 'none';
-const ToolBar = 'toolbar';
-const Tree = 'tree';
-const TreeItem$1 = 'treeitem';
-
-const Badge = 'Badge';
-const SourceControlBadge = 'SourceControlBadge';
-
-const Button$1 = 1;
-const Div = 4;
-const Span = 8;
-const Text = 12;
-const Img = 17;
-const TextArea = 62;
-
-const Enter = 3;
-
-const CtrlCmd = 1 << 11 >>> 0;
-
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
 
 const text = data => {
   return {
-    type: Text,
+    childCount: 0,
     text: data,
-    childCount: 0
+    type: Text
+  };
+};
+
+const SetText = 1;
+const Replace = 2;
+const SetAttribute = 3;
+const RemoveAttribute = 4;
+const Add = 6;
+const NavigateChild = 7;
+const NavigateParent = 8;
+const RemoveChild = 9;
+const NavigateSibling = 10;
+const SetReferenceNodeUid = 11;
+
+const isKey = key => {
+  return key !== 'type' && key !== 'childCount';
+};
+
+const getKeys = node => {
+  const keys = Object.keys(node).filter(isKey);
+  return keys;
+};
+
+const arrayToTree = nodes => {
+  const result = [];
+  let i = 0;
+  while (i < nodes.length) {
+    const node = nodes[i];
+    const {
+      children,
+      nodesConsumed
+    } = getChildrenWithCount(nodes, i + 1, node.childCount || 0);
+    result.push({
+      node,
+      children
+    });
+    i += 1 + nodesConsumed;
+  }
+  return result;
+};
+const getChildrenWithCount = (nodes, startIndex, childCount) => {
+  if (childCount === 0) {
+    return {
+      children: [],
+      nodesConsumed: 0
+    };
+  }
+  const children = [];
+  let i = startIndex;
+  let remaining = childCount;
+  let totalConsumed = 0;
+  while (remaining > 0 && i < nodes.length) {
+    const node = nodes[i];
+    const nodeChildCount = node.childCount || 0;
+    const {
+      children: nodeChildren,
+      nodesConsumed
+    } = getChildrenWithCount(nodes, i + 1, nodeChildCount);
+    children.push({
+      node,
+      children: nodeChildren
+    });
+    const nodeSize = 1 + nodesConsumed;
+    i += nodeSize;
+    totalConsumed += nodeSize;
+    remaining--;
+  }
+  return {
+    children,
+    nodesConsumed: totalConsumed
   };
 };
 
+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;
+  }
+  // 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;
+  }
+  // Handle text nodes
+  if (oldNode.type === Text && newNode.type === Text) {
+    if (oldNode.text !== newNode.text) {
+      patches.push({
+        type: SetText,
+        value: newNode.text
+      });
+    }
+    return patches;
+  }
+  // Compare attributes
+  const oldKeys = getKeys(oldNode);
+  const newKeys = getKeys(newNode);
+  // Check for attribute changes
+  for (const key of newKeys) {
+    if (oldNode[key] !== newNode[key]) {
+      patches.push({
+        type: SetAttribute,
+        key,
+        value: newNode[key]
+      });
+    }
+  }
+  // Check for removed attributes
+  for (const key of oldKeys) {
+    if (!(key in newNode)) {
+      patches.push({
+        type: RemoveAttribute,
+        key
+      });
+    }
+  }
+  return patches;
+};
+
+const treeToArray = node => {
+  const result = [node.node];
+  for (const child of node.children) {
+    result.push(...treeToArray(child));
+  }
+  return result;
+};
+
+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];
+    const newNode = newChildren[i];
+    if (!oldNode && !newNode) {
+      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
+      indicesToRemove.push(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
+  for (let j = indicesToRemove.length - 1; j >= 0; j--) {
+    patches.push({
+      type: RemoveChild,
+      index: indicesToRemove[j]
+    });
+  }
+};
+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);
+  }
+};
+
+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];
+    if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling) {
+      lastNonNavigationIndex = i;
+      break;
+    }
+  }
+  // Return patches up to and including the last non-navigation patch
+  return lastNonNavigationIndex === -1 ? [] : patches.slice(0, lastNonNavigationIndex + 1);
+};
+
+const diffTree = (oldNodes, newNodes) => {
+  // Step 1: Convert flat arrays to tree structures
+  const oldTree = arrayToTree(oldNodes);
+  const newTree = arrayToTree(newNodes);
+  // Step 3: Compare the trees
+  const patches = [];
+  diffTrees(oldTree, newTree, patches, []);
+  // Remove trailing navigation patches since they serve no purpose
+  return removeTrailingNavigationPatches(patches);
+};
+
 const getKeyBindings = () => {
   return [{
     command: 'Source Control.acceptInput',
@@ -1970,42 +2466,42 @@ const getKeyBindings = () => {
 const getMenuEntries = () => {
   return [{
     command: /* TODO */'-1',
-    flags: None$1,
+    flags: None,
     id: '',
     label: openChanges()
   }, {
     command: /* TODO */'-1',
-    flags: None$1,
+    flags: None,
     id: '',
     label: openFile()
   }, {
     command: /* TODO */'-1',
-    flags: None$1,
+    flags: None,
     id: '',
     label: openFileHead()
   }, {
     command: /* TODO */'-1',
-    flags: None$1,
+    flags: None,
     id: '',
     label: discardChanges()
   }, {
     command: /* TODO */'-1',
-    flags: None$1,
+    flags: None,
     id: '',
     label: stageChanges()
   }, {
     command: /* TODO */'-1',
-    flags: None$1,
+    flags: None,
     id: '',
     label: addToGitignore()
   }, {
     command: /* TODO */'-1',
-    flags: None$1,
+    flags: None,
     id: '',
     label: revealInExplorerView()
   }, {
     command: /* TODO */'-1',
-    flags: None$1,
+    flags: None,
     id: '',
     label: openContainingFolder()
   }];
@@ -2019,10 +2515,64 @@ const getMenuIds = () => {
   return [SourceControl$1];
 };
 
+const handleInput = async (state, value, inputSource = User) => {
+  const {
+    inputFontFamily,
+    inputFontSize,
+    inputFontWeight,
+    inputLetterSpacing,
+    inputLineHeight,
+    inputPadding,
+    width
+  } = state;
+  const inputBoxHeight = await getInputHeight(value, width, inputFontFamily, inputFontWeight, inputFontSize, inputLetterSpacing, inputLineHeight, inputPadding);
+  return {
+    ...state,
+    inputBoxHeight,
+    inputMessage: '',
+    inputSource,
+    inputValue: value
+  };
+};
+
+const toErrorMessage = error => {
+  if (error instanceof Error && error.message) {
+    return `Failed to generate commit message: ${error.message}`;
+  }
+  return 'Failed to generate commit message';
+};
+const handleGenerateCommitMessage = async state => {
+  const {
+    assetDir,
+    enabledProviderIds,
+    platform
+  } = state;
+  if (enabledProviderIds.length === 0) {
+    return {
+      ...state,
+      inputMessage: 'Failed to generate commit message: no source control provider found'
+    };
+  }
+  try {
+    const inputValue = await generateCommitMessage$1(enabledProviderIds[0], assetDir, platform);
+    const newState = await handleInput(state, inputValue, Script);
+    return {
+      ...newState,
+      inputMessage: ''
+    };
+  } catch (error) {
+    return {
+      ...state,
+      inputMessage: toErrorMessage(error)
+    };
+  }
+};
+
 const SourceControlInput = 'SourceControlInput';
 const ViewAsTree = 'ViewAsTree';
 const CommitAndPush = 'CommitAndPush';
 const Refresh$1 = 'Refresh';
+const GenerateCommitMessage = 'GenerateCommitMessage';
 
 const refresh = async state => {
   const {
@@ -2044,7 +2594,7 @@ const refresh = async state => {
   } = await getGroups(enabledProviderIds, root, assetDir, platform);
   const expandedGroups = restoreExpandedGroups(allGroups);
   const displayItems = getDisplayItems(allGroups, expandedGroups, iconDefinitions);
-  const badgeCount = allGroups.reduce((sum, group) => sum + group.items.length, 0);
+  const badgeCount = await getBadgeCount$1(enabledProviderIds, assetDir, platform);
   const total = displayItems.length;
   const contentHeight = total * itemHeight;
   const listHeight = getListHeight(total, itemHeight, height);
@@ -2075,7 +2625,7 @@ const refresh = async state => {
 const viewAsTree = state => {
   return {
     ...state,
-    viewMode: Tree$1
+    viewMode: Tree
   };
 };
 
@@ -2084,6 +2634,8 @@ const handleActionClick = async (state, actionName) => {
     case CommitAndPush:
       warn(`[source-control-worker] CommitAndPush action not yet implemented`);
       return state;
+    case GenerateCommitMessage:
+      return handleGenerateCommitMessage(state);
     case Refresh$1:
       return refresh(state);
     case ViewAsTree:
@@ -2288,32 +2840,13 @@ const handleInputFocus = async state => {
   };
 };
 
-const handleInput = async (state, value, inputSource = User) => {
-  const {
-    inputFontFamily,
-    inputFontSize,
-    inputFontWeight,
-    inputLetterSpacing,
-    inputLineHeight,
-    inputPadding,
-    width
-  } = state;
-  const inputBoxHeight = await getInputHeight(value, width, inputFontFamily, inputFontWeight, inputFontSize, inputLetterSpacing, inputLineHeight, inputPadding);
-  return {
-    ...state,
-    inputBoxHeight,
-    inputSource,
-    inputValue: value
-  };
-};
-
 const handleInputBlur = async state => {
   // TODO reset focus
   return state;
 };
 
 const handleMessagePort = async port => {
-  await PlainMessagePortRpc.create({
+  await create$4({
     commandMap: {},
     messagePort: port
   });
@@ -2354,6 +2887,21 @@ const handleMouseOverAt = async (state, eventX, eventY) => {
   return handleMouseOver(state, index);
 };
 
+const handleSourceControlButtonClick = async (state, name) => {
+  const button = state.sourceControlButtons.find(button => button.label === name);
+  if (!button) {
+    warn(`[source-control-worker] Source control button not found ${name}`);
+    return state;
+  }
+  await executeCommand(button.command, state.assetDir, state.platform, state.inputValue);
+  const newState = await loadContent(state, {});
+  return {
+    ...newState,
+    inputMessage: '',
+    inputValue: ''
+  };
+};
+
 const setDeltaY = async (state, newDeltaY) => {
   const {
     actionsCache,
@@ -2393,7 +2941,7 @@ const sendMessagePortToExtensionHostWorker = async port => {
 
 const createExtensionHostRpc = async () => {
   try {
-    const rpc = await TransferMessagePortRpcParent.create({
+    const rpc = await create$3({
       commandMap: {},
       send: sendMessagePortToExtensionHostWorker
     });
@@ -2409,7 +2957,7 @@ const sendMessagePortToTextMeasurementWorker = async port => {
 
 const createTextMeasurementWorkerRpc = async () => {
   try {
-    const rpc = await TransferMessagePortRpcParent.create({
+    const rpc = await create$3({
       commandMap: {},
       send: sendMessagePortToTextMeasurementWorker
     });
@@ -2419,12 +2967,39 @@ const createTextMeasurementWorkerRpc = async () => {
   }
 };
 
+const createExtensionManagementWorkerRpc = async () => {
+  try {
+    const rpc = await create$3({
+      commandMap: {},
+      send: port => sendMessagePortToExtensionManagementWorker(port, 0)
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create extension management rpc`);
+  }
+};
+
+const initializeExtensionManagementWorker = async () => {
+  try {
+    const rpc = await createExtensionManagementWorkerRpc();
+    set$3(rpc);
+  } catch {
+    // ignore
+  }
+};
+
 const initialize = async () => {
-  const [extensionHostRpc, textRpc] = await Promise.all([createExtensionHostRpc(), createTextMeasurementWorkerRpc()]);
-  set$3(extensionHostRpc);
+  const [extensionHostRpc, textRpc] = await Promise.all([createExtensionHostRpc(), createTextMeasurementWorkerRpc(), initializeExtensionManagementWorker()]);
+  set$4(extensionHostRpc);
   set$1(textRpc);
 };
 
+const getIndentRule = indent => {
+  return `.Indent-${indent} {
+  padding-left: ${indent}px;
+}`;
+};
+
 const getUnique = items => {
   const seens = [];
   for (const item of items) {
@@ -2435,11 +3010,6 @@ const getUnique = items => {
   return seens;
 };
 
-const getIndentRule = indent => {
-  return `.Indent-${indent} {
-  padding-left: ${indent}px;
-}`;
-};
 const renderCss = (oldState, newState) => {
   const {
     id,
@@ -2479,19 +3049,13 @@ const IconButton = 'IconButton';
 const InputBox = 'InputBox';
 const Label = 'Label';
 const LabelDetail = 'LabelDetail';
-const MaskIcon = 'MaskIcon';
-const MaskIconChevronDown = 'MaskIconChevronDown';
+const Message = 'Message';
 const SourceControl = 'SourceControl';
 const SourceControlButton = 'SourceControlButton';
 const SourceControlHeader = 'SourceControlHeader';
 const SourceControlItems = 'SourceControlItems';
 const SplitButton = 'SplitButton';
 const SplitButtonContent = 'SplitButtonContent';
-const SplitButtonContentDisabled = 'SplitButtonContentDisabled';
-const SplitButtonDisabled = 'SplitButtonDisabled';
-const SplitButtonDropDown = 'SplitButtonDropDown';
-const SplitButtonDropDownDisabled = 'SplitButtonDropDownDisabled';
-const SplitButtonSeparator = 'SplitButtonSeparator';
 const StrikeThrough = 'StrikeThrough';
 const TreeItem = 'TreeItem';
 const Viewlet = 'Viewlet';
@@ -2505,9 +3069,34 @@ const HandleMouseOver = 7;
 const HandleMouseOverAt = 8;
 const HandleWheel = 9;
 const HandleClickAction = 10;
+const HandleClickSourceControlButton = 11;
 
-const getSourceControlInputDom = inputPlaceholder => {
+const getSourceControlButtonVirtualDom = button => {
+  const {
+    id,
+    label
+  } = button;
   return [{
+    childCount: 1,
+    className: SplitButton,
+    type: Div
+  }, {
+    childCount: 1,
+    className: SplitButtonContent,
+    name: label,
+    onClick: HandleClickSourceControlButton,
+    tabIndex: 0,
+    title: id,
+    type: Div
+  }, text(label)];
+};
+
+const getSourceControlButtonsVirtualDom = buttons => {
+  return buttons.flatMap(getSourceControlButtonVirtualDom);
+};
+
+const getSourceControlInputDom = (inputPlaceholder, inputMessage) => {
+  const dom = [{
     ariaLabel: sourceControlInput(),
     autocapitalize: 'off',
     autocorrect: 'off',
@@ -2520,14 +3109,26 @@ const getSourceControlInputDom = inputPlaceholder => {
     spellcheck: false,
     type: TextArea
   }];
+  if (inputMessage) {
+    dom.push({
+      childCount: 1,
+      className: Message,
+      type: Div
+    }, {
+      text: inputMessage,
+      type: Text
+    });
+  }
+  return dom;
 };
 
-const getSourceControlHeaderVirtualDom = inputPlaceholder => {
+const getSourceControlHeaderVirtualDom = (inputPlaceholder, inputMessage) => {
+  const inputDom = getSourceControlInputDom(inputPlaceholder, inputMessage);
   return [{
-    childCount: 1,
+    childCount: inputMessage ? 2 : 1,
     className: SourceControlHeader,
     type: Div
-  }, ...getSourceControlInputDom(inputPlaceholder)];
+  }, ...inputDom];
 };
 
 const className$1 = mergeClassNames(Badge, SourceControlBadge);
@@ -2537,14 +3138,14 @@ const parentNode = {
   type: Div
 };
 const getBadgeVirtualDom = count => {
-  return [parentNode, text(`${count}`)];
+  return [parentNode, text(String(count))];
 };
 
 const getIconVirtualDom = (icon, type = Div) => {
   return {
     childCount: 0,
     className: `MaskIcon MaskIcon${icon}`,
-    role: None,
+    role: None$1,
     type
   };
 };
@@ -2560,7 +3161,7 @@ const getButtonVirtualDom = button => {
     className: SourceControlButton,
     name: label,
     title: label,
-    type: Button$1
+    type: Button$2
   }, getIconVirtualDom(icon, Span)];
 };
 
@@ -2632,7 +3233,7 @@ const getFileIconVirtualDom = icon => {
   return {
     childCount: 0,
     className: FileIcon,
-    role: None,
+    role: None$1,
     src: icon,
     type: Img
   };
@@ -2721,45 +3322,15 @@ const getSourceControlListVirtualDom = items => {
     onClick: HandleClickAt,
     onPointerOut: HandleMouseOutAt,
     onPointerOver: HandleMouseOverAt,
-    role: Tree,
+    role: Tree$1,
     type: Div
   }, ...items.flatMap(getSourceControlItemVirtualDom)];
 };
 
-const getSplitButtonVirtualDom = (hasItems, splitButtonEnabled, buttonText) => {
-  if (!splitButtonEnabled || !hasItems) {
-    return [];
-  }
-  return [{
-    childCount: 3,
-    className: mergeClassNames(SplitButton, hasItems ? '' : SplitButtonDisabled),
-    type: Div
-  }, {
-    childCount: 1,
-    className: mergeClassNames(SplitButtonContent, hasItems ? '' : SplitButtonContentDisabled),
-    tabIndex: 0,
-    type: Div
-  }, text(buttonText), {
-    childCount: 0,
-    className: SplitButtonSeparator,
-    type: Div
-  }, {
-    childCount: 1,
-    className: mergeClassNames(SplitButtonDropDown, hasItems ? '' : SplitButtonDropDownDisabled),
-    tabIndex: 0,
-    type: Div
-  }, {
-    childCount: 0,
-    className: mergeClassNames(MaskIcon, MaskIconChevronDown),
-    type: Div
-  }];
-};
-
 const className = mergeClassNames(Viewlet, SourceControl);
-const getSourceControlVirtualDom = (items, splitButtonEnabled, inputPlaceholder) => {
-  const hasItems = items.length > 0;
+const getSourceControlVirtualDom = (items, sourceControlButtons, inputPlaceholder, inputMessage) => {
   const dom = [{
-    childCount: splitButtonEnabled ? 3 : 2,
+    childCount: 2 + sourceControlButtons.length,
     className: className,
     onContextMenu: HandleContextMenu,
     onMouseOver: HandleMouseOver,
@@ -2767,21 +3338,36 @@ const getSourceControlVirtualDom = (items, splitButtonEnabled, inputPlaceholder)
     onWheel: HandleWheel,
     tabIndex: 0,
     type: Div
-  }, ...getSourceControlHeaderVirtualDom(inputPlaceholder), ...getSplitButtonVirtualDom(hasItems, splitButtonEnabled, 'Commit'), ...getSourceControlListVirtualDom(items)];
+  }, ...getSourceControlHeaderVirtualDom(inputPlaceholder, inputMessage), ...getSourceControlButtonsVirtualDom(sourceControlButtons), ...getSourceControlListVirtualDom(items)];
   return dom;
 };
 
 const renderItems = (oldState, newState) => {
   const {
     id,
+    initial,
+    inputMessage,
     inputPlaceholder,
-    splitButtonEnabled,
+    sourceControlButtons,
     visibleItems
   } = newState;
-  const dom = getSourceControlVirtualDom(visibleItems, splitButtonEnabled, inputPlaceholder);
+  if (initial) {
+    return [SetDom2, id, []];
+  }
+  const dom = getSourceControlVirtualDom(visibleItems, sourceControlButtons, inputPlaceholder, inputMessage);
   return [SetDom2, id, dom];
 };
 
+const renderIncremental = (oldState, newState) => {
+  const oldDom = renderItems(oldState, oldState)[2];
+  const newDom = renderItems(newState, newState)[2];
+  const patches = diffTree(oldDom, newDom);
+  const {
+    id
+  } = newState;
+  return ['Viewlet.setPatches', id, patches];
+};
+
 const renderValue = (oldState, newState) => {
   const {
     id,
@@ -2796,6 +3382,8 @@ const getRenderer = diffType => {
       return renderCss;
     case RenderFocusContext:
       return renderFocusContext;
+    case RenderIncremental:
+      return renderIncremental;
     case RenderItems:
       return renderItems;
     case RenderValue:
@@ -2830,11 +3418,12 @@ const render2 = (uid, diffResult) => {
 const Button = 1;
 
 const Check = 'Check';
+const DebugAlt2 = 'DebugAlt2';
 const ListFlat = 'ListFlat';
 const Refresh = 'Refresh';
 
-const getActions = () => {
-  return [{
+const getActions = state => {
+  const actions = [{
     command: '',
     icon: ListFlat,
     id: viewAsTree$1(),
@@ -2853,6 +3442,16 @@ const getActions = () => {
     name: Refresh$1,
     type: Button
   }];
+  if (state.showGenerateCommitMessageButton) {
+    actions.splice(2, 0, {
+      command: '',
+      icon: DebugAlt2,
+      id: generateCommitMessage(),
+      name: GenerateCommitMessage,
+      type: Button
+    });
+  }
+  return actions;
 };
 
 const getActionButtonVirtualDom = action => {
@@ -2866,7 +3465,7 @@ const getActionButtonVirtualDom = action => {
     className: IconButton,
     name: label,
     title: id,
-    type: Button$1
+    type: Button$2
   }, getIconVirtualDom(icon)];
 };
 
@@ -2897,7 +3496,7 @@ const getActionsVirtualDom = actions => {
 };
 
 const renderActions = state => {
-  const actions = getActions();
+  const actions = getActions(state);
   const dom = getActionsVirtualDom(actions);
   return dom;
 };
@@ -2927,7 +3526,7 @@ const renderEventListeners = () => {
     params: ['handleInput', TargetValue]
   }, {
     name: HandleContextMenu,
-    params: ['handleContextMenu', Button$2, ClientX, ClientY],
+    params: ['handleContextMenu', Button$1, ClientX, ClientY],
     preventDefault: true
   }, {
     name: HandleWheel,
@@ -2936,6 +3535,9 @@ const renderEventListeners = () => {
   }, {
     name: HandleClickAction,
     params: ['handleActionClick', TargetName]
+  }, {
+    name: HandleClickSourceControlButton,
+    params: ['handleSourceControlButtonClick', TargetName]
   }];
 };
 
@@ -2996,12 +3598,14 @@ const commandMap = {
   'SourceControl.getKeyBindings': getKeyBindings,
   'SourceControl.getMenuEntries2': wrapGetter(getMenuEntries2),
   'SourceControl.getMenuIds': getMenuIds,
+  'SourceControl.getWorkspaceBadgeCount': getWorkspaceBadgeCount,
   'SourceControl.handleActionClick': wrapCommand(handleActionClick),
   'SourceControl.handleButtonClick': wrapCommand(handleButtonClick),
   'SourceControl.handleClickAt': wrapCommand(handleClickAt),
   'SourceControl.handleClickSourceControlButtons': wrapCommand(handleClickSourceControlButtons),
   'SourceControl.handleContextMenu': wrapCommand(handleContextMenu),
   'SourceControl.handleFocus': wrapCommand(handleInputFocus),
+  'SourceControl.handleGenerateCommitMessage': wrapCommand(handleGenerateCommitMessage),
   'SourceControl.handleInput': wrapCommand(handleInput),
   'SourceControl.handleInputBlur': wrapCommand(handleInputBlur),
   'SourceControl.handleMessagePort': handleMessagePort,
@@ -3009,6 +3613,7 @@ const commandMap = {
   'SourceControl.handleMouseOutAt': wrapCommand(handleMouseOutAt),
   'SourceControl.handleMouseOver': wrapCommand(handleMouseOver),
   'SourceControl.handleMouseOverAt': wrapCommand(handleMouseOverAt),
+  'SourceControl.handleSourceControlButtonClick': wrapCommand(handleSourceControlButtonClick),
   'SourceControl.handleWheel': wrapCommand(handleWheel),
   'SourceControl.handleWorkspaceRefresh': wrapCommand(handleWorkspaceRefresh),
   'SourceControl.loadContent': wrapCommand(loadContent),
@@ -3028,7 +3633,7 @@ const commandMap = {
 
 const listen = async () => {
   registerCommands(commandMap);
-  const rpc = await WebWorkerRpcClient.create({
+  const rpc = await create$2({
     commandMap: commandMap
   });
   set$2(rpc);