diff --git a/client/browser/BUILD.bazel b/client/browser/BUILD.bazel
index c6cce7565b90..86f4e6d237aa 100644
--- a/client/browser/BUILD.bazel
+++ b/client/browser/BUILD.bazel
@@ -116,14 +116,12 @@ ts_project(
     srcs = [
         "code-intel-extensions.json",
         "src/browser-extension/ThemeWrapper.tsx",
-        "src/browser-extension/after-install-page/AfterInstallPageContent.tsx",
         "src/browser-extension/browser-action-icon.ts",
         "src/browser-extension/environmentAssertion.ts",
         "src/browser-extension/knownCodeHosts.ts",
         "src/browser-extension/options-menu/OptionsPage.tsx",
         "src/browser-extension/options-menu/OptionsPageAdvancedSettings.tsx",
         "src/browser-extension/options-menu/components/OptionsPageContainer.tsx",
-        "src/browser-extension/scripts/afterInstallPage.main.tsx",
         "src/browser-extension/scripts/backgroundPage.main.ts",
         "src/browser-extension/scripts/contentPage.main.ts",
         "src/browser-extension/scripts/optionsPage.main.tsx",
@@ -206,7 +204,6 @@ ts_project(
         "src/shared/platform/inlineExtensionsService.ts",
         "src/shared/platform/ports.ts",
         "src/shared/platform/settings.ts",
-        "src/shared/platform/worker.ts",
         "src/shared/polyfills.ts",
         "src/shared/repo/backend.tsx",
         "src/shared/repo/index.tsx",
@@ -262,7 +259,6 @@ ts_project(
         "//:node_modules/utility-types",
         "//:node_modules/uuid",
         "//:node_modules/vitest",
-        "//:node_modules/webext-domain-permission-toggle",
         "//:node_modules/webextension-polyfill",  #keep
     ],
 )
@@ -367,7 +363,6 @@ esbuild(
         "src/browser-extension/scripts/backgroundPage.main.js",
         "src/browser-extension/scripts/contentPage.main.js",
         "src/browser-extension/scripts/optionsPage.main.js",
-        "src/browser-extension/scripts/afterInstallPage.main.js",
         "src/native-integration/nativeIntegration.main.js",
         "src/native-integration/phabricator/phabricatorNativeIntegration.main.js",
         "src/app.css",
@@ -406,7 +401,6 @@ copy_to_directory(
 ts_project(
     name = "stories",
     srcs = [
-        "src/browser-extension/after-install-page/AfterInstallPageContent.story.tsx",
         "src/browser-extension/options-menu/OptionsPage.story.tsx",
         "src/shared/components/HoverOverlay.story.tsx",
     ],
diff --git a/client/browser/config/esbuild.ts b/client/browser/config/esbuild.ts
index 23546fd72397..3355256dac44 100644
--- a/client/browser/config/esbuild.ts
+++ b/client/browser/config/esbuild.ts
@@ -20,7 +20,6 @@ export function esbuildBuildOptions(mode: 'dev' | 'prod', extraPlugins: esbuild.
             path.resolve(browserSourcePath, 'browser-extension/scripts/backgroundPage.main.ts'),
             path.resolve(browserSourcePath, 'browser-extension/scripts/contentPage.main.ts'),
             path.resolve(browserSourcePath, 'browser-extension/scripts/optionsPage.main.tsx'),
-            path.resolve(browserSourcePath, 'browser-extension/scripts/afterInstallPage.main.tsx'),
 
             // Common native integration entry point (Gitlab, Bitbucket)
             path.resolve(browserSourcePath, 'native-integration/nativeIntegration.main.ts'),
@@ -39,9 +38,11 @@ export function esbuildBuildOptions(mode: 'dev' | 'prod', extraPlugins: esbuild.
         plugins: [stylePlugin, ...extraPlugins],
         define: {
             'process.env.NODE_ENV': JSON.stringify(mode === 'dev' ? 'development' : 'production'),
+            'process.env.NODE_DEBUG': 'false',
             'process.env.BUNDLE_UID': JSON.stringify(generateBundleUID()),
         },
         bundle: true,
+        treeShaking: true,
         minify: false,
         logLevel: 'error',
         jsx: 'automatic',
@@ -50,7 +51,12 @@ export function esbuildBuildOptions(mode: 'dev' | 'prod', extraPlugins: esbuild.
         entryNames: '[ext]/[name].bundle',
         target: 'esnext',
         sourcemap: true,
-        alias: { path: 'path-browserify' },
+        alias: { path: 'path-browserify', lodash: 'lodash-es' },
+        banner: {
+            // HACK: lodash has a `Function("return this")`, which Firefox's CSP protection
+            // complains about. This ensures we do not encounter it.
+            js: 'globalThis.global = globalThis;',
+        },
         loader: {
             '.svg': 'text',
         },
diff --git a/client/browser/scripts/tasks.ts b/client/browser/scripts/tasks.ts
index 8be717217336..b3e3f32fce26 100644
--- a/client/browser/scripts/tasks.ts
+++ b/client/browser/scripts/tasks.ts
@@ -2,7 +2,7 @@
 import fs from 'fs'
 import path from 'path'
 
-import { omit, cloneDeep, curry } from 'lodash'
+import { cloneDeep, curry, omit } from 'lodash'
 import shelljs from 'shelljs'
 import signale from 'signale'
 import utcVersion from 'utc-version'
@@ -175,7 +175,7 @@ function writeManifest(environment: BuildEnvironment, browser: Browser, writeDir
     if (EXTENSION_PERMISSIONS_ALL_URLS) {
         manifest.permissions!.push('<all_urls>')
         /** Set key to make extension id deterministic */
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+
         // @ts-ignore
         manifest.key = manifestSpec.dev.key
         signale.info('Adding <all_urls> to permissions because of env var setting')
@@ -194,9 +194,20 @@ function writeManifest(environment: BuildEnvironment, browser: Browser, writeDir
         }
     }
 
-    // Add the inline extensions to web accessible resources
-    manifest.web_accessible_resources = manifest.web_accessible_resources || []
-    manifest.web_accessible_resources.push('extensions/*')
+    // Firefox doesn't support service workers, so we need a workaround. See
+    // https://github.com/mozilla/web-ext/issues/2532.
+    if (browser === 'firefox') {
+        manifest.background!.scripts = [manifest.background!.service_worker]
+        delete manifest.background!.service_worker
+    }
+
+    if (browser === 'firefox') {
+        manifest.browser_specific_settings = {
+            gecko: {
+                id: 'sourcegraph-for-firefox@sourcegraph.com',
+            },
+        }
+    }
 
     delete manifest.$schema
 
diff --git a/client/browser/src/browser-extension/after-install-page/AfterInstallPageContent.module.scss b/client/browser/src/browser-extension/after-install-page/AfterInstallPageContent.module.scss
deleted file mode 100644
index ee4ae10793a0..000000000000
--- a/client/browser/src/browser-extension/after-install-page/AfterInstallPageContent.module.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-.sourcegraph-logo {
-    height: 1.5rem;
-}
-
-.code-host-logo {
-    height: 2rem !important;
-    width: 2rem !important;
-}
-
-.code-host-titles {
-    line-height: 2;
-}
diff --git a/client/browser/src/browser-extension/after-install-page/AfterInstallPageContent.story.tsx b/client/browser/src/browser-extension/after-install-page/AfterInstallPageContent.story.tsx
deleted file mode 100644
index 736532786d1b..000000000000
--- a/client/browser/src/browser-extension/after-install-page/AfterInstallPageContent.story.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { Meta, StoryFn } from '@storybook/react'
-
-import { BrandedStory } from '@sourcegraph/wildcard/src/stories'
-
-import { AfterInstallPageContent } from './AfterInstallPageContent'
-
-import brandedStyles from '../../branded.scss'
-
-const config: Meta = {
-    title: 'browser/AfterInstallPage',
-    parameters: {
-        chromatic: {
-            enableDarkMode: true,
-            disableSnapshot: false,
-        },
-    },
-}
-
-export default config
-
-export const Default: StoryFn = () => <BrandedStory styles={brandedStyles}>{AfterInstallPageContent}</BrandedStory>
diff --git a/client/browser/src/browser-extension/after-install-page/AfterInstallPageContent.tsx b/client/browser/src/browser-extension/after-install-page/AfterInstallPageContent.tsx
deleted file mode 100644
index 61921b60eda4..000000000000
--- a/client/browser/src/browser-extension/after-install-page/AfterInstallPageContent.tsx
+++ /dev/null
@@ -1,239 +0,0 @@
-import React, { type VideoHTMLAttributes } from 'react'
-
-import { mdiOpenInNew, mdiGithub, mdiCheck, mdiGitlab, mdiBitbucket, mdiLock, mdiBookOpenPageVariant } from '@mdi/js'
-import classNames from 'classnames'
-
-import { SourcegraphLogo } from '@sourcegraph/branded/src/components/SourcegraphLogo'
-import { PhabricatorIcon } from '@sourcegraph/shared/src/components/icons'
-import { Link, Icon, Code, H1, H2, H3, Text } from '@sourcegraph/wildcard'
-
-import { getPlatformName } from '../../shared/util/context'
-
-import styles from './AfterInstallPageContent.module.scss'
-
-interface VideoProps extends Pick<VideoHTMLAttributes<HTMLVideoElement>, 'width' | 'height'> {
-    name: string
-    isLightTheme: boolean
-}
-
-const Video: React.FC<VideoProps> = ({ name, isLightTheme, width, height }) => {
-    const suffix = isLightTheme ? 'Light' : 'Dark'
-    return (
-        <video
-            className="w-100 h-auto cursor-pointer"
-            width={width}
-            height={height}
-            autoPlay={true}
-            loop={true}
-            muted={true}
-            playsInline={true}
-            onClick={event => event.currentTarget.requestFullscreen()}
-            // Add a key on the theme to force React to render a new <video> element when the theme changes
-            key={name + suffix}
-        >
-            <source
-                src={`https://storage.googleapis.com/sourcegraph-assets/code-host-integration/${name}${suffix}.webm`}
-                type="video/webm"
-            />
-            <source
-                src={`https://storage.googleapis.com/sourcegraph-assets/code-host-integration/${name}${suffix}.mp4`}
-                type="video/mp4"
-            />
-        </video>
-    )
-}
-
-interface AfterInstallPageContentProps {
-    isLightTheme: boolean
-}
-
-export const AfterInstallPageContent: React.FC<AfterInstallPageContentProps> = props => {
-    // Safari does not support the search shortcut. So don't show the feature.
-    const isSafari = getPlatformName() === 'safari-extension'
-    const showSearchShortcut = !isSafari
-
-    return (
-        <div className="after-install-page-content" data-testid="after-install-page-content">
-            <div className="d-flex w-100 p-3 justify-content-between align-items-center">
-                <Link to="https://sourcegraph.com/search" target="_blank" rel="noopener">
-                    <SourcegraphLogo className={styles.sourcegraphLogo} />
-                </Link>
-                <Link to="https://sourcegraph.com/docs/integration/browser_extension" target="_blank" rel="noopener">
-                    Browser extension docs <Icon aria-hidden={true} svgPath={mdiOpenInNew} />
-                </Link>
-            </div>
-
-            <div className="container mt-3">
-                <H1>🎉 You’ve just installed the Sourcegraph browser extension!</H1>
-                <Text className="lead mb-0">
-                    We’ve gathered the most important information that will get your started:
-                </Text>
-            </div>
-
-            <section className="border-bottom py-5">
-                <div className="container">
-                    <H2 className="mb-4">How do I use the extension?</H2>
-                    <div className="row">
-                        <div className="col-md-6">
-                            <H3>Code navigation on your code host</H3>
-                            <Text>
-                                Sourcegraph browser extension adds code navigation to files and diffs on GitHub, GitHub
-                                Enterprise, GitLab, Phabricator, Bitbucket Server, and Gerrit.
-                            </Text>
-                            <Video {...props} name="CodeIntelligenceOnCodeHost" width={1760} height={1060} />
-                        </div>
-                        {showSearchShortcut && (
-                            <div className="col-md-6 mt-4 mt-md-0">
-                                <H3>Search shortcut in the URL location bar</H3>
-                                <Text>
-                                    Type <Code>src</Code>
-                                    <kbd>tab</kbd> in the address bar of your browser to search for queries on
-                                    Sourcegraph.
-                                </Text>
-                                <Video {...props} name="BrowserShortcut" width={1196} height={720} />
-                            </div>
-                        )}
-                    </div>
-                </div>
-            </section>
-
-            <section className="border-bottom py-5">
-                <div className="container">
-                    <div className="row">
-                        <div className="col-md-6 d-flex flex-column">
-                            <H2 className="mb-4">Make it work on your codehost</H2>
-                            <div className="bg-2 rounded p-3 mb-3 d-flex flex-column justify-content-center">
-                                <H3 className={classNames('mb-3', styles.codeHostTitles)}>
-                                    <Icon className={styles.codeHostLogo} aria-hidden={true} svgPath={mdiGithub} />{' '}
-                                    github.com
-                                </H3>
-                                <Text className="m-0">
-                                    <Icon aria-hidden={true} svgPath={mdiCheck} /> No action required.Your extension
-                                    works here by default.
-                                </Text>
-                            </div>
-                            <div className="bg-2 rounded p-3 d-flex flex-column justify-content-center">
-                                <H3 className={classNames('d-flex flex-wrap', styles.codeHostTitles)}>
-                                    <div className="mr-5 mb-3">
-                                        <Icon className={styles.codeHostLogo} aria-hidden={true} svgPath={mdiGithub} />{' '}
-                                        GitHub Enterprise
-                                    </div>
-                                    <div className="mr-5 mb-3">
-                                        <Icon className={styles.codeHostLogo} aria-hidden={true} svgPath={mdiGitlab} />{' '}
-                                        GitLab
-                                    </div>
-                                    <div className="mr-5 mb-3">
-                                        <Icon
-                                            className={styles.codeHostLogo}
-                                            aria-hidden={true}
-                                            svgPath={mdiBitbucket}
-                                        />{' '}
-                                        Bitbucket Server
-                                    </div>
-                                    <div className="mr-5 mb-3">
-                                        <Icon className={styles.codeHostLogo} as={PhabricatorIcon} aria-hidden={true} />{' '}
-                                        Phabricator
-                                    </div>
-                                </H3>
-                                <Text>Your extension needs explicit permissions to your code host:</Text>
-                                <ol className="m-0">
-                                    <li>Navigate to any page on your code host.</li>
-                                    <li>
-                                        Click the{' '}
-                                        <q>
-                                            <strong>Grant permissions</strong>
-                                        </q>{' '}
-                                        button.
-                                    </li>
-                                    <li>
-                                        Click{' '}
-                                        <q>
-                                            <strong>Allow</strong>
-                                        </q>{' '}
-                                        in the permissions request popup.
-                                    </li>
-                                </ol>
-                            </div>
-                        </div>
-                        <div className="col-md-6 mt-4 mt-md-0">
-                            <Video {...props} name="GrantPermissions" width={1762} height={1384} />
-                        </div>
-                    </div>
-                </div>
-            </section>
-
-            <section className="border-bottom py-5">
-                <div className="container">
-                    <div className="row">
-                        <div className="col-md-6 d-flex flex-column">
-                            <H2 className="mb-4">Make it work for private code</H2>
-                            <Text>By default, the browser extension works only for public code.</Text>
-                            <div className="d-flex align-items-center">
-                                <div className="bg-3 rounded-circle p-2">
-                                    <Icon aria-hidden={true} svgPath={mdiLock} />
-                                </div>
-                                <Text className="m-0 ml-3">
-                                    To use the browser extension with your private repositories, you need to set up a{' '}
-                                    <strong>private Sourcegraph instance</strong> and connect the extension to it.
-                                </Text>
-                            </div>
-                            <div className="bg-2 rounded p-3 mt-4 d-flex flex-column justify-content-around">
-                                <Text>Follow these instructions:</Text>
-                                <ol className="m-0 d-flex flex-column justify-content-around">
-                                    <li>
-                                        <strong>Install Sourcegraph</strong> (
-                                        <Link
-                                            to="https://sourcegraph.com/docs/admin/install"
-                                            target="_blank"
-                                            rel="noopener"
-                                        >
-                                            visit our docs for instructions
-                                        </Link>
-                                        ).Skip this step if you already have a private Sourcegraph instance.
-                                    </li>
-                                    <li>
-                                        Click the Sourcegraph extension icon in the browser toolbar to{' '}
-                                        <Link to="./options.html" rel="noopener" target="_blank">
-                                            open the settings page
-                                        </Link>
-                                        .
-                                    </li>
-                                    <li>
-                                        Enter the <strong>URL</strong> (including the protocol) of your Sourcegraph
-                                        instance (such as <q>https://sourcegraph.example.com</q>).
-                                    </li>
-                                    <li>Make sure a green checkmark appears in the input field.</li>
-                                </ol>
-                            </div>
-                        </div>
-                        <div className="col-md-6 mt-4 mt-md-0">
-                            <Video {...props} name="PrivateInstance" width={1764} height={1390} />
-                        </div>
-                    </div>
-                </div>
-            </section>
-
-            <section className="py-5">
-                <div className="container">
-                    <H2 className="mb-4">Additional resources</H2>
-                    <div className="d-flex w-100 align-items-center">
-                        <div className="bg-3 rounded-circle p-2">
-                            <Icon aria-hidden={true} svgPath={mdiBookOpenPageVariant} />
-                        </div>
-                        <Text className="m-0 ml-3">
-                            Read the{' '}
-                            <Link
-                                to="https://sourcegraph.com/docs/integration/browser_extension"
-                                rel="noopener"
-                                target="_blank"
-                            >
-                                Sourcegraph docs
-                            </Link>{' '}
-                            to learn more about how we respect your privacy, troubleshooting and extension features.
-                        </Text>
-                    </div>
-                </div>
-            </section>
-        </div>
-    )
-}
diff --git a/client/browser/src/browser-extension/browser-action-icon.ts b/client/browser/src/browser-extension/browser-action-icon.ts
index d337b1dfa095..f67bfc2b8cb1 100644
--- a/client/browser/src/browser-extension/browser-action-icon.ts
+++ b/client/browser/src/browser-extension/browser-action-icon.ts
@@ -9,8 +9,10 @@ import { IsProductionVersion } from './util'
  * on the state of the browser extension.
  */
 
-/** State of the Sourcegraph browser extension, as represented by the browser
- * action icon. */
+/**
+ * State of the Sourcegraph browser extension, as represented by the browser
+ * action icon.
+ */
 export type BrowserActionIconState = 'active' | 'active-with-alert' | 'inactive'
 interface BrowserActionIconPaths {
     '32': string
@@ -21,36 +23,36 @@ interface BrowserActionIconPaths {
 const browserActionIconPaths: Record<BrowserActionIconState, BrowserActionIconPaths> = IsProductionVersion
     ? {
           active: {
-              '32': 'img/icon-32.png',
-              '48': 'img/icon-48.png',
-              '128': 'img/icon-128.png',
+              '32': '/img/icon-32.png',
+              '48': '/img/icon-48.png',
+              '128': '/img/icon-128.png',
           },
           'active-with-alert': {
-              '32': 'img/icon-active-with-alert-32.png',
-              '48': 'img/icon-active-with-alert-48.png',
-              '128': 'img/icon-active-with-alert-128.png',
+              '32': '/img/icon-active-with-alert-32.png',
+              '48': '/img/icon-active-with-alert-48.png',
+              '128': '/img/icon-active-with-alert-128.png',
           },
           inactive: {
-              '32': 'img/icon-inactive-32.png',
-              '48': 'img/icon-inactive-48.png',
-              '128': 'img/icon-inactive-128.png',
+              '32': '/img/icon-inactive-32.png',
+              '48': '/img/icon-inactive-48.png',
+              '128': '/img/icon-inactive-128.png',
           },
       }
     : {
           active: {
-              '32': 'img/dev/icon-32.png',
-              '48': 'img/dev/icon-48.png',
-              '128': 'img/dev/icon-128.png',
+              '32': '/img/dev/icon-32.png',
+              '48': '/img/dev/icon-48.png',
+              '128': '/img/dev/icon-128.png',
           },
           'active-with-alert': {
-              '32': 'img/dev/icon-active-with-alert-32.png',
-              '48': 'img/dev/icon-active-with-alert-48.png',
-              '128': 'img/dev/icon-active-with-alert-128.png',
+              '32': '/img/dev/icon-active-with-alert-32.png',
+              '48': '/img/dev/icon-active-with-alert-48.png',
+              '128': '/img/dev/icon-active-with-alert-128.png',
           },
           inactive: {
-              '32': 'img/dev/icon-inactive-32.png',
-              '48': 'img/dev/icon-inactive-48.png',
-              '128': 'img/dev/icon-inactive-128.png',
+              '32': '/img/dev/icon-inactive-32.png',
+              '48': '/img/dev/icon-inactive-48.png',
+              '128': '/img/dev/icon-inactive-128.png',
           },
       }
 
@@ -60,7 +62,7 @@ const browserActionIconPaths: Record<BrowserActionIconState, BrowserActionIconPa
 export function setBrowserActionIconState(iconState: BrowserActionIconState): void {
     const iconPaths = browserActionIconPaths[iconState]
     console.log('Setting icons to', iconPaths)
-    browser.browserAction.setIcon({ path: iconPaths }).catch(error => {
+    ;(browser.action ?? browser.browserAction).setIcon({ path: iconPaths }).catch(error => {
         console.error(error)
     })
 }
diff --git a/client/browser/src/browser-extension/environmentAssertion.ts b/client/browser/src/browser-extension/environmentAssertion.ts
index 2143811b4b90..c45ae690ecee 100644
--- a/client/browser/src/browser-extension/environmentAssertion.ts
+++ b/client/browser/src/browser-extension/environmentAssertion.ts
@@ -1,8 +1,8 @@
 export function assertEnvironment(environment: typeof window['EXTENSION_ENV']): void {
-    if (window.EXTENSION_ENV !== environment) {
+    if (globalThis.EXTENSION_ENV !== environment) {
         throw new Error(
             'Detected transitive import of an entrypoint! ' +
-                String(window.EXTENSION_ENV) +
+                String(globalThis.EXTENSION_ENV) +
                 ' attempted to import a file that is only intended to be imported by ' +
                 String(environment) +
                 '.'
diff --git a/client/browser/src/browser-extension/manifest.spec.json b/client/browser/src/browser-extension/manifest.spec.json
index 9dda82492780..61299c12e1ce 100644
--- a/client/browser/src/browser-extension/manifest.spec.json
+++ b/client/browser/src/browser-extension/manifest.spec.json
@@ -1,16 +1,17 @@
 {
-  "$schema": "http://json.schemastore.org/webextension",
+  "$schema": "https://json.schemastore.org/chrome-manifest",
   "version": "0.0.0",
   "name": "Sourcegraph",
-  "manifest_version": 2,
+  "manifest_version": 3,
   "description": "Adds code intelligence to GitHub, GitLab, and other hosts: hovers, definitions, references. For 20+ languages.",
-  "browser_action": {
+  "action": {
     "default_title": "Sourcegraph",
     "default_icon": {
       "32": "img/icon-32.png",
       "48": "img/icon-48.png",
       "128": "img/icon-128.png"
-    }
+    },
+    "default_popup": "options.html"
   },
   "icons": {
     "32": "img/icon-32.png",
@@ -18,8 +19,18 @@
     "128": "img/icon-128.png"
   },
   "background": {
-    "scripts": ["js/backgroundPage.main.bundle.js"]
+    "service_worker": "js/backgroundPage.main.bundle.js"
   },
+  "content_scripts": [
+    {
+      "matches": ["https://github.com/*"],
+      "js": ["js/contentPage.main.bundle.js"],
+      "run_at": "document_idle"
+    }
+  ],
+  "permissions": ["activeTab", "storage", "scripting"],
+  "host_permissions": ["https://github.com/*", "https://sourcegraph.com/*"],
+  "optional_host_permissions": ["https://*/*", "http://*/*"],
   "options_ui": {
     "page": "options.html",
     "open_in_tab": true
@@ -27,31 +38,16 @@
   "storage": {
     "managed_schema": "schema.json"
   },
-  "optional_permissions": ["tabs", "http://*/*", "https://*/*"],
-  "content_security_policy": "script-src 'self' blob:; object-src 'self'",
-  "web_accessible_resources": ["img/*", "css/*"],
+  "web_accessible_resources": [
+    {
+      "resources": ["img/*", "css/*", "extensions/*", "extensions/sourcegraph-go/*"],
+      "matches": ["<all_urls>"]
+    }
+  ],
   "omnibox": {
     "keyword": "src"
   },
-  "applications": {
-    "gecko": {
-      "id": "sourcegraph-for-firefox@sourcegraph.com"
-    }
-  },
   "dev": {
-    "permissions": [
-      "storage",
-      "activeTab",
-      "contextMenus",
-      "https://github.com/*",
-      "https://gitlab.com/*",
-      "https://localhost:3443/*",
-      "https://sourcegraph.com/*",
-      "http://localhost:32773/*"
-    ],
     "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCl2X/axNHMbP0K/NCpMzGo/pgBSsHB2xKx6tfohORKtEv2wUMBPmkK3++kirrwYO2f8Ficyq6pjlXV8LjwPSjSw9KZj6bkDn8QNoSdCp6x9i8ZOWPw6UTQ6s54b3rGQNyvrvfD7S6LphxGEx8rNlkjpWKcrvY3+DyoFKHP/hax7wIDAQAB"
-  },
-  "prod": {
-    "permissions": ["activeTab", "storage", "contextMenus", "https://github.com/*", "https://sourcegraph.com/*"]
   }
 }
diff --git a/client/browser/src/browser-extension/options-menu/OptionsPage.tsx b/client/browser/src/browser-extension/options-menu/OptionsPage.tsx
index 4d91b095f8d9..8c3a9789ff06 100644
--- a/client/browser/src/browser-extension/options-menu/OptionsPage.tsx
+++ b/client/browser/src/browser-extension/options-menu/OptionsPage.tsx
@@ -1,13 +1,13 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 
 import {
-    mdiEarth,
+    mdiBlockHelper,
     mdiBookOpenPageVariant,
     mdiCheckCircleOutline,
+    mdiClose,
+    mdiEarth,
     mdiLock,
-    mdiBlockHelper,
     mdiOpenInNew,
-    mdiClose,
 } from '@mdi/js'
 import classNames from 'classnames'
 import type { Observable } from 'rxjs'
@@ -17,18 +17,18 @@ import { Toggle } from '@sourcegraph/branded/src/components/Toggle'
 import { createURLWithUTM } from '@sourcegraph/shared/src/tracking/utm'
 import { type InputValidationState, useInputValidation } from '@sourcegraph/shared/src/util/useInputValidation'
 import {
+    Button,
     Combobox,
     ComboboxInput,
+    ComboboxList,
     ComboboxOption,
     ComboboxPopover,
-    ComboboxList,
-    Button,
-    Link,
+    H4,
     Icon,
+    InputStatus,
     Label,
-    H4,
+    Link,
     Text,
-    InputStatus,
 } from '@sourcegraph/wildcard'
 
 import type { CurrentUserResult } from '../../graphql-operations'
@@ -39,8 +39,6 @@ import { OptionsPageAdvancedSettings } from './OptionsPageAdvancedSettings'
 
 import styles from './OptionsPage.module.scss'
 
-import '@reach/combobox/styles.css'
-
 export interface OptionsPageProps {
     version: string
 
@@ -350,7 +348,6 @@ export const SourcegraphURLForm: React.FunctionComponent<React.PropsWithChildren
 
     /**
      * BEGIN: Workaround for reach/combobox undesirably expanded
-     *
      * @see https://github.com/reach/reach-ui/issues/755
      */
     const [hasInteracted, setHasInteracted] = useState(false)
diff --git a/client/browser/src/browser-extension/pages/after_install.html b/client/browser/src/browser-extension/pages/after_install.html
deleted file mode 100644
index 6bcb7b517586..000000000000
--- a/client/browser/src/browser-extension/pages/after_install.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-        <title>Sourcegraph browser extension</title>
-        <meta name="color-scheme" content="light dark" />
-        <link href="./css/branded.bundle.css" rel="stylesheet" type="text/css" />
-        <link href="./css/afterInstallPage.main.bundle.css" rel="stylesheet" type="text/css" />
-    </head>
-    <body>
-        <div id="root"></div>
-        <noscript>You must enable JavaScript for the Sourcegraph browser extension to work.</noscript>
-        <script type="text/javascript" src="./js/afterInstallPage.main.bundle.js"></script>
-    </body>
-</html>
diff --git a/client/browser/src/browser-extension/scripts/afterInstallPage.main.tsx b/client/browser/src/browser-extension/scripts/afterInstallPage.main.tsx
deleted file mode 100644
index 8edb2002c0bb..000000000000
--- a/client/browser/src/browser-extension/scripts/afterInstallPage.main.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-// We want to polyfill first.
-import '../../shared/polyfills'
-
-import React from 'react'
-
-import { createRoot } from 'react-dom/client'
-
-import { AnchorLink, setLinkComponent } from '@sourcegraph/wildcard'
-
-import { WildcardThemeProvider } from '../../shared/components/WildcardThemeProvider'
-import { AfterInstallPageContent } from '../after-install-page/AfterInstallPageContent'
-import { ThemeWrapper } from '../ThemeWrapper'
-
-setLinkComponent(AnchorLink)
-
-const AfterInstallPage: React.FunctionComponent<React.PropsWithChildren<unknown>> = () => (
-    <ThemeWrapper>
-        {({ isLightTheme }) => (
-            <WildcardThemeProvider isBranded={true}>
-                <AfterInstallPageContent isLightTheme={isLightTheme} />
-            </WildcardThemeProvider>
-        )}
-    </ThemeWrapper>
-)
-
-const root = createRoot(document.querySelector('#root')!)
-
-root.render(<AfterInstallPage />)
diff --git a/client/browser/src/browser-extension/scripts/backgroundPage.main.ts b/client/browser/src/browser-extension/scripts/backgroundPage.main.ts
index ea95d4416aad..7a78009d5001 100644
--- a/client/browser/src/browser-extension/scripts/backgroundPage.main.ts
+++ b/client/browser/src/browser-extension/scripts/backgroundPage.main.ts
@@ -1,26 +1,25 @@
 // Set globals first before any imports.
-import '../../config/extension.entry'
 import '../../config/background.entry'
+import '../../config/extension.entry'
 // Polyfill before other imports.
 import '../../shared/polyfills'
 
 import type { Endpoint } from 'comlink'
-import { combineLatest, merge, type Observable, of, Subject, Subscription, timer, lastValueFrom } from 'rxjs'
+import { combineLatest, lastValueFrom, merge, type Observable, of, Subject, Subscription, timer } from 'rxjs'
 import {
     bufferCount,
+    catchError,
+    concatMap,
+    distinctUntilChanged,
     filter,
     groupBy,
     map,
     mergeMap,
     switchMap,
     take,
-    concatMap,
-    catchError,
-    distinctUntilChanged,
 } from 'rxjs/operators'
-import addDomainPermissionToggle from 'webext-domain-permission-toggle'
 
-import { isDefined, fetchCache } from '@sourcegraph/common'
+import { fetchCache, isDefined } from '@sourcegraph/common'
 import { type GraphQLResult, requestGraphQLCommon } from '@sourcegraph/http-client'
 import { createExtensionHostWorker } from '@sourcegraph/shared/src/api/extension/worker'
 import type { EndpointPair } from '@sourcegraph/shared/src/platform/context'
@@ -30,7 +29,6 @@ import { getHeaders } from '../../shared/backend/headers'
 import { fetchSite } from '../../shared/backend/server'
 import { initializeOmniboxInterface } from '../../shared/cli'
 import { browserPortToMessagePort, findMessagePorts } from '../../shared/platform/ports'
-import { createBlobURLForBundle } from '../../shared/platform/worker'
 import { initSentry } from '../../shared/sentry'
 import { ConditionalTelemetryRecorderProvider } from '../../shared/telemetry'
 import { EventLogger } from '../../shared/tracking/eventLogger'
@@ -155,10 +153,6 @@ async function main(): Promise<void> {
                     })
             )
         }
-
-        browser.tabs.create({ url: browser.extension.getURL('after_install.html') }).catch(error => {
-            console.error('Error opening after-install page:', error)
-        })
     })
 
     // Mirror the managed sourcegraphURL to sync storage
@@ -209,9 +203,9 @@ async function main(): Promise<void> {
                          * Loading content script dynamically
                          * See https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Content_scripts#loading_content_scripts
                          */
-                        await browser.tabs.executeScript(tabId, {
-                            file: 'js/contentPage.main.bundle.js',
-                            runAt: 'document_end',
+                        await browser.scripting.executeScript({
+                            files: ['js/contentPage.main.bundle.js'],
+                            target: { tabId },
                         })
                     }
                 })
@@ -228,10 +222,6 @@ async function main(): Promise<void> {
             await browser.runtime.openOptionsPage()
         },
 
-        async createBlobURL(bundleUrl: string): Promise<string> {
-            return createBlobURLForBundle(bundleUrl)
-        },
-
         async requestGraphQL<T, V = object>({
             request,
             variables,
@@ -291,10 +281,7 @@ async function main(): Promise<void> {
 
     // The `popup=true` param is used by the options page to determine if it's
     // loaded in the popup or in th standalone options page.
-    browser.browserAction.setPopup({ popup: 'options.html?popup=true' })
-
-    // Add "Enable Sourcegraph on this domain" context menu item
-    addDomainPermissionToggle()
+    ;(browser.action ?? browser.browserAction).setPopup({ popup: 'options.html?popup=true' })
 
     const ENDPOINT_KIND_REGEX = /^(proxy|expose)-/
 
@@ -376,8 +363,8 @@ function handleBrowserPortPair(
     const subscriptions = new Subscription()
 
     console.log('Extension host client connected')
-    const { worker, clientEndpoints } = createExtensionHostWorker(workerBundleURL)
-    subscriptions.add(() => worker.terminate())
+    const { terminate: terminateExtensionHost, clientEndpoints } = createExtensionHostWorker(workerBundleURL)
+    subscriptions.add(() => terminateExtensionHost())
 
     /** Forwards all messages between two endpoints (in one direction) */
     const forwardEndpoint = (from: Endpoint, to: Endpoint): void => {
diff --git a/client/browser/src/browser-extension/scripts/contentPage.main.ts b/client/browser/src/browser-extension/scripts/contentPage.main.ts
index 18c0c803e68b..449cbb7e046b 100644
--- a/client/browser/src/browser-extension/scripts/contentPage.main.ts
+++ b/client/browser/src/browser-extension/scripts/contentPage.main.ts
@@ -1,12 +1,12 @@
-// Set globals first before any imports.
 import '../../config/extension.entry'
+// Set globals first before any imports.
 import '../../config/content.entry'
 // Polyfill before other imports.
 import '../../shared/polyfills'
 
 import { firstValueFrom, fromEvent, Subscription } from 'rxjs'
 
-import { setLinkComponent, AnchorLink } from '@sourcegraph/wildcard'
+import { AnchorLink, setLinkComponent } from '@sourcegraph/wildcard'
 
 import { determineCodeHost } from '../../shared/code-hosts/shared/codeHost'
 import { injectCodeIntelligence } from '../../shared/code-hosts/shared/inject'
@@ -46,7 +46,7 @@ function loadStyleSheet(options: { id: string; path: string }): HTMLLinkElement
         styleSheet.id = id
         styleSheet.rel = 'stylesheet'
         styleSheet.type = 'text/css'
-        styleSheet.href = browser.extension.getURL(path)
+        styleSheet.href = browser.runtime.getURL(path)
     }
     return styleSheet
 }
diff --git a/client/browser/src/browser-extension/web-extension-api/runtime.ts b/client/browser/src/browser-extension/web-extension-api/runtime.ts
index 41be0d2c0b4a..108c93d07691 100644
--- a/client/browser/src/browser-extension/web-extension-api/runtime.ts
+++ b/client/browser/src/browser-extension/web-extension-api/runtime.ts
@@ -18,7 +18,6 @@ const messageSender =
  * Functions that can be invoked from content scripts that will be executed in the background page.
  */
 export const background: BackgroundPageApi = {
-    createBlobURL: messageSender('createBlobURL'),
     openOptionsPage: messageSender('openOptionsPage'),
     requestGraphQL: messageSender('requestGraphQL'),
     notifyRepoSyncError: messageSender('notifyRepoSyncError'),
diff --git a/client/browser/src/browser-extension/web-extension-api/types.ts b/client/browser/src/browser-extension/web-extension-api/types.ts
index 1c24809943f2..bbe5c5dd4068 100644
--- a/client/browser/src/browser-extension/web-extension-api/types.ts
+++ b/client/browser/src/browser-extension/web-extension-api/types.ts
@@ -68,7 +68,6 @@ export interface ManagedStorageItems extends SourcegraphURL {
  */
 export interface BackgroundPageApi {
     openOptionsPage(): Promise<void>
-    createBlobURL(bundleUrl: string): Promise<string>
     requestGraphQL<T, V = object>(options: {
         request: string
         variables: V
diff --git a/client/browser/src/config/background.entry.ts b/client/browser/src/config/background.entry.ts
index 71c8b2bf1529..2396d3ddfbac 100644
--- a/client/browser/src/config/background.entry.ts
+++ b/client/browser/src/config/background.entry.ts
@@ -1 +1 @@
-window.EXTENSION_ENV = 'BACKGROUND'
+globalThis.EXTENSION_ENV = 'BACKGROUND'
diff --git a/client/browser/src/config/content.entry.ts b/client/browser/src/config/content.entry.ts
index b7b15309aff6..b72516f3cd2a 100644
--- a/client/browser/src/config/content.entry.ts
+++ b/client/browser/src/config/content.entry.ts
@@ -1 +1 @@
-window.EXTENSION_ENV = 'CONTENT'
+globalThis.EXTENSION_ENV = 'CONTENT'
diff --git a/client/browser/src/config/extension.entry.ts b/client/browser/src/config/extension.entry.ts
index 49e5238f9e1c..46b68ef2064a 100644
--- a/client/browser/src/config/extension.entry.ts
+++ b/client/browser/src/config/extension.entry.ts
@@ -1 +1 @@
-window.SG_ENV = 'EXTENSION'
+globalThis.SG_ENV = 'EXTENSION'
diff --git a/client/browser/src/config/options.entry.ts b/client/browser/src/config/options.entry.ts
index 4d50376daaca..715763886f58 100644
--- a/client/browser/src/config/options.entry.ts
+++ b/client/browser/src/config/options.entry.ts
@@ -1 +1 @@
-window.EXTENSION_ENV = 'OPTIONS'
+globalThis.EXTENSION_ENV = 'OPTIONS'
diff --git a/client/browser/src/config/page.entry.ts b/client/browser/src/config/page.entry.ts
index 55ee8634eada..3a6bdf96fc57 100644
--- a/client/browser/src/config/page.entry.ts
+++ b/client/browser/src/config/page.entry.ts
@@ -1,2 +1,2 @@
-window.SG_ENV = 'PAGE'
-window.EXTENSION_ENV = null
+globalThis.SG_ENV = 'PAGE'
+globalThis.EXTENSION_ENV = null
diff --git a/client/browser/src/end-to-end/BUILD.bazel b/client/browser/src/end-to-end/BUILD.bazel
index ca4b47efcd1a..31eb0083e6eb 100644
--- a/client/browser/src/end-to-end/BUILD.bazel
+++ b/client/browser/src/end-to-end/BUILD.bazel
@@ -23,10 +23,8 @@ ts_project(
     deps = [
         "//:node_modules/@types/mocha",
         "//:node_modules/@types/node",
-        "//:node_modules/@types/puppeteer",
         "//:node_modules/expect",
         "//:node_modules/mocha",
-        "//:node_modules/puppeteer",
         "//client/browser:node_modules/@sourcegraph/shared",
     ],
 )
diff --git a/client/browser/src/end-to-end/github.test.ts b/client/browser/src/end-to-end/github.test.ts
index 5814cc7a0aab..bd0c677576f1 100644
--- a/client/browser/src/end-to-end/github.test.ts
+++ b/client/browser/src/end-to-end/github.test.ts
@@ -2,9 +2,9 @@ import assert from 'assert'
 
 import { startCase } from 'lodash'
 import { describe, it } from 'mocha'
-import type { Target, Page } from 'puppeteer'
+import type { Page, Target } from 'puppeteer'
 import { firstValueFrom, fromEvent } from 'rxjs'
-import { filter, timeout, mergeMap } from 'rxjs/operators'
+import { filter, mergeMap, timeout } from 'rxjs/operators'
 
 import { isDefined } from '@sourcegraph/common'
 import { getConfig } from '@sourcegraph/shared/src/testing/config'
@@ -12,7 +12,7 @@ import { type Driver, createDriverForTest } from '@sourcegraph/shared/src/testin
 import { afterEachSaveScreenshotIfFailed } from '@sourcegraph/shared/src/testing/screenshotReporter'
 import { retry } from '@sourcegraph/shared/src/testing/utils'
 
-import { closeInstallPageTab, testSingleFilePage } from './shared'
+import { testSingleFilePage } from './shared'
 
 describe('Sourcegraph browser extension on github.com', function () {
     this.slow(8000)
@@ -80,7 +80,6 @@ describe('Sourcegraph browser extension on github.com', function () {
                     const { token, lineId, goToDefinitionURLs } = tokens[side]
                     it(`provides hover tooltips on token "${token}" in the ${side} part`, async () => {
                         await driver.page.goto(`https://github.com/gorilla/mux/pull/117/files?diff=${diffType}`)
-                        await closeInstallPageTab(driver.browser)
                         // The browser extension takes a bit to initialize and register all event listeners.
                         // Waiting here saves one retry cycle below in the common case.
                         // If it's not enough, the retry will catch it.
diff --git a/client/browser/src/end-to-end/shared.ts b/client/browser/src/end-to-end/shared.ts
index f7ecdcd69aaa..25a89e0ee4c0 100644
--- a/client/browser/src/end-to-end/shared.ts
+++ b/client/browser/src/end-to-end/shared.ts
@@ -2,7 +2,6 @@ import assert from 'assert'
 
 import expect from 'expect'
 import { describe, it } from 'mocha'
-import type puppeteer from 'puppeteer'
 
 import type { Driver } from '@sourcegraph/shared/src/testing/driver'
 import { retry } from '@sourcegraph/shared/src/testing/utils'
@@ -44,9 +43,6 @@ export function testSingleFilePage({
         it('adds "View on Sourcegraph" buttons to files', async () => {
             await getDriver().page.goto(url)
 
-            // Make sure the tab is active, because it might not be active if the install page has opened.
-            await closeInstallPageTab(getDriver().page.browser())
-
             await getDriver().page.waitForSelector(
                 '[data-testid="code-view-toolbar"] [data-testid="open-on-sourcegraph"]',
                 { timeout: 10000 }
@@ -105,19 +101,3 @@ export function testSingleFilePage({
         }
     })
 }
-
-/**
- * Find a tab that contains the browser extension's after-install page (url
- * ending in `/after_install.html`) and, if found, close it.
- *
- * The after-install page is opened automatically when the browser extension is
- * installed. In tests, this means that it's opened automatically every time we
- * start the browser (with the browser extension loaded).
- */
-export async function closeInstallPageTab(browser: puppeteer.Browser): Promise<void> {
-    const pages = await browser.pages()
-    const installPage = pages.find(page => page.url().endsWith('/after_install.html'))
-    if (installPage) {
-        await installPage.close()
-    }
-}
diff --git a/client/browser/src/integration/github.test.ts b/client/browser/src/integration/github.test.ts
index b344caf39401..ec683f2691bc 100644
--- a/client/browser/src/integration/github.test.ts
+++ b/client/browser/src/integration/github.test.ts
@@ -10,7 +10,6 @@ import { afterEachSaveScreenshotIfFailed } from '@sourcegraph/shared/src/testing
 import { readEnvironmentBoolean, readEnvironmentString, retry } from '@sourcegraph/shared/src/testing/utils'
 
 import { type BrowserIntegrationTestContext, createBrowserIntegrationTestContext } from './context'
-import { closeInstallPageTab } from './shared'
 
 describe('GitHub', () => {
     let driver: Driver
@@ -26,7 +25,6 @@ describe('GitHub', () => {
 
     beforeEach(async function () {
         driver = await createDriverForTest({ loadExtension: true })
-        await closeInstallPageTab(driver.browser)
         if (driver.sourcegraphBaseUrl !== 'https://sourcegraph.com') {
             await driver.setExtensionSourcegraphUrl()
         }
diff --git a/client/browser/src/integration/gitlab.test.ts b/client/browser/src/integration/gitlab.test.ts
index d0c8c87d9b05..6d9cd4273bc4 100644
--- a/client/browser/src/integration/gitlab.test.ts
+++ b/client/browser/src/integration/gitlab.test.ts
@@ -9,13 +9,11 @@ import { afterEachSaveScreenshotIfFailed } from '@sourcegraph/shared/src/testing
 import { readEnvironmentString, retry } from '@sourcegraph/shared/src/testing/utils'
 
 import { type BrowserIntegrationTestContext, createBrowserIntegrationTestContext } from './context'
-import { closeInstallPageTab } from './shared'
 
 describe('GitLab', () => {
     let driver: Driver
     before(async () => {
         driver = await createDriverForTest({ loadExtension: true })
-        await closeInstallPageTab(driver.browser)
         if (driver.sourcegraphBaseUrl !== 'https://sourcegraph.com') {
             await driver.setExtensionSourcegraphUrl()
         }
diff --git a/client/browser/src/integration/shared.ts b/client/browser/src/integration/shared.ts
deleted file mode 100644
index c5a6dc96b7a1..000000000000
--- a/client/browser/src/integration/shared.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type puppeteer from 'puppeteer'
-
-/**
- * Find a tab that contains the browser extension's after-install page (url
- * ending in `/after_install.html`) and, if found, close it.
- *
- * The after-install page is opened automatically when the browser extension is
- * installed. In tests, this means that it's opened automatically every time we
- * start the browser (with the browser extension loaded).
- */
-export async function closeInstallPageTab(browser: puppeteer.Browser): Promise<void> {
-    // Sometimes the install page isn't open by the time we try to close it.
-    // Try to close the install page as quickly as possible, retry until it's open.
-    let tries = 0
-    while (tries < 5) {
-        const pages = await browser.pages()
-        const installPage = pages.find(page => page.url().endsWith('/after_install.html'))
-        if (installPage) {
-            await installPage.close()
-            return
-        }
-        await new Promise(resolve => setTimeout(resolve, 200))
-        tries++
-    }
-}
diff --git a/client/browser/src/shared/code-hosts/github/codeHost.module.scss b/client/browser/src/shared/code-hosts/github/codeHost.module.scss
index 0c2b9d21771c..2cd25ea475ea 100644
--- a/client/browser/src/shared/code-hosts/github/codeHost.module.scss
+++ b/client/browser/src/shared/code-hosts/github/codeHost.module.scss
@@ -3,8 +3,8 @@
 :root {
     // Map out CSS variables to the theme-aware GitHub ones
     // Latest variable, backwards compat (GitHub Enterprise) fallback, last-resort fallback to Sourcegraph color (in case GitHub changes its variables again)
-    --body-bg: var(--color-canvas-default, var(--color-bg-canvas, var(--white)));
-    --border-color: var(--color-border-default, var(--color-border-primary, var(--secondary)));
+    --body-bg: var(--bgColor-default, var(--color-canvas-default, var(--color-bg-canvas, var(--white))));
+    --border-color: var(--borderColor-default, var(--color-border-default, var(--color-border-primary, var(--secondary))));
     --secondary: var(--color-btn-bg, var(--color-auto-gray-2), var(--gray-06));
 }
 
@@ -18,19 +18,12 @@
     }
 }
 
-.action-item {
-    /* Match GitHub's button height even if button only contains icon
-     * (no text that would push the height) */
-    height: 28px;
-}
-
 .icon {
     height: 16px;
     width: 16px;
 }
 
 .code-view-toolbar {
-    margin-bottom: -4px;
     text-align: right;
 }
 
@@ -44,7 +37,6 @@
 .code-view-toolbar-item {
     /* The space provides enough margin */
     margin-left: 0 !important;
-    margin-bottom: 4px;
 }
 
 .hover-overlay-badge {
diff --git a/client/browser/src/shared/code-hosts/github/codeHost.tsx b/client/browser/src/shared/code-hosts/github/codeHost.tsx
index cf3d3f39fe24..69edcbb7f283 100644
--- a/client/browser/src/shared/code-hosts/github/codeHost.tsx
+++ b/client/browser/src/shared/code-hosts/github/codeHost.tsx
@@ -32,11 +32,11 @@ import type { ViewResolver } from '../shared/views'
 import { diffDomFunctions, searchCodeSnippetDOMFunctions, singleFileDOMFunctions } from './domFunctions'
 import { resolveDiffFileInfo, resolveFileInfo, resolveSnippetFileInfo } from './fileInfo'
 import {
+    getEmbeddedData,
     getFileContainers,
-    parseURL,
     getSelectorFor,
     isNewGitHubUI,
-    getEmbeddedData,
+    parseURL,
     windowLocation__testingOnly,
 } from './util'
 
@@ -725,14 +725,14 @@ export const githubCodeHost: GithubCodeHost = {
     }),
     getViewContextOnSourcegraphMount: createOpenOnSourcegraphIfNotExists,
     viewOnSourcegraphButtonClassProps: {
-        className: 'btn btn-sm tooltipped tooltipped-s',
+        className: 'Button Button--iconOnly Button--secondary Button--medium AppHeader-button',
         iconClassName,
     },
     check: checkIsGitHub,
     codeViewToolbarClassProps: {
         className: styles.codeViewToolbar,
         listItemClass: classNames(styles.codeViewToolbarItem, 'BtnGroup'),
-        actionItemClass: classNames('btn btn-sm tooltipped tooltipped-s BtnGroup-item', styles.actionItem),
+        actionItemClass: 'Button Button--iconOnly Button--secondary Button--medium',
         actionItemPressedClass: 'selected',
         actionItemIconClass: classNames(styles.icon, 'v-align-text-bottom'),
     },
diff --git a/client/browser/src/shared/code-hosts/shared/codeHost.module.scss b/client/browser/src/shared/code-hosts/shared/codeHost.module.scss
index 85ae2defce94..cab93de169c6 100644
--- a/client/browser/src/shared/code-hosts/shared/codeHost.module.scss
+++ b/client/browser/src/shared/code-hosts/shared/codeHost.module.scss
@@ -1,4 +1,9 @@
 .hover-overlay {
     isolation: isolate;
     z-index: 2000 !important;
+    min-width: 20rem !important;
+}
+
+.badge-hidden {
+    display: none !important;
 }
diff --git a/client/browser/src/shared/code-hosts/shared/codeHost.tsx b/client/browser/src/shared/code-hosts/shared/codeHost.tsx
index 42208bfae34f..bd3c425e1d12 100644
--- a/client/browser/src/shared/code-hosts/shared/codeHost.tsx
+++ b/client/browser/src/shared/code-hosts/shared/codeHost.tsx
@@ -7,35 +7,35 @@ import type { Renderer } from 'react-dom'
 import { createRoot } from 'react-dom/client'
 import {
     asyncScheduler,
+    BehaviorSubject,
     combineLatest,
+    concat,
     EMPTY,
     from,
+    fromEvent,
+    lastValueFrom,
     type Observable,
     of,
     Subject,
     Subscription,
-    type Unsubscribable,
-    concat,
-    BehaviorSubject,
-    fromEvent,
-    lastValueFrom,
     throwError,
+    type Unsubscribable,
 } from 'rxjs'
 import {
     catchError,
     concatAll,
     concatMap,
+    distinctUntilChanged,
     filter,
     map,
     mergeMap,
     observeOn,
-    switchMap,
-    withLatestFrom,
-    tap,
-    startWith,
-    distinctUntilChanged,
     retry,
+    startWith,
+    switchMap,
     take,
+    tap,
+    withLatestFrom,
 } from 'rxjs/operators'
 
 import type { HoverMerged } from '@sourcegraph/client-api'
@@ -51,18 +51,19 @@ import {
     asError,
     asObservable,
     isDefined,
+    isExternalLink,
     isInstanceOf,
+    type LineOrPositionOrRange,
     property,
     registerHighlightContributions,
-    isExternalLink,
-    type LineOrPositionOrRange,
 } from '@sourcegraph/common'
 import type { WorkspaceRoot } from '@sourcegraph/extension-api-types'
 import { gql, isHTTPAuthError } from '@sourcegraph/http-client'
 import type { ActionItemAction } from '@sourcegraph/shared/src/actions/ActionItem'
-import { wrapRemoteObservable } from '@sourcegraph/shared/src/api/client/api/common'
 import type { CodeEditorData, CodeEditorWithPartialModel } from '@sourcegraph/shared/src/api/viewerTypes'
 import { isRepoNotFoundErrorLike } from '@sourcegraph/shared/src/backend/errors'
+import { createCodeIntelAPI } from '@sourcegraph/shared/src/codeintel/api'
+import type { CodeIntelContext } from '@sourcegraph/shared/src/codeintel/legacy-extensions/api'
 import type { Controller } from '@sourcegraph/shared/src/extensions/controller'
 import { getHoverActions, registerHoverContributions } from '@sourcegraph/shared/src/hover/actions'
 import {
@@ -72,18 +73,18 @@ import {
 } from '@sourcegraph/shared/src/hover/HoverOverlay'
 import { getModeFromPath } from '@sourcegraph/shared/src/languages'
 import type { PlatformContext, URLToFileContext } from '@sourcegraph/shared/src/platform/context'
-import { TelemetryV2Props } from '@sourcegraph/shared/src/telemetry'
+import type { TelemetryV2Props } from '@sourcegraph/shared/src/telemetry'
 import type { TelemetryProps } from '@sourcegraph/shared/src/telemetry/telemetryService'
 import { createURLWithUTM } from '@sourcegraph/shared/src/tracking/utm'
 import {
     type FileSpec,
-    type UIPositionSpec,
+    makeRepoGitURI,
     type RawRepoSpec,
     type RepoSpec,
     type ResolvedRevisionSpec,
     type RevisionSpec,
+    type UIPositionSpec,
     type ViewStateSpec,
-    makeRepoGitURI,
 } from '@sourcegraph/shared/src/util/url'
 
 import { background } from '../../../browser-extension/web-extension-api/runtime'
@@ -95,8 +96,8 @@ import { CodeViewToolbar, type CodeViewToolbarClassProps } from '../../component
 import { TrackAnchorClick } from '../../components/TrackAnchorClick'
 import { WildcardThemeProvider } from '../../components/WildcardThemeProvider'
 import { isExtension, isInPage } from '../../context'
-import type { SourcegraphIntegrationURLs, BrowserPlatformContext } from '../../platform/context'
-import { resolveRevision, retryWhenCloneInProgressError, resolvePrivateRepo } from '../../repo/backend'
+import type { BrowserPlatformContext, SourcegraphIntegrationURLs } from '../../platform/context'
+import { resolvePrivateRepo, resolveRevision, retryWhenCloneInProgressError } from '../../repo/backend'
 import { ConditionalTelemetryRecorderProvider } from '../../telemetry'
 import { ConditionalTelemetryService, EventLogger } from '../../tracking/eventLogger'
 import { DEFAULT_SOURCEGRAPH_URL, getPlatformName, isDefaultSourcegraphUrl } from '../../util/context'
@@ -109,16 +110,16 @@ import { type GithubCodeHost, githubCodeHost, isGithubCodeHost } from '../github
 import { gitlabCodeHost } from '../gitlab/codeHost'
 import { phabricatorCodeHost } from '../phabricator/codeHost'
 
-import { type CodeView, trackCodeViews, fetchFileContentForDiffOrFileInfo } from './codeViews'
+import { type CodeView, fetchFileContentForDiffOrFileInfo, trackCodeViews } from './codeViews'
 import { NotAuthenticatedError, RepoURLParseError } from './errors'
 import { initializeExtensions } from './extensions'
 import { SignInButton } from './SignInButton'
-import { resolveRepoNamesForDiffOrFileInfo, defaultRevisionToCommitID } from './util/fileInfo'
+import { defaultRevisionToCommitID, resolveRepoNamesForDiffOrFileInfo } from './util/fileInfo'
 import { lprToSelectionsZeroIndexed } from './util/selections'
 import {
-    type ViewOnSourcegraphButtonClassProps,
-    ViewOnSourcegraphButton,
     ConfigureSourcegraphButton,
+    ViewOnSourcegraphButton,
+    type ViewOnSourcegraphButtonClassProps,
 } from './ViewOnSourcegraphButton'
 import { delayUntilIntersecting, trackViews, type ViewResolver } from './views'
 
@@ -227,7 +228,6 @@ export interface CodeHost {
 
     /**
      * Construct the URL to the specified file.
-     *
      * @param sourcegraphURL The URL of the Sourcegraph instance.
      * @param target The target to build a URL for.
      * @param context Context information about this invocation.
@@ -355,6 +355,13 @@ function initCodeIntelligence({
         })
     )
 
+    const codeintelContext: CodeIntelContext = { ...platformContext, telemetryRecorder, settings: () => undefined }
+    const codeintelAPI = createCodeIntelAPI(codeintelContext)
+
+    function thenMaybeLoadingResult<T>(result: T): MaybeLoadingResult<T> {
+        return { isLoading: false, result }
+    }
+
     // Code views come and go, but there is always a single hoverifier on the page
     const hoverifier = createHoverifier<
         RepoSpec & RevisionSpec & FileSpec & ResolvedRevisionSpec,
@@ -370,17 +377,22 @@ function initCodeIntelligence({
         getHover: ({ line, character, part, ...rest }) =>
             concat(
                 [{ isLoading: true, result: null }],
-                from(extensionsController.extHostAPI)
+                of(true /* TODO!(sqs) */)
                     .pipe(
                         withLatestFrom(repoSyncErrors),
-                        switchMap(([extensionHost, hasRepoSyncError]) =>
+                        switchMap(([, hasRepoSyncError]) =>
                             // Prevent GraphQL requests that we know will result in error/null when the repo is private (and not added to Cloud)
                             hasRepoSyncError
                                 ? of({ isLoading: true, result: null })
-                                : wrapRemoteObservable(
-                                      extensionHost.getHover(
-                                          toTextDocumentPositionParameters({ ...rest, position: { line, character } })
-                                      )
+                                : from(
+                                      codeintelAPI
+                                          .getHover(
+                                              toTextDocumentPositionParameters({
+                                                  ...rest,
+                                                  position: { line, character },
+                                              })
+                                          )
+                                          .then(thenMaybeLoadingResult)
                                   )
                         )
                     )
@@ -394,19 +406,20 @@ function initCodeIntelligence({
                     )
             ),
         getDocumentHighlights: ({ line, character, part, ...rest }) =>
-            from(extensionsController.extHostAPI).pipe(
+            of(true /* TODO!(sqs) */).pipe(
                 withLatestFrom(repoSyncErrors),
-                switchMap(([extensionHost, hasRepoSyncError]) =>
+                switchMap(([, hasRepoSyncError]) =>
                     // Prevent GraphQL requests that we know will result in error/null when the repo is private (and not added to Cloud)
                     hasRepoSyncError
                         ? of([])
-                        : wrapRemoteObservable(
-                              extensionHost.getDocumentHighlights(
+                        : from(
+                              codeintelAPI.getDocumentHighlights(
                                   toTextDocumentPositionParameters({ ...rest, position: { line, character } })
                               )
                           )
                 )
             ),
+        // TODO!(sqs): just gotta make it so the actions are determined programmatically AND we only trigger it on supported languages
         getActions: context =>
             // Prevent GraphQL requests that we know will result in error/null when the repo is private (and not added to Cloud)
             repoSyncErrors.pipe(
@@ -474,6 +487,7 @@ function initCodeIntelligence({
                     <HoverOverlay
                         {...this.state.hoverOverlayProps}
                         {...codeHost.hoverOverlayClassProps}
+                        badgeClassName={styles.badgeHidden} // hide badges in browser ext
                         className={classNames(styles.hoverOverlay, codeHost.hoverOverlayClassProps?.className)}
                         telemetryService={telemetryService}
                         telemetryRecorder={telemetryRecorder}
@@ -666,7 +680,7 @@ const isSafeToContinueCodeIntel = async ({
         if (isExtension) {
             // Notify to show extension alert-icon
             background.notifyRepoSyncError({ sourcegraphURL, hasRepoSyncError: true }).catch(error => {
-                console.error('Error notifying background page of private cloud.', error)
+                console.error('Error notifying background page of repository sync error.', error)
             })
         }
 
@@ -748,7 +762,7 @@ export async function handleCodeHost({
      * active Sourcegraph URL.
      * 2. It is a repository not added to the Sourcegraph instance (other than Cloud).
      * If the current state is `true`, we can short circuit subsequent requests.
-     * */
+     */
     const repoSyncErrors = new BehaviorSubject<boolean>(false)
     // Set by `ViewOnSourcegraphButton` (cleans up and sets to `false` whenever it is unmounted).
     const setRepoSyncError = repoSyncErrors.next.bind(repoSyncErrors)
@@ -759,7 +773,7 @@ export async function handleCodeHost({
      * - repository is not added to other than Cloud Sourcegraph instance.
      *
      * (no side effects, doesn't notify `repoSyncErrors`)
-     * */
+     */
     const checkRepoSyncError = async (error: any): Promise<boolean> =>
         isRepoNotFoundErrorLike(error) &&
         (isDefaultSourcegraphUrl(sourcegraphURL) ? !!(await codeHost.getContext?.())?.privateRepository : true)
@@ -841,7 +855,7 @@ export async function handleCodeHost({
                     setRepoSyncError(hasRepoSyncError)
                     if (isExtension) {
                         background.notifyRepoSyncError({ sourcegraphURL, hasRepoSyncError }).catch(error => {
-                            console.error('Error notifying background page of private cloud error:', error)
+                            console.error('Error notifying background page of repository sync error:', error)
                         })
                     }
                 }
diff --git a/client/browser/src/shared/context.ts b/client/browser/src/shared/context.ts
index 8f0c192b08e3..49f1d00addad 100644
--- a/client/browser/src/shared/context.ts
+++ b/client/browser/src/shared/context.ts
@@ -15,11 +15,11 @@ interface AppContext {
 }
 
 function getContext(): AppContext {
-    const appEnvironment = window.SG_ENV === 'EXTENSION' ? AppEnvironment.Extension : AppEnvironment.Page
+    const appEnvironment = globalThis.SG_ENV === 'EXTENSION' ? AppEnvironment.Extension : AppEnvironment.Page
 
     let scriptEnvironment: ScriptEnvironment = ScriptEnvironment.Content
     if (appEnvironment === AppEnvironment.Extension) {
-        if (window.location.pathname.includes('options.html')) {
+        if (globalThis.location.pathname.includes('options.html')) {
             scriptEnvironment = ScriptEnvironment.Options
         } else if (globalThis.browser && browser.runtime.getBackgroundPage) {
             scriptEnvironment = ScriptEnvironment.Background
@@ -40,4 +40,4 @@ export const isOptions = context.scriptEnvironment === ScriptEnvironment.Options
 export const isExtension = context.appEnvironment === AppEnvironment.Extension
 export const isInPage = !isExtension
 
-export const isPhabricator = Boolean(document.querySelector('.phabricator-wordmark'))
+export const isPhabricator = Boolean(typeof document !== 'undefined' && document.querySelector('.phabricator-wordmark'))
diff --git a/client/browser/src/shared/platform/extensionHost.ts b/client/browser/src/shared/platform/extensionHost.ts
index 396392931ba3..0b56c074393c 100644
--- a/client/browser/src/shared/platform/extensionHost.ts
+++ b/client/browser/src/shared/platform/extensionHost.ts
@@ -1,7 +1,7 @@
 import { Subscription } from 'rxjs'
 import * as uuid from 'uuid'
 
-import type { EndpointPair, ClosableEndpointPair } from '@sourcegraph/shared/src/platform/context'
+import type { ClosableEndpointPair, EndpointPair } from '@sourcegraph/shared/src/platform/context'
 
 import { isInPage } from '../context'
 
@@ -72,6 +72,7 @@ function createInPageExtensionHost({
 export function createExtensionHost(
     urls: Pick<SourcegraphIntegrationURLs, 'assetsURL'>
 ): Promise<ClosableEndpointPair> {
+    // TODO!(sqs): in-page ext host doesnt need a separate code path anymore if just importing the exthost entrypoint here works
     if (isInPage) {
         return createInPageExtensionHost(urls)
     }
diff --git a/client/browser/src/shared/platform/inlineExtensionsService.ts b/client/browser/src/shared/platform/inlineExtensionsService.ts
index 533f85c27f95..145910a765ce 100644
--- a/client/browser/src/shared/platform/inlineExtensionsService.ts
+++ b/client/browser/src/shared/platform/inlineExtensionsService.ts
@@ -51,13 +51,22 @@ export function getInlineExtensions(assetsURL: string): Observable<ExecutableExt
         promises.push(
             fetch(manifestURL)
                 .then(response => checkOk(response).json())
-                .then(
-                    (manifest: ExtensionManifest): ExecutableExtension => ({
+                .then((manifest: ExtensionManifest): ExecutableExtension => {
+                    // HACK(sqs): Remove the not-super-useful "Find implementations" action.
+                    try {
+                        if (manifest.contributes?.actions) {
+                            manifest.contributes.actions = []
+                        }
+                    } catch {
+                        /* noop */
+                    }
+
+                    return {
                         id: extensionID,
                         manifest,
                         scriptURL,
-                    })
-                )
+                    }
+                })
         )
     }
 
diff --git a/client/browser/src/shared/platform/worker.ts b/client/browser/src/shared/platform/worker.ts
deleted file mode 100644
index 615ef50f4a05..000000000000
--- a/client/browser/src/shared/platform/worker.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { checkOk } from '@sourcegraph/http-client'
-
-import { isDefaultSourcegraphUrl } from '../util/context'
-
-/*
- * See [freeze_legacy_extensions.go](https://sourcegraph.com/github.com/sourcegraph/sourcegraph@e8abca577d556b557372518170aaf045093ea760/-/blob/cmd/frontend/internal/registry/scripts/freeze_legacy_extensions.go)
- * and [sourcegraph/pull/45923](https://github.com/sourcegraph/sourcegraph/pull/45923) for more context.
- */
-const LEGACY_EXTENSIONS_BUCKET_URL = 'https://storage.googleapis.com/sourcegraph-legacy-extensions/'
-
-export async function createBlobURLForBundle(bundleURL: string): Promise<string> {
-    const { origin, hostname, href } = new URL(bundleURL)
-    // Include credentials when fetching extensions from the private registry
-    const includeCredentials =
-        !isDefaultSourcegraphUrl(origin) && hostname !== 'localhost' && !href.startsWith(LEGACY_EXTENSIONS_BUCKET_URL)
-    const response = await fetch(bundleURL, {
-        credentials: includeCredentials ? 'include' : 'omit',
-    })
-    checkOk(response)
-    const blob = await response.blob()
-    return window.URL.createObjectURL(blob)
-}
diff --git a/client/browser/src/shared/util/context.tsx b/client/browser/src/shared/util/context.tsx
index 9b8aeb710a88..1368fb04cc0a 100644
--- a/client/browser/src/shared/util/context.tsx
+++ b/client/browser/src/shared/util/context.tsx
@@ -13,7 +13,9 @@ export function observeSourcegraphURL(isExtension: boolean): Observable<string>
             map(sourcegraphURL => sourcegraphURL || DEFAULT_SOURCEGRAPH_URL)
         )
     }
-    return of(window.SOURCEGRAPH_URL || window.localStorage.getItem('SOURCEGRAPH_URL') || DEFAULT_SOURCEGRAPH_URL)
+    return of(
+        globalThis.SOURCEGRAPH_URL || globalThis.localStorage.getItem('SOURCEGRAPH_URL') || DEFAULT_SOURCEGRAPH_URL
+    )
 }
 
 /**
@@ -27,7 +29,7 @@ export function observeSourcegraphURL(isExtension: boolean): Observable<string>
  * Otherwise, the given `sourcegraphURL` will be used.
  */
 export function getAssetsURL(sourcegraphURL: string): string {
-    const assetsURL = window.SOURCEGRAPH_ASSETS_URL || new URL('/.assets/extension/', sourcegraphURL).href
+    const assetsURL = globalThis.SOURCEGRAPH_ASSETS_URL || new URL('/.assets/extension/', sourcegraphURL).href
     return assetsURL.endsWith('/') ? assetsURL : assetsURL + '/'
 }
 
@@ -38,11 +40,11 @@ export type PlatformName =
     | 'safari-extension'
 
 export function getPlatformName(): PlatformName {
-    if (window.SOURCEGRAPH_PHABRICATOR_EXTENSION) {
+    if (globalThis.SOURCEGRAPH_PHABRICATOR_EXTENSION) {
         return 'phabricator-integration'
     }
-    if (window.SOURCEGRAPH_INTEGRATION) {
-        return window.SOURCEGRAPH_INTEGRATION
+    if (globalThis.SOURCEGRAPH_INTEGRATION) {
+        return globalThis.SOURCEGRAPH_INTEGRATION
     }
     if (isSafari()) {
         return 'safari-extension'
@@ -51,13 +53,16 @@ export function getPlatformName(): PlatformName {
 }
 
 export function getTelemetryClientName(): string {
-    if (window.SOURCEGRAPH_PHABRICATOR_EXTENSION || window.SOURCEGRAPH_INTEGRATION === 'phabricator-integration') {
+    if (
+        globalThis.SOURCEGRAPH_PHABRICATOR_EXTENSION ||
+        globalThis.SOURCEGRAPH_INTEGRATION === 'phabricator-integration'
+    ) {
         return 'phabricator.integration'
     }
-    if (window.SOURCEGRAPH_INTEGRATION === 'bitbucket-integration') {
+    if (globalThis.SOURCEGRAPH_INTEGRATION === 'bitbucket-integration') {
         return 'bitbucket.integration'
     }
-    if (window.SOURCEGRAPH_INTEGRATION === 'gitlab-integration') {
+    if (globalThis.SOURCEGRAPH_INTEGRATION === 'gitlab-integration') {
         return 'gitlab.integration'
     }
     if (isSafari()) {
@@ -78,7 +83,7 @@ export function getExtensionVersion(): string {
 function isSafari(): boolean {
     // Chrome's user agent contains "Safari" as well as "Chrome", so for Safari
     // we must check that it does not include "Chrome"
-    return window.navigator.userAgent.includes('Safari') && !window.navigator.userAgent.includes('Chrome')
+    return globalThis.navigator.userAgent.includes('Safari') && !globalThis.navigator.userAgent.includes('Chrome')
 }
 
 export function isDefaultSourcegraphUrl(url?: string): boolean {
diff --git a/client/browser/src/types/webextension-polyfill/index.d.ts b/client/browser/src/types/webextension-polyfill/index.d.ts
index 7400dc5eed81..ea981d11efda 100644
--- a/client/browser/src/types/webextension-polyfill/index.d.ts
+++ b/client/browser/src/types/webextension-polyfill/index.d.ts
@@ -133,7 +133,7 @@ declare namespace browser.bookmarks {
     >
 }
 
-declare namespace browser.browserAction {
+declare namespace browser.action {
     type ColorArray = [number, number, number, number]
     type ImageDataType = ImageData
 
@@ -162,7 +162,10 @@ declare namespace browser.browserAction {
     function openPopup(): Promise<void>
     function setBadgeText(details: { text: string | null; tabId?: number }): void
     function getBadgeText(details: { tabId?: number }): Promise<string>
-    function setBadgeBackgroundColor(details: { color: string | ColorArray | null; tabId?: number }): void
+    function setBadgeBackgroundColor(details: {
+        color: string | ColorArray | null
+        tabId?: number
+    }): void
     function getBadgeBackgroundColor(details: { tabId?: number }): Promise<ColorArray>
 
     interface SetBadgeTextColorDetails {
@@ -176,12 +179,10 @@ declare namespace browser.browserAction {
     }
     function setBadgeTextColor(details: SetBadgeTextColorDetails & { tabId?: number }): void
     // a union type would allow specifying both, which is not allowed.
-    // eslint-disable-next-line @typescript-eslint/unified-signatures
     function setBadgeTextColor(details: SetBadgeTextColorDetails & { windowId?: number }): void
 
     function getBadgeTextColor(details: { tabId?: string }): Promise<ColorArray>
     // a union type would allow specifying both, which is not allowed.
-    // eslint-disable-next-line @typescript-eslint/unified-signatures
     function getBadgeTextColor(details: { windowId?: string }): Promise<ColorArray>
 
     function enable(tabId?: number): void
@@ -190,6 +191,11 @@ declare namespace browser.browserAction {
     const onClicked: EventEmitter<tabs.Tab>
 }
 
+declare namespace browser.browserAction {
+    function setIcon(details: IconViaPath | IconViaImageData | IconReset): Promise<void>
+    function setPopup(details: { popup: string | null; tabId?: number }): void
+}
+
 declare namespace browser.browsingData {
     interface DataTypeSet {
         cache?: boolean
@@ -342,7 +348,11 @@ declare namespace browser.contextualIdentities {
         name: string
     }
 
-    function create(details: { name: string; color: IdentityColor; icon: IdentityIcon }): Promise<ContextualIdentity>
+    function create(details: {
+        name: string
+        color: IdentityColor
+        icon: IdentityIcon
+    }): Promise<ContextualIdentity>
     function get(cookieStoreId: string): Promise<ContextualIdentity | null>
     function query(details: { name?: string }): Promise<ContextualIdentity[]>
     function update(
@@ -424,13 +434,19 @@ declare namespace browser.contentScripts {
         unregister: () => void
     }
 
-    function register(contentScriptOptions: RegisteredContentScriptOptions): Promise<RegisteredContentScript>
+    function register(
+        contentScriptOptions: RegisteredContentScriptOptions
+    ): Promise<RegisteredContentScript>
 }
 
 declare namespace browser.devtools.inspectedWindow {
     const tabId: number
 
-    function reload(reloadOptions?: { ignoreCache?: boolean; userAgent?: string; injectedScript?: string }): void
+    function reload(reloadOptions?: {
+        ignoreCache?: boolean
+        userAgent?: string
+        injectedScript?: string
+    }): void
 }
 
 declare namespace browser.devtools.network {
@@ -690,7 +706,10 @@ declare namespace browser.history {
 
     function deleteUrl(details: { url: string }): Promise<void>
 
-    function deleteRange(range: { startTime: number | string | Date; endTime: number | string | Date }): Promise<void>
+    function deleteRange(range: {
+        startTime: number | string | Date
+        endTime: number | string | Date
+    }): Promise<void>
 
     function deleteAll(): Promise<void>
 
@@ -787,8 +806,12 @@ declare namespace browser.omnibox {
     function setDefaultSuggestion(suggestion: { description: string }): void
 
     const onInputStarted: EventEmitter<void>
-    const onInputChanged: CallbackEventEmitter<(text: string, suggest: (arg: SuggestResult[]) => void) => void>
-    const onInputEntered: CallbackEventEmitter<(text: string, disposition: OnInputEnteredDisposition) => void>
+    const onInputChanged: CallbackEventEmitter<
+        (text: string, suggest: (arg: SuggestResult[]) => void) => void
+    >
+    const onInputEntered: CallbackEventEmitter<
+        (text: string, disposition: OnInputEnteredDisposition) => void
+    >
     const onInputCancelled: EventEmitter<void>
 }
 
@@ -803,7 +826,11 @@ declare namespace browser.pageAction {
 
     function getTitle(details: { tabId: number }): Promise<string>
 
-    function setIcon(details: { tabId: number; path?: string | object; imageData?: ImageDataType }): Promise<void>
+    function setIcon(details: {
+        tabId: number
+        path?: string | object
+        imageData?: ImageDataType
+    }): Promise<void>
 
     function setPopup(details: { tabId: number; popup: string }): void
 
@@ -1339,6 +1366,10 @@ declare namespace browser.storage {
     const onChanged: CallbackEventEmitter<(changes: ChangeDict<any>, areaName: AreaName) => void>
 }
 
+declare namespace browser.scripting {
+    function executeScript(details: { files: string[], target: any }): Promise<object[]>
+}
+
 declare namespace browser.tabs {
     type MutedInfoReason = 'capture' | 'extension' | 'user'
     interface MutedInfo {
@@ -1403,7 +1434,6 @@ declare namespace browser.tabs {
     function captureVisibleTab(windowId?: number, options?: extensionTypes.ImageDetails): Promise<string>
     function detectLanguage(tabId?: number): Promise<string>
     function duplicate(tabId: number): Promise<Tab>
-    function executeScript(tabId: number | undefined, details: extensionTypes.InjectDetails): Promise<object[]>
     function get(tabId: number): Promise<Tab>
     // deprecated: function getAllInWindow(): x;
     function getCurrent(): Promise<Tab>
@@ -1415,7 +1445,10 @@ declare namespace browser.tabs {
     //     windowId?: number,
     //     tabs: number[]|number,
     // }): Promise<browser.windows.Window>;
-    function insertCSS(tabId: number | undefined, details: extensionTypes.InjectDetailsCSS): Promise<void>
+    function insertCSS(
+        tabId: number | undefined,
+        details: extensionTypes.InjectDetailsCSS
+    ): Promise<void>
     function removeCSS(tabId: number | undefined, details: extensionTypes.InjectDetails): Promise<void>
     function move(
         tabIds: number | number[],
@@ -1930,7 +1963,10 @@ declare namespace browser.windows {
 
     function getCurrent(getInfo?: { populate?: boolean; windowTypes?: WindowType[] }): Promise<Window>
 
-    function getLastFocused(getInfo?: { populate?: boolean; windowTypes?: WindowType[] }): Promise<Window>
+    function getLastFocused(getInfo?: {
+        populate?: boolean
+        windowTypes?: WindowType[]
+    }): Promise<Window>
 
     function getAll(getInfo?: { populate?: boolean; windowTypes?: WindowType[] }): Promise<Window[]>
 
diff --git a/client/build-config/package.json b/client/build-config/package.json
index 3a5bb7ed8578..0591f0af5d79 100644
--- a/client/build-config/package.json
+++ b/client/build-config/package.json
@@ -16,7 +16,6 @@
   "dependencies": {
     "buffer": "^6.0.3",
     "enhanced-resolve": "^5.9.3",
-    "esbuild": "^0.17.7",
     "monaco-editor-webpack-plugin": "^3.1.0",
     "postcss": "^8.4.19",
     "postcss-cli": "^10.1.0",
diff --git a/client/build-config/src/esbuild/stylePlugin.ts b/client/build-config/src/esbuild/stylePlugin.ts
index cba1b1bf67a6..0039e2ddddbf 100644
--- a/client/build-config/src/esbuild/stylePlugin.ts
+++ b/client/build-config/src/esbuild/stylePlugin.ts
@@ -1,7 +1,7 @@
 import fs from 'fs'
 import path from 'path'
 
-import { ResolverFactory, CachedInputFileSystem } from 'enhanced-resolve'
+import { CachedInputFileSystem, ResolverFactory } from 'enhanced-resolve'
 import type esbuild from 'esbuild'
 import postcss from 'postcss'
 import postcssModules from 'postcss-modules'
@@ -27,7 +27,7 @@ export const stylePlugin: esbuild.Plugin = {
 
         const modulesMap = new Map<string, string>()
         const modulesPlugin = postcssModules({
-            generateScopedName: '[name]__[local]', // omit hash for local dev
+            generateScopedName: '[name]__[local]___[hash:base64:5]',
             localsConvention: 'camelCase',
             getJSON: (cssPath, json) => modulesMap.set(cssPath, JSON.stringify(json)),
         })
@@ -46,7 +46,7 @@ export const stylePlugin: esbuild.Plugin = {
             const isSCSS = inputPath.endsWith('.scss')
             const sassResult = isSCSS
                 ? // renderSync is ~20% faster than render with an async callback (because it's blocked on CPU, not IO).
-                  // eslint-disable-next-line no-sync
+
                   sass.renderSync({
                       file: inputPath,
                       data: inputContents,
diff --git a/client/shared/src/api/client/mainthread-api.ts b/client/shared/src/api/client/mainthread-api.ts
index ede9a8765ca3..857db9eddf5a 100644
--- a/client/shared/src/api/client/mainthread-api.ts
+++ b/client/shared/src/api/client/mainthread-api.ts
@@ -1,5 +1,5 @@
 import { type Remote, proxy } from 'comlink'
-import { type Unsubscribable, Subscription, from, of, lastValueFrom, ReplaySubject } from 'rxjs'
+import { type Unsubscribable, from, lastValueFrom, of, ReplaySubject, Subscription } from 'rxjs'
 import { share, switchMap } from 'rxjs/operators'
 
 import { logger } from '@sourcegraph/common'
@@ -141,7 +141,7 @@ export const initMainThreadAPI = (
             return proxySubscribable(of([]))
         },
         logEvent: (eventName, eventProperties) => platformContext.telemetryService?.log(eventName, eventProperties),
-        getTelemetryRecorder: () => platformContext.telemetryRecorder,
+        recordEvent: platformContext.telemetryRecorder.recordEvent as MainThreadAPI['recordEvent'],
         logExtensionMessage: (...data) => logger.log(...data),
     }
 
diff --git a/client/shared/src/api/contract.ts b/client/shared/src/api/contract.ts
index 50e6af884d9b..dbc4745c9e46 100644
--- a/client/shared/src/api/contract.ts
+++ b/client/shared/src/api/contract.ts
@@ -1,22 +1,22 @@
-import type { Remote, ProxyMarked } from 'comlink'
+import type { ProxyMarked, Remote } from 'comlink'
 import type { Unsubscribable } from 'rxjs'
 
 import type {
     Contributions,
     Evaluated,
+    HoverMerged,
     Raw,
     TextDocumentPositionParameters,
-    HoverMerged,
 } from '@sourcegraph/client-api'
 import type { MaybeLoadingResult } from '@sourcegraph/codeintellify'
 import type * as clientType from '@sourcegraph/extension-api-types'
 import type { GraphQLResult } from '@sourcegraph/http-client'
+import type { KnownKeys, TelemetryEventParameters } from '@sourcegraph/telemetry'
 
 import type { DocumentHighlight, ReferenceContext } from '../codeintel/legacy-extensions/api'
 import type { Occurrence } from '../codeintel/scip'
 import type { ConfiguredExtension } from '../extensions/extension'
 import type { SettingsCascade } from '../settings/settings'
-import type { TelemetryV2Props } from '../telemetry'
 
 import type { SettingsEdit } from './client/services/settings'
 import type { ExecutableExtension } from './extension/activation'
@@ -75,7 +75,6 @@ export interface FlatExtensionHostAPI extends CodeIntelExtensionHostAPI {
     /**
      * Sets the given context keys and values.
      * If a value is `null`, the context key is removed.
-     *
      * @param update Object with context keys as values
      */
     updateContext: (update: { [k: string]: unknown }) => void
@@ -89,7 +88,6 @@ export interface FlatExtensionHostAPI extends CodeIntelExtensionHostAPI {
     /**
      * Returns an observable that emits all contributions (merged) evaluated in the current model
      * (with the optional scope). It emits whenever there is any change.
-     *
      * @template T Extra allowed property value types for the {@link Context} value. See
      * {@link Context}'s `T` type parameter for more information.
      * @param scope The scope in which contributions are fetched. A scope can be a sub-component of
@@ -111,7 +109,6 @@ export interface FlatExtensionHostAPI extends CodeIntelExtensionHostAPI {
 
     /**
      * Add a viewer.
-     *
      * @param viewer The description of the viewer to add.
      * @returns The added code viewer (which must be passed as the first argument to other
      * viewer methods to operate on this viewer).
@@ -125,7 +122,6 @@ export interface FlatExtensionHostAPI extends CodeIntelExtensionHostAPI {
 
     /**
      * Sets the selections for a CodeEditor.
-     *
      * @param codeEditor The editor for which to set the selections.
      * @param selections The new selections to apply.
      * @throws if no editor exists with the given editor ID.
@@ -136,7 +132,6 @@ export interface FlatExtensionHostAPI extends CodeIntelExtensionHostAPI {
     /**
      * Removes a viewer.
      * Also removes the corresponding model if no other viewer is referencing it.
-     *
      * @param viewer The viewer to remove.
      */
     removeViewer(viewer: ViewerId): void
@@ -176,15 +171,29 @@ export interface MainThreadAPI {
 
     /**
      * Log an event (by sending it to the server).
-     *
-     * @deprecated use getTelemetryRecorder().recordEvent instead
+     * @deprecated use {@link MainThreadAPI.recordEvent} instead
      */
     logEvent: (eventName: string, eventProperties?: any) => void
 
     /**
-     * Get a TelemetryRecorder for recording telemetry events to the server.
+     * Record a telemetry event.
+     *
+     * The type signature should be kept in sync with {@link TelemetryRecorder.recordEvent}.
      */
-    getTelemetryRecorder: () => TelemetryV2Props['telemetryRecorder']
+    recordEvent: (
+        feature: string,
+        action: string,
+        parameters?: TelemetryEventParameters<
+            KnownKeys<
+                string,
+                {
+                    [key in string]: number
+                }
+            >,
+            string,
+            string
+        >
+    ) => void
 
     /**
      * Log messages from extensions in the main thread. Makes it easier to debug extensions for applications
diff --git a/client/shared/src/api/extension/activation.ts b/client/shared/src/api/extension/activation.ts
index bd170670588e..b926e55857c3 100644
--- a/client/shared/src/api/extension/activation.ts
+++ b/client/shared/src/api/extension/activation.ts
@@ -4,7 +4,7 @@ import { catchError, concatMap, distinctUntilChanged, first, map, switchMap, tap
 import type sourcegraph from 'sourcegraph'
 
 import type { Contributions } from '@sourcegraph/client-api'
-import { asError, isErrorLike, hashCode, logger } from '@sourcegraph/common'
+import { asError, hashCode, isErrorLike, logger } from '@sourcegraph/common'
 
 import {
     type ConfiguredExtension,
@@ -66,18 +66,17 @@ const DEPRECATED_EXTENSION_IDS = new Set(['sourcegraph/code-stats-insights', 'so
 
 export function activateExtensions(
     state: Pick<ExtensionHostState, 'activeExtensions' | 'contributions' | 'haveInitialExtensionsLoaded' | 'settings'>,
-    mainAPI: Remote<Pick<MainThreadAPI, 'logEvent' | 'getTelemetryRecorder'>>,
+    mainAPI: Remote<Pick<MainThreadAPI, 'logEvent' | 'recordEvent'>>,
     createExtensionAPI: (extensionID: string) => typeof sourcegraph,
-    mainThreadAPIInitializations: Observable<boolean>,
     /**
      * Function that activates an extension.
      * Returns a promise that resolves once the extension is activated.
-     * */
+     */
     activate = activateExtension,
     /**
      * Function that de-activates an extension.
      * Returns a promise that resolves once the extension is de-activated.
-     * */
+     */
     deactivate = deactivateExtension
 ): Subscription {
     const previouslyActivatedExtensions = new Set<string>()
@@ -168,8 +167,7 @@ export function activateExtensions(
                                                 .catch(() => {
                                                     // noop
                                                 })
-                                            const telemetryRecorder = await mainAPI.getTelemetryRecorder()
-                                            telemetryRecorder.recordEvent('blob.extension', 'activate', {
+                                            mainAPI.recordEvent('blob.extension', 'activate', {
                                                 privateMetadata: { extensionID: telemetryExtensionID },
                                             })
                                         } catch (error) {
@@ -365,7 +363,6 @@ export interface ExecutableExtension extends Pick<ConfiguredExtension, 'id' | 'm
  *
  * Because `require` is replaced on each extension activation with the API created for that extension,
  * the API can only be imported once to prevent extensions importing APIs created for other extensions.
- *
  * @param extensionAPI The extension API instance for the extension to be activated.
  * @throws error to give extension authors feedback if they try to import an API instance that was
  * already imported (e.g. if they asynchronously import the extension API and the current `require` was
diff --git a/client/shared/src/api/extension/extensionHost.ts b/client/shared/src/api/extension/extensionHost.ts
index 99d02909d287..133635d9c4fd 100644
--- a/client/shared/src/api/extension/extensionHost.ts
+++ b/client/shared/src/api/extension/extensionHost.ts
@@ -35,7 +35,6 @@ export interface InitData {
  *
  * It expects to receive a message containing {@link InitData} from the client application as the
  * first message.
- *
  * @param endpoints The endpoints to the client.
  * @returns An unsubscribable to terminate the extension host.
  */
@@ -74,7 +73,6 @@ export function startExtensionHost(
  *
  * The extension API is made globally available to all requires/imports of the "sourcegraph" module
  * by other scripts running in the same JavaScript context.
- *
  * @param endpoints The endpoints to the client.
  * @param initData The information to initialize this extension host.
  * @returns An unsubscribable to terminate the extension host.
@@ -137,7 +135,7 @@ function createExtensionAndExtensionHostAPIs(
     const createExtensionAPI = createExtensionAPIFactory(extensionHostState, proxy, initData)
 
     // Activate extensions. Create extension APIs on extension activation.
-    subscription.add(activateExtensions(extensionHostState, proxy, createExtensionAPI, mainThreadAPIInitializations))
+    subscription.add(activateExtensions(extensionHostState, proxy, createExtensionAPI))
 
     // Observe settings and update active loggers state
     subscription.add(setActiveLoggers(extensionHostState))
diff --git a/client/shared/src/api/extension/test/activation.test.ts b/client/shared/src/api/extension/test/activation.test.ts
index 8b18c5d3d1b2..704945a279d9 100644
--- a/client/shared/src/api/extension/test/activation.test.ts
+++ b/client/shared/src/api/extension/test/activation.test.ts
@@ -1,4 +1,4 @@
-import { BehaviorSubject, firstValueFrom, of } from 'rxjs'
+import { BehaviorSubject, firstValueFrom } from 'rxjs'
 import { filter, first } from 'rxjs/operators'
 import sinon from 'sinon'
 import type sourcegraph from 'sourcegraph'
@@ -18,9 +18,9 @@ describe('Extension activation', () => {
         it('logs events for activated extensions', async () => {
             const logEvent = sinon.spy()
 
-            const mockMain = pretendRemote<Pick<MainThreadAPI, 'logEvent' | 'getTelemetryRecorder'>>({
+            const mockMain = pretendRemote<Pick<MainThreadAPI, 'logEvent' | 'recordEvent'>>({
                 logEvent,
-                getTelemetryRecorder: () => noOpTelemetryRecorder,
+                recordEvent: noOpTelemetryRecorder.recordEvent as MainThreadAPI['recordEvent'],
             })
 
             const FIXTURE_EXTENSION: ExecutableExtension = {
@@ -53,8 +53,6 @@ describe('Extension activation', () => {
                 function createExtensionAPI() {
                     return {} as typeof sourcegraph
                 },
-                of(true),
-                noopPromise,
                 noopPromise
             )
 
diff --git a/client/shared/src/api/extension/worker.ts b/client/shared/src/api/extension/worker.ts
index 0ced19f250ac..fb50a61540e8 100644
--- a/client/shared/src/api/extension/worker.ts
+++ b/client/shared/src/api/extension/worker.ts
@@ -1,20 +1,29 @@
 import type { EndpointPair } from '../../platform/context'
 
+import { startExtensionHost } from './extensionHost'
+
 /**
  * Creates a web worker with the extension host and sets up a bidirectional MessageChannel-based communication channel.
  */
-export function createExtensionHostWorker(workerBundleURL: string): { worker: Worker; clientEndpoints: EndpointPair } {
+export function createExtensionHostWorker(workerBundleURL: string): {
+    terminate: () => void
+    clientEndpoints: EndpointPair
+} {
     const clientAPIChannel = new MessageChannel()
     const extensionHostAPIChannel = new MessageChannel()
-    const worker = new Worker(workerBundleURL)
+    // TODO!(sqs): remove worker bundle from esbuild config
+
+    // const worker = new Worker(workerBundleURL)
     const workerEndpoints: EndpointPair = {
         proxy: clientAPIChannel.port2,
         expose: extensionHostAPIChannel.port2,
     }
-    worker.postMessage({ endpoints: workerEndpoints }, Object.values(workerEndpoints))
+    const extensionHost = startExtensionHost(workerEndpoints)
+    // worker.postMessage({ endpoints: workerEndpoints }, Object.values(workerEndpoints))
+
     const clientEndpoints = {
         proxy: extensionHostAPIChannel.port1,
         expose: clientAPIChannel.port1,
     }
-    return { worker, clientEndpoints }
+    return { terminate: () => extensionHost.unsubscribe(), clientEndpoints }
 }
diff --git a/client/shared/src/testing/driver.ts b/client/shared/src/testing/driver.ts
index 811debb20cfc..c4a436a1597b 100644
--- a/client/shared/src/testing/driver.ts
+++ b/client/shared/src/testing/driver.ts
@@ -286,7 +286,7 @@ export class Driver {
     /**
      * Navigates to the Sourcegraph browser extension page.
      */
-    public async openBrowserExtensionPage(page: 'options' | 'after_install'): Promise<void> {
+    public async openBrowserExtensionPage(page: 'options'): Promise<void> {
         await this.page.goto(`chrome-extension://${BROWSER_EXTENSION_DEV_ID}/${page}.html`)
     }
 
diff --git a/package.json b/package.json
index 8f48ecb0c0db..110bea3a145a 100644
--- a/package.json
+++ b/package.json
@@ -194,7 +194,7 @@
     "dedent": "^0.7.0",
     "dompurify": "^3.0.6",
     "envalid": "^7.3.1",
-    "esbuild": "^0.17.14",
+    "esbuild": "^0.23.0",
     "eslint": "^8.52.0",
     "eslint-plugin-monorepo": "^0.3.2",
     "eslint-plugin-react": "^7.33.2",
@@ -427,7 +427,6 @@
     "utility-types": "^3.10.0",
     "uuid": "^8.3.0",
     "vscode-uri": "^3.0.7",
-    "webext-domain-permission-toggle": "^1.0.1",
     "webextension-polyfill": "^0.6.0",
     "whatwg-url": "^14.0.0",
     "yaml-ast-parser": "^0.0.43",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7c22d3bde2e9..15c399863be0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -487,9 +487,6 @@ importers:
       vscode-uri:
         specifier: ^3.0.7
         version: 3.0.7
-      webext-domain-permission-toggle:
-        specifier: ^1.0.1
-        version: 1.0.1
       webextension-polyfill:
         specifier: ^0.6.0
         version: 0.6.0
@@ -897,8 +894,8 @@ importers:
         specifier: ^7.3.1
         version: 7.3.1
       esbuild:
-        specifier: ^0.17.14
-        version: 0.17.14
+        specifier: ^0.23.0
+        version: 0.23.0
       eslint:
         specifier: ^8.52.0
         version: 8.57.0
@@ -1189,9 +1186,6 @@ importers:
       enhanced-resolve:
         specifier: ^5.9.3
         version: 5.16.0
-      esbuild:
-        specifier: ^0.17.7
-        version: 0.17.14
       monaco-editor-webpack-plugin:
         specifier: ^3.1.0
         version: 3.1.0(monaco-editor@0.24.0)(webpack@5.90.3)
@@ -2193,7 +2187,7 @@ packages:
       '@babel/core': 7.24.7
       '@babel/helper-compilation-targets': 7.24.7
       '@babel/helper-plugin-utils': 7.24.7
-      debug: 4.3.4
+      debug: 4.3.5
       lodash.debounce: 4.0.8
       resolve: 1.22.8
     dev: false
@@ -3952,11 +3946,11 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/android-arm64@0.17.14:
-    resolution: {integrity: sha512-eLOpPO1RvtsP71afiFTvS7tVFShJBCT0txiv/xjFBo5a7R7Gjw7X0IgIaFoLKhqXYAXhahoXm7qAmRXhY4guJg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
+  /@esbuild/aix-ppc64@0.23.0:
+    resolution: {integrity: sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
     requiresBuild: true
     optional: true
 
@@ -3977,10 +3971,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/android-arm@0.17.14:
-    resolution: {integrity: sha512-0CnlwnjDU8cks0yJLXfkaU/uoLyRf9VZJs4p1PskBr2AlAHeEsFEwJEo0of/Z3g+ilw5mpyDwThlxzNEIxOE4g==}
-    engines: {node: '>=12'}
-    cpu: [arm]
+  /@esbuild/android-arm64@0.23.0:
+    resolution: {integrity: sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
     os: [android]
     requiresBuild: true
     optional: true
@@ -4002,10 +3996,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/android-x64@0.17.14:
-    resolution: {integrity: sha512-nrfQYWBfLGfSGLvRVlt6xi63B5IbfHm3tZCdu/82zuFPQ7zez4XjmRtF/wIRYbJQ/DsZrxJdEvYFE67avYXyng==}
-    engines: {node: '>=12'}
-    cpu: [x64]
+  /@esbuild/android-arm@0.23.0:
+    resolution: {integrity: sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==}
+    engines: {node: '>=18'}
+    cpu: [arm]
     os: [android]
     requiresBuild: true
     optional: true
@@ -4027,11 +4021,11 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/darwin-arm64@0.17.14:
-    resolution: {integrity: sha512-eoSjEuDsU1ROwgBH/c+fZzuSyJUVXQTOIN9xuLs9dE/9HbV/A5IqdXHU1p2OfIMwBwOYJ9SFVGGldxeRCUJFyw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
+  /@esbuild/android-x64@0.23.0:
+    resolution: {integrity: sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
     requiresBuild: true
     optional: true
 
@@ -4052,10 +4046,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/darwin-x64@0.17.14:
-    resolution: {integrity: sha512-zN0U8RWfrDttdFNkHqFYZtOH8hdi22z0pFm0aIJPsNC4QQZv7je8DWCX5iA4Zx6tRhS0CCc0XC2m7wKsbWEo5g==}
-    engines: {node: '>=12'}
-    cpu: [x64]
+  /@esbuild/darwin-arm64@0.23.0:
+    resolution: {integrity: sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
     os: [darwin]
     requiresBuild: true
     optional: true
@@ -4077,11 +4071,11 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/freebsd-arm64@0.17.14:
-    resolution: {integrity: sha512-z0VcD4ibeZWVQCW1O7szaLxGsx54gcCnajEJMdYoYjLiq4g1jrP2lMq6pk71dbS5+7op/L2Aod+erw+EUr28/A==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
+  /@esbuild/darwin-x64@0.23.0:
+    resolution: {integrity: sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
     requiresBuild: true
     optional: true
 
@@ -4102,10 +4096,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/freebsd-x64@0.17.14:
-    resolution: {integrity: sha512-hd9mPcxfTgJlolrPlcXkQk9BMwNBvNBsVaUe5eNUqXut6weDQH8whcNaKNF2RO8NbpT6GY8rHOK2A9y++s+ehw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
+  /@esbuild/freebsd-arm64@0.23.0:
+    resolution: {integrity: sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
     os: [freebsd]
     requiresBuild: true
     optional: true
@@ -4127,11 +4121,11 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-arm64@0.17.14:
-    resolution: {integrity: sha512-FhAMNYOq3Iblcj9i+K0l1Fp/MHt+zBeRu/Qkf0LtrcFu3T45jcwB6A1iMsemQ42vR3GBhjNZJZTaCe3VFPbn9g==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
+  /@esbuild/freebsd-x64@0.23.0:
+    resolution: {integrity: sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
     requiresBuild: true
     optional: true
 
@@ -4152,10 +4146,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-arm@0.17.14:
-    resolution: {integrity: sha512-BNTl+wSJ1omsH8s3TkQmIIIQHwvwJrU9u1ggb9XU2KTVM4TmthRIVyxSp2qxROJHhZuW/r8fht46/QE8hU8Qvg==}
-    engines: {node: '>=12'}
-    cpu: [arm]
+  /@esbuild/linux-arm64@0.23.0:
+    resolution: {integrity: sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
     os: [linux]
     requiresBuild: true
     optional: true
@@ -4177,10 +4171,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-ia32@0.17.14:
-    resolution: {integrity: sha512-91OK/lQ5y2v7AsmnFT+0EyxdPTNhov3y2CWMdizyMfxSxRqHazXdzgBKtlmkU2KYIc+9ZK3Vwp2KyXogEATYxQ==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
+  /@esbuild/linux-arm@0.23.0:
+    resolution: {integrity: sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==}
+    engines: {node: '>=18'}
+    cpu: [arm]
     os: [linux]
     requiresBuild: true
     optional: true
@@ -4202,10 +4196,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-loong64@0.17.14:
-    resolution: {integrity: sha512-vp15H+5NR6hubNgMluqqKza85HcGJgq7t6rMH7O3Y6ApiOWPkvW2AJfNojUQimfTp6OUrACUXfR4hmpcENXoMQ==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
+  /@esbuild/linux-ia32@0.23.0:
+    resolution: {integrity: sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
     os: [linux]
     requiresBuild: true
     optional: true
@@ -4227,10 +4221,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-mips64el@0.17.14:
-    resolution: {integrity: sha512-90TOdFV7N+fgi6c2+GO9ochEkmm9kBAKnuD5e08GQMgMINOdOFHuYLPQ91RYVrnWwQ5683sJKuLi9l4SsbJ7Hg==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
+  /@esbuild/linux-loong64@0.23.0:
+    resolution: {integrity: sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
     os: [linux]
     requiresBuild: true
     optional: true
@@ -4252,10 +4246,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-ppc64@0.17.14:
-    resolution: {integrity: sha512-NnBGeoqKkTugpBOBZZoktQQ1Yqb7aHKmHxsw43NddPB2YWLAlpb7THZIzsRsTr0Xw3nqiPxbA1H31ZMOG+VVPQ==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
+  /@esbuild/linux-mips64el@0.23.0:
+    resolution: {integrity: sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
     os: [linux]
     requiresBuild: true
     optional: true
@@ -4277,10 +4271,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-riscv64@0.17.14:
-    resolution: {integrity: sha512-0qdlKScLXA8MGVy21JUKvMzCYWovctuP8KKqhtE5A6IVPq4onxXhSuhwDd2g5sRCzNDlDjitc5sX31BzDoL5Fw==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
+  /@esbuild/linux-ppc64@0.23.0:
+    resolution: {integrity: sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
     os: [linux]
     requiresBuild: true
     optional: true
@@ -4302,10 +4296,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-s390x@0.17.14:
-    resolution: {integrity: sha512-Hdm2Jo1yaaOro4v3+6/zJk6ygCqIZuSDJHdHaf8nVH/tfOuoEX5Riv03Ka15LmQBYJObUTNS1UdyoMk0WUn9Ww==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
+  /@esbuild/linux-riscv64@0.23.0:
+    resolution: {integrity: sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
     os: [linux]
     requiresBuild: true
     optional: true
@@ -4327,10 +4321,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-x64@0.17.14:
-    resolution: {integrity: sha512-8KHF17OstlK4DuzeF/KmSgzrTWQrkWj5boluiiq7kvJCiQVzUrmSkaBvcLB2UgHpKENO2i6BthPkmUhNDaJsVw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
+  /@esbuild/linux-s390x@0.23.0:
+    resolution: {integrity: sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
     os: [linux]
     requiresBuild: true
     optional: true
@@ -4352,11 +4346,11 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/netbsd-x64@0.17.14:
-    resolution: {integrity: sha512-nVwpqvb3yyXztxIT2+VsxJhB5GCgzPdk1n0HHSnchRAcxqKO6ghXwHhJnr0j/B+5FSyEqSxF4q03rbA2fKXtUQ==}
-    engines: {node: '>=12'}
+  /@esbuild/linux-x64@0.23.0:
+    resolution: {integrity: sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==}
+    engines: {node: '>=18'}
     cpu: [x64]
-    os: [netbsd]
+    os: [linux]
     requiresBuild: true
     optional: true
 
@@ -4377,10 +4371,18 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/openbsd-x64@0.17.14:
-    resolution: {integrity: sha512-1RZ7uQQ9zcy/GSAJL1xPdN7NDdOOtNEGiJalg/MOzeakZeTrgH/DoCkbq7TaPDiPhWqnDF+4bnydxRqQD7il6g==}
-    engines: {node: '>=12'}
+  /@esbuild/netbsd-x64@0.23.0:
+    resolution: {integrity: sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==}
+    engines: {node: '>=18'}
     cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/openbsd-arm64@0.23.0:
+    resolution: {integrity: sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
     os: [openbsd]
     requiresBuild: true
     optional: true
@@ -4402,11 +4404,11 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/sunos-x64@0.17.14:
-    resolution: {integrity: sha512-nqMjDsFwv7vp7msrwWRysnM38Sd44PKmW8EzV01YzDBTcTWUpczQg6mGao9VLicXSgW/iookNK6AxeogNVNDZA==}
-    engines: {node: '>=12'}
+  /@esbuild/openbsd-x64@0.23.0:
+    resolution: {integrity: sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==}
+    engines: {node: '>=18'}
     cpu: [x64]
-    os: [sunos]
+    os: [openbsd]
     requiresBuild: true
     optional: true
 
@@ -4427,11 +4429,11 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/win32-arm64@0.17.14:
-    resolution: {integrity: sha512-xrD0mccTKRBBIotrITV7WVQAwNJ5+1va6L0H9zN92v2yEdjfAN7864cUaZwJS7JPEs53bDTzKFbfqVlG2HhyKQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
+  /@esbuild/sunos-x64@0.23.0:
+    resolution: {integrity: sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
     requiresBuild: true
     optional: true
 
@@ -4452,10 +4454,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/win32-ia32@0.17.14:
-    resolution: {integrity: sha512-nXpkz9bbJrLLyUTYtRotSS3t5b+FOuljg8LgLdINWFs3FfqZMtbnBCZFUmBzQPyxqU87F8Av+3Nco/M3hEcu1w==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
+  /@esbuild/win32-arm64@0.23.0:
+    resolution: {integrity: sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
     os: [win32]
     requiresBuild: true
     optional: true
@@ -4477,10 +4479,10 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/win32-x64@0.17.14:
-    resolution: {integrity: sha512-gPQmsi2DKTaEgG14hc3CHXHp62k8g6qr0Pas+I4lUxRMugGSATh/Bi8Dgusoz9IQ0IfdrvLpco6kujEIBoaogA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
+  /@esbuild/win32-ia32@0.23.0:
+    resolution: {integrity: sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
     os: [win32]
     requiresBuild: true
     optional: true
@@ -4502,6 +4504,14 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/win32-x64@0.23.0:
+    resolution: {integrity: sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    optional: true
+
   /@eslint-community/eslint-utils@4.4.0(eslint@8.57.0):
     resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -11976,13 +11986,6 @@ packages:
       '@types/responselike': 1.0.0
     dev: false
 
-  /@types/chrome@0.0.106:
-    resolution: {integrity: sha512-sCQa+QJL/Kl+6ngU4xD1VjTFIkQDizOHN94zbb7byK9D3U79x/KXjqXyS7lHoa2q9xw3bWePb+giLhBKOILRuA==}
-    dependencies:
-      '@types/filesystem': 0.0.29
-      '@types/har-format': 1.2.4
-    dev: false
-
   /@types/chrome@0.0.127:
     resolution: {integrity: sha512-hBB9EApLYKKn2GvklVkTxVP6vZvxsH9okyIRUinNtMzZHIgIKWQk/ESbX+O5g4Bihfy38+aFGn7Kl7Cxou5JUg==}
     dependencies:
@@ -12184,9 +12187,11 @@ packages:
     resolution: {integrity: sha512-85/1KfRedmfPGsbK8YzeaQUyV1FQAvMPMTuWFQ5EkLd2w7szhNO96bk3Rh/SKmOfd9co2rCLf0Voy4o7ECBOvw==}
     dependencies:
       '@types/filewriter': 0.0.28
+    dev: true
 
   /@types/filewriter@0.0.28:
     resolution: {integrity: sha512-AR2KUJIMdSfl/SaAHpRotBAlaJpmhgHwehEeSJQOG0hS3IrjDU16xUEEUTdqcvdLa1q16ZK5MMrtOagfLvm0gw==}
+    dev: true
 
   /@types/find-cache-dir@3.2.1:
     resolution: {integrity: sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw==}
@@ -12219,6 +12224,7 @@ packages:
 
   /@types/har-format@1.2.4:
     resolution: {integrity: sha512-iUxzm1meBm3stxUMzRqgOVHjj4Kgpgu5w9fm4X7kPRfSgVRzythsucEN7/jtOo8SQzm+HfcxWWzJS0mJDH/3DQ==}
+    dev: true
 
   /@types/hast@2.3.1:
     resolution: {integrity: sha512-viwwrB+6xGzw+G1eWpF9geV3fnsDgXqHG+cqgiHrvQfDUW5hzhCyV7Sy3UJxhfRFBsgky2SSW33qi/YrIkjX5Q==}
@@ -12867,7 +12873,7 @@ packages:
       '@typescript-eslint/scope-manager': 5.62.0
       '@typescript-eslint/types': 5.62.0
       '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.4.2)
-      debug: 4.3.4
+      debug: 4.3.5
       eslint: 8.57.0
       typescript: 5.4.2
     dev: true
@@ -16202,7 +16208,6 @@ packages:
     dependencies:
       ms: 2.1.2
       supports-color: 8.1.1
-    dev: true
 
   /debuglog@1.0.1:
     resolution: {integrity: sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==}
@@ -16768,7 +16773,7 @@ packages:
       base64id: 2.0.0
       cookie: 0.4.2
       cors: 2.8.5
-      debug: 4.3.4
+      debug: 4.3.5
       engine.io-parser: 5.2.2
       ws: 8.11.0
     transitivePeerDependencies:
@@ -17022,35 +17027,6 @@ packages:
       esbuild: 0.19.11
     dev: true
 
-  /esbuild@0.17.14:
-    resolution: {integrity: sha512-vOO5XhmVj/1XQR9NQ1UPq6qvMYL7QFJU57J5fKBKBKxp17uDt5PgxFDb4A2nEiXhr1qQs4x0F5+66hVVw4ruNw==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    optionalDependencies:
-      '@esbuild/android-arm': 0.17.14
-      '@esbuild/android-arm64': 0.17.14
-      '@esbuild/android-x64': 0.17.14
-      '@esbuild/darwin-arm64': 0.17.14
-      '@esbuild/darwin-x64': 0.17.14
-      '@esbuild/freebsd-arm64': 0.17.14
-      '@esbuild/freebsd-x64': 0.17.14
-      '@esbuild/linux-arm': 0.17.14
-      '@esbuild/linux-arm64': 0.17.14
-      '@esbuild/linux-ia32': 0.17.14
-      '@esbuild/linux-loong64': 0.17.14
-      '@esbuild/linux-mips64el': 0.17.14
-      '@esbuild/linux-ppc64': 0.17.14
-      '@esbuild/linux-riscv64': 0.17.14
-      '@esbuild/linux-s390x': 0.17.14
-      '@esbuild/linux-x64': 0.17.14
-      '@esbuild/netbsd-x64': 0.17.14
-      '@esbuild/openbsd-x64': 0.17.14
-      '@esbuild/sunos-x64': 0.17.14
-      '@esbuild/win32-arm64': 0.17.14
-      '@esbuild/win32-ia32': 0.17.14
-      '@esbuild/win32-x64': 0.17.14
-
   /esbuild@0.18.20:
     resolution: {integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==}
     engines: {node: '>=12'}
@@ -17111,6 +17087,37 @@ packages:
       '@esbuild/win32-ia32': 0.19.11
       '@esbuild/win32-x64': 0.19.11
 
+  /esbuild@0.23.0:
+    resolution: {integrity: sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==}
+    engines: {node: '>=18'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.23.0
+      '@esbuild/android-arm': 0.23.0
+      '@esbuild/android-arm64': 0.23.0
+      '@esbuild/android-x64': 0.23.0
+      '@esbuild/darwin-arm64': 0.23.0
+      '@esbuild/darwin-x64': 0.23.0
+      '@esbuild/freebsd-arm64': 0.23.0
+      '@esbuild/freebsd-x64': 0.23.0
+      '@esbuild/linux-arm': 0.23.0
+      '@esbuild/linux-arm64': 0.23.0
+      '@esbuild/linux-ia32': 0.23.0
+      '@esbuild/linux-loong64': 0.23.0
+      '@esbuild/linux-mips64el': 0.23.0
+      '@esbuild/linux-ppc64': 0.23.0
+      '@esbuild/linux-riscv64': 0.23.0
+      '@esbuild/linux-s390x': 0.23.0
+      '@esbuild/linux-x64': 0.23.0
+      '@esbuild/netbsd-x64': 0.23.0
+      '@esbuild/openbsd-arm64': 0.23.0
+      '@esbuild/openbsd-x64': 0.23.0
+      '@esbuild/sunos-x64': 0.23.0
+      '@esbuild/win32-arm64': 0.23.0
+      '@esbuild/win32-ia32': 0.23.0
+      '@esbuild/win32-x64': 0.23.0
+
   /escalade@3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
     engines: {node: '>=6'}
@@ -21169,7 +21176,7 @@ packages:
     engines: {node: '>=8.0'}
     dependencies:
       date-format: 4.0.14
-      debug: 4.3.4
+      debug: 4.3.5
       flatted: 3.3.1
       rfdc: 1.3.0
       streamroller: 3.1.5
@@ -22182,7 +22189,7 @@ packages:
     dependencies:
       loader-utils: 2.0.4
       monaco-editor: 0.24.0
-      webpack: 5.90.3(esbuild@0.17.14)
+      webpack: 5.90.3(esbuild@0.23.0)
     dev: false
 
   /monaco-editor@0.24.0:
@@ -25694,7 +25701,7 @@ packages:
   /socket.io-adapter@2.5.4:
     resolution: {integrity: sha512-wDNHGXGewWAjQPt3pyeYBtpWSq9cLE5UW1ZUPL/2eGK9jtse/FpXib7epSTsz0Q0m+6sg6Y4KtcFTlah1bdOVg==}
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.5
       ws: 8.11.0
     transitivePeerDependencies:
       - bufferutil
@@ -25706,7 +25713,7 @@ packages:
     engines: {node: '>=10.0.0'}
     dependencies:
       '@socket.io/component-emitter': 3.1.2
-      debug: 4.3.4
+      debug: 4.3.5
     dev: true
 
   /socket.io@4.7.5:
@@ -25716,7 +25723,7 @@ packages:
       accepts: 1.3.8
       base64id: 2.0.0
       cors: 2.8.5
-      debug: 4.3.4
+      debug: 4.3.5
       engine.io: 6.5.4
       socket.io-adapter: 2.5.4
       socket.io-parser: 4.2.4
@@ -26008,7 +26015,7 @@ packages:
     engines: {node: '>=8.0'}
     dependencies:
       date-format: 4.0.14
-      debug: 4.3.4
+      debug: 4.3.5
       fs-extra: 8.1.0
     dev: true
 
@@ -26675,7 +26682,7 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /terser-webpack-plugin@5.3.10(esbuild@0.17.14)(webpack@5.90.3):
+  /terser-webpack-plugin@5.3.10(esbuild@0.23.0)(webpack@5.90.3):
     resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
@@ -26692,12 +26699,12 @@ packages:
         optional: true
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
-      esbuild: 0.17.14
+      esbuild: 0.23.0
       jest-worker: 27.5.1
       schema-utils: 3.3.0
       serialize-javascript: 6.0.2
       terser: 5.29.2
-      webpack: 5.90.3(esbuild@0.17.14)
+      webpack: 5.90.3(esbuild@0.23.0)
     dev: false
 
   /terser@5.29.2:
@@ -28239,18 +28246,6 @@ packages:
       tslib: 2.1.0
     dev: true
 
-  /webext-additional-permissions@1.0.0:
-    resolution: {integrity: sha512-QHMAah++muVoK/d+aYM56BY2DdpMAFMvW/dG28/+SdYJxgUsShsm3fOuwCPIiAIgsC8lsM52hZNJ1ROeii1lKg==}
-    dependencies:
-      '@types/chrome': 0.0.106
-    dev: false
-
-  /webext-domain-permission-toggle@1.0.1:
-    resolution: {integrity: sha512-vP3Io5KB+9YSlexDpSykcPKyu/U9pH07YGRIN1snwl92mvHy0aQlOmwYhAdfxLf4KKT7E1te1Bo0+ZvZJYFK2g==}
-    dependencies:
-      webext-additional-permissions: 1.0.0
-    dev: false
-
   /webextension-polyfill@0.6.0:
     resolution: {integrity: sha512-PlYwiX8e4bNZrEeBFxbFFsLtm0SMPxJliLTGdNCA0Bq2XkWrAn2ejUd+89vZm+8BnfFB1BclJyCz3iKsm2atNg==}
     dev: false
@@ -28273,7 +28268,7 @@ packages:
     resolution: {integrity: sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg==}
     dev: true
 
-  /webpack@5.90.3(esbuild@0.17.14):
+  /webpack@5.90.3(esbuild@0.23.0):
     resolution: {integrity: sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==}
     engines: {node: '>=10.13.0'}
     hasBin: true
@@ -28304,7 +28299,7 @@ packages:
       neo-async: 2.6.2
       schema-utils: 3.3.0
       tapable: 2.2.1
-      terser-webpack-plugin: 5.3.10(esbuild@0.17.14)(webpack@5.90.3)
+      terser-webpack-plugin: 5.3.10(esbuild@0.23.0)(webpack@5.90.3)
       watchpack: 2.4.1
       webpack-sources: 3.2.3
     transitivePeerDependencies:
diff --git a/third-party-licenses/ThirdPartyLicenses.csv b/third-party-licenses/ThirdPartyLicenses.csv
index bf2737a3ffc1..01b099cb58c9 100644
--- a/third-party-licenses/ThirdPartyLicenses.csv
+++ b/third-party-licenses/ThirdPartyLicenses.csv
@@ -2615,8 +2615,6 @@ PNPM,web-encoding,1.1.5,MIT,"",Approved
 PNPM,web-streams-polyfill,3.2.1,MIT,"",Approved
 PNPM,webcomponents.js,0.7.20,New BSD,"",Approved
 PNPM,webcrypto-core,1.7.5,MIT,"",Approved
-PNPM,webext-additional-permissions,1.0.0,MIT,"",Approved
-PNPM,webext-domain-permission-toggle,1.0.1,MIT,"",Approved
 PNPM,webextension-polyfill,0.6.0,Mozilla Public License 2.0,"",Approved
 PNPM,webidl-conversions,7.0.0,Simplified BSD,"",Approved
 PNPM,webpack,5.88.2,MIT,"",Approved