@lvce-editor/activity-bar-worker 6.2.0 → 7.1.0

package/dist/activityBarWorkerMain.js

@@ -1,1705 +1,1715 @@
-const normalizeLine = line => {
-  if (line.startsWith('Error: ')) {
-    return line.slice('Error: '.length);
-  }
-  if (line.startsWith('VError: ')) {
-    return line.slice('VError: '.length);
-  }
-  return line;
-};
-const getCombinedMessage = (error, message) => {
-  const stringifiedError = normalizeLine(`${error}`);
-  if (message) {
-    return `${message}: ${stringifiedError}`;
-  }
-  return stringifiedError;
-};
-const NewLine$2 = '\n';
-const getNewLineIndex$1 = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine$2, startIndex);
-};
-const mergeStacks = (parent, child) => {
-  if (!child) {
-    return parent;
-  }
-  const parentNewLineIndex = getNewLineIndex$1(parent);
-  const childNewLineIndex = getNewLineIndex$1(child);
-  if (childNewLineIndex === -1) {
-    return parent;
-  }
-  const parentFirstLine = parent.slice(0, parentNewLineIndex);
-  const childRest = child.slice(childNewLineIndex);
-  const childFirstLine = normalizeLine(child.slice(0, childNewLineIndex));
-  if (parentFirstLine.includes(childFirstLine)) {
-    return parentFirstLine + childRest;
-  }
-  return child;
+const toCommandId = key => {
+  const dotIndex = key.indexOf('.');
+  return key.slice(dotIndex + 1);
 };
-class VError extends Error {
-  constructor(error, message) {
-    const combinedMessage = getCombinedMessage(error, message);
-    super(combinedMessage);
-    this.name = 'VError';
-    if (error instanceof Error) {
-      this.stack = mergeStacks(this.stack, error.stack);
-    }
-    if (error.codeFrame) {
-      // @ts-ignore
-      this.codeFrame = error.codeFrame;
-    }
-    if (error.code) {
-      // @ts-ignore
-      this.code = error.code;
-    }
-  }
-}
-
-class AssertionError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'AssertionError';
-  }
-}
-const Object$1 = 1;
-const Number$1 = 2;
-const Array$1 = 3;
-const String = 4;
-const Boolean$1 = 5;
-const Function = 6;
-const Null = 7;
-const Unknown = 8;
-const getType = value => {
-  switch (typeof value) {
-    case 'number':
-      return Number$1;
-    case 'function':
-      return Function;
-    case 'string':
-      return String;
-    case 'object':
-      if (value === null) {
-        return Null;
+const create$a = () => {
+  const states = Object.create(null);
+  const commandMapRef = {};
+  return {
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
       }
-      if (Array.isArray(value)) {
-        return Array$1;
+    },
+    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 Object$1;
-    case 'boolean':
-      return Boolean$1;
-    default:
-      return Unknown;
-  }
+      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.parseFloat(key);
+      });
+    },
+    registerCommands(commandMap) {
+      Object.assign(commandMapRef, commandMap);
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        newState,
+        oldState
+      };
+    },
+    wrapCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          newState,
+          oldState
+        } = states[uid];
+        const newerState = await fn(newState, ...args);
+        if (oldState === newerState || newState === newerState) {
+          return;
+        }
+        const latestOld = states[uid];
+        const latestNew = {
+          ...latestOld.newState,
+          ...newerState
+        };
+        states[uid] = {
+          newState: latestNew,
+          oldState: latestOld.oldState
+        };
+      };
+      return wrapped;
+    },
+    wrapGetter(fn) {
+      const wrapped = (uid, ...args) => {
+        const {
+          newState
+        } = states[uid];
+        return fn(newState, ...args);
+      };
+      return wrapped;
+    },
+    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
+          };
+        }
+        const latestOld = states[uid];
+        const latestNew = {
+          ...latestOld.newState,
+          ...state
+        };
+        states[uid] = {
+          newState: latestNew,
+          oldState: latestOld.oldState
+        };
+        return {
+          error
+        };
+      };
+      return wrapped;
+    }
+  };
 };
-const number = value => {
-  const type = getType(value);
-  if (type !== Number$1) {
-    throw new AssertionError('expected value to be of type number');
-  }
+const terminate = () => {
+  globalThis.close();
 };
 
-const isMessagePort = value => {
-  return value && value instanceof MessagePort;
-};
-const isMessagePortMain = value => {
-  return value && value.constructor && value.constructor.name === 'MessagePortMain';
-};
-const isOffscreenCanvas = value => {
-  return typeof OffscreenCanvas !== 'undefined' && value instanceof OffscreenCanvas;
-};
-const isInstanceOf = (value, constructorName) => {
-  return value?.constructor?.name === constructorName;
-};
-const isSocket = value => {
-  return isInstanceOf(value, 'Socket');
+const {
+  diff,
+  get: get$2,
+  getCommandIds,
+  registerCommands,
+  set: set$4,
+  wrapCommand,
+  wrapGetter
+} = create$a();
+
+// TODO parentUid might ot be needed
+const create$9 = (id, uri, x, y, width, height, args, parentUid, platform = 0) => {
+  const state = {
+    accountEnabled: true,
+    activityBarItems: [],
+    currentViewletId: '',
+    filteredItems: [],
+    focus: 0,
+    focused: false,
+    focusedIndex: -1,
+    height,
+    initial: true,
+    itemHeight: 48,
+    numberOfVisibleItems: 0,
+    platform,
+    scrollBarHeight: 0,
+    selectedIndex: -1,
+    sideBarLocation: 0,
+    sideBarVisible: false,
+    uid: id,
+    updateProgress: 0,
+    updateState: '',
+    userLoginState: 'logged out',
+    width,
+    x,
+    y
+  };
+  set$4(id, state, state);
+  return state;
 };
-const transferrables = [isMessagePort, isMessagePortMain, isOffscreenCanvas, isSocket];
-const isTransferrable = value => {
-  for (const fn of transferrables) {
-    if (fn(value)) {
-      return true;
-    }
-  }
-  return false;
+
+const isEqual$2 = (oldState, newState) => {
+  return oldState.itemHeight === newState.itemHeight;
 };
-const walkValue = (value, transferrables, isTransferrable) => {
-  if (!value) {
-    return;
-  }
-  if (isTransferrable(value)) {
-    transferrables.push(value);
-    return;
-  }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      walkValue(item, transferrables, isTransferrable);
-    }
-    return;
-  }
-  if (typeof value === 'object') {
-    for (const property of Object.values(value)) {
-      walkValue(property, transferrables, isTransferrable);
-    }
-    return;
-  }
+
+const isEqual$1 = (oldState, newState) => {
+  return oldState.focused === newState.focused && oldState.focus === newState.focus;
 };
-const getTransferrables = value => {
-  const transferrables = [];
-  walkValue(value, transferrables, isTransferrable);
-  return transferrables;
+
+const isEqual = (oldState, newState) => {
+  return oldState.activityBarItems === newState.activityBarItems && oldState.filteredItems === newState.filteredItems && oldState.focusedIndex === newState.focusedIndex && oldState.sideBarLocation === newState.sideBarLocation && oldState.sideBarVisible === newState.sideBarVisible && oldState.updateProgress === newState.updateProgress && oldState.updateState === newState.updateState;
 };
-const attachEvents = that => {
-  const handleMessage = (...args) => {
-    const data = that.getData(...args);
-    that.dispatchEvent(new MessageEvent('message', {
-      data
-    }));
+
+const RenderItems = 4;
+const RenderFocus = 6;
+const RenderFocusContext = 7;
+const RenderCss = 11;
+const RenderIncremental = 12;
+
+const modules = [isEqual, isEqual$1, isEqual$1, isEqual$2];
+const numbers = [RenderIncremental, RenderFocus, RenderFocusContext, RenderCss];
+
+const diff2 = uid => {
+  return diff(uid, modules, numbers);
+};
+
+const List = 1;
+
+const focus = state => {
+  const {
+    focus
+  } = state;
+  if (focus) {
+    return state;
+  }
+  return {
+    ...state,
+    focus: List
   };
-  that.onMessage(handleMessage);
-  const handleClose = event => {
-    that.dispatchEvent(new Event('close'));
+};
+
+const focusIndex = (state, index) => {
+  return {
+    ...state,
+    focused: true,
+    focusedIndex: index
   };
-  that.onClose(handleClose);
 };
-class Ipc extends EventTarget {
-  constructor(rawIpc) {
-    super();
-    this._rawIpc = rawIpc;
-    attachEvents(this);
+
+const focusFirst = state => {
+  return focusIndex(state, -1);
+};
+
+const focusLast = state => {
+  return focusIndex(state, -1);
+};
+
+const focusNext = state => {
+  return focusIndex(state, -1);
+};
+
+const focusNone = state => {
+  const {
+    focusedIndex
+  } = state;
+  if (focusedIndex === -1) {
+    return state;
   }
-}
-const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE';
-const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON';
-const ERR_MODULE_NOT_FOUND = 'ERR_MODULE_NOT_FOUND';
-const NewLine$1 = '\n';
-const joinLines$1 = lines => {
-  return lines.join(NewLine$1);
+  return focusIndex(state, -1);
 };
-const RE_AT = /^\s+at/;
-const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
-const isNormalStackLine = line => {
-  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line);
+
+const Button$2 = 'button';
+const None$1 = 'none';
+const Tab$1 = 'tab';
+const ToolBar = 'toolbar';
+
+const Div = 4;
+const Text = 12;
+const Reference = 100;
+
+const Button$1 = 'event.button';
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
+
+const Enter = 3;
+const Space = 9;
+const PageUp = 10;
+const PageDown = 11;
+const End = 255;
+const Home = 12;
+const UpArrow = 14;
+const DownArrow = 16;
+
+const ActivityBar$3 = 1;
+const Settings$1 = 12;
+const ActivityBarAdditionalViews = 17;
+
+const Separator = 1;
+const None = 0;
+const Checked = 2;
+const Unchecked = 3;
+
+const LeftClick = 0;
+
+const Web = 1;
+
+const ExtensionManagementWorker = 9006;
+const RendererWorker = 1;
+
+const Left = 1;
+const Right = 2;
+
+const SetCss = 'Viewlet.setCss';
+const SetDom2 = 'Viewlet.setDom2';
+const SetFocusContext = 'Viewlet.setFocusContext';
+const SetPatches = 'Viewlet.setPatches';
+
+const FocusActivityBar = 5;
+const FocusExplorer = 13;
+
+const getKeyBindings = () => {
+  return [{
+    command: 'ActivityBar.focusNext',
+    key: DownArrow,
+    when: FocusActivityBar
+  }, {
+    command: 'ActivityBar.focusPrevious',
+    key: UpArrow,
+    when: FocusActivityBar
+  }, {
+    command: 'ActivityBar.focusFirst',
+    key: Home,
+    when: FocusActivityBar
+  }, {
+    command: 'ActivityBar.focusFirst',
+    key: PageUp,
+    when: FocusActivityBar
+  }, {
+    command: 'ActivityBar.focusLast',
+    key: PageDown,
+    when: FocusActivityBar
+  }, {
+    command: 'ActivityBar.focusLast',
+    key: End,
+    when: FocusActivityBar
+  }, {
+    command: 'ActivityBar.selectCurrent',
+    key: Space,
+    when: FocusActivityBar
+  }, {
+    command: 'ActivityBar.selectCurrent',
+    key: Enter,
+    when: FocusActivityBar
+  }];
 };
-const getDetails = lines => {
-  const index = lines.findIndex(isNormalStackLine);
-  if (index === -1) {
-    return {
-      actualMessage: joinLines$1(lines),
-      rest: []
-    };
+
+const getMenuEntriesAccountLoggedIn = state => {
+  const {
+    userLoginState
+  } = state;
+  const signOutLabel = userLoginState === 'logging out' ? 'Signing Out...' : 'Sign Out';
+  return [{
+    command: 'ActivityBar.handleClickSignOut',
+    flags: None,
+    id: 'signOut',
+    label: signOutLabel
+  }];
+};
+const getMenuEntriesAccountLoggedOut = state => {
+  const {
+    userLoginState
+  } = state;
+  const signInLabel = userLoginState === 'logging in' ? 'Signing In...' : 'Sign In';
+  return [{
+    command: 'ActivityBar.handleClickSignIn',
+    flags: None,
+    id: 'signIn',
+    label: signInLabel
+  }];
+};
+const getMenuEntriesAccount = state => {
+  // TODO maybe query it now from layout?
+  const {
+    userLoginState
+  } = state;
+  if (userLoginState === 'logged in' || userLoginState === 'logging out') {
+    return getMenuEntriesAccountLoggedIn(state);
   }
-  let lastIndex = index - 1;
-  while (++lastIndex < lines.length) {
-    if (!isNormalStackLine(lines[lastIndex])) {
-      break;
-    }
+  return getMenuEntriesAccountLoggedOut(state);
+};
+
+const Tab = 1;
+const Button = 1 << 1;
+const Progress = 1 << 2;
+const Enabled = 1 << 3;
+const Selected = 1 << 4;
+const Focused = 1 << 5;
+const MarginTop = 1 << 6;
+
+const emptyObject = {};
+const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
+const i18nString = (key, placeholders = emptyObject) => {
+  if (placeholders === emptyObject) {
+    return key;
   }
-  return {
-    actualMessage: lines[index - 1],
-    rest: lines.slice(index, lastIndex)
+  const replacer = (match, rest) => {
+    return placeholders[rest];
   };
+  return key.replaceAll(RE_PLACEHOLDER, replacer);
 };
-const splitLines$1 = lines => {
-  return lines.split(NewLine$1);
+
+const Account$1 = 'Account';
+const Explorer$1 = 'Explorer';
+const Search$2 = 'Search';
+const SourceControl$2 = 'Source Control';
+const RunAndDebug$1 = 'Run and Debug';
+const Extensions$2 = 'Extensions';
+const Settings = 'Settings';
+const AdditionalViews = 'Additional Views';
+const ActivityBar$2 = 'Activity Bar';
+const MoveSideBarLeft = 'Move Side Bar Left';
+const MoveSideBarRight = 'Move Side Bar Right';
+const HideActivityBar = 'Hide Activity Bar';
+const CheckForUpdates = 'Check For Updates';
+const ColorTheme = 'Color Theme';
+const CommandPalette = 'Command Palette';
+const KeyboardShortcuts = 'Keyboard Shortcuts';
+
+const account = () => {
+  return i18nString(Account$1);
 };
-const RE_MESSAGE_CODE_BLOCK_START = /^Error: The module '.*'$/;
-const RE_MESSAGE_CODE_BLOCK_END = /^\s* at/;
-const isMessageCodeBlockStartIndex = line => {
-  return RE_MESSAGE_CODE_BLOCK_START.test(line);
+const explorer = () => {
+  return i18nString(Explorer$1);
 };
-const isMessageCodeBlockEndIndex = line => {
-  return RE_MESSAGE_CODE_BLOCK_END.test(line);
+const search = () => {
+  return i18nString(Search$2);
 };
-const getMessageCodeBlock = stderr => {
-  const lines = splitLines$1(stderr);
-  const startIndex = lines.findIndex(isMessageCodeBlockStartIndex);
-  const endIndex = startIndex + lines.slice(startIndex).findIndex(isMessageCodeBlockEndIndex, startIndex);
-  const relevantLines = lines.slice(startIndex, endIndex);
-  const relevantMessage = relevantLines.join(' ').slice('Error: '.length);
-  return relevantMessage;
+const sourceControl = () => {
+  return i18nString(SourceControl$2);
 };
-const isModuleNotFoundMessage = line => {
-  return line.includes('[ERR_MODULE_NOT_FOUND]');
+const runAndDebug = () => {
+  return i18nString(RunAndDebug$1);
+};
+const extensions = () => {
+  return i18nString(Extensions$2);
 };
-const getModuleNotFoundError = stderr => {
-  const lines = splitLines$1(stderr);
-  const messageIndex = lines.findIndex(isModuleNotFoundMessage);
-  const message = lines[messageIndex];
-  return {
-    code: ERR_MODULE_NOT_FOUND,
-    message
-  };
+const settings = () => {
+  return i18nString(Settings);
 };
-const isModuleNotFoundError = stderr => {
-  if (!stderr) {
-    return false;
-  }
-  return stderr.includes('ERR_MODULE_NOT_FOUND');
+const additionalViews = () => {
+  return i18nString(AdditionalViews);
 };
-const isModulesSyntaxError = stderr => {
-  if (!stderr) {
-    return false;
-  }
-  return stderr.includes('SyntaxError: Cannot use import statement outside a module');
+const activityBar = () => {
+  return i18nString(ActivityBar$2);
 };
-const RE_NATIVE_MODULE_ERROR = /^innerError Error: Cannot find module '.*.node'/;
-const RE_NATIVE_MODULE_ERROR_2 = /was compiled against a different Node.js version/;
-const isUnhelpfulNativeModuleError = stderr => {
-  return RE_NATIVE_MODULE_ERROR.test(stderr) && RE_NATIVE_MODULE_ERROR_2.test(stderr);
+const moveSideBarRight = () => {
+  return i18nString(MoveSideBarRight);
 };
-const getNativeModuleErrorMessage = stderr => {
-  const message = getMessageCodeBlock(stderr);
-  return {
-    code: E_INCOMPATIBLE_NATIVE_MODULE,
-    message: `Incompatible native node module: ${message}`
-  };
+const moveSideBarLeft = () => {
+  return i18nString(MoveSideBarLeft);
 };
-const getModuleSyntaxError = () => {
-  return {
-    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON,
-    message: `ES Modules are not supported in electron`
-  };
+const hideActivityBar = () => {
+  return i18nString(HideActivityBar);
 };
-const getHelpfulChildProcessError = (stdout, stderr) => {
-  if (isUnhelpfulNativeModuleError(stderr)) {
-    return getNativeModuleErrorMessage(stderr);
-  }
-  if (isModulesSyntaxError(stderr)) {
-    return getModuleSyntaxError();
-  }
-  if (isModuleNotFoundError(stderr)) {
-    return getModuleNotFoundError(stderr);
-  }
-  const lines = splitLines$1(stderr);
-  const {
-    actualMessage,
-    rest
-  } = getDetails(lines);
-  return {
-    code: '',
-    message: actualMessage,
-    stack: rest
-  };
+const checkForUpdates = () => {
+  return i18nString(CheckForUpdates);
 };
-class IpcError extends VError {
-  // @ts-ignore
-  constructor(betterMessage, stdout = '', stderr = '') {
-    if (stdout || stderr) {
-      // @ts-ignore
-      const {
-        code,
-        message,
-        stack
-      } = getHelpfulChildProcessError(stdout, stderr);
-      const cause = new Error(message);
-      // @ts-ignore
-      cause.code = code;
-      cause.stack = stack;
-      super(cause, betterMessage);
-    } else {
-      super(betterMessage);
-    }
-    // @ts-ignore
-    this.name = 'IpcError';
-    // @ts-ignore
-    this.stdout = stdout;
-    // @ts-ignore
-    this.stderr = stderr;
-  }
-}
-const readyMessage = 'ready';
-const getData$2 = event => {
-  return event.data;
+const commandPalette = () => {
+  return i18nString(CommandPalette);
 };
-const listen$7 = () => {
-  // @ts-ignore
-  if (typeof WorkerGlobalScope === 'undefined') {
-    throw new TypeError('module is not in web worker scope');
-  }
-  return globalThis;
+const keyboardShortcuts = () => {
+  return i18nString(KeyboardShortcuts);
 };
-const signal$8 = global => {
-  global.postMessage(readyMessage);
+const colorTheme = () => {
+  return i18nString(ColorTheme);
 };
-class IpcChildWithModuleWorker extends Ipc {
-  getData(event) {
-    return getData$2(event);
-  }
-  send(message) {
-    // @ts-ignore
-    this._rawIpc.postMessage(message);
-  }
-  sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
-    // @ts-ignore
-    this._rawIpc.postMessage(message, transfer);
-  }
-  dispose() {
-    // ignore
-  }
-  onClose(callback) {
-    // ignore
-  }
-  onMessage(callback) {
-    this._rawIpc.addEventListener('message', callback);
+
+const menuEntryMoveSideBar = sideBarLocation => {
+  switch (sideBarLocation) {
+    case Left:
+      return {
+        command: 'Layout.moveSideBarRight',
+        flags: None,
+        id: 'moveSideBarRight',
+        label: moveSideBarRight()
+      };
+    case Right:
+      return {
+        command: 'Layout.moveSideBarLeft',
+        flags: None,
+        id: 'moveSideBarLeft',
+        label: moveSideBarLeft()
+      };
+    default:
+      throw new Error('unexpected side bar location');
   }
-}
-const wrap$f = global => {
-  return new IpcChildWithModuleWorker(global);
 };
-const waitForFirstMessage = async port => {
-  const {
-    promise,
-    resolve
-  } = Promise.withResolvers();
-  port.addEventListener('message', resolve, {
-    once: true
-  });
-  const event = await promise;
-  // @ts-ignore
-  return event.data;
+
+const menuEntrySeparator = {
+  command: '',
+  flags: Separator,
+  id: 'separator',
+  label: ''
 };
-const listen$6 = async () => {
-  const parentIpcRaw = listen$7();
-  signal$8(parentIpcRaw);
-  const parentIpc = wrap$f(parentIpcRaw);
-  const firstMessage = await waitForFirstMessage(parentIpc);
-  if (firstMessage.method !== 'initialize') {
-    throw new IpcError('unexpected first message');
-  }
-  const type = firstMessage.params[0];
-  if (type === 'message-port') {
-    parentIpc.send({
-      id: firstMessage.id,
-      jsonrpc: '2.0',
-      result: null
-    });
-    parentIpc.dispose();
-    const port = firstMessage.params[1];
-    return port;
-  }
-  return globalThis;
+
+const toContextMenuItem$1 = activityBarItem => {
+  const isEnabled = activityBarItem.flags & Enabled;
+  return {
+    args: [activityBarItem.id],
+    command: 'ActivityBar.toggleActivityBarItem',
+    flags: isEnabled ? Checked : Unchecked,
+    id: `toggle-${activityBarItem.id}`,
+    label: activityBarItem.id
+  };
 };
-class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
-  getData(event) {
-    return getData$2(event);
-  }
-  send(message) {
-    this._rawIpc.postMessage(message);
-  }
-  sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
-    this._rawIpc.postMessage(message, transfer);
-  }
-  dispose() {
-    if (this._rawIpc.close) {
-      this._rawIpc.close();
-    }
-  }
-  onClose(callback) {
-    // ignore
-  }
-  onMessage(callback) {
-    this._rawIpc.addEventListener('message', callback);
-    this._rawIpc.start();
+
+const getMenuEntriesActivityBar = state => {
+  const {
+    activityBarItems,
+    sideBarLocation
+  } = state;
+  const topItems = activityBarItems.filter(item => !(item.flags & Button));
+  const bottomItems = activityBarItems.filter(item => item.flags & Button);
+  const entries = [...topItems.map(toContextMenuItem$1)];
+  if (bottomItems.length > 0) {
+    entries.push(menuEntrySeparator, ...bottomItems.map(toContextMenuItem$1));
   }
-}
-const wrap$e = port => {
-  return new IpcChildWithModuleWorkerAndMessagePort(port);
+  return [...entries, menuEntrySeparator, menuEntryMoveSideBar(sideBarLocation), {
+    command: 'Layout.hideActivityBar',
+    flags: None,
+    id: 'hideActivityBar',
+    label: hideActivityBar()
+  }];
 };
-const IpcChildWithModuleWorkerAndMessagePort$1 = {
-  __proto__: null,
-  listen: listen$6,
-  wrap: wrap$e
+
+const getNumberOfVisibleItems = state => {
+  const {
+    height,
+    itemHeight
+  } = state;
+  const numberOfVisibleItemsTop = Math.floor(height / itemHeight);
+  return numberOfVisibleItemsTop;
 };
-const addListener = (emitter, type, callback) => {
-  if ('addEventListener' in emitter) {
-    emitter.addEventListener(type, callback);
-  } else {
-    emitter.on(type, callback);
+const getHiddenItems = state => {
+  const numberOfVisibleItems = getNumberOfVisibleItems(state);
+  const items = state.activityBarItems.filter(item => item.flags & Enabled);
+  if (numberOfVisibleItems >= items.length) {
+    return [];
   }
+  return items.slice(numberOfVisibleItems - 2, -1);
 };
-const removeListener = (emitter, type, callback) => {
-  if ('removeEventListener' in emitter) {
-    emitter.removeEventListener(type, callback);
-  } else {
-    emitter.off(type, callback);
-  }
+
+const toContextMenuItem = activityBarItem => {
+  return {
+    command: '-1',
+    // TODO
+    flags: None,
+    id: '8000',
+    // TODO
+    label: activityBarItem.id
+  };
 };
-const getFirstEvent = (eventEmitter, eventMap) => {
+const getMenuEntriesAdditionalViews = state => {
+  const hiddenActivityBarItems = getHiddenItems(state);
+  return hiddenActivityBarItems.map(toContextMenuItem);
+};
+
+const keyBindingsUri = 'app://keybindings';
+const getMenuEntriesSettings = state => {
   const {
-    promise,
-    resolve
-  } = Promise.withResolvers();
-  const listenerMap = Object.create(null);
-  const cleanup = value => {
-    for (const event of Object.keys(eventMap)) {
-      removeListener(eventEmitter, event, listenerMap[event]);
-    }
-    resolve(value);
-  };
-  for (const [event, type] of Object.entries(eventMap)) {
-    const listener = event => {
-      cleanup({
-        event,
-        type
-      });
-    };
-    addListener(eventEmitter, event, listener);
-    listenerMap[event] = listener;
+    platform
+  } = state;
+  const items = [{
+    command: 'QuickPick.showEverything',
+    flags: None,
+    id: 'commandPalette',
+    label: commandPalette()
+  }, menuEntrySeparator, {
+    command: 'Preferences.openSettingsJson',
+    flags: None,
+    id: 'settings',
+    label: settings()
+  }, {
+    args: [keyBindingsUri],
+    command: 'Main.openUri',
+    flags: None,
+    id: 'keyboardShortcuts',
+    label: keyboardShortcuts()
+  }, {
+    command: 'QuickPick.showColorTheme',
+    flags: None,
+    id: 'colorTheme',
+    label: colorTheme()
+  }];
+  if (platform !== Web) {
+    items.push(menuEntrySeparator, {
+      command: 'AutoUpdater.checkForUpdates',
+      flags: None,
+      id: 'checkForUpdates',
+      label: checkForUpdates()
+    });
   }
-  return promise;
+  return items;
 };
-const Message$1 = 3;
-const create$5$1 = async ({
-  isMessagePortOpen,
-  messagePort
-}) => {
-  if (!isMessagePort(messagePort)) {
-    throw new IpcError('port must be of type MessagePort');
-  }
-  if (isMessagePortOpen) {
-    return messagePort;
+
+const normalizeLine = line => {
+  if (line.startsWith('Error: ')) {
+    return line.slice('Error: '.length);
   }
-  const eventPromise = getFirstEvent(messagePort, {
-    message: Message$1
-  });
-  messagePort.start();
-  const {
-    event,
-    type
-  } = await eventPromise;
-  if (type !== Message$1) {
-    throw new IpcError('Failed to wait for ipc message');
+  if (line.startsWith('VError: ')) {
+    return line.slice('VError: '.length);
   }
-  if (event.data !== readyMessage) {
-    throw new IpcError('unexpected first message');
+  return line;
+};
+const getCombinedMessage = (error, message) => {
+  const stringifiedError = normalizeLine(`${error}`);
+  if (message) {
+    return `${message}: ${stringifiedError}`;
   }
-  return messagePort;
+  return stringifiedError;
 };
-const signal$1 = messagePort => {
-  messagePort.start();
+const NewLine$2 = '\n';
+const getNewLineIndex$1 = (string, startIndex = undefined) => {
+  return string.indexOf(NewLine$2, startIndex);
 };
-class IpcParentWithMessagePort extends Ipc {
-  getData = getData$2;
-  send(message) {
-    this._rawIpc.postMessage(message);
-  }
-  sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
-    this._rawIpc.postMessage(message, transfer);
+const mergeStacks = (parent, child) => {
+  if (!child) {
+    return parent;
   }
-  dispose() {
-    this._rawIpc.close();
+  const parentNewLineIndex = getNewLineIndex$1(parent);
+  const childNewLineIndex = getNewLineIndex$1(child);
+  if (childNewLineIndex === -1) {
+    return parent;
   }
-  onMessage(callback) {
-    this._rawIpc.addEventListener('message', callback);
+  const parentFirstLine = parent.slice(0, parentNewLineIndex);
+  const childRest = child.slice(childNewLineIndex);
+  const childFirstLine = normalizeLine(child.slice(0, childNewLineIndex));
+  if (parentFirstLine.includes(childFirstLine)) {
+    return parentFirstLine + childRest;
   }
-  onClose(callback) {}
-}
-const wrap$5 = messagePort => {
-  return new IpcParentWithMessagePort(messagePort);
-};
-const IpcParentWithMessagePort$1 = {
-  __proto__: null,
-  create: create$5$1,
-  signal: signal$1,
-  wrap: wrap$5
+  return child;
 };
-
-class CommandNotFoundError extends Error {
-  constructor(command) {
-    super(`Command not found ${command}`);
-    this.name = 'CommandNotFoundError';
+class VError extends Error {
+  constructor(error, message) {
+    const combinedMessage = getCombinedMessage(error, message);
+    super(combinedMessage);
+    this.name = 'VError';
+    if (error instanceof Error) {
+      this.stack = mergeStacks(this.stack, error.stack);
+    }
+    if (error.codeFrame) {
+      // @ts-ignore
+      this.codeFrame = error.codeFrame;
+    }
+    if (error.code) {
+      // @ts-ignore
+      this.code = error.code;
+    }
   }
 }
-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 Two$1 = '2.0';
-const callbacks = Object.create(null);
-const get$2 = id => {
-  return callbacks[id];
-};
-const remove$1 = id => {
-  delete callbacks[id];
-};
-class JsonRpcError extends Error {
+class AssertionError extends Error {
   constructor(message) {
     super(message);
-    this.name = 'JsonRpcError';
+    this.name = 'AssertionError';
   }
 }
-const NewLine = '\n';
-const DomException = 'DOMException';
-const ReferenceError$1 = 'ReferenceError';
-const SyntaxError$1 = 'SyntaxError';
-const TypeError$1 = 'TypeError';
-const getErrorConstructor = (message, type) => {
-  if (type) {
-    switch (type) {
-      case DomException:
-        return DOMException;
-      case ReferenceError$1:
-        return ReferenceError;
-      case SyntaxError$1:
-        return SyntaxError;
-      case TypeError$1:
-        return TypeError;
-      default:
-        return Error;
-    }
-  }
-  if (message.startsWith('TypeError: ')) {
-    return TypeError;
-  }
-  if (message.startsWith('SyntaxError: ')) {
-    return SyntaxError;
-  }
-  if (message.startsWith('ReferenceError: ')) {
-    return ReferenceError;
+const Object$1 = 1;
+const Number$1 = 2;
+const Array$1 = 3;
+const String = 4;
+const Boolean$1 = 5;
+const Function = 6;
+const Null = 7;
+const Unknown = 8;
+const getType = value => {
+  switch (typeof value) {
+    case 'number':
+      return Number$1;
+    case 'function':
+      return Function;
+    case 'string':
+      return String;
+    case 'object':
+      if (value === null) {
+        return Null;
+      }
+      if (Array.isArray(value)) {
+        return Array$1;
+      }
+      return Object$1;
+    case 'boolean':
+      return Boolean$1;
+    default:
+      return Unknown;
   }
-  return Error;
 };
-const constructError = (message, type, name) => {
-  const ErrorConstructor = getErrorConstructor(message, type);
-  if (ErrorConstructor === DOMException && name) {
-    return new ErrorConstructor(message, name);
-  }
-  if (ErrorConstructor === Error) {
-    const error = new Error(message);
-    if (name && name !== 'VError') {
-      error.name = name;
-    }
-    return error;
+const number = value => {
+  const type = getType(value);
+  if (type !== Number$1) {
+    throw new AssertionError('expected value to be of type number');
   }
-  return new ErrorConstructor(message);
 };
-const joinLines = lines => {
-  return lines.join(NewLine);
+
+const isMessagePort = value => {
+  return value && value instanceof MessagePort;
 };
-const splitLines = lines => {
-  return lines.split(NewLine);
+const isMessagePortMain = value => {
+  return value && value.constructor && value.constructor.name === 'MessagePortMain';
 };
-const getCurrentStack = () => {
-  const stackLinesToSkip = 3;
-  const currentStack = joinLines(splitLines(new Error().stack || '').slice(stackLinesToSkip));
-  return currentStack;
+const isOffscreenCanvas = value => {
+  return typeof OffscreenCanvas !== 'undefined' && value instanceof OffscreenCanvas;
 };
-const getNewLineIndex = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine, startIndex);
+const isInstanceOf = (value, constructorName) => {
+  return value?.constructor?.name === constructorName;
 };
-const getParentStack = error => {
-  let parentStack = error.stack || error.data || error.message || '';
-  if (parentStack.startsWith('    at')) {
-    parentStack = error.message + NewLine + parentStack;
-  }
-  return parentStack;
+const isSocket = value => {
+  return isInstanceOf(value, 'Socket');
 };
-const MethodNotFound = -32601;
-const Custom = -32001;
-const restoreJsonRpcError = error => {
-  const currentStack = getCurrentStack();
-  if (error && error instanceof Error) {
-    if (typeof error.stack === 'string') {
-      error.stack = error.stack + NewLine + currentStack;
+const transferrables = [isMessagePort, isMessagePortMain, isOffscreenCanvas, isSocket];
+const isTransferrable = value => {
+  for (const fn of transferrables) {
+    if (fn(value)) {
+      return true;
     }
-    return error;
   }
-  if (error && error.code && error.code === MethodNotFound) {
-    const restoredError = new JsonRpcError(error.message);
-    const parentStack = getParentStack(error);
-    restoredError.stack = parentStack + NewLine + currentStack;
-    return restoredError;
+  return false;
+};
+const walkValue = (value, transferrables, isTransferrable) => {
+  if (!value) {
+    return;
   }
-  if (error && error.message) {
-    const restoredError = constructError(error.message, error.type, error.name);
-    if (error.data) {
-      if (error.data.stack && error.data.type && error.message) {
-        restoredError.stack = error.data.type + ': ' + error.message + NewLine + error.data.stack + NewLine + currentStack;
-      } else if (error.data.stack) {
-        restoredError.stack = error.data.stack;
-      }
-      if (error.data.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.data.codeFrame;
-      }
-      if (error.data.code) {
-        // @ts-ignore
-        restoredError.code = error.data.code;
-      }
-      if (error.data.type) {
-        // @ts-ignore
-        restoredError.name = error.data.type;
-      }
-    } else {
-      if (error.stack) {
-        const lowerStack = restoredError.stack || '';
-        // @ts-ignore
-        const indexNewLine = getNewLineIndex(lowerStack);
-        const parentStack = getParentStack(error);
-        // @ts-ignore
-        restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
-      }
-      if (error.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.codeFrame;
-      }
+  if (isTransferrable(value)) {
+    transferrables.push(value);
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      walkValue(item, transferrables, isTransferrable);
     }
-    return restoredError;
+    return;
   }
-  if (typeof error === 'string') {
-    return new Error(`JsonRpc Error: ${error}`);
+  if (typeof value === 'object') {
+    for (const property of Object.values(value)) {
+      walkValue(property, transferrables, isTransferrable);
+    }
+    return;
   }
-  return new Error(`JsonRpc Error: ${error}`);
 };
-const unwrapJsonRpcResult = responseMessage => {
-  if ('error' in responseMessage) {
-    const restoredError = restoreJsonRpcError(responseMessage.error);
-    throw restoredError;
-  }
-  if ('result' in responseMessage) {
-    return responseMessage.result;
-  }
-  throw new JsonRpcError('unexpected response message');
+const getTransferrables = value => {
+  const transferrables = [];
+  walkValue(value, transferrables, isTransferrable);
+  return transferrables;
 };
-const warn = (...args) => {
-  console.warn(...args);
+const attachEvents = that => {
+  const handleMessage = (...args) => {
+    const data = that.getData(...args);
+    that.dispatchEvent(new MessageEvent('message', {
+      data
+    }));
+  };
+  that.onMessage(handleMessage);
+  const handleClose = event => {
+    that.dispatchEvent(new Event('close'));
+  };
+  that.onClose(handleClose);
 };
-const resolve = (id, response) => {
-  const fn = get$2(id);
-  if (!fn) {
-    console.log(response);
-    warn(`callback ${id} may already be disposed`);
-    return;
+class Ipc extends EventTarget {
+  constructor(rawIpc) {
+    super();
+    this._rawIpc = rawIpc;
+    attachEvents(this);
   }
-  fn(response);
-  remove$1(id);
+}
+const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE';
+const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON';
+const ERR_MODULE_NOT_FOUND = 'ERR_MODULE_NOT_FOUND';
+const NewLine$1 = '\n';
+const joinLines$1 = lines => {
+  return lines.join(NewLine$1);
 };
-const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
-const getErrorType = prettyError => {
-  if (prettyError && prettyError.type) {
-    return prettyError.type;
+const RE_AT = /^\s+at/;
+const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
+const isNormalStackLine = line => {
+  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line);
+};
+const getDetails = lines => {
+  const index = lines.findIndex(isNormalStackLine);
+  if (index === -1) {
+    return {
+      actualMessage: joinLines$1(lines),
+      rest: []
+    };
   }
-  if (prettyError && prettyError.constructor && prettyError.constructor.name) {
-    return prettyError.constructor.name;
+  let lastIndex = index - 1;
+  while (++lastIndex < lines.length) {
+    if (!isNormalStackLine(lines[lastIndex])) {
+      break;
+    }
   }
-  return undefined;
+  return {
+    actualMessage: lines[index - 1],
+    rest: lines.slice(index, lastIndex)
+  };
 };
-const isAlreadyStack = line => {
-  return line.trim().startsWith('at ');
+const splitLines$1 = lines => {
+  return lines.split(NewLine$1);
 };
-const getStack = prettyError => {
-  const stackString = prettyError.stack || '';
-  const newLineIndex = stackString.indexOf('\n');
-  if (newLineIndex !== -1 && !isAlreadyStack(stackString.slice(0, newLineIndex))) {
-    return stackString.slice(newLineIndex + 1);
-  }
-  return stackString;
+const RE_MESSAGE_CODE_BLOCK_START = /^Error: The module '.*'$/;
+const RE_MESSAGE_CODE_BLOCK_END = /^\s* at/;
+const isMessageCodeBlockStartIndex = line => {
+  return RE_MESSAGE_CODE_BLOCK_START.test(line);
 };
-const getErrorProperty = (error, prettyError) => {
-  if (error && error.code === E_COMMAND_NOT_FOUND) {
-    return {
-      code: MethodNotFound,
-      data: error.stack,
-      message: error.message
-    };
-  }
+const isMessageCodeBlockEndIndex = line => {
+  return RE_MESSAGE_CODE_BLOCK_END.test(line);
+};
+const getMessageCodeBlock = stderr => {
+  const lines = splitLines$1(stderr);
+  const startIndex = lines.findIndex(isMessageCodeBlockStartIndex);
+  const endIndex = startIndex + lines.slice(startIndex).findIndex(isMessageCodeBlockEndIndex, startIndex);
+  const relevantLines = lines.slice(startIndex, endIndex);
+  const relevantMessage = relevantLines.join(' ').slice('Error: '.length);
+  return relevantMessage;
+};
+const isModuleNotFoundMessage = line => {
+  return line.includes('[ERR_MODULE_NOT_FOUND]');
+};
+const getModuleNotFoundError = stderr => {
+  const lines = splitLines$1(stderr);
+  const messageIndex = lines.findIndex(isModuleNotFoundMessage);
+  const message = lines[messageIndex];
   return {
-    code: Custom,
-    data: {
-      code: prettyError.code,
-      codeFrame: prettyError.codeFrame,
-      name: prettyError.name,
-      stack: getStack(prettyError),
-      type: getErrorType(prettyError)
-    },
-    message: prettyError.message
+    code: ERR_MODULE_NOT_FOUND,
+    message
   };
 };
-const create$1$1 = (id, error) => {
-  return {
-    error,
-    id,
-    jsonrpc: Two$1
-  };
+const isModuleNotFoundError = stderr => {
+  if (!stderr) {
+    return false;
+  }
+  return stderr.includes('ERR_MODULE_NOT_FOUND');
+};
+const isModulesSyntaxError = stderr => {
+  if (!stderr) {
+    return false;
+  }
+  return stderr.includes('SyntaxError: Cannot use import statement outside a module');
 };
-const getErrorResponse = (id, error, preparePrettyError, logError) => {
-  const prettyError = preparePrettyError(error);
-  logError(error, prettyError);
-  const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$1(id, errorProperty);
+const RE_NATIVE_MODULE_ERROR = /^innerError Error: Cannot find module '.*.node'/;
+const RE_NATIVE_MODULE_ERROR_2 = /was compiled against a different Node.js version/;
+const isUnhelpfulNativeModuleError = stderr => {
+  return RE_NATIVE_MODULE_ERROR.test(stderr) && RE_NATIVE_MODULE_ERROR_2.test(stderr);
 };
-const create$a = (message, result) => {
+const getNativeModuleErrorMessage = stderr => {
+  const message = getMessageCodeBlock(stderr);
   return {
-    id: message.id,
-    jsonrpc: Two$1,
-    result: result ?? null
+    code: E_INCOMPATIBLE_NATIVE_MODULE,
+    message: `Incompatible native node module: ${message}`
   };
 };
-const getSuccessResponse = (message, result) => {
-  const resultProperty = result ?? null;
-  return create$a(message, resultProperty);
+const getModuleSyntaxError = () => {
+  return {
+    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON,
+    message: `ES Modules are not supported in electron`
+  };
 };
-const getErrorResponseSimple = (id, error) => {
+const getHelpfulChildProcessError = (stdout, stderr) => {
+  if (isUnhelpfulNativeModuleError(stderr)) {
+    return getNativeModuleErrorMessage(stderr);
+  }
+  if (isModulesSyntaxError(stderr)) {
+    return getModuleSyntaxError();
+  }
+  if (isModuleNotFoundError(stderr)) {
+    return getModuleNotFoundError(stderr);
+  }
+  const lines = splitLines$1(stderr);
+  const {
+    actualMessage,
+    rest
+  } = getDetails(lines);
   return {
-    error: {
-      code: Custom,
-      data: error,
-      // @ts-ignore
-      message: error.message
-    },
-    id,
-    jsonrpc: Two$1
+    code: '',
+    message: actualMessage,
+    stack: rest
   };
 };
-const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
-  try {
-    const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
-    return getSuccessResponse(message, result);
-  } catch (error) {
-    if (ipc.canUseSimpleErrorResponse) {
-      return getErrorResponseSimple(message.id, error);
+class IpcError extends VError {
+  // @ts-ignore
+  constructor(betterMessage, stdout = '', stderr = '') {
+    if (stdout || stderr) {
+      // @ts-ignore
+      const {
+        code,
+        message,
+        stack
+      } = getHelpfulChildProcessError(stdout, stderr);
+      const cause = new Error(message);
+      // @ts-ignore
+      cause.code = code;
+      cause.stack = stack;
+      super(cause, betterMessage);
+    } else {
+      super(betterMessage);
     }
-    return getErrorResponse(message.id, error, preparePrettyError, logError);
+    // @ts-ignore
+    this.name = 'IpcError';
+    // @ts-ignore
+    this.stdout = stdout;
+    // @ts-ignore
+    this.stderr = stderr;
   }
+}
+const readyMessage = 'ready';
+const getData$2 = event => {
+  return event.data;
 };
-const defaultPreparePrettyError = error => {
-  return error;
-};
-const defaultLogError = () => {
-  // ignore
+const listen$7 = () => {
+  // @ts-ignore
+  if (typeof WorkerGlobalScope === 'undefined') {
+    throw new TypeError('module is not in web worker scope');
+  }
+  return globalThis;
 };
-const defaultRequiresSocket = () => {
-  return false;
+const signal$8 = global => {
+  global.postMessage(readyMessage);
 };
-const defaultResolve = resolve;
-
-// TODO maybe remove this in v6 or v7, only accept options object to simplify the code
-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,
-      preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
-      requiresSocket: options.requiresSocket || defaultRequiresSocket,
-      resolve: options.resolve || defaultResolve
-    };
+class IpcChildWithModuleWorker extends Ipc {
+  getData(event) {
+    return getData$2(event);
   }
-  return {
-    execute: args[2],
-    ipc: args[0],
-    logError: args[5],
-    message: args[1],
-    preparePrettyError: args[4],
-    requiresSocket: args[6],
-    resolve: args[3]
-  };
+  send(message) {
+    // @ts-ignore
+    this._rawIpc.postMessage(message);
+  }
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    // @ts-ignore
+    this._rawIpc.postMessage(message, transfer);
+  }
+  dispose() {
+    // ignore
+  }
+  onClose(callback) {
+    // ignore
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
+}
+const wrap$f = global => {
+  return new IpcChildWithModuleWorker(global);
 };
-const handleJsonRpcMessage = async (...args) => {
-  const options = normalizeParams(args);
+const waitForFirstMessage = async port => {
   const {
-    execute,
-    ipc,
-    logError,
-    message,
-    preparePrettyError,
-    requiresSocket,
+    promise,
     resolve
-  } = options;
-  if ('id' in message) {
-    if ('method' in message) {
-      const response = await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
-      try {
-        ipc.send(response);
-      } catch (error) {
-        const errorResponse = getErrorResponse(message.id, error, preparePrettyError, logError);
-        ipc.send(errorResponse);
-      }
-      return;
-    }
-    resolve(message.id, message);
-    return;
+  } = Promise.withResolvers();
+  port.addEventListener('message', resolve, {
+    once: true
+  });
+  const event = await promise;
+  // @ts-ignore
+  return event.data;
+};
+const listen$6 = async () => {
+  const parentIpcRaw = listen$7();
+  signal$8(parentIpcRaw);
+  const parentIpc = wrap$f(parentIpcRaw);
+  const firstMessage = await waitForFirstMessage(parentIpc);
+  if (firstMessage.method !== 'initialize') {
+    throw new IpcError('unexpected first message');
   }
-  if ('method' in message) {
-    await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
-    return;
+  const type = firstMessage.params[0];
+  if (type === 'message-port') {
+    parentIpc.send({
+      id: firstMessage.id,
+      jsonrpc: '2.0',
+      result: null
+    });
+    parentIpc.dispose();
+    const port = firstMessage.params[1];
+    return port;
   }
-  throw new JsonRpcError('unexpected message');
-};
-
-const Two = '2.0';
-
-const create$9 = (method, params) => {
-  return {
-    jsonrpc: Two,
-    method,
-    params
-  };
+  return globalThis;
 };
-
-const create$8 = (id, method, params) => {
-  const message = {
-    id,
-    jsonrpc: Two,
-    method,
-    params
-  };
-  return message;
+class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
+  getData(event) {
+    return getData$2(event);
+  }
+  send(message) {
+    this._rawIpc.postMessage(message);
+  }
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    this._rawIpc.postMessage(message, transfer);
+  }
+  dispose() {
+    if (this._rawIpc.close) {
+      this._rawIpc.close();
+    }
+  }
+  onClose(callback) {
+    // ignore
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+    this._rawIpc.start();
+  }
+}
+const wrap$e = port => {
+  return new IpcChildWithModuleWorkerAndMessagePort(port);
 };
-
-let id = 0;
-const create$7 = () => {
-  return ++id;
+const IpcChildWithModuleWorkerAndMessagePort$1 = {
+  __proto__: null,
+  listen: listen$6,
+  wrap: wrap$e
 };
-
-const registerPromise = map => {
-  const id = create$7();
+const addListener = (emitter, type, callback) => {
+  if ('addEventListener' in emitter) {
+    emitter.addEventListener(type, callback);
+  } else {
+    emitter.on(type, callback);
+  }
+};
+const removeListener = (emitter, type, callback) => {
+  if ('removeEventListener' in emitter) {
+    emitter.removeEventListener(type, callback);
+  } else {
+    emitter.off(type, callback);
+  }
+};
+const getFirstEvent = (eventEmitter, eventMap) => {
   const {
     promise,
     resolve
   } = Promise.withResolvers();
-  map[id] = resolve;
-  return {
-    id,
-    promise
+  const listenerMap = Object.create(null);
+  const cleanup = value => {
+    for (const event of Object.keys(eventMap)) {
+      removeListener(eventEmitter, event, listenerMap[event]);
+    }
+    resolve(value);
   };
+  for (const [event, type] of Object.entries(eventMap)) {
+    const listener = event => {
+      cleanup({
+        event,
+        type
+      });
+    };
+    addListener(eventEmitter, event, listener);
+    listenerMap[event] = listener;
+  }
+  return promise;
 };
-
-const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
+const Message$1 = 3;
+const create$5$1 = async ({
+  isMessagePortOpen,
+  messagePort
+}) => {
+  if (!isMessagePort(messagePort)) {
+    throw new IpcError('port must be of type MessagePort');
+  }
+  if (isMessagePortOpen) {
+    return messagePort;
+  }
+  const eventPromise = getFirstEvent(messagePort, {
+    message: Message$1
+  });
+  messagePort.start();
   const {
-    id,
-    promise
-  } = registerPromise(callbacks);
-  const message = create$8(id, method, params);
-  if (useSendAndTransfer && ipc.sendAndTransfer) {
-    ipc.sendAndTransfer(message);
-  } else {
-    ipc.send(message);
+    event,
+    type
+  } = await eventPromise;
+  if (type !== Message$1) {
+    throw new IpcError('Failed to wait for ipc message');
   }
-  const responseMessage = await promise;
-  return unwrapJsonRpcResult(responseMessage);
-};
-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) {
-      const message = create$9(method, params);
-      ipc.send(message);
-    }
-  };
-  return rpc;
-};
-
-const requiresSocket = () => {
-  return false;
+  if (event.data !== readyMessage) {
+    throw new IpcError('unexpected first message');
+  }
+  return messagePort;
 };
-const preparePrettyError = error => {
-  return error;
+const signal$1 = messagePort => {
+  messagePort.start();
 };
-const logError = () => {
-  // handled by renderer worker
+class IpcParentWithMessagePort extends Ipc {
+  getData = getData$2;
+  send(message) {
+    this._rawIpc.postMessage(message);
+  }
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    this._rawIpc.postMessage(message, transfer);
+  }
+  dispose() {
+    this._rawIpc.close();
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
+  onClose(callback) {}
+}
+const wrap$5 = messagePort => {
+  return new IpcParentWithMessagePort(messagePort);
 };
-const handleMessage = event => {
-  const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
-  const actualExecute = event?.target?.execute || execute;
-  return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError, actualRequiresSocket);
+const IpcParentWithMessagePort$1 = {
+  __proto__: null,
+  create: create$5$1,
+  signal: signal$1,
+  wrap: wrap$5
 };
 
-const handleIpc = ipc => {
-  if ('addEventListener' in ipc) {
-    ipc.addEventListener('message', handleMessage);
-  } else if ('on' in ipc) {
-    // deprecated
-    ipc.on('message', handleMessage);
+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 listen$1 = async (module, options) => {
-  const rawIpc = await module.listen(options);
-  if (module.signal) {
-    module.signal(rawIpc);
+const getCommand = key => {
+  return commands[key];
+};
+const execute = (command, ...args) => {
+  const fn = getCommand(command);
+  if (!fn) {
+    throw new CommandNotFoundError(command);
   }
-  const ipc = module.wrap(rawIpc);
-  return ipc;
+  return fn(...args);
 };
 
-const create$6 = async ({
-  commandMap,
-  isMessagePortOpen = true,
-  messagePort
-}) => {
-  // TODO create a commandMap per rpc instance
-  register(commandMap);
-  const rawIpc = await IpcParentWithMessagePort$1.create({
-    isMessagePortOpen,
-    messagePort
-  });
-  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
-  handleIpc(ipc);
-  const rpc = createRpc(ipc);
-  messagePort.start();
-  return rpc;
+const Two$1 = '2.0';
+const callbacks = Object.create(null);
+const get$1 = id => {
+  return callbacks[id];
 };
-
-const create$5 = async ({
-  commandMap,
-  isMessagePortOpen,
-  send
-}) => {
-  const {
-    port1,
-    port2
-  } = new MessageChannel();
-  await send(port1);
-  return create$6({
-    commandMap,
-    isMessagePortOpen,
-    messagePort: port2
-  });
+const remove$1 = id => {
+  delete callbacks[id];
 };
-
-const createSharedLazyRpc = factory => {
-  let rpcPromise;
-  const getOrCreate = () => {
-    if (!rpcPromise) {
-      rpcPromise = factory();
-    }
-    return rpcPromise;
-  };
-  return {
-    async dispose() {
-      const rpc = await getOrCreate();
-      await rpc.dispose();
-    },
-    async invoke(method, ...params) {
-      const rpc = await getOrCreate();
-      return rpc.invoke(method, ...params);
-    },
-    async invokeAndTransfer(method, ...params) {
-      const rpc = await getOrCreate();
-      return rpc.invokeAndTransfer(method, ...params);
-    },
-    async send(method, ...params) {
-      const rpc = await getOrCreate();
-      rpc.send(method, ...params);
+class JsonRpcError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'JsonRpcError';
+  }
+}
+const NewLine = '\n';
+const DomException = 'DOMException';
+const ReferenceError$1 = 'ReferenceError';
+const SyntaxError$1 = 'SyntaxError';
+const TypeError$1 = 'TypeError';
+const getErrorConstructor = (message, type) => {
+  if (type) {
+    switch (type) {
+      case DomException:
+        return DOMException;
+      case ReferenceError$1:
+        return ReferenceError;
+      case SyntaxError$1:
+        return SyntaxError;
+      case TypeError$1:
+        return TypeError;
+      default:
+        return Error;
     }
-  };
+  }
+  if (message.startsWith('TypeError: ')) {
+    return TypeError;
+  }
+  if (message.startsWith('SyntaxError: ')) {
+    return SyntaxError;
+  }
+  if (message.startsWith('ReferenceError: ')) {
+    return ReferenceError;
+  }
+  return Error;
 };
-
-const create$4 = async ({
-  commandMap,
-  isMessagePortOpen,
-  send
-}) => {
-  return createSharedLazyRpc(() => {
-    return create$5({
-      commandMap,
-      isMessagePortOpen,
-      send
-    });
-  });
+const constructError = (message, type, name) => {
+  const ErrorConstructor = getErrorConstructor(message, type);
+  if (ErrorConstructor === DOMException && name) {
+    return new ErrorConstructor(message, name);
+  }
+  if (ErrorConstructor === Error) {
+    const error = new Error(message);
+    if (name && name !== 'VError') {
+      error.name = name;
+    }
+    return error;
+  }
+  return new ErrorConstructor(message);
 };
-
-const create$3 = async ({
-  commandMap
-}) => {
-  // TODO create a commandMap per rpc instance
-  register(commandMap);
-  const ipc = await listen$1(IpcChildWithModuleWorkerAndMessagePort$1);
-  handleIpc(ipc);
-  const rpc = createRpc(ipc);
-  return rpc;
+const joinLines = lines => {
+  return lines.join(NewLine);
 };
-
-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 splitLines = lines => {
+  return lines.split(NewLine);
 };
-
-const rpcs = Object.create(null);
-const set$3 = (id, rpc) => {
-  rpcs[id] = rpc;
+const getCurrentStack = () => {
+  const stackLinesToSkip = 3;
+  const currentStack = joinLines(splitLines(new Error().stack || '').slice(stackLinesToSkip));
+  return currentStack;
 };
-const get$1 = id => {
-  return rpcs[id];
+const getNewLineIndex = (string, startIndex = undefined) => {
+  return string.indexOf(NewLine, startIndex);
 };
-const remove = id => {
-  delete rpcs[id];
+const getParentStack = error => {
+  let parentStack = error.stack || error.data || error.message || '';
+  if (parentStack.startsWith('    at')) {
+    parentStack = error.message + NewLine + parentStack;
+  }
+  return parentStack;
 };
-
-/* eslint-disable  @typescript-eslint/explicit-function-return-type */
-const create$2 = rpcId => {
-  return {
-    async dispose() {
-      const rpc = get$1(rpcId);
-      await rpc.dispose();
-    },
-    // @ts-ignore
-    invoke(method, ...params) {
-      const rpc = get$1(rpcId);
-      // @ts-ignore
-      return rpc.invoke(method, ...params);
-    },
-    // @ts-ignore
-    invokeAndTransfer(method, ...params) {
-      const rpc = get$1(rpcId);
-      // @ts-ignore
-      return rpc.invokeAndTransfer(method, ...params);
-    },
-    registerMockRpc(commandMap) {
-      const mockRpc = createMockRpc({
-        commandMap
-      });
-      set$3(rpcId, mockRpc);
-      // @ts-ignore
-      mockRpc[Symbol.dispose] = () => {
-        remove(rpcId);
-      };
-      // @ts-ignore
-      return mockRpc;
-    },
-    set(rpc) {
-      set$3(rpcId, rpc);
+const MethodNotFound = -32601;
+const Custom = -32001;
+const restoreJsonRpcError = error => {
+  const currentStack = getCurrentStack();
+  if (error && error instanceof Error) {
+    if (typeof error.stack === 'string') {
+      error.stack = error.stack + NewLine + currentStack;
     }
-  };
+    return error;
+  }
+  if (error && error.code && error.code === MethodNotFound) {
+    const restoredError = new JsonRpcError(error.message);
+    const parentStack = getParentStack(error);
+    restoredError.stack = parentStack + NewLine + currentStack;
+    return restoredError;
+  }
+  if (error && error.message) {
+    const restoredError = constructError(error.message, error.type, error.name);
+    if (error.data) {
+      if (error.data.stack && error.data.type && error.message) {
+        restoredError.stack = error.data.type + ': ' + error.message + NewLine + error.data.stack + NewLine + currentStack;
+      } else if (error.data.stack) {
+        restoredError.stack = error.data.stack;
+      }
+      if (error.data.codeFrame) {
+        // @ts-ignore
+        restoredError.codeFrame = error.data.codeFrame;
+      }
+      if (error.data.code) {
+        // @ts-ignore
+        restoredError.code = error.data.code;
+      }
+      if (error.data.type) {
+        // @ts-ignore
+        restoredError.name = error.data.type;
+      }
+    } else {
+      if (error.stack) {
+        const lowerStack = restoredError.stack || '';
+        // @ts-ignore
+        const indexNewLine = getNewLineIndex(lowerStack);
+        const parentStack = getParentStack(error);
+        // @ts-ignore
+        restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
+      }
+      if (error.codeFrame) {
+        // @ts-ignore
+        restoredError.codeFrame = error.codeFrame;
+      }
+    }
+    return restoredError;
+  }
+  if (typeof error === 'string') {
+    return new Error(`JsonRpc Error: ${error}`);
+  }
+  return new Error(`JsonRpc Error: ${error}`);
 };
-
-const {
-  set: set$2
-} = create$2(6010);
-
-const Button$2 = 'button';
-const None$1 = 'none';
-const Tab$1 = 'tab';
-const ToolBar = 'toolbar';
-
-const Div = 4;
-const Text = 12;
-const Reference = 100;
-
-const Button$1 = 'event.button';
-const ClientX = 'event.clientX';
-const ClientY = 'event.clientY';
-
-const Enter = 3;
-const Space = 9;
-const PageUp = 10;
-const PageDown = 11;
-const End = 255;
-const Home = 12;
-const UpArrow = 14;
-const DownArrow = 16;
-
-const ActivityBar$3 = 1;
-const Settings$1 = 12;
-const ActivityBarAdditionalViews = 17;
-
-const Separator = 1;
-const None = 0;
-const Checked = 2;
-const Unchecked = 3;
-
-const LeftClick = 0;
-
-const Web = 1;
-
-const RendererWorker = 1;
-
-const Left = 1;
-const Right = 2;
-
-const SetCss = 'Viewlet.setCss';
-const SetDom2 = 'Viewlet.setDom2';
-const SetFocusContext = 'Viewlet.setFocusContext';
-const SetPatches = 'Viewlet.setPatches';
-
-const FocusActivityBar = 5;
-const FocusExplorer = 13;
-
-const {
-  invoke,
-  invokeAndTransfer,
-  set: set$1
-} = create$2(RendererWorker);
-const showContextMenu2 = async (uid, menuId, x, y, args) => {
-  number(uid);
-  number(menuId);
-  number(x);
-  number(y);
-  await invoke('ContextMenu.show2', uid, menuId, x, y, args);
+const unwrapJsonRpcResult = responseMessage => {
+  if ('error' in responseMessage) {
+    const restoredError = restoreJsonRpcError(responseMessage.error);
+    throw restoredError;
+  }
+  if ('result' in responseMessage) {
+    return responseMessage.result;
+  }
+  throw new JsonRpcError('unexpected response message');
+};
+const warn = (...args) => {
+  console.warn(...args);
 };
-const sendMessagePortToAuthWorker = async (port, rpcId) => {
-  const command = 'HandleMessagePort.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToAuthWorker', port, command, rpcId);
+const resolve = (id, response) => {
+  const fn = get$1(id);
+  if (!fn) {
+    console.log(response);
+    warn(`callback ${id} may already be disposed`);
+    return;
+  }
+  fn(response);
+  remove$1(id);
 };
-
-const toCommandId = key => {
-  const dotIndex = key.indexOf('.');
-  return key.slice(dotIndex + 1);
+const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
+const getErrorType = prettyError => {
+  if (prettyError && prettyError.type) {
+    return prettyError.type;
+  }
+  if (prettyError && prettyError.constructor && prettyError.constructor.name) {
+    return prettyError.constructor.name;
+  }
+  return undefined;
 };
-const create$1 = () => {
-  const states = Object.create(null);
-  const commandMapRef = {};
+const isAlreadyStack = line => {
+  return line.trim().startsWith('at ');
+};
+const getStack = prettyError => {
+  const stackString = prettyError.stack || '';
+  const newLineIndex = stackString.indexOf('\n');
+  if (newLineIndex !== -1 && !isAlreadyStack(stackString.slice(0, newLineIndex))) {
+    return stackString.slice(newLineIndex + 1);
+  }
+  return stackString;
+};
+const getErrorProperty = (error, prettyError) => {
+  if (error && error.code === E_COMMAND_NOT_FOUND) {
+    return {
+      code: MethodNotFound,
+      data: error.stack,
+      message: error.message
+    };
+  }
   return {
-    clear() {
-      for (const key of Object.keys(states)) {
-        delete states[key];
-      }
-    },
-    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.parseFloat(key);
-      });
-    },
-    registerCommands(commandMap) {
-      Object.assign(commandMapRef, commandMap);
-    },
-    set(uid, oldState, newState) {
-      states[uid] = {
-        newState,
-        oldState
-      };
-    },
-    wrapCommand(fn) {
-      const wrapped = async (uid, ...args) => {
-        const {
-          newState,
-          oldState
-        } = states[uid];
-        const newerState = await fn(newState, ...args);
-        if (oldState === newerState || newState === newerState) {
-          return;
-        }
-        const latestOld = states[uid];
-        const latestNew = {
-          ...latestOld.newState,
-          ...newerState
-        };
-        states[uid] = {
-          newState: latestNew,
-          oldState: latestOld.oldState
-        };
-      };
-      return wrapped;
-    },
-    wrapGetter(fn) {
-      const wrapped = (uid, ...args) => {
-        const {
-          newState
-        } = states[uid];
-        return fn(newState, ...args);
-      };
-      return wrapped;
+    code: Custom,
+    data: {
+      code: prettyError.code,
+      codeFrame: prettyError.codeFrame,
+      name: prettyError.name,
+      stack: getStack(prettyError),
+      type: getErrorType(prettyError)
     },
-    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
-          };
-        }
-        const latestOld = states[uid];
-        const latestNew = {
-          ...latestOld.newState,
-          ...state
-        };
-        states[uid] = {
-          newState: latestNew,
-          oldState: latestOld.oldState
-        };
-        return {
-          error
-        };
-      };
-      return wrapped;
-    }
+    message: prettyError.message
   };
 };
-const terminate = () => {
-  globalThis.close();
-};
-
-const {
-  diff,
-  get,
-  getCommandIds,
-  registerCommands,
-  set,
-  wrapCommand,
-  wrapGetter
-} = create$1();
-
-// TODO parentUid might ot be needed
-const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) => {
-  const state = {
-    accountEnabled: true,
-    activityBarItems: [],
-    currentViewletId: '',
-    filteredItems: [],
-    focus: 0,
-    focused: false,
-    focusedIndex: -1,
-    height,
-    initial: true,
-    itemHeight: 48,
-    numberOfVisibleItems: 0,
-    platform,
-    scrollBarHeight: 0,
-    selectedIndex: -1,
-    sideBarLocation: 0,
-    sideBarVisible: false,
-    uid: id,
-    updateProgress: 0,
-    updateState: '',
-    userLoginState: 'logged out',
-    width,
-    x,
-    y
+const create$1$1 = (id, error) => {
+  return {
+    error,
+    id,
+    jsonrpc: Two$1
   };
-  set(id, state, state);
-  return state;
-};
-
-const isEqual$2 = (oldState, newState) => {
-  return oldState.itemHeight === newState.itemHeight;
 };
-
-const isEqual$1 = (oldState, newState) => {
-  return oldState.focused === newState.focused && oldState.focus === newState.focus;
+const getErrorResponse = (id, error, preparePrettyError, logError) => {
+  const prettyError = preparePrettyError(error);
+  logError(error, prettyError);
+  const errorProperty = getErrorProperty(error, prettyError);
+  return create$1$1(id, errorProperty);
 };
-
-const isEqual = (oldState, newState) => {
-  return oldState.activityBarItems === newState.activityBarItems && oldState.filteredItems === newState.filteredItems && oldState.focusedIndex === newState.focusedIndex && oldState.sideBarLocation === newState.sideBarLocation && oldState.sideBarVisible === newState.sideBarVisible && oldState.updateProgress === newState.updateProgress && oldState.updateState === newState.updateState;
+const create$8 = (message, result) => {
+  return {
+    id: message.id,
+    jsonrpc: Two$1,
+    result: result ?? null
+  };
 };
-
-const RenderItems = 4;
-const RenderFocus = 6;
-const RenderFocusContext = 7;
-const RenderCss = 11;
-const RenderIncremental = 12;
-
-const modules = [isEqual, isEqual$1, isEqual$1, isEqual$2];
-const numbers = [RenderIncremental, RenderFocus, RenderFocusContext, RenderCss];
-
-const diff2 = uid => {
-  return diff(uid, modules, numbers);
+const getSuccessResponse = (message, result) => {
+  const resultProperty = result ?? null;
+  return create$8(message, resultProperty);
 };
-
-const List = 1;
-
-const focus = state => {
-  const {
-    focus
-  } = state;
-  if (focus) {
-    return state;
-  }
+const getErrorResponseSimple = (id, error) => {
   return {
-    ...state,
-    focus: List
+    error: {
+      code: Custom,
+      data: error,
+      // @ts-ignore
+      message: error.message
+    },
+    id,
+    jsonrpc: Two$1
   };
 };
-
-const focusIndex = (state, index) => {
-  return {
-    ...state,
-    focused: true,
-    focusedIndex: index
-  };
+const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
+  try {
+    const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
+    return getSuccessResponse(message, result);
+  } catch (error) {
+    if (ipc.canUseSimpleErrorResponse) {
+      return getErrorResponseSimple(message.id, error);
+    }
+    return getErrorResponse(message.id, error, preparePrettyError, logError);
+  }
 };
-
-const focusFirst = state => {
-  return focusIndex(state, -1);
+const defaultPreparePrettyError = error => {
+  return error;
 };
-
-const focusLast = state => {
-  return focusIndex(state, -1);
+const defaultLogError = () => {
+  // ignore
 };
-
-const focusNext = state => {
-  return focusIndex(state, -1);
+const defaultRequiresSocket = () => {
+  return false;
 };
+const defaultResolve = resolve;
 
-const focusNone = state => {
-  const {
-    focusedIndex
-  } = state;
-  if (focusedIndex === -1) {
-    return state;
+// TODO maybe remove this in v6 or v7, only accept options object to simplify the code
+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,
+      preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
+      requiresSocket: options.requiresSocket || defaultRequiresSocket,
+      resolve: options.resolve || defaultResolve
+    };
   }
-  return focusIndex(state, -1);
-};
-
-const getKeyBindings = () => {
-  return [{
-    command: 'ActivityBar.focusNext',
-    key: DownArrow,
-    when: FocusActivityBar
-  }, {
-    command: 'ActivityBar.focusPrevious',
-    key: UpArrow,
-    when: FocusActivityBar
-  }, {
-    command: 'ActivityBar.focusFirst',
-    key: Home,
-    when: FocusActivityBar
-  }, {
-    command: 'ActivityBar.focusFirst',
-    key: PageUp,
-    when: FocusActivityBar
-  }, {
-    command: 'ActivityBar.focusLast',
-    key: PageDown,
-    when: FocusActivityBar
-  }, {
-    command: 'ActivityBar.focusLast',
-    key: End,
-    when: FocusActivityBar
-  }, {
-    command: 'ActivityBar.selectCurrent',
-    key: Space,
-    when: FocusActivityBar
-  }, {
-    command: 'ActivityBar.selectCurrent',
-    key: Enter,
-    when: FocusActivityBar
-  }];
-};
-
-const getMenuEntriesAccountLoggedIn = state => {
-  const {
-    userLoginState
-  } = state;
-  const signOutLabel = userLoginState === 'logging out' ? 'Signing Out...' : 'Sign Out';
-  return [{
-    command: 'ActivityBar.handleClickSignOut',
-    flags: None,
-    id: 'signOut',
-    label: signOutLabel
-  }];
-};
-const getMenuEntriesAccountLoggedOut = state => {
-  const {
-    userLoginState
-  } = state;
-  const signInLabel = userLoginState === 'logging in' ? 'Signing In...' : 'Sign In';
-  return [{
-    command: 'ActivityBar.handleClickSignIn',
-    flags: None,
-    id: 'signIn',
-    label: signInLabel
-  }];
+  return {
+    execute: args[2],
+    ipc: args[0],
+    logError: args[5],
+    message: args[1],
+    preparePrettyError: args[4],
+    requiresSocket: args[6],
+    resolve: args[3]
+  };
 };
-const getMenuEntriesAccount = state => {
-  // TODO maybe query it now from layout?
+const handleJsonRpcMessage = async (...args) => {
+  const options = normalizeParams(args);
   const {
-    userLoginState
-  } = state;
-  if (userLoginState === 'logged in' || userLoginState === 'logging out') {
-    return getMenuEntriesAccountLoggedIn(state);
+    execute,
+    ipc,
+    logError,
+    message,
+    preparePrettyError,
+    requiresSocket,
+    resolve
+  } = options;
+  if ('id' in message) {
+    if ('method' in message) {
+      const response = await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
+      try {
+        ipc.send(response);
+      } catch (error) {
+        const errorResponse = getErrorResponse(message.id, error, preparePrettyError, logError);
+        ipc.send(errorResponse);
+      }
+      return;
+    }
+    resolve(message.id, message);
+    return;
   }
-  return getMenuEntriesAccountLoggedOut(state);
+  if ('method' in message) {
+    await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
+    return;
+  }
+  throw new JsonRpcError('unexpected message');
 };
 
-const Tab = 1;
-const Button = 1 << 1;
-const Progress = 1 << 2;
-const Enabled = 1 << 3;
-const Selected = 1 << 4;
-const Focused = 1 << 5;
-const MarginTop = 1 << 6;
+const Two = '2.0';
 
-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];
+const create$7 = (method, params) => {
+  return {
+    jsonrpc: Two,
+    method,
+    params
   };
-  return key.replaceAll(RE_PLACEHOLDER, replacer);
 };
 
-const Account$1 = 'Account';
-const Explorer$1 = 'Explorer';
-const Search$2 = 'Search';
-const SourceControl$2 = 'Source Control';
-const RunAndDebug$1 = 'Run and Debug';
-const Extensions$2 = 'Extensions';
-const Settings = 'Settings';
-const AdditionalViews = 'Additional Views';
-const ActivityBar$2 = 'Activity Bar';
-const MoveSideBarLeft = 'Move Side Bar Left';
-const MoveSideBarRight = 'Move Side Bar Right';
-const HideActivityBar = 'Hide Activity Bar';
-const CheckForUpdates = 'Check For Updates';
-const ColorTheme = 'Color Theme';
-const CommandPalette = 'Command Palette';
-const KeyboardShortcuts = 'Keyboard Shortcuts';
-
-const account = () => {
-  return i18nString(Account$1);
-};
-const explorer = () => {
-  return i18nString(Explorer$1);
-};
-const search = () => {
-  return i18nString(Search$2);
-};
-const sourceControl = () => {
-  return i18nString(SourceControl$2);
-};
-const runAndDebug = () => {
-  return i18nString(RunAndDebug$1);
-};
-const extensions = () => {
-  return i18nString(Extensions$2);
-};
-const settings = () => {
-  return i18nString(Settings);
+const create$6 = (id, method, params) => {
+  const message = {
+    id,
+    jsonrpc: Two,
+    method,
+    params
+  };
+  return message;
 };
-const additionalViews = () => {
-  return i18nString(AdditionalViews);
+
+let id = 0;
+const create$5 = () => {
+  return ++id;
 };
-const activityBar = () => {
-  return i18nString(ActivityBar$2);
+
+const registerPromise = map => {
+  const id = create$5();
+  const {
+    promise,
+    resolve
+  } = Promise.withResolvers();
+  map[id] = resolve;
+  return {
+    id,
+    promise
+  };
 };
-const moveSideBarRight = () => {
-  return i18nString(MoveSideBarRight);
+
+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 {
+    ipc.send(message);
+  }
+  const responseMessage = await promise;
+  return unwrapJsonRpcResult(responseMessage);
 };
-const moveSideBarLeft = () => {
-  return i18nString(MoveSideBarLeft);
+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) {
+      const message = create$7(method, params);
+      ipc.send(message);
+    }
+  };
+  return rpc;
 };
-const hideActivityBar = () => {
-  return i18nString(HideActivityBar);
+
+const requiresSocket = () => {
+  return false;
 };
-const checkForUpdates = () => {
-  return i18nString(CheckForUpdates);
+const preparePrettyError = error => {
+  return error;
 };
-const commandPalette = () => {
-  return i18nString(CommandPalette);
+const logError = () => {
+  // handled by renderer worker
 };
-const keyboardShortcuts = () => {
-  return i18nString(KeyboardShortcuts);
+const handleMessage = event => {
+  const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
+  const actualExecute = event?.target?.execute || execute;
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError, actualRequiresSocket);
 };
-const colorTheme = () => {
-  return i18nString(ColorTheme);
+
+const handleIpc = ipc => {
+  if ('addEventListener' in ipc) {
+    ipc.addEventListener('message', handleMessage);
+  } else if ('on' in ipc) {
+    // deprecated
+    ipc.on('message', handleMessage);
+  }
 };
 
-const menuEntryMoveSideBar = sideBarLocation => {
-  switch (sideBarLocation) {
-    case Left:
-      return {
-        command: 'Layout.moveSideBarRight',
-        flags: None,
-        id: 'moveSideBarRight',
-        label: moveSideBarRight()
-      };
-    case Right:
-      return {
-        command: 'Layout.moveSideBarLeft',
-        flags: None,
-        id: 'moveSideBarLeft',
-        label: moveSideBarLeft()
-      };
-    default:
-      throw new Error('unexpected side bar location');
+const listen$1 = async (module, options) => {
+  const rawIpc = await module.listen(options);
+  if (module.signal) {
+    module.signal(rawIpc);
   }
+  const ipc = module.wrap(rawIpc);
+  return ipc;
 };
 
-const menuEntrySeparator = {
-  command: '',
-  flags: Separator,
-  id: 'separator',
-  label: ''
+const create$4 = async ({
+  commandMap,
+  isMessagePortOpen = true,
+  messagePort
+}) => {
+  // TODO create a commandMap per rpc instance
+  register(commandMap);
+  const rawIpc = await IpcParentWithMessagePort$1.create({
+    isMessagePortOpen,
+    messagePort
+  });
+  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
+  handleIpc(ipc);
+  const rpc = createRpc(ipc);
+  messagePort.start();
+  return rpc;
 };
 
-const toContextMenuItem$1 = activityBarItem => {
-  const isEnabled = activityBarItem.flags & Enabled;
+const create$3 = async ({
+  commandMap,
+  isMessagePortOpen,
+  send
+}) => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  await send(port1);
+  return create$4({
+    commandMap,
+    isMessagePortOpen,
+    messagePort: port2
+  });
+};
+
+const createSharedLazyRpc = factory => {
+  let rpcPromise;
+  const getOrCreate = () => {
+    if (!rpcPromise) {
+      rpcPromise = factory();
+    }
+    return rpcPromise;
+  };
   return {
-    args: [activityBarItem.id],
-    command: 'ActivityBar.toggleActivityBarItem',
-    flags: isEnabled ? Checked : Unchecked,
-    id: `toggle-${activityBarItem.id}`,
-    label: activityBarItem.id
+    async dispose() {
+      const rpc = await getOrCreate();
+      await rpc.dispose();
+    },
+    async invoke(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invoke(method, ...params);
+    },
+    async invokeAndTransfer(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    async send(method, ...params) {
+      const rpc = await getOrCreate();
+      rpc.send(method, ...params);
+    }
   };
 };
 
-const getMenuEntriesActivityBar = state => {
-  const {
-    activityBarItems,
-    sideBarLocation
-  } = state;
-  const topItems = activityBarItems.filter(item => !(item.flags & Button));
-  const bottomItems = activityBarItems.filter(item => item.flags & Button);
-  const entries = [...topItems.map(toContextMenuItem$1)];
-  if (bottomItems.length > 0) {
-    entries.push(menuEntrySeparator, ...bottomItems.map(toContextMenuItem$1));
-  }
-  return [...entries, menuEntrySeparator, menuEntryMoveSideBar(sideBarLocation), {
-    command: 'Layout.hideActivityBar',
-    flags: None,
-    id: 'hideActivityBar',
-    label: hideActivityBar()
-  }];
+const create$2 = async ({
+  commandMap,
+  isMessagePortOpen,
+  send
+}) => {
+  return createSharedLazyRpc(() => {
+    return create$3({
+      commandMap,
+      isMessagePortOpen,
+      send
+    });
+  });
 };
 
-const getNumberOfVisibleItems = state => {
-  const {
-    height,
-    itemHeight
-  } = state;
-  const numberOfVisibleItemsTop = Math.floor(height / itemHeight);
-  return numberOfVisibleItemsTop;
+const create$1 = async ({
+  commandMap
+}) => {
+  // TODO create a commandMap per rpc instance
+  register(commandMap);
+  const ipc = await listen$1(IpcChildWithModuleWorkerAndMessagePort$1);
+  handleIpc(ipc);
+  const rpc = createRpc(ipc);
+  return rpc;
 };
-const getHiddenItems = state => {
-  const numberOfVisibleItems = getNumberOfVisibleItems(state);
-  const items = state.activityBarItems;
-  if (numberOfVisibleItems >= items.length) {
-    return [];
-  }
-  return state.activityBarItems.slice(numberOfVisibleItems - 2, -1);
+
+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$3 = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+const get = id => {
+  return rpcs[id];
+};
+const remove = id => {
+  delete rpcs[id];
+};
+
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
+const create = rpcId => {
+  return {
+    async dispose() {
+      const rpc = get(rpcId);
+      await rpc.dispose();
+    },
+    // @ts-ignore
+    invoke(method, ...params) {
+      const rpc = get(rpcId);
+      // @ts-ignore
+      return rpc.invoke(method, ...params);
+    },
+    // @ts-ignore
+    invokeAndTransfer(method, ...params) {
+      const rpc = get(rpcId);
+      // @ts-ignore
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    registerMockRpc(commandMap) {
+      const mockRpc = createMockRpc({
+        commandMap
+      });
+      set$3(rpcId, mockRpc);
+      // @ts-ignore
+      mockRpc[Symbol.dispose] = () => {
+        remove(rpcId);
+      };
+      // @ts-ignore
+      return mockRpc;
+    },
+    set(rpc) {
+      set$3(rpcId, rpc);
+    }
+  };
 };
 
-const toContextMenuItem = activityBarItem => {
-  return {
-    command: '-1',
-    // TODO
-    flags: None,
-    id: '8000',
-    // TODO
-    label: activityBarItem.id
-  };
+const {
+  set: set$2
+} = create(6010);
+
+const {
+  invoke: invoke$1,
+  set: set$1
+} = create(ExtensionManagementWorker);
+
+const {
+  invoke,
+  invokeAndTransfer,
+  set
+} = create(RendererWorker);
+const showContextMenu2 = async (uid, menuId, x, y, args) => {
+  number(uid);
+  number(menuId);
+  number(x);
+  number(y);
+  await invoke('ContextMenu.show2', uid, menuId, x, y, args);
 };
-const getMenuEntriesAdditionalViews = state => {
-  const hiddenActivityBarItems = getHiddenItems(state);
-  return hiddenActivityBarItems.map(toContextMenuItem);
+const sendMessagePortToAuthWorker = async (port, rpcId) => {
+  const command = 'HandleMessagePort.handleMessagePort';
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToAuthWorker', port, command, rpcId);
 };
-
-const keyBindingsUri = 'app://keybindings';
-const getMenuEntriesSettings = state => {
-  const {
-    platform
-  } = state;
-  const items = [{
-    command: 'QuickPick.showEverything',
-    flags: None,
-    id: 'commandPalette',
-    label: commandPalette()
-  }, menuEntrySeparator, {
-    command: 'Preferences.openSettingsJson',
-    flags: None,
-    id: 'settings',
-    label: settings()
-  }, {
-    args: [keyBindingsUri],
-    command: 'Main.openUri',
-    flags: None,
-    id: 'keyboardShortcuts',
-    label: keyboardShortcuts()
-  }, {
-    command: 'QuickPick.showColorTheme',
-    flags: None,
-    id: 'colorTheme',
-    label: colorTheme()
-  }];
-  if (platform !== Web) {
-    items.push(menuEntrySeparator, {
-      command: 'AutoUpdater.checkForUpdates',
-      flags: None,
-      id: 'checkForUpdates',
-      label: checkForUpdates()
-    });
-  }
-  return items;
+const sendMessagePortToExtensionManagementWorker = async (port, rpcId) => {
+  const command = 'Extensions.handleMessagePort';
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionManagementWorker', port, command, rpcId);
 };
 
 const show2 = async (uid, menuId, x, y, args) => {
@@ -1849,12 +1859,13 @@ const SourceControl$1 = 'SourceControl';
 const Ellipsis = 'Ellipsis';
 
 const getFilteredActivityBarItems = (items, height, itemHeight) => {
+  const enabledItems = items.filter(item => item.flags & Enabled);
   const numberOfVisibleItems = getNumberOfVisibleItems({
     height,
     itemHeight
   });
-  if (numberOfVisibleItems >= items.length) {
-    return items;
+  if (numberOfVisibleItems >= enabledItems.length) {
+    return enabledItems;
   }
   const showMoreItem = {
     flags: Button,
@@ -1863,7 +1874,7 @@ const getFilteredActivityBarItems = (items, height, itemHeight) => {
     keyShortcuts: '',
     title: additionalViews()
   };
-  return [...items.slice(0, numberOfVisibleItems - 2), showMoreItem, items.at(-1)];
+  return [...enabledItems.slice(0, numberOfVisibleItems - 2), showMoreItem, enabledItems.at(-1)];
 };
 
 const setFlag = (item, flag, enabled) => {
@@ -2001,42 +2012,14 @@ const handleContextMenu = async (state, button, eventX, eventY) => {
   return state;
 };
 
-const handleFocus = state => {
-  return {
-    ...state,
-    focused: true
-  };
-};
-
-const handleResize = (state, dimensions) => {
-  const {
-    activityBarItems,
-    itemHeight
-  } = state;
-  const {
-    height,
-    width,
-    x,
-    y
-  } = dimensions;
-  const filteredItems = getFilteredActivityBarItems(activityBarItems, height, itemHeight);
-  return {
-    ...state,
-    filteredItems,
-    height,
-    width,
-    x,
-    y
-  };
-};
+const commandMap$1 = {};
 
-const getAccountEnabled = async defaultValue => {
-  try {
-    const value = await invoke('Preferences.get', 'activityBar.accountEnabled');
-    return typeof value === 'boolean' ? value : defaultValue;
-  } catch {
-    return defaultValue;
-  }
+const handleExtensionManagementMessagePort = async port => {
+  const rpc = await create$4({
+    commandMap: commandMap$1,
+    messagePort: port
+  });
+  set$1(rpc);
 };
 
 const Explorer = 'Explorer';
@@ -2045,7 +2028,16 @@ const RunAndDebug = 'Run And Debug';
 const Search = 'Search';
 const SourceControl = 'Source Control';
 
-const getActivityBarItems = state => {
+const toActivityBarItem = view => {
+  return {
+    flags: Tab | Enabled,
+    icon: view.icon || Extensions$1,
+    id: view.id,
+    keyShortcuts: '',
+    title: view.title || view.id
+  };
+};
+const getActivityBarItems = (state, contributedViews = []) => {
   const {
     accountEnabled
   } = state;
@@ -2082,7 +2074,7 @@ const getActivityBarItems = state => {
     id: Extensions,
     keyShortcuts: 'Control+Shift+X',
     title: extensions()
-  }
+  }, ...contributedViews.map(toActivityBarItem)
   // Bottom
   ];
   if (accountEnabled) {
@@ -2104,6 +2096,70 @@ const getActivityBarItems = state => {
   return items;
 };
 
+const getContributedViews = async platform => {
+  try {
+    return await invoke$1('Extensions.getViews', '', platform);
+  } catch {
+    return [];
+  }
+};
+
+const handleExtensionsChanged = async state => {
+  const {
+    height,
+    itemHeight,
+    selectedIndex
+  } = state;
+  const contributedViews = await getContributedViews(state.platform);
+  const items = getActivityBarItems(state, contributedViews);
+  const itemsWithSelected = markSelected(items, selectedIndex);
+  const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
+  const newItems = await updateItemsWithBadgeCount(filteredItems);
+  return {
+    ...state,
+    activityBarItems: itemsWithSelected,
+    filteredItems: newItems
+  };
+};
+
+const handleFocus = state => {
+  return {
+    ...state,
+    focused: true
+  };
+};
+
+const handleResize = (state, dimensions) => {
+  const {
+    activityBarItems,
+    itemHeight
+  } = state;
+  const {
+    height,
+    width,
+    x,
+    y
+  } = dimensions;
+  const filteredItems = getFilteredActivityBarItems(activityBarItems, height, itemHeight);
+  return {
+    ...state,
+    filteredItems,
+    height,
+    width,
+    x,
+    y
+  };
+};
+
+const getAccountEnabled = async defaultValue => {
+  try {
+    const value = await invoke('Preferences.get', 'activityBar.accountEnabled');
+    return typeof value === 'boolean' ? value : defaultValue;
+  } catch {
+    return defaultValue;
+  }
+};
+
 const getSideBarPosition = async () => {
   try {
     return await invoke('Layout.getSideBarPosition');
@@ -2118,12 +2174,12 @@ const handleSettingsChanged = async state => {
     itemHeight,
     selectedIndex
   } = state;
-  const [accountEnabled, sidebarLocation] = await Promise.all([getAccountEnabled(state.accountEnabled), getSideBarPosition()]);
+  const [accountEnabled, contributedViews, sidebarLocation] = await Promise.all([getAccountEnabled(state.accountEnabled), getContributedViews(state.platform), getSideBarPosition()]);
   const newState = {
     ...state,
     accountEnabled
   };
-  const items = getActivityBarItems(newState);
+  const items = getActivityBarItems(newState, contributedViews);
   const itemsWithSelected = markSelected(items, selectedIndex);
   const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
   const newItems = await updateItemsWithBadgeCount(filteredItems);
@@ -2262,15 +2318,16 @@ const loadContent = async state => {
   const {
     accountEnabled,
     height,
-    itemHeight
+    itemHeight,
+    platform
   } = state;
-  const [accountEnabledNew, activeView, sideBarVisible, sidebarLocation, userInfo] = await Promise.all([getAccountEnabled(accountEnabled), getActiveView(), getSideBarVisible(), getSideBarPosition(), getUserInfo()]);
+  const [accountEnabledNew, activeView, contributedViews, sideBarVisible, sidebarLocation, userInfo] = await Promise.all([getAccountEnabled(accountEnabled), getActiveView(), getContributedViews(platform), getSideBarVisible(), getSideBarPosition(), getUserInfo()]);
   const newState = {
     ...state,
     accountEnabled: accountEnabledNew,
     userLoginState: toUserLoginState(getUserState(userInfo))
   };
-  const items = getActivityBarItems(newState);
+  const items = getActivityBarItems(newState, contributedViews);
   const index = items.findIndex(item => item.id === activeView);
   const selectedIndex = sideBarVisible ? index : -1;
   const itemsWithSelected = markSelected(items, selectedIndex);
@@ -2453,11 +2510,78 @@ const treeToArray = node => {
   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];
@@ -2466,88 +2590,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,
@@ -2556,33 +2609,11 @@ 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 => {
@@ -2882,8 +2913,8 @@ const render2 = (uid, diffResult) => {
   const {
     newState,
     oldState
-  } = get(uid);
-  set(uid, newState, newState);
+  } = get$2(uid);
+  set$4(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -2963,7 +2994,7 @@ const toggleActivityBarItem = async (state, itemId) => {
 };
 
 const commandMap = {
-  'ActivityBar.create': create,
+  'ActivityBar.create': create$9,
   'ActivityBar.diff2': diff2,
   'ActivityBar.focus': wrapCommand(focus),
   'ActivityBar.focusFirst': wrapCommand(focusFirst),
@@ -2985,6 +3016,8 @@ const commandMap = {
   'ActivityBar.handleClickSignIn': wrapCommand(handleClickSignIn),
   'ActivityBar.handleClickSignOut': wrapCommand(handleClickSignOut),
   'ActivityBar.handleContextMenu': wrapCommand(handleContextMenu),
+  'ActivityBar.handleExtensionManagementMessagePort': handleExtensionManagementMessagePort,
+  'ActivityBar.handleExtensionsChanged': wrapCommand(handleExtensionsChanged),
   'ActivityBar.handleFocus': wrapCommand(handleFocus),
   'ActivityBar.handleSettingsChanged': wrapCommand(handleSettingsChanged),
   'ActivityBar.handleSideBarStateChange': wrapCommand(handleSideBarStateChange),
@@ -3000,25 +3033,39 @@ const commandMap = {
   'ActivityBar.toggleActivityBarItem': wrapCommand(toggleActivityBarItem)
 };
 
-const send = async port => {
+const send$1 = async port => {
   // @ts-ignore
   await sendMessagePortToAuthWorker(port);
 };
 const initializeAuthWorker = async () => {
-  const rpc = await create$4({
+  const rpc = await create$2({
     commandMap: {},
-    send
+    send: send$1
   });
   set$2(rpc);
 };
 
-const listen = async () => {
-  registerCommands(commandMap);
-  const rpc = await create$3({
-    commandMap: commandMap
+const send = async port => {
+  await sendMessagePortToExtensionManagementWorker(port, 0);
+};
+const initializeExtensionManagementWorker = async () => {
+  const rpc = await create$2({
+    commandMap: {},
+    send
   });
   set$1(rpc);
-  await initializeAuthWorker();
+};
+
+const initializeRendererWorker = async () => {
+  const rpc = await create$1({
+    commandMap: commandMap
+  });
+  set(rpc);
+};
+
+const listen = async () => {
+  registerCommands(commandMap);
+  await Promise.all([initializeRendererWorker(), initializeAuthWorker(), initializeExtensionManagementWorker()]);
 };
 
 const main = async () => {